perf/x86/intel/uncore: Cache logical pkg id in uncore driver

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. This allows to change the logical package
management without affecting the performance critical path.

Signed-off-by: Andi Kleen <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Prarit Bhargava <[email protected]>
Cc: Tom Lendacky <[email protected]>
Cc: Christian Borntraeger <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Kan Liang <[email protected]>
Cc: He Chen <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Piotr Luc <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Arvind Yadav <[email protected]>
Cc: Vitaly Kuznetsov <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Tim Chen <[email protected]>
Cc: Mathias Krause <[email protected]>
Cc: "Kirill A. Shutemov" <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]

diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index d45e06346f14d8636f1b4348a84a6e503012c686..7874c980d56921961328fa0212da9dae61458789 100644 (file)
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -975,10 +975,10 @@ static void uncore_pci_remove(struct pci_dev *pdev)
        int i, phys_id, pkg;
 
        phys_id = uncore_pcibus_to_physid(pdev->bus);
-       pkg = topology_phys_to_logical_pkg(phys_id);
 
        box = pci_get_drvdata(pdev);
        if (!box) {
+               pkg = topology_phys_to_logical_pkg(phys_id);
                for (i = 0; i < UNCORE_EXTRA_PCI_DEV_MAX; i++) {
                        if (uncore_extra_pci_dev[pkg].dev[i] == pdev) {
                                uncore_extra_pci_dev[pkg].dev[i] = NULL;
@@ -994,7 +994,7 @@ static void uncore_pci_remove(struct pci_dev *pdev)
                return;
 
        pci_set_drvdata(pdev, NULL);
-       pmu->boxes[pkg] = NULL;
+       pmu->boxes[box->pkgid] = NULL;
        if (atomic_dec_return(&pmu->activeboxes) == 0)
                uncore_pmu_unregister(pmu);
        uncore_box_exit(box);

diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h
index 4364191e7c6b2904a443bf2a522ca4445b7f0a12..414dc7e7c950c6cf7279b51f4161b04e6e868aad 100644 (file)
--- a/arch/x86/events/intel/uncore.h
+++ b/arch/x86/events/intel/uncore.h
@@ -100,7 +100,7 @@ struct intel_uncore_extra_reg {
 
 struct intel_uncore_box {
        int pci_phys_id;
-       int pkgid;
+       int pkgid;      /* Logical package ID */
        int n_active;   /* number of active events */
        int n_events;
        int cpu;        /* cpu to collect events */

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index 95cb19f4e06f03376b03a5a27c59f7e6612167e1..de8f8625213c85d2b9360269b0c6123cd0269e9a 100644 (file)
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -1057,7 +1057,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->pkgid;
                struct pci_dev *filter_pdev = uncore_extra_pci_dev[pkg].dev[idx];
 
                if (filter_pdev) {