[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20171024180802.8422-2-prarit@redhat.com>
Date: Tue, 24 Oct 2017 14:08:00 -0400
From: Prarit Bhargava <prarit@...hat.com>
To: linux-kernel@...r.kernel.org
Cc: Andi Kleen <ak@...ux.intel.com>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>, x86@...nel.org,
Peter Zijlstra <peterz@...radead.org>,
Dave Hansen <dave.hansen@...el.com>,
Piotr Luc <piotr.luc@...el.com>,
Kan Liang <kan.liang@...el.com>, Borislav Petkov <bp@...e.de>,
Stephane Eranian <eranian@...gle.com>,
Prarit Bhargava <prarit@...hat.com>,
Arvind Yadav <arvind.yadav.cs@...il.com>,
Andy Lutomirski <luto@...nel.org>,
Christian Borntraeger <borntraeger@...ibm.com>,
"Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
Tom Lendacky <thomas.lendacky@....com>,
Mathias Krause <minipli@...glemail.com>,
Tim Chen <tim.c.chen@...ux.intel.com>,
Vitaly Kuznetsov <vkuznets@...hat.com>
Subject: [PATCH 1/3] perf/x86/intel/uncore: Cache logical pkg id in uncore driver
From: Andi Kleen <ak@...ux.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@...ux.intel.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: x86@...nel.org
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Andi Kleen <ak@...ux.intel.com>
Cc: Dave Hansen <dave.hansen@...el.com>
Cc: Piotr Luc <piotr.luc@...el.com>
Cc: Kan Liang <kan.liang@...el.com>
Cc: Borislav Petkov <bp@...e.de>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Prarit Bhargava <prarit@...hat.com>
Cc: Arvind Yadav <arvind.yadav.cs@...il.com>
Cc: Andy Lutomirski <luto@...nel.org>
Cc: Christian Borntraeger <borntraeger@...ibm.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>
Cc: Tom Lendacky <thomas.lendacky@....com>
Cc: Mathias Krause <minipli@...glemail.com>
Cc: Tim Chen <tim.c.chen@...ux.intel.com>
Cc: Vitaly Kuznetsov <vkuznets@...hat.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
Powered by blists - more mailing lists