Message ID | 20171012141116.32475-4-ganapatrao.kulkarni@cavium.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8859F6028A for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 12 Oct 2017 14:13:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AD2928DEA for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 12 Oct 2017 14:13:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F85128DED; Thu, 12 Oct 2017 14:13:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_WEB autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E771928DEA for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 12 Oct 2017 14:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=n7dZWINtltcBiT86V8qui+pUtnKFMn5O7QOSENxswU8=; b=VtAggifZZcCwDF zXfSpk39jxuXYqRROH/YMlQLadlz8foGbJxXjcVdL+Mv321msZXQlZCJ/dmF7v7Fa0F/xzIcP2WRa nV+bHXflYWdK1TOwnpii63uZHBDcYEqdBoYCEUgr8/Zc4WFvbnwmPxi+3aDMA5mYb5s9h0bmGxHLB MoMaMFX628vE/+8pT2TqWGzsJoSO4/O3m8KtHSF/3c8RqEMRZ3dMBVFVoavbuduO0LWNPh90vlqkX f10uDdNDDpQGE9u7CvLOwDpf0bbHmavL+e208pFmno0tPuWu9iznWWTaFhss9/WCozzkC/QjeVGll RPLQRiSg2Ab2ya48gOBw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e2eEa-0002Px-Ut; Thu, 12 Oct 2017 14:13:12 +0000 Received: from mail-sn1nam01on0047.outbound.protection.outlook.com ([104.47.32.47] helo=NAM01-SN1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e2eDq-0001ND-0E for linux-arm-kernel@lists.infradead.org; Thu, 12 Oct 2017 14:12:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=esUNh7o8Xq6knT/hXQNdPMA7PV1qzGjnlFMcldf+Oio=; b=NRKitPljYJqobEasxxzTSRQ3dC3v0Y0Z6fL/TucFW4i/QxRvO8ofmyBnRy4QBZ64WrueWj3oRdlYqkTQLS0mytPnVp2jxTeLXIXIN/vocEu32aYGqlZJ6TuNmeE10OPGcoDw6TgRxXqQbHY7+M06b82dfxwrEyAqG9oOpAqqDIA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Ganapatrao.Kulkarni@cavium.com; Received: from mypc.cavium.com.com (111.93.218.67) by BN3PR07MB2561.namprd07.prod.outlook.com (10.167.4.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Thu, 12 Oct 2017 14:12:04 +0000 From: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 3/4] perf utils: Add helper function is_pmu_core to detect PMU CORE devices Date: Thu, 12 Oct 2017 19:41:15 +0530 Message-Id: <20171012141116.32475-4-ganapatrao.kulkarni@cavium.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20171012141116.32475-1-ganapatrao.kulkarni@cavium.com> References: <20171012141116.32475-1-ganapatrao.kulkarni@cavium.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: BMXPR01CA0028.INDPRD01.PROD.OUTLOOK.COM (10.174.214.14) To BN3PR07MB2561.namprd07.prod.outlook.com (10.167.4.150) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 83a50351-1a93-498c-6c1c-08d5117b3931 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BN3PR07MB2561; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2561; 3:o8o6792PMu8FYRky+PnzsFURR9FJbVfy6aVRmharXUP4h3QBthPa4PmI2zjI71hkV8y1xcRDPwGL9bkUvauexOcwzNIxZi06MbFJq7lDwz0ZD6abC9f8gE867Si1PUaySSC9COt5/V5iDMTKuUhxyG0wXvIPBSLFDFp2QBgRcIYWvkg+DYHD0O5DqQCwXKBNayxPaLgQ1VeZlBM2uHW2CHG9uR3rHF3ZhjlNcYHz038b5W5GTOFBSTWHcadzLHVG; 25:DoCuicApO4YdCftRNAe2ye4j0WUxssifOp2ax4OBmvLF4IbcoNi0mJXH38lL+jwz7jIhjo5b9Ssn5UfL2TDCNXNLNkuzF6zlpVxX1eab67cSjlR9lLHRBUqqbijb8sd3yp2zOGL7DJIG2mx2CGmjAs0XeAiXkHP39g9z1s1VlLnNpDQQyRnwNA7vKwf6B7LcXuDSRZ7S+k6rmG5OxQ6brb966NWTQ4vrqLNSOHLetgBBpcImdGWfarR9V5f21DGYGTEH5oEIoB5MUBpDEUhPHN2ACj+7hqv0TlTd08XW7trFbu18c8pzJ/RnAIW9YnL91hW8WWeYUAYkC80QGBZNYQ==; 31:BALlq1TStSCoocAcb8gCVo8NyNSVXA+hFi+t9u5tljpMqgxwVLZtKgZFtFu0OkMJkEWLZd53pH4Z+69/a1eVO1DMFkKYHMRxOlKEPZ+7GtoCVHqOzr57eJFjA0HyKey2cE+edHZUHehj29thh//T6JBJiqUNg0hehzCXKJ+aMF/GxwVJlF0D6hUk3p23lHB944coAC3psQtp+9ebmCxLQt4VwphE4VdA1uyPrAlTPCE= X-MS-TrafficTypeDiagnostic: BN3PR07MB2561: X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2561; 20:9Rzee1dTrp6Th0vl5EVIFkX22h+tSwnP6KNCso/cSzyYJ5Qnu7lx4M68Fp8P+0kRUYO6s5NpAbaRoFPjKR1xew5xKy09hv11PvwW4Mg6y8Ac5ojWkllNZHX9PPmM3z139kHTSzqDxPto9DMiXG/86kX8yWSXRKcRMQGTr2VkOfjKRByjxHYqedAfW5ZaW3zaXoODuOrbet9DEp+2c3+nRd8xoNyd2HzzNuPet67uEKwdzfVsa0xtm/Xgq+NUjspfxbbKdjXalZXH7If/AL1vBlAWbpdjyYzPW7z9yoIv2YYtrqEGOX7Zdv831KBtonO5rbPmiPaNP8tJDPLJkHL/7Q2WytTgxXHTSMURtxK3e+k2ZMG6sS49e2h0tTE9aKTsKB39V+TX21I9EuSzNgW51qTg8PnRIRMy+q77lfJFBa3XAJqilDGZUH9+hnBf9G8loGPcqa6dWap9BR40wUbNEzocsuZqrozpfe5ufQZGj4YdWipgLwx1H/MFCr3M0ZPx; 4:7WCfdvgAlCgeLqwM9r35YaYQjrnztpcRJNaIjoud4ISkdw4PlzyQULCvNS2Gnd0lhPj0ki6KBIcZ0zdIa7A78u92tOWyNsWrofhgqUYN15Ex6v/GSc6GVtJkk5mugYwj3cZ2hOKYTnwrw2AEIx8WoV1rfsiCdYMmPdy47m+wjzsB6KcH+cwosKNKUOgdeZbLnAjRKTTzsQntdem4btkc9ky2cto3mOQalemNGQ4pL4FToRp0GMTi0lJBCOSTYtkoa3GTju4s/PYzZweO4BJMFLlhtwByPHUmNqcfzecoexE= X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Microsoft-Antispam-PRVS: <BN3PR07MB2561D0996DBAF06AFE52691E834B0@BN3PR07MB2561.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(20161123558100)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR07MB2561; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR07MB2561; X-Forefront-PRVS: 04583CED1A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(199003)(189002)(68736007)(189998001)(16586007)(5003940100001)(25786009)(16526018)(72206003)(316002)(50986999)(101416001)(478600001)(8936002)(6666003)(39060400002)(36756003)(7416002)(50226002)(97736004)(6486002)(53936002)(4326008)(2950100002)(6512007)(6506006)(5660300001)(76176999)(86362001)(33646002)(305945005)(81156014)(7736002)(6116002)(50466002)(106356001)(105586002)(2906002)(48376002)(81166006)(3846002)(1076002)(47776003)(5009440100003)(66066001)(8676002)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR07MB2561; H:mypc.cavium.com.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR07MB2561; 23:W+fsHePtdmoe5dUtM0zgFPQnlUV+1iEb1hT/xpDWR?= =?us-ascii?Q?BvoPlbLIwD+VBDGeagBwyognvD0Aio3AEGiptkzEwWQB6L6dcwrqJYa7eonK?= =?us-ascii?Q?q0sIbLGqJnhho8DduuIHjHA/JMIADR4iWQ6jjo5LVxlWKSC+en57G4GmqMTx?= =?us-ascii?Q?+gXEX3mPdiSVG8HQCu7ZsrIIh1lYWKpQPjkPS6buBYm2/7bRF8dDGqN+aQGl?= =?us-ascii?Q?f18/CEgbug+mbu9epzAGZFpSqm4yeA2kgJpq+1v3kWct7/EP1eNvpOkPEtWp?= =?us-ascii?Q?fOq1ToCLs0f3hE4fgJsj0Bw9PZVRZvHvn01ArKm8PaM+nSUjYAngo1BOXU/L?= =?us-ascii?Q?ctWdPX7ux6Z3kDmuPd77Rc0r3ZUwfc7MnHzkRmotgmxshvsdnyp/2mIHytbX?= =?us-ascii?Q?XffxtxJ9zendKx7kYtJ89F0t1iEB9NQ8JmZxoXJ5NPXyvgwxvBXaEb58yBm5?= =?us-ascii?Q?uwoQf8uZHBINJAINZZBVid8Z9vWhsKp0EdNuE3unFjs/+GHLQC55aHLOjnMw?= =?us-ascii?Q?T4vfzHAK/YSPwyI4dVqPjvjuj902E2AzJH5/0xF3Fc43v8kaXpWVJbDeeEcp?= =?us-ascii?Q?T2Flc+KamXG5uLNJ71xjIy2bAUnxC9/aVd0BucOyWqg6DPF1WqT381EpovkG?= =?us-ascii?Q?uAPGZhIpZ88iOvQdt0u8mKYrZRJIOntH56COQdonR3GvfN6wjWg7TcRcMPds?= =?us-ascii?Q?kSx5gDRKC01cNhwiCITsjfzar+wzUJYtmGCHmn8Zfcai2bNKltKB0gimRmUU?= =?us-ascii?Q?CXW5jK0hSqF5TbpHWJi1Ve4nl9FObivkKsxitKl8MXrBJwsZYCFXdg01Ckh0?= =?us-ascii?Q?SzrFjdR8xMgo2gfLE+LCsSqOs1yIQw+EQ9qEW/YXJaa0lrFj4n/e0I9bIBAQ?= =?us-ascii?Q?2N+XRKFmwartwXUCXON8nI4VEZx+3le1Vvg+bsOuZbkmk3MlPP+3MZT86Rsm?= =?us-ascii?Q?xZAcmIZ0FN8E1uJwH1cCt5FF6k8V+Y+uIKOPIXpit8Sw67iI4WGZb5/eo+KA?= =?us-ascii?Q?O1M3EQfKvj6Et20P3GVJa2t4n8T8gZvQjen5pA3OwIp7lICiKzfAJ5/wysdo?= =?us-ascii?Q?ZOiMayg5bv9fAe70Gee+xq+5yoGr1gR5BTYZdB+EfgX5xoi20m+YyehfQtPT?= =?us-ascii?Q?5JFssuPPRYw5LISGtE/8OKJBmL/P/VGx3cdJutRu84PxGTAJlGvFJtwAXVQ5?= =?us-ascii?Q?1mgB82Lcsu2GsQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2561; 6:xRaRdVFY2lKl8hbFFa47wEyTv0GtIEVBYde9KK4fY+A8T3agEFPA1pGX/Vn3ThQxUP5IYAKdH6fUFBvDgS+CFcdVGrDLKLa4KECRDDeCPnw3W9vBFQsFm8yzXGm1SQcYJwF6E+lPEWpfLtTvOdZiAJ6HJaG7/WpRbkfZHnGmLht1THUu88jw9B2Mb1BkNx0DT7JFAChErMrZnH9p4RN8jtXYjkwT+GnRd5xW0spJhYvWwCC2ipgrdku6ehuglkncTR5REwqiFMlAWTNYTwtbVmlGtHMUWjyRo4oBAuEIHPXKA3vzT5gOc/nlUQ/HvXoYJHGHTRK8xz0BE2MXbT3otA==; 5:tMQ5kPzjHIST+WBdkiiQkxVV7t3wsu72qpfIiXGfJ21iEGu8RSPV95YXP9QAfo1mT3tBRwRpBTcuzYlZ99d/+wuQ+gUAhj3GFfokBS0ZeHClDG1yKUJ32wB8T0yPioYR3KWKPvoUYhbLTlfGysBTbg==; 24:X4XAHFsJ2rp5LKzaY4lA2HDreD3e6SVzMKpuUp3MS5KBjeKR/xgPgAn/CoNbeTmnHu/J35ZzGQyBlSQIfEgCi5HvWJVZ4756D/23Y57Q8QU=; 7:Iost+AytZzhnTyIXgrqNuEf/eDNkdwo+9mDQWsggJnNWnNcTdpgRaQ6CI8aPhWXUnCXIl/9TO642YDjcg2wPa+6+rpylgO1jxu3f48+YZrwIYZYhHdxrd2UbqJCYMUjO49LHxL9d7KNR6cTrgMNrqapDTkDb65l10OFUHGr66+s1FFBrBE6ZwGfkaBsubjxnmySfiC9ceaj2pDI/eop+eiBi9awvKL1zCiI3NqIujpg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2017 14:12:04.0514 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR07MB2561 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171012_071226_741346_FBEAFB24 X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: mark.rutland@arm.com, alexander.shishkin@linux.intel.com, catalin.marinas@arm.com, Will.Deacon@arm.com, gklkml16@gmail.com, acme@kernel.org, zhangshaokun@hisilicon.com, peterz@infradead.org, Robert.Richter@cavium.com, mingo@redhat.com, jnair@caviumnetworks.com, Jonathan.Cameron@huawei.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 18edf86..153f92d 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -506,6 +506,34 @@ 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(); + + if (!sysfs) + return 0; + + /* Look for cpu sysfs (x86 and others) */ + scnprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu", sysfs); + if ((stat(path, &st) == 0) && + (strncmp(name, "cpu", strlen("cpu")) == 0)) + return 1; + + /* Look for cpu sysfs (specific to arm) */ + scnprintf(path, PATH_MAX, "%s/bus/event_source/devices/%s/cpus", + 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 +586,18 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) */ 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,