Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1783781ybv; Fri, 14 Feb 2020 06:02:36 -0800 (PST) X-Google-Smtp-Source: APXvYqyM6EKWIHPb+xdcA1pmy8cP2zUhvkeM3UDQ39bHcAuw+zQMP12spfyk01MyyMuF+J0kJg0F X-Received: by 2002:a9d:729c:: with SMTP id t28mr2410076otj.66.1581688956691; Fri, 14 Feb 2020 06:02:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581688956; cv=none; d=google.com; s=arc-20160816; b=mtlL4pMKyP6bCdifijrtNdijavnsD+LmXv+uTn22KrK2eDhGgnBxZFFaSaPbeXFM9x M8Ja0mG7ilgAERGl3Rv+zb2orIQ09xqGV2lxqAjJMEwOtKTK6tn8SDnZ7SIgkxL6VLH6 J7ZHX0HtLJovuX1cMXYh2riq3vcrgvYkwR5K6o7TeOqENDshf4SwUlS5Mr6737ixD7CC hotiVxv0GQITsaFs9aKGjGPQGjHbd2FODd51B3dYxY9vSg6gd6TApy9xSqbvdLpM3lbv 7Hls5+PpjCN/U9VnWMccwNmpSsFA5D9HAJ8abaR+rX5K05VFhZRsmg5ZVQVboDDvv1NJ CbFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=l1PmeWhbg468F6tnlWbGIj5sz3LqiYeJddVtnbPCGuM=; b=xydHcdwUoLzcofqJq9unwGcmP1BX3bcibfgtgykyqbelnqFGjGX5E/p5I2cjHVVBsU WxTRu5F4Zn8xJKFTh9Vvkvphxhezx7/7HniErkuJMDidVmNdvHlqUBdNJOox/5hCGy2y YoymB5NrTyl74D3fDmsdUMVThgDXCT3kHoGI3sQ66jmL7+2U2R0cgmWl2ynXhkcJerCV iN3Y53yKy+G1DElwgcV05DikFqrU75zFdCRW0W5GdhK+kBBc3LSNbEK8tcVDhnUCiDDI 1rLjMZ9dZa047xUuS6qRMsc29Cmi83Htuj6HLS6AOXMm9bN5ebGFxTGQ6ktRwmKBArvk cWvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e77si2977287ote.153.2020.02.14.06.02.18; Fri, 14 Feb 2020 06:02:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729335AbgBNOCH (ORCPT + 99 others); Fri, 14 Feb 2020 09:02:07 -0500 Received: from mga01.intel.com ([192.55.52.88]:62357 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728123AbgBNOCG (ORCPT ); Fri, 14 Feb 2020 09:02:06 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Feb 2020 06:02:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,440,1574150400"; d="scan'208";a="347959410" Received: from nntpdsd52-183.inn.intel.com ([10.125.52.183]) by fmsmga001.fm.intel.com with ESMTP; 14 Feb 2020 06:02:03 -0800 From: roman.sudarikov@linux.intel.com To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@redhat.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, eranian@google.com, bgregg@netflix.com, ak@linux.intel.com, kan.liang@linux.intel.com, gregkh@linuxfoundation.org Cc: alexander.antonov@intel.com, roman.sudarikov@linux.intel.com Subject: [PATCH v7 1/3] perf x86: Infrastructure for exposing an Uncore unit to PMON mapping Date: Fri, 14 Feb 2020 17:01:57 +0300 Message-Id: <20200214140159.9267-2-roman.sudarikov@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200214140159.9267-1-roman.sudarikov@linux.intel.com> References: <20200214140159.9267-1-roman.sudarikov@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roman Sudarikov Intel® Xeon® Scalable processor family (code name Skylake-SP) makes significant changes in the integrated I/O (IIO) architecture. The new solution introduces IIO stacks which are responsible for managing traffic between the PCIe domain and the Mesh domain. Each IIO stack has its own PMON block and can handle either DMI port, x16 PCIe root port, MCP-Link or various built-in accelerators. IIO PMON blocks allow concurrent monitoring of I/O flows up to 4 x4 bifurcation within each IIO stack. Software is supposed to program required perf counters within each IIO stack and gather performance data. The tricky thing here is that IIO PMON reports data per IIO stack but users have no idea what IIO stacks are - they only know devices which are connected to the platform. Understanding IIO stack concept to find which IIO stack that particular IO device is connected to, or to identify an IIO PMON block to program for monitoring specific IIO stack assumes a lot of implicit knowledge about given Intel server platform architecture. Usage example: ls /sys/devices/uncore__/die* Each Uncore unit type, by its nature, can be mapped to its own context, for example: 1. CHA - each uncore_cha_ is assigned to manage a distinct slice of LLC capacity; 2. UPI - each uncore_upi_ is assigned to manage one link of Intel UPI Subsystem; 3. IIO - each uncore_iio_ is assigned to manage one stack of the IIO module; 4. IMC - each uncore_imc_ is assigned to manage one channel of Memory Controller. Implementation details: Optional callbacks added to struct intel_uncore_type to discover and map Uncore units to PMONs: int (*set_mapping)(struct intel_uncore_type *type) void (*cleanup_mapping)(struct intel_uncore_type *type) Details of IIO Uncore unit mapping to IIO PMON: Each IIO stack is either DMI port, x16 PCIe root port, MCP-Link or various built-in accelerators. For Uncore IIO Unit type, the mapping file holds bus numbers of devices, which can be monitored by that IIO PMON block on each die. Co-developed-by: Alexander Antonov Signed-off-by: Alexander Antonov Signed-off-by: Roman Sudarikov --- arch/x86/events/intel/uncore.c | 8 ++++++++ arch/x86/events/intel/uncore.h | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 86467f85c383..fb693608c223 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -843,10 +843,12 @@ static int uncore_pmu_register(struct intel_uncore_pmu *pmu) .read = uncore_pmu_event_read, .module = THIS_MODULE, .capabilities = PERF_PMU_CAP_NO_EXCLUDE, + .attr_update = pmu->type->attr_update, }; } else { pmu->pmu = *pmu->type->pmu; pmu->pmu.attr_groups = pmu->type->attr_groups; + pmu->pmu.attr_update = pmu->type->attr_update; } if (pmu->type->num_boxes == 1) { @@ -887,6 +889,9 @@ static void uncore_type_exit(struct intel_uncore_type *type) struct intel_uncore_pmu *pmu = type->pmus; int i; + if (type->cleanup_mapping) + type->cleanup_mapping(type); + if (pmu) { for (i = 0; i < type->num_boxes; i++, pmu++) { uncore_pmu_unregister(pmu); @@ -954,6 +959,9 @@ static int __init uncore_type_init(struct intel_uncore_type *type, bool setid) type->pmu_group = &uncore_pmu_attr_group; + if (type->set_mapping) + type->set_mapping(type); + return 0; err: diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h index bbfdaa720b45..d41f8874adc5 100644 --- a/arch/x86/events/intel/uncore.h +++ b/arch/x86/events/intel/uncore.h @@ -72,7 +72,13 @@ struct intel_uncore_type { struct uncore_event_desc *event_descs; struct freerunning_counters *freerunning; const struct attribute_group *attr_groups[4]; + const struct attribute_group **attr_update; struct pmu *pmu; /* for custom pmu ops */ + /* PMON's topologies */ + u64 *topology; + /* mapping Uncore units to PMON ranges */ + int (*set_mapping)(struct intel_uncore_type *type); + void (*cleanup_mapping)(struct intel_uncore_type *type); }; #define pmu_group attr_groups[0] -- 2.19.1