From: Prarit Bhargava <prarit@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kan.liang@intel.com, x86@kernel.org, andi@firstfloor.org,
peterz@infradead.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 1/3 v2] perf/x86/intel/uncore: Cache logical pkg id in uncore driver
Date: Thu, 14 Sep 2017 16:26:58 -0400 [thread overview]
Message-ID: <1505420820-7274-2-git-send-email-prarit@redhat.com> (raw)
In-Reply-To: <1505420820-7274-1-git-send-email-prarit@redhat.com>
From: Andi Kleen <ak@linux.intel.com>
The SNB-EP uncore driver is the only user of topology_phys_to_logical_pkg
in a performance critical path. Change it query the logical pkg ID
only once at initialization time and then cache it in box structure.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
arch/x86/events/intel/uncore.c | 1 +
arch/x86/events/intel/uncore.h | 1 +
arch/x86/events/intel/uncore_snbep.c | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index 1c5390f1cf09..d13ac98e922b 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -939,6 +939,7 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id
atomic_inc(&box->refcnt);
box->pci_phys_id = phys_id;
+ box->logical_pkg_id = topology_phys_to_logical_pkg(box->pci_phys_id);
box->pkgid = pkg;
box->pci_dev = pdev;
box->pmu = pmu;
diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h
index df5989f27b1b..6214cd33a9fb 100644
--- a/arch/x86/events/intel/uncore.h
+++ b/arch/x86/events/intel/uncore.h
@@ -99,6 +99,7 @@ struct intel_uncore_extra_reg {
struct intel_uncore_box {
int pci_phys_id;
+ int logical_pkg_id;
int pkgid;
int n_active; /* number of active events */
int n_events;
diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index db1fe377e6dd..11dec9f94cb0 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -1056,7 +1056,7 @@ static void snbep_qpi_enable_event(struct intel_uncore_box *box, struct perf_eve
if (reg1->idx != EXTRA_REG_NONE) {
int idx = box->pmu->pmu_idx + SNBEP_PCI_QPI_PORT0_FILTER;
- int pkg = topology_phys_to_logical_pkg(box->pci_phys_id);
+ int pkg = box->logical_pkg_id;
struct pci_dev *filter_pdev = uncore_extra_pci_dev[pkg].dev[idx];
if (filter_pdev) {
--
1.8.5.5
next prev parent reply other threads:[~2017-09-14 20:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-14 20:26 [PATCH 0/3 v2] x86/smpboot: Cleanup logical package ID Prarit Bhargava
2017-09-14 20:26 ` Prarit Bhargava [this message]
2017-09-14 20:26 ` [PATCH 2/3 v2] x86/topology: Avoid wasting 128k for package id array Prarit Bhargava
2017-09-14 20:27 ` [PATCH 3/3 v2] x86/smpboot: Fix __max_logical_packages estimate Prarit Bhargava
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=1505420820-7274-2-git-send-email-prarit@redhat.com \
--to=prarit@redhat.com \
--cc=ak@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=kan.liang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.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).