From: Andi Kleen <a...@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 <a...@linux.intel.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: "H. Peter Anvin" <h...@zytor.com>
Cc: x...@kernel.org
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Andi Kleen <a...@linux.intel.com>
Cc: Dave Hansen <dave.han...@intel.com>
Cc: Piotr Luc <piotr....@intel.com>
Cc: Kan Liang <kan.li...@intel.com>
Cc: Borislav Petkov <b...@suse.de>
Cc: Stephane Eranian <eran...@google.com>
Cc: Prarit Bhargava <pra...@redhat.com>
Cc: Arvind Yadav <arvind.yadav...@gmail.com>
Cc: Andy Lutomirski <l...@kernel.org>
Cc: Christian Borntraeger <borntrae...@de.ibm.com>
Cc: "Kirill A. Shutemov" <kirill.shute...@linux.intel.com>
Cc: Tom Lendacky <thomas.lenda...@amd.com>
Cc: He Chen <he.c...@linux.intel.com>
Cc: Mathias Krause <mini...@googlemail.com>
Cc: Tim Chen <tim.c.c...@linux.intel.com>
Cc: Vitaly Kuznetsov <vkuzn...@redhat.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 d45e06346f14..87ef77982248 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -947,6 +947,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 a7196818416a..252d371b488b 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) {
--
2.15.0.rc0.39.g2f0e14e64
