Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3972046ybl; Mon, 13 Jan 2020 05:56:16 -0800 (PST) X-Google-Smtp-Source: APXvYqwI+KGi7Uzja1C6ghZYnwTU2PFbUNab5SRNr7FpOVkki/u4IPNkDhKx3hJdBTzl6zNzrR/F X-Received: by 2002:aca:1b08:: with SMTP id b8mr4370254oib.62.1578923776403; Mon, 13 Jan 2020 05:56:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578923776; cv=none; d=google.com; s=arc-20160816; b=vH58SmFhTxFR7fdNIAYIiP0u9z4f9PBXQzqWr0kiXDMoLG0XdmCDzl8OKaVK504Zgg DDbcbDs76da1qsH2e2JeNknp7oDIJ1UpsMFECiqi8JDe5InjRJyncvrFCUs5CL/hEhdP YYEA9P+mqJ+eaApFExA8BL0IfAGjuIqaF1NQBKItkX9QVl12c0lW/elYVRcpI6M+Mxr7 cExnsr98SNa0h2BhLDaGUkhKwrLg1WcwvDTv7zbwFMCewQq/XpXDg6Jbx/ELmkYvLPG6 4CE8mypj7aaWE/wpw0w1af+PQVmVHQEzAS0fnSEtNgpASx0JIL6Z+fFmgoFfzp2qn0S+ QMwg== 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=Me/vZUZfr03eztGNfPKLeRSnf0Vp6s6c1C0I4pBIVvU=; b=eBJP+EWicHN2WCLKt7uUjbrggwcLVtBynOHpK4BozbtCFct0u2sk9QlxU9ULyqzD0o ixpOh+tX4gjBikv6hDbZVDsc7WYaEg5Cw0nDURxd0Hq1Jo2p/MMadezHc9wQiAXB7ST0 E34+6hejk3e88CMmxjDsMu2y/Ed9N9jW3GmxM9+VH01NNCP86NWeJfKBBFcFdY/3rPL2 UOod9Jkig6726tznxeswEdz+dT0YUPaKkoPBOdRpflFJGbbcfsPUKHHaMSBUQDAVi0C/ kqz1fqoKqShU+6WwP/fzChxpAv9S1p6kHSkDcdcMLImRhEFfaaJpg7qkRR66d44xB9ch U8yA== 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 q66si5395506oig.65.2020.01.13.05.56.04; Mon, 13 Jan 2020 05:56:16 -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 S1728777AbgAMNyx (ORCPT + 99 others); Mon, 13 Jan 2020 08:54:53 -0500 Received: from mga03.intel.com ([134.134.136.65]:23348 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726074AbgAMNyx (ORCPT ); Mon, 13 Jan 2020 08:54:53 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2020 05:54:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,429,1571727600"; d="scan'208";a="218670949" Received: from nntpdsd52-183.inn.intel.com ([10.125.52.183]) by fmsmga007.fm.intel.com with ESMTP; 13 Jan 2020 05:54:49 -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 v3 1/2] perf x86: Infrastructure for exposing an Uncore unit to PMON mapping Date: Mon, 13 Jan 2020 16:54:43 +0300 Message-Id: <20200113135444.12027-2-roman.sudarikov@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200113135444.12027-1-roman.sudarikov@linux.intel.com> References: <20200113135444.12027-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: /sys/devices/uncore__/platform_mapping 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: Two callbacks added to struct intel_uncore_type to discover and map Uncore units to PMONs: int (*get_topology)(void) int (*set_mapping)(struct intel_uncore_pmu *pmu) 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 platform_mapping file holds bus numbers of devices, which can be monitored by that IIO PMON block on each die. Co-developed-by: Alexander Antonov Reviewed-by: Kan Liang Signed-off-by: Alexander Antonov Signed-off-by: Roman Sudarikov --- arch/x86/events/intel/uncore.c | 37 +++++++++++++++++++++++++++++++++- arch/x86/events/intel/uncore.h | 9 ++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 86467f85c383..2c53ad44b51f 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -905,6 +905,32 @@ static void uncore_types_exit(struct intel_uncore_type **types) uncore_type_exit(*types); } +static struct attribute *empty_attrs[] = { + NULL, +}; + +static const struct attribute_group empty_group = { + .attrs = empty_attrs, +}; + +static ssize_t platform_mapping_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct intel_uncore_pmu *pmu = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE - 1, "%s\n", pmu->mapping); +} +static DEVICE_ATTR_RO(platform_mapping); + +static struct attribute *mapping_attrs[] = { + &dev_attr_platform_mapping.attr, + NULL, +}; + +static const struct attribute_group uncore_mapping_group = { + .attrs = mapping_attrs, +}; + static int __init uncore_type_init(struct intel_uncore_type *type, bool setid) { struct intel_uncore_pmu *pmus; @@ -950,10 +976,19 @@ static int __init uncore_type_init(struct intel_uncore_type *type, bool setid) attr_group->attrs[j] = &type->event_descs[j].attr.attr; type->events_group = &attr_group->group; - } + } else + type->events_group = &empty_group; type->pmu_group = &uncore_pmu_attr_group; + /* + * Exposing mapping of Uncore units to corresponding Uncore PMUs + * through /sys/devices/uncore__/platform_mapping + */ + if (type->get_topology && type->set_mapping) + if (!type->get_topology(type) && !type->set_mapping(type)) + type->mapping_group = &uncore_mapping_group; + return 0; err: diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h index bbfdaa720b45..f52dd3f112a7 100644 --- a/arch/x86/events/intel/uncore.h +++ b/arch/x86/events/intel/uncore.h @@ -71,13 +71,19 @@ struct intel_uncore_type { struct intel_uncore_ops *ops; struct uncore_event_desc *event_descs; struct freerunning_counters *freerunning; - const struct attribute_group *attr_groups[4]; + const struct attribute_group *attr_groups[5]; struct pmu *pmu; /* for custom pmu ops */ + u64 *topology; + /* finding Uncore units */ + int (*get_topology)(struct intel_uncore_type *type); + /* mapping Uncore units to PMON ranges */ + int (*set_mapping)(struct intel_uncore_type *type); }; #define pmu_group attr_groups[0] #define format_group attr_groups[1] #define events_group attr_groups[2] +#define mapping_group attr_groups[3] struct intel_uncore_ops { void (*init_box)(struct intel_uncore_box *); @@ -99,6 +105,7 @@ struct intel_uncore_pmu { int pmu_idx; int func_id; bool registered; + char *mapping; atomic_t activeboxes; struct intel_uncore_type *type; struct intel_uncore_box **boxes; -- 2.19.1