From nobody Sun Sep 3 20:27:46 2023 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 4Rf3H63gjbz4sMnH; Sun, 3 Sep 2023 20:27:46 +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 4Rf3H6383Fz4Sm3; Sun, 3 Sep 2023 20:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693772866; 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=wU2kXQaIyYJISr8hjJzqPf7hZgdwCDb5EP8aC8HfQqk=; b=wHqYs4CI3xygx5psuRLiThG0dUGoRz4/QyY2K7j/HSIY6jQeN5WzZLijDzHpBRrw+GlSWu hlx9bNpwMCiLHDdDwtBNfB6sG2e0VyDA9k/FchWPw7dF1JO+HRsVoOk0Ws0Kxk6+13KWKN TdVZ/MVfSvjyat00Hb3FMYn8oQ2P0X2idhMSnjmWXPOTe7r3A4ef81G99L27wmjnZ7MBKr 4TpajJlws1PFxuIGmo0Ge9yPc+M0BTbAQpeoB3zBZO72FflcZIr6nkmnfuqLMThAsZBS0N 1L6M6B79OAG9Vz+eUrfwrljiYrjPZbDoqMzZ1rD5B7Heuu3q+4TGv4WCswOCYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693772866; a=rsa-sha256; cv=none; b=Z9kK1Ol2zAgvgGn/JUta6BVr5+IO7wTU+KPtGLsT/aOQkttNHGVk5e2PAy2X9K9TgLWs7J 2Hv2w51Q14UecexaV6amVu/mDxUEaFo3oRw+k3AuLcuykNsmtc93yyN/1O+GEFE1mdpPMP SpzSU7BfjjdnE8yafoOEkLQFUqP9esW0P8ILuerBFnxL9kLCYFhFF1f8j4aqRU5Lg9M/Ed Jgxft+Q22YkVi5hxrjFy2KCKbqswuKuf9nOHI6Dd55JctXFEbmVD+mspWcsgjxv1k4lB9K gUWCod3VDoLx7SAG+ZfkexQo+H+syEWi/4pyPdAo2R2Yw7Hh2qeJvgREYR0VNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693772866; 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=wU2kXQaIyYJISr8hjJzqPf7hZgdwCDb5EP8aC8HfQqk=; b=MdJDXg7uP77Q77507rTt1+gr/+jNt3vxg8CFV1fXDttvVD+/v4Hq0AMSpNuvInifL8e6Mr fIDnIYdAkV7fCA3SFf2PbcxpnBFLS62/RwyD8gOIj/5bRerB9F9x7VmArdzV4fM2+mcsE9 e8AKcoDnEL/M72+gr/zMIOWNvOkuZSjxhts9b2g6dXUkXqigB/mGfi+DCiHEb01hd6k8VA 1/Cfz/XX9HioEIzHQQA8CttM/KhFBf5Rz/L2b57a1pxWI4FZ+tuVpHdITpH/wrHbkpwnqK LTKtyz1SMJnnByx6ckPhO/KHxej0noFnjwYFEWqACnJOQ/1YmICQnjJ3Sjc9RA== 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 4Rf3H62Bvgzf3r; Sun, 3 Sep 2023 20:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 383KRkbn089775; Sun, 3 Sep 2023 20:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 383KRkcu089772; Sun, 3 Sep 2023 20:27:46 GMT (envelope-from git) Date: Sun, 3 Sep 2023 20:27:46 GMT Message-Id: <202309032027.383KRkcu089772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 45dcc17e2fb8 - main - libpmc: make pmc_pmu_pmcallocate() machine-independent 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45dcc17e2fb8f0f9838ba167b311f271a08fcea9 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=45dcc17e2fb8f0f9838ba167b311f271a08fcea9 commit 45dcc17e2fb8f0f9838ba167b311f271a08fcea9 Author: Mitchell Horne AuthorDate: 2023-06-19 22:32:22 +0000 Commit: Mitchell Horne CommitDate: 2023-09-03 20:27:05 +0000 libpmc: make pmc_pmu_pmcallocate() machine-independent Have it call the platform-dependent version. For better layering, move the reset logic inside the new function. This is mainly to facilitate an upcoming change. Reviewed by: jkoshy MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40752 --- lib/libpmc/libpmc.c | 5 ----- lib/libpmc/libpmc_pmu_util.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index 71fba89237ff..a7ed1c3d9ac8 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -1091,11 +1091,6 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode, assert(pmc_config.pm_ev < PMC_EVENT_FIRST); goto found; } - - /* Otherwise, reset any changes */ - pmc_config.pm_ev = 0; - pmc_config.pm_caps = 0; - pmc_config.pm_class = 0; } free(spec_copy); spec_copy = NULL; diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index a61f81f7d2c7..772dec7a9d53 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -572,8 +572,8 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, return (0); } -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -604,8 +604,8 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #elif defined(__powerpc64__) -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -631,8 +631,8 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #elif defined(__aarch64__) -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -658,9 +658,27 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #else -int -pmc_pmu_pmcallocate(const char *e __unused, struct pmc_op_pmcallocate *p __unused) +static int +pmc_pmu_pmcallocate_md(const char *e __unused, struct pmc_op_pmcallocate *p __unused) { return (EOPNOTSUPP); } #endif + +int +pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +{ + int error; + + error = pmc_pmu_pmcallocate_md(event_name, pm); + if (error != 0) { + /* Reset any changes. */ + pm->pm_ev = 0; + pm->pm_caps = 0; + pm->pm_class = 0; + + return (error); + } + + return (0); +}