From: kan.liang@linux.intel.com
To: peterz@infradead.org, mingo@redhat.com, linux-kernel@vger.kernel.org
Cc: eranian@google.com, namhyung@kernel.org, acme@kernel.org,
jolsa@redhat.com, ak@linux.intel.com,
Kan Liang <kan.liang@linux.intel.com>
Subject: [PATCH 3/7] perf/x86/intel/uncore: Create a symlink for an uncore PMU
Date: Wed, 23 Jun 2021 18:22:05 -0700 [thread overview]
Message-ID: <1624497729-158864-4-git-send-email-kan.liang@linux.intel.com> (raw)
In-Reply-To: <1624497729-158864-1-git-send-email-kan.liang@linux.intel.com>
From: Kan Liang <kan.liang@linux.intel.com>
The platform specific support for Sapphire Rapids will apply a
meaningful name for each uncore PMU. The script which works well with
the old name may not work anymore because of the name change. To avoid
the issue, a symlink should be created from the new name to the old
name.
Add an variable link_name to store the new name.
The rule to name a new meaningful uncore name is the same as the
previous platforms. Factor out __uncore_get_pmu_name().
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
---
arch/x86/events/intel/uncore.c | 28 ++++++++++++++++++++--------
arch/x86/events/intel/uncore.h | 2 ++
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index 9bf4dbb..04e5d37 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -842,6 +842,18 @@ static const struct attribute_group uncore_pmu_attr_group = {
.attrs = uncore_pmu_attrs,
};
+static void __uncore_get_pmu_name(char *pmu_name, const char *type_name,
+ int num_boxes, int idx)
+{
+ if (num_boxes == 1) {
+ if (strlen(type_name) > 0)
+ sprintf(pmu_name, "uncore_%s", type_name);
+ else
+ sprintf(pmu_name, "uncore");
+ } else
+ sprintf(pmu_name, "uncore_%s_%d", type_name, idx);
+}
+
static void uncore_get_pmu_name(struct intel_uncore_pmu *pmu)
{
struct intel_uncore_type *type = pmu->type;
@@ -857,17 +869,17 @@ static void uncore_get_pmu_name(struct intel_uncore_pmu *pmu)
sprintf(pmu->name, "uncore_type_%u_%d",
type->type_id, type->box_ids[pmu->pmu_idx]);
}
+
+ if (type->link_name) {
+ __uncore_get_pmu_name(pmu->link_name, type->link_name,
+ type->num_boxes, type->box_ids[pmu->pmu_idx]);
+ pmu->pmu.link_name = pmu->link_name;
+ }
return;
}
- if (type->num_boxes == 1) {
- if (strlen(type->name) > 0)
- sprintf(pmu->name, "uncore_%s", type->name);
- else
- sprintf(pmu->name, "uncore");
- } else
- sprintf(pmu->name, "uncore_%s_%d", type->name, pmu->pmu_idx);
-
+ __uncore_get_pmu_name(pmu->name, type->name,
+ type->num_boxes, pmu->pmu_idx);
}
static int uncore_pmu_register(struct intel_uncore_pmu *pmu)
diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h
index 187d728..2fc8565 100644
--- a/arch/x86/events/intel/uncore.h
+++ b/arch/x86/events/intel/uncore.h
@@ -46,6 +46,7 @@ struct intel_uncore_topology;
struct intel_uncore_type {
const char *name;
+ const char *link_name;
int num_counters;
int num_boxes;
int perf_ctr_bits;
@@ -118,6 +119,7 @@ struct intel_uncore_ops {
struct intel_uncore_pmu {
struct pmu pmu;
char name[UNCORE_PMU_NAME_LEN];
+ char link_name[UNCORE_PMU_NAME_LEN];
int pmu_idx;
int func_id;
bool registered;
--
2.7.4
next prev parent reply other threads:[~2021-06-24 1:37 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-24 1:22 [PATCH 0/7] perf: Add Sapphire Rapids server uncore support kan.liang
2021-06-24 1:22 ` [PATCH 1/7] driver core: Add a way to get to bus devices kset kan.liang
2021-06-24 5:41 ` Greg KH
2021-06-24 1:22 ` [PATCH 2/7] perf: Create a symlink for a PMU kan.liang
2021-06-24 5:48 ` Greg KH
2021-06-24 14:24 ` Andi Kleen
2021-06-24 14:29 ` Greg KH
2021-06-24 15:24 ` Andi Kleen
2021-06-24 15:31 ` Greg KH
2021-06-24 17:07 ` Liang, Kan
2021-06-24 17:35 ` Greg KH
2021-06-24 17:49 ` Andi Kleen
2021-06-25 5:18 ` Greg KH
2021-06-25 5:17 ` Greg KH
2021-06-24 17:28 ` Andi Kleen
2021-06-25 5:19 ` Greg KH
2021-06-25 14:22 ` Andi Kleen
2021-06-25 14:38 ` Greg KH
2021-06-25 14:49 ` Andi Kleen
2021-06-25 15:03 ` Liang, Kan
2021-06-25 15:44 ` Andi Kleen
2021-06-25 15:57 ` Liang, Kan
2021-06-25 16:18 ` Liang, Kan
2021-06-27 11:02 ` Greg KH
2021-06-27 16:30 ` Andi Kleen
2021-06-28 6:55 ` Greg KH
2021-06-28 15:00 ` Andi Kleen
2021-06-24 1:22 ` kan.liang [this message]
2021-06-24 5:44 ` [PATCH 3/7] perf/x86/intel/uncore: Create a symlink for an uncore PMU Greg KH
2021-06-24 1:22 ` [PATCH 4/7] perf/x86/intel/uncore: Add Sapphire Rapids server support kan.liang
2021-06-24 1:22 ` [PATCH 5/7] perf/x86/intel/uncore: Factor out snr_uncore_mmio_map() kan.liang
2021-06-24 1:22 ` [PATCH 6/7] perf/x86/intel/uncore: Support free-running counters on Sapphire Rapids server kan.liang
2021-06-24 1:22 ` [PATCH 7/7] perf/x86/intel/uncore: Fix invalid unit check kan.liang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1624497729-158864-4-git-send-email-kan.liang@linux.intel.com \
--to=kan.liang@linux.intel.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).