From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751987AbdEPIe6 (ORCPT ); Tue, 16 May 2017 04:34:58 -0400 Received: from mail-co1nam03on0075.outbound.protection.outlook.com ([104.47.40.75]:28316 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751861AbdEPIew (ORCPT ); Tue, 16 May 2017 04:34:52 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=cavium.com; From: Ganapatrao Kulkarni To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Will.Deacon@arm.com, catalin.marinas@arm.com, mark.rutland@arm.com, acme@kernel.org, alexander.shishkin@linux.intel.com, peterz@infradead.org, mingo@redhat.com, jnair@caviumnetworks.com, gpkulkarni@gmail.com Subject: [PATCH v3 3/4] perf utils: Add helper function is_pmu_core to detect PMU CORE devices Date: Tue, 16 May 2017 14:03:38 +0530 Message-Id: <1494923619-18687-4-git-send-email-ganapatrao.kulkarni@cavium.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1494923619-18687-1-git-send-email-ganapatrao.kulkarni@cavium.com> References: <1494923619-18687-1-git-send-email-ganapatrao.kulkarni@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: BMXPR01CA0025.INDPRD01.PROD.OUTLOOK.COM (10.174.214.11) To CY1PR0701MB1695.namprd07.prod.outlook.com (10.163.20.29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1ddf8588-2667-4477-f07d-08d49c3667da X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:CY1PR0701MB1695; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1695;3:6j0N+PfWaW0vwOUoRSl4FMInPA+SeiM+h7WrMRCV4oecmYa/sa6W0MCKNyW7r0F9IZhOO+jNO69o64lQ8+0S6bnzQUGX4xhddoyNGvnpq/4DKsHKeXyWMUISMXW6M8IuDvsFRzk8K8ymTFkl8ZsuIAYNDHM2uYofvkUHIodpd8sNoAOWTOIQm06Q2eKgbzpriwUZfbrPhlODnNUnRiYmKclkuF0w0S/miY+n9QoDjhEL8PTI5cmAVhTfUumm6Vu5HcwpgO5RQfYv2x//hV5rWzYPwJ3Cc8Bo/50pYBzCgukLdZnQ2lZEfzNimG5r7MDten27lW4vlpBcZzsfehfydA==;25:NWs0NvMa/R3eZdVzk/8Zdfq11906lrLYyre2xAAm8Nex9W5jSVgC1pyoJg8XFexGuQ3uO5HBwxXbxpx2KJvB8pTfT+9/oEpoVvYo0WQiyHY1YfE9TPGPfQ3dvOYat32ElBRrgPth2y+x/n7b1AmnsSIG8ZiaS6Fvo+hFWpYUdA2jHSvpLCv8Ijss7HaHPqP0hDFiK66efBhk7hqCwmpXVKmDs5yxIAZjsoI8FI69SxkZRT8H8HYOie/NYeBGfd88LDRgzyNgUmk2IcjT+K8Ky48SxH+rRWl02A1S/UXVhJ+lMavv9bQQXe5KsmAtBwe3Ec+IFpd3pSjne5YyOkYs+UQ2b7YVM17V1VvtpBxY/yXeeHGI0k120Rib1qbe+ADSetnptXLCSffL0MQ+Dh2DZdPKUN6I/daW9D0nj4kR4TkYEWkuI27ywYmu8PfdG0oAFYwU8VKL0ic++GpQ3X+KGdE42MHd2coUeedriN/MuOU= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1695;31:L1XCLk+MlCCuKDyUPuBJh+0X1JprL2QRC5v0ZsDRXwvuk0I2tzenukytWKGX0Cz8xYmfRkLI6S0jnMGwfyYCs8HSzO4K6dAh71kJC9j/2VMOXNgBlXLfCMLKFYFVvK1vFGTOYAPxBbJAhEo/2kke1+4fINPc+QEpGEddoJCY6jYY98hjFqtR23RdiHClVzgrTSlYrXmGMxkdtqvuK1/2lltvIt6k/vklRlx4GuYszbo=;20:dv1x9ikk9QkbSteFD+O4fL1Rr7kc6jIJkabDYWxHR3B+85cXAY2Wcrhq8CIOhduxoVvRwIfISEbnfw2j/3YOuPdAwxb5BdqwrBoeB/z6fOSnwuzEIAro1ImxU1UVagwOOOjORWek1HpXWkECe1kjuFuaxsGouaNICOWdjiMtPF9r6CGHL2JCAL2vXrhou+WNEw58FPE1lsXnND7K0boQlFFI4fWAb955qu/WKu+l6SIuFsGNWF4mg0GQ/Td690GDlqKqKLDWNEeXsjUydSJ9O5TvJ9LJii2nPdMZ9CnbYou320ELg4Ez/s3AvLhUo7joYCQCBZX29ngLImfoVL25rzQCBZy3hRR9sKsRzVsIRbLBDmcL/PW69Q31IHD/U1FPDOYg3tPwNdBdEkcd2AW4dWh5SRVWAoJHUWwMlnVxCYYZFuCG2pAYwNvrOpHPFCErJ9ZzqAbk9Yn36aG4CGYLwD0xmeH0nuxE7aojH8kd3l583PorR5usrPSaPML7sOfL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123555025)(6072148);SRVR:CY1PR0701MB1695;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0701MB1695; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1695;4:UFyy85PD9O34lYema5fgZqe0hw4F5zjjr5aztmuKxpB1u7Y0WELNnhEDbwWQp7A50DPeG2VGz0/Hv5Iubw0sFoelTJZ2KEGGMogdEbgkEvnVyUyfnqYRelOSpKGgPHkja52nH/nL5bFlsWu0Kwnqi5dOKXNEhqfLFUoHLagtWxyv5O0ib6KnWGI/EF8zTNfrn0uJhVBvRibhiJPTXL3Mz5N0BkDchnLQQHLAppwEuSoY1eztBizJJpWUmhlMu48K8B4FlrfQXSRPvWJ2In/u1snTvECMri9GLZ3ZzXaZtrqAPidj5MAN3hSj3aVHA4ZPZJ/nYBn9Y9UFB7OFnwzTSLzARQpTePRWg6swavHAJzMMe0UU+Maz0Edac2Y5LDUXxhdrVVlFQANR5nnOm8RwWi0gc5cUOuYz9TeMy47ykP4z5ImXOe64puyZ/woP2DW0OnFM9zZWzRQ1QW+BGoZMgIoO7AoYmvAVwCowMshAkBHkJlvDOVAhL5IagWf28yxESJ8/9x4dto68djkf6C99osK23Av40SOaq1lfK7xCS4o89QFbZ/BnYR0QIOUplJueyWz3lwwad/lysyQF6mfNeoF70UCkOvyLlqLNPhE+iVmsg5waXNWmZ+CJAKisXnCwqKWq96psTs9LU6BmHbI9zxqOFhC4dcN90lrIY/Z7ZMrlMwQwj3mI9cbJyDKgapd8972uyRUDEkavhS5jPTEu3T40qKJJ+Xz23GegNgEAsY8QcXrLFFEVPkC3ERXa06AGdpUiukyNRV7xwReQ2xhI+fH7rM50PTO1xUMAETBzyp8= X-Forefront-PRVS: 03094A4065 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39450400003)(39850400002)(39400400002)(39410400002)(5003940100001)(50986999)(6486002)(81166006)(76176999)(8676002)(38730400002)(110136004)(478600001)(6666003)(33646002)(4720700003)(6506006)(6512007)(72206003)(42186005)(36756003)(66066001)(50466002)(25786009)(5660300001)(305945005)(7416002)(2906002)(53936002)(189998001)(48376002)(86362001)(5009440100003)(47776003)(3846002)(6116002)(7736002)(4326008)(2950100002)(217873001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0701MB1695;H:mypc.cavium.com.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0701MB1695;23:oc8BzOAOv/8Ys4kXZBGdpxavUgErgbYDNC6Lao8?= =?us-ascii?Q?fmOWY4D/XQGaQA80JGAL9f2m5PiYeNN09odr1uiOVXra5b+xBcm0Uqmef6T2?= =?us-ascii?Q?G31i5ONBd84NyAyVrh5w6eh9IaKJjv5iUoL6dwVh9Qien5s29FqeMU+QRq3P?= =?us-ascii?Q?dnRn/GLXCMi3fZSalEh2fyR7WEy8EFx2zjWCkxcSOTa4Jm2RCO8y/2XZho3A?= =?us-ascii?Q?6T0zKuVvE2w5cney5BhQYanqvOc+xhMtrkvUpCJKWknTIpcZwwupaINnUz03?= =?us-ascii?Q?WrKHLURDW3lfohhnFeKcLJ3kznNwPVEtXdimyQthbY8mCyVBUAWTjQc0hgX2?= =?us-ascii?Q?83STSNnJsfDJkJUdJmTaDwPv2kVWFszYaN0JABeFM3EqVSQvIZ+f6lnkYnLH?= =?us-ascii?Q?jB50jg6CkJilykGdxTSqiMNmNGkG2HI/01TM7SIOGuAsMRUy2EcVcRuJPdTA?= =?us-ascii?Q?BqNdlqYfkQuiGevCjy2ZcFxAtx3Of/W7Io5naJrrqptNiEef2XPI/e+8GLGl?= =?us-ascii?Q?2Y0dgirI5k1J4gM4I4oEAw6ftR0ERdd7lJme5iSRaq2nsZWikoffx+npfD5L?= =?us-ascii?Q?MBs5FIpKn/sgKnvk2kQpl9fcA5ALY+YNmVjI7FkupWgjyofbSNTOZr9U1GaM?= =?us-ascii?Q?OEqLrX+EglGbHWxQwMbUCEY+ClIS7cCLZDtHZxYUdV/f0R+3yUB1Qe61axMP?= =?us-ascii?Q?2jLoHQoqe/0XIdNzxIFOTnaDQ+4zvAQ94QUnkEzdHrPRlbMwBdRy9SQ2B4dj?= =?us-ascii?Q?RJw5ZdMr5+cwpxmqVh8SDz8AsrKo0C5jUCjarLob+Zl5jq3qcXI2IZDB2IZR?= =?us-ascii?Q?DQhqC+MmVGEIlczOaatfXpooLHUXuFczK+C/2WpNbt9RkMAYC3AG68QQkwQr?= =?us-ascii?Q?/Z9ozhP/Ful1opOC8MqQMycd46DzytB9JHd4SRQkJB2PufAeg3OBZUyHitg2?= =?us-ascii?Q?PouKFbi4F+76KU895tp3AgGLL03JCB0rkAS7I43/pw3t8n9M6whtQRcBgiS7?= =?us-ascii?Q?P3l5hh7tW479s3TOwWfagLan0EMA2m7V35Mno4eA1qZoRadMjs+BSEptP/jN?= =?us-ascii?Q?uHochHyOeRAeFIf80JyG0a6YsakPv?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1695;6:m8MZg2xfs8wcLU3rjrN4nVHXGSsTduKFpp6OcfCpcgt4n+F6Fb/VTNIJbMNtzO9xYj0t7jW6BHTapLIHYIbqmB/H/qxlGAa24JisjPPNRlr4skXoNO1SieLIL94MagcQc0uVI2v1eoOVdLZD1Acq9sXJtr+GgJVUKAfkct3lVNcMomwW/GSWm4wo2WLRrta17/vGtu/fCRARXjrerz2XoLIkVRu+vNO1XovCxP0VbqtgqJmzXcyVWY1S6N+5So+g4oGRbucIZ8J2w0nhYzUHE62jnxaHW27hFFoZ/vug9ErO8YOMPjrOED+FP5fDi4uj+CzsRQRsHRElCl/5YOcrzWLqxyo6Or3V1os+/LLsjK0eveBH68rTnwScOSltZkWTe1NiY3mTab9VxXBXs/ydTeGqos68wfFyHYt980LZdz0QKoSYfb2WnRtNLraO3iwBNsP0UKaLEGzOVrXI6aEe+t8KDhaP0xD2eGl7nhcYEKL/lKc1qP8mDyS/3oxa1Iy8kKZhrl4MGDd3BkUwsh3sPg==;5:USaIv0TkwZ1TNzKReDpN9NXoigi+EoH5NDEL5cXggTaTC32ZAqGbNTE9laBz4unecGDYnWWtGNfkLbB2YtBZZzrQjmr96Lab19NvA0ibhro9Ti1cWbP6heb1rw6O4aSFcmWuEA1/bl5nyD0Crni73w==;24:Hrp8NebGb7qNYvj+tY3HvAWogZreAKNsiJDjprNyDO5SzFbDbBSSWA2Hx7ReJz+bdYWd7Bd49LwynpPNzlQn/z9il/K8W1hNdqBeuPeb6f8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR0701MB1695;7:ZuTJOEsnpHALQq+MwrjDRTNuZyGH19HI+83QzhfsTWgMSGFk43oy6rooo20HuCbIm1V1cre1Zfb2sKgGPkpw/m2L5rEGgJCobO4hyOmpmLYgnNw+tBgRtsbGlWq10pBsMIT7bwI2GF5QkMwdHuRS4uLXPNIFhUXYGMV9xvYCc3MLw+XHMSGuZZt/bPj67pKTIUJmsWKZ6FR5cAmWEuXJSuQLBq4+goAwo5UJ6A1DdPYr26FWseY28NOy06p70iyEaTBS4DwXZaKeGhjdOREC7UqjgWJFWkdC5DXMrhqvsC3Nwhx8u2jh1IDpwhM2fy/Ts1zyOghKsjk8BEw6RtHmsA== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2017 08:34:41.0959 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1695 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On some platforms, PMU core devices sysfs name is not cpu. Adding function is_pmu_core to detect as core device using core device specific hints in sysfs. For arm64 platforms, all core devices have file "cpus" in sysfs. Signed-off-by: Ganapatrao Kulkarni --- tools/perf/util/pmu.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index aefdbd1..0057d1c 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -506,6 +506,39 @@ static struct cpu_map *pmu_cpumask(const char *name) } /* + * PMU CORE devices have different name other than cpu in sysfs on some + * platforms. looking for possible sysfs files to identify as core device. + */ +static int is_pmu_core(const char *name) +{ + struct stat st; + char path[PATH_MAX]; + const char *sysfs = sysfs__mountpoint(); + const char **template; + const char *templates[] = { + "%s/bus/event_source/devices/%s/cpus", + NULL + }; + + if (!sysfs) + return 0; + + /* Look for cpu sysfs */ + snprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu", sysfs); + if ((stat(path, &st) == 0) && + (strncmp(name, "cpu", strlen("cpu")) == 0)) + return 1; + + for (template = templates; *template; template++) { + snprintf(path, PATH_MAX, *template, sysfs, name); + if (stat(path, &st) == 0) + return 1; + } + + return 0; +} + +/* * Return the CPU id as a raw string. * * Each architecture should provide a more precise id string that @@ -558,15 +591,18 @@ static void pmu_add_cpu_aliases(struct list_head *head, const char *name, */ i = 0; while (1) { - const char *pname; pe = &map->table[i++]; if (!pe->name) break; - pname = pe->pmu ? pe->pmu : "cpu"; - if (strncmp(pname, name, strlen(pname))) - continue; + if (!is_pmu_core(name)) { + /* check for uncore devices */ + if (pe->pmu == NULL) + continue; + if (strncmp(pe->pmu, name, strlen(pe->pmu))) + continue; + } /* need type casts to override 'const' */ __perf_pmu__new_alias(head, NULL, (char *)pe->name, -- 1.8.1.4