From patchwork Fri Jul 12 12:19:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 168941 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp820815ilk; Fri, 12 Jul 2019 05:29:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDHgfkeXJ4Ksg5dHgMz68Qw0HJBXBqyJbxS6v3o5zOQlZTbkB8JCwmQBnHF/NWvHVlxYQo X-Received: by 2002:a17:902:3081:: with SMTP id v1mr11402042plb.169.1562934586405; Fri, 12 Jul 2019 05:29:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562934586; cv=none; d=google.com; s=arc-20160816; b=OnJtOajOCTB2fwpafuVAwAtqjrlXe+wOZ8M79RhZbKnhWjIIgXpqOh8qW2oZoUyosl HYmH+jcGHBpaDsvwWYyubzCwsA8bEP+ZG3QiKK1rp15z5eaWt5uTMMBbrdqaxNC2jqSE Dgk11xArkeM0eaW/Ft802dbZKOsSOtKgyaz3j0a/DKnMTlknQLKZJ2FM/a1SzLrUXY+P 3itXY4cFTFMj65pKokocOvxdTFJHjafPqiQxgM2Pcm1GRCuel+MAXLUSr2kUtHdIfgFU T1HqaxR3e0Q+NMcbRuAca3iT5K50sVoHgRY0E5bTaQppDhxXGE/oGqYI89plmbvI2wFU bX0g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=11Dyiqec6wajqzSgTGwsUd9OrMe5kuwDmKQla8lUMdk=; b=IC8J2gqQMuTgvt8QVbeWtyc7rxgPNm2kYu7Sw9DXAhhl62W4t+Gtb8GG2Pj8M5JSkm CebVym22h2cSh2oXXc9wIQVyzt2/Hwp6J6aRh1Y/VLEYtICW4iaS2zksWZeIBjOLF1sL 0yPz+T2LRoidg14MZ9JHUrw45edU1mxhuaGuSPmEO6M0lXLoMzPqqhG994NU5CXlLDD0 y5jVvZg+zbwU7PkYcqBx2sn0dHloBssHx1y7S7RuvaRJNuM6cMVFmuFETcX9x7xqwbqk ieEDhuYaukAZphHb885Yj2GMuXpobc0IdxYptR2P8BgxAhmvMS4ey3BCGzAHgQr1ZROM 6Aww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HlZ6YAsk; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v16si8368635pfi.142.2019.07.12.05.29.42; Fri, 12 Jul 2019 05:29:46 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=HlZ6YAsk; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729016AbfGLM3h (ORCPT + 29 others); Fri, 12 Jul 2019 08:29:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:44414 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728435AbfGLM3b (ORCPT ); Fri, 12 Jul 2019 08:29:31 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6DEE02084B; Fri, 12 Jul 2019 12:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934570; bh=dqGDFDIi2rDPmFMdQfVLnotYxhySOqw8XaoV8MfvQW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HlZ6YAsk3Xx9CSqYc06bvq11lgcRqzLIjr7gbNUOZ7ji+z5csg6tGZOKhBY+E8EA6 XOgRXdG2v+Lmz4cKlTzW8n/G2KZ2IOdtxNAqJZWQPi3aw8/07ffZ9lQV0Rb3990/a7 6j56BlcqHHe1Y4McfremD3hq2v4IMkiZKC0N/560= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Garry , Alexander Shishkin , Ben Hutchings , Hendrik Brueckner , Jiri Olsa , Kan Liang , Mark Rutland , Mathieu Poirier , Namhyung Kim , Peter Zijlstra , Shaokun Zhang , Thomas Richter , Will Deacon , linux-arm-kernel@lists.infradead.org, linuxarm@huawei.com, Arnaldo Carvalho de Melo Subject: [PATCH 5.1 099/138] perf pmu: Fix uncore PMU alias list for ARM64 Date: Fri, 12 Jul 2019 14:19:23 +0200 Message-Id: <20190712121632.564396373@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Garry commit 599ee18f0740d7661b8711249096db94c09bc508 upstream. In commit 292c34c10249 ("perf pmu: Fix core PMU alias list for X86 platform"), we fixed the issue of CPU events being aliased to uncore events. Fix this same issue for ARM64, since the said commit left the (broken) behaviour untouched for ARM64. Signed-off-by: John Garry Cc: Alexander Shishkin Cc: Ben Hutchings Cc: Hendrik Brueckner Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Mathieu Poirier Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Shaokun Zhang Cc: Thomas Richter Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Cc: stable@vger.kernel.org Fixes: 292c34c10249 ("perf pmu: Fix core PMU alias list for X86 platform") Link: http://lkml.kernel.org/r/1560521283-73314-2-git-send-email-john.garry@huawei.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/pmu.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -709,9 +709,7 @@ static void pmu_add_cpu_aliases(struct l { int i; struct pmu_events_map *map; - struct pmu_event *pe; const char *name = pmu->name; - const char *pname; map = perf_pmu__find_map(pmu); if (!map) @@ -722,28 +720,26 @@ static void pmu_add_cpu_aliases(struct l */ i = 0; while (1) { + const char *cpu_name = is_arm_pmu_core(name) ? name : "cpu"; + struct pmu_event *pe = &map->table[i++]; + const char *pname = pe->pmu ? pe->pmu : cpu_name; - pe = &map->table[i++]; if (!pe->name) { if (pe->metric_group || pe->metric_name) continue; break; } - if (!is_arm_pmu_core(name)) { - pname = pe->pmu ? pe->pmu : "cpu"; + /* + * uncore alias may be from different PMU + * with common prefix + */ + if (pmu_is_uncore(name) && + !strncmp(pname, name, strlen(pname))) + goto new_alias; - /* - * uncore alias may be from different PMU - * with common prefix - */ - if (pmu_is_uncore(name) && - !strncmp(pname, name, strlen(pname))) - goto new_alias; - - if (strcmp(pname, name)) - continue; - } + if (strcmp(pname, name)) + continue; new_alias: /* need type casts to override 'const' */