From nobody Mon Jul 04 18:09:26 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 333D21C3F493; Mon, 4 Jul 2022 18:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LcDN64hJTz4kPb; Mon, 4 Jul 2022 18:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iA68Jbadb4VB6sqTI5bHDNZG8Okk8AiaFA6VHDrPV30=; b=t8Tg5axOdsRmUxbnBQCjLUWc5o5RNCyB9CerqQGjNUiMINMXrUpV6UJRsNlqTtPsPwDIyG FPZEB+gFYIMRSCqNou7tjBwCIQZRQXD36JNbAxdAjScEupzQzRBi+pWGyBfrhSqymAA2ra Od1/GigXV1G2WGkVvIx7oX4oslJt5KKhmk3MAH8/42i1tRcUrxWhLq35m0iviPk2Uo3oo1 aoWeW8X84v27YPswcwl/cLHqIXSyrN2aYJMHvQ7ThLqkt27WeRAKPLTjNGokuh5YQpVcra vfnCLZsQiM30IAXd1/IBGCcybEKc8oMkVzWzNySNiI+mwq1bggn6MnET3voufg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A97216095; Mon, 4 Jul 2022 18:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 264I9QH2064481; Mon, 4 Jul 2022 18:09:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264I9Qt6064480; Mon, 4 Jul 2022 18:09:26 GMT (envelope-from git) Date: Mon, 4 Jul 2022 18:09:26 GMT Message-Id: <202207041809.264I9Qt6064480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: fad7a311d9ff - stable/13 - hwpmc: Make powerpc memory allocation alike to x86. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fad7a311d9ffa394470e427e6d928269640f602b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iA68Jbadb4VB6sqTI5bHDNZG8Okk8AiaFA6VHDrPV30=; b=ON7NmXUbUJ9vZZsiniqbifAoLnHTLL3FynfXIiWw7nGbAgR+UQuRrNBanF6xRif2UnxkD3 wa/e+poIuiaHG5esdrIli+op70nPAGmtHfxPjWmbSln+57evhOWtnzCPdELDnNuAAh6BV2 h6PiNc/Qg5QrZnMZTFd6OsVMepl+zUBnRqR+nQC2Fm3Qobp0iPnDmtAo/WVefQHFEPQ5xq BGeXQIj7+H2tWKm5Q3GlVE2YCSNmunhkQ9dvAlOwDmGduvuqU5ibn1R2FyfOz78xwnCb2s dut6Aj2FVfQfXSLrShwdinzsn52Y7sCvZllT3tZFmb31EpvIrgSqJyyHffpeRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656958166; a=rsa-sha256; cv=none; b=HDCp157AOEQFr4DxT8Ku+lxVgHL161VrmAH6K4OyX1vk8V17Vc72SofbzNZwg2HR+WlIdQ gvGFnf4ZqEx1s2a40dsnKfSzo3qA7YFlvlbDkzjdzJGZP+PmDCK+bEOp5xTgQmRkfmw1ja qqwp9Lrs67kFun+wpwnFWe229iC0nxrOR94v3ZG4CgwW33FyOHA1oIJgJoNGnukd+K33cT laG3EJaDMN+IZfhb/cmkE7104QSF8KZwPqVjQ2c0FM29SpnCschfNGEa48ag7AA67whH1n tOIuWSYSqPw9TLk1Ud+lzRkyZ2kDTacquEgwwuUZ7LllHKAJKzA2/Yj00w5sWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=fad7a311d9ffa394470e427e6d928269640f602b commit fad7a311d9ffa394470e427e6d928269640f602b Author: Alexander Motin AuthorDate: 2022-06-01 18:50:27 +0000 Commit: Alexander Motin CommitDate: 2022-07-04 17:48:10 +0000 hwpmc: Make powerpc memory allocation alike to x86. It should remove some unneeded pointer dereferences. MFC after: 1 month (cherry picked from commit 47699fc265b9d966b4eba6bc0c41739ac793f52b) --- sys/dev/hwpmc/hwpmc_powerpc.c | 8 +++----- sys/dev/hwpmc/hwpmc_powerpc.h | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c index e97211f0d9a6..537e263d4c15 100644 --- a/sys/dev/hwpmc/hwpmc_powerpc.c +++ b/sys/dev/hwpmc/hwpmc_powerpc.c @@ -166,10 +166,8 @@ powerpc_pcpu_init(struct pmc_mdep *md, int cpu) ("[powerpc,%d] wrong cpu number %d", __LINE__, cpu)); PMCDBG1(MDP,INI,1,"powerpc-init cpu=%d", cpu); - powerpc_pcpu[cpu] = pac = malloc(sizeof(struct powerpc_cpu), M_PMC, - M_WAITOK|M_ZERO); - pac->pc_ppcpmcs = malloc(sizeof(struct pmc_hw) * ppc_max_pmcs, - M_PMC, M_WAITOK|M_ZERO); + powerpc_pcpu[cpu] = pac = malloc(sizeof(struct powerpc_cpu) + + ppc_max_pmcs * sizeof(struct pmc_hw), M_PMC, M_WAITOK | M_ZERO); pac->pc_class = md->pmd_classdep[PMC_MDEP_CLASS_INDEX_POWERPC].pcd_class; @@ -192,8 +190,8 @@ powerpc_pcpu_fini(struct pmc_mdep *md, int cpu) { PMCDBG1(MDP,INI,1,"powerpc-fini cpu=%d", cpu); - free(powerpc_pcpu[cpu]->pc_ppcpmcs, M_PMC); free(powerpc_pcpu[cpu], M_PMC); + powerpc_pcpu[cpu] = NULL; return (0); } diff --git a/sys/dev/hwpmc/hwpmc_powerpc.h b/sys/dev/hwpmc/hwpmc_powerpc.h index 31c20592a21f..551f59b60528 100644 --- a/sys/dev/hwpmc/hwpmc_powerpc.h +++ b/sys/dev/hwpmc/hwpmc_powerpc.h @@ -58,8 +58,8 @@ #define PPC_OVERFLOWCNT_MAX 0x200000000UL struct powerpc_cpu { - struct pmc_hw *pc_ppcpmcs; - enum pmc_class pc_class; + enum pmc_class pc_class; + struct pmc_hw pc_ppcpmcs[]; }; struct pmc_ppc_event {