From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751540AbdKEQyn (ORCPT ); Sun, 5 Nov 2017 11:54:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54112 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750731AbdKEQyl (ORCPT ); Sun, 5 Nov 2017 11:54:41 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B44C3C04AC57 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=prarit@redhat.com From: Prarit Bhargava To: linux-kernel@vger.kernel.org Cc: Andi Kleen , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Peter Zijlstra , Dave Hansen , Piotr Luc , Kan Liang , Borislav Petkov , Stephane Eranian , Prarit Bhargava , Arvind Yadav , Andy Lutomirski , Christian Borntraeger , "Kirill A. Shutemov" , Tom Lendacky , He Chen , Mathias Krause , Tim Chen , Vitaly Kuznetsov Subject: [PATCH v5 1/3] perf/x86/intel/uncore: Cache logical pkg id in uncore driver Date: Sun, 5 Nov 2017 11:54:26 -0500 Message-Id: <20171105165428.32108-2-prarit@redhat.com> In-Reply-To: <20171105165428.32108-1-prarit@redhat.com> References: <20171105165428.32108-1-prarit@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sun, 05 Nov 2017 16:54:41 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen 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 Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: Peter Zijlstra Cc: Andi Kleen Cc: Dave Hansen Cc: Piotr Luc Cc: Kan Liang Cc: Borislav Petkov Cc: Stephane Eranian Cc: Prarit Bhargava Cc: Arvind Yadav Cc: Andy Lutomirski Cc: Christian Borntraeger Cc: "Kirill A. Shutemov" Cc: Tom Lendacky Cc: He Chen Cc: Mathias Krause Cc: Tim Chen Cc: Vitaly Kuznetsov --- 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 4364191e7c6b..cdf6f7083fe2 100644 --- a/arch/x86/events/intel/uncore.h +++ b/arch/x86/events/intel/uncore.h @@ -100,6 +100,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 95cb19f4e06f..d8e39d331ea2 100644 --- 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->logical_pkg_id; struct pci_dev *filter_pdev = uncore_extra_pci_dev[pkg].dev[idx]; if (filter_pdev) { -- 2.15.0.rc0.39.g2f0e14e64