From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932596AbdIHT6B (ORCPT ); Fri, 8 Sep 2017 15:58:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36388 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932498AbdIHT56 (ORCPT ); Fri, 8 Sep 2017 15:57:58 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8E740C047B61 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: kan.liang@intel.com, x86@kernel.org, andi@firstfloor.org, peterz@infradead.org, Andi Kleen Subject: [PATCH 1/3] perf/x86/intel/uncore: Cache logical pkg id in uncore driver Date: Fri, 8 Sep 2017 15:57:46 -0400 Message-Id: <1504900668-13270-2-git-send-email-prarit@redhat.com> In-Reply-To: <1504900668-13270-1-git-send-email-prarit@redhat.com> References: <1504900668-13270-1-git-send-email-prarit@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 08 Sep 2017 19:57:58 +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 --- 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