From patchwork Fri Jun 21 17:38:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 167403 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1029979ilk; Fri, 21 Jun 2019 10:41:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqyrDCUO8kCfYDmSIo2qV2kp/d4w2g5IioJoG0B6nhzFhNvuw1xViWwQVqufkhgPs+3KX2ea X-Received: by 2002:a17:902:8f93:: with SMTP id z19mr45739557plo.97.1561138866044; Fri, 21 Jun 2019 10:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561138866; cv=none; d=google.com; s=arc-20160816; b=KAA1QwnftPxluzt2gwWt6uE/kA+nozMz4/ulbXCM5x9vZe4qJIAXpNOigxEr5ryEUa dHteCU8NB1CToRKxy/CcGXT8PMngt468++saAqLb34nTtKDPEGmyTuSitE1vHV6+bxJ4 niQN9HCCMJ16RUkEHIWTNAxEmjsVVzQo652aI2lMAPdv0/CS62/OfS9jNUWvxFWwr+0w F54haNMRXgVdZiVJ7vgB9ikDDJNCGJOPQNfwvXAqMUnPKXfenC5cYMib2tg6Y0rUC6vq eIVFzhhC/DpDggWUu7T9ZiavM/G6B6Xue44vf9vBdfEg6oSfQyB6jOL9Kpylx0LBGWME 7TRw== 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 :dkim-signature; bh=T5T+0CkOaS2GtW1uFq8rgTHfeBjKA+CGl0OrnMDkv2A=; b=SJ9xmT1vXF9Dt9a80MAVfbfANayAfmRVPS7AwOhN9lHV21khCZdCP1lIKIV+WQ9om1 9wD2frrzPjRRjhqik2+rUQRwQdiLQd4pX7Nz9wcrOenqSV2KpBP9dBwtoAMK+ovfmpoQ 2V2Hv2JewcT4Ae0Xo3ByXtSF5b7H4cCVNF1IgaKKzc+24dpWL6rBYGzusGr7UAv6zCQm K6Ayxfx6IOJ/N/67H5o2rvTrYuSDpQGOHGxr4vZUhQghMNWCW25QhPSg6mbjE1QCzzst qQ8qS/7nGPULlcFR0oWzChFxTsHyTxrKvZ5xYajcWZH/v0SfpAc4elp4tIfLIVymTgCR dw/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wN1itsim; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 123si3409983pfz.150.2019.06.21.10.41.05; Fri, 21 Jun 2019 10:41:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=wN1itsim; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726101AbfFURlE (ORCPT + 14 others); Fri, 21 Jun 2019 13:41:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:60086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726233AbfFURlE (ORCPT ); Fri, 21 Jun 2019 13:41:04 -0400 Received: from quaco.ghostprotocols.net (187-26-104-93.3g.claro.net.br [187.26.104.93]) (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 D8FA6208C3; Fri, 21 Jun 2019 17:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561138863; bh=QPJHaL3OS0GzfeK6O1ZxuGW8Vz75KPhsoGFuVduABng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wN1itsimpustKG30e0ueI6HXePSqD0jBieAjifNXTLIKDv96oumJMz4CnYPlN0F2T odHpXrDIn9m/RD6inXUwepvT5w1AmwYEX3WH3oxf4ayImFqnkKy57jKboPi1UOTXIR VgHmCfsFgqP+xi/zcLZGnZMi+MRDRVp8vtIWzcss= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, John Garry , Alexander Shishkin , Ben Hutchings , Hendrik Brueckner , Jiri Olsa , Kan Liang , Mark Rutland , Mathieu Poirier , Peter Zijlstra , Shaokun Zhang , Thomas Richter , Will Deacon , linux-arm-kernel@lists.infradead.org, linuxarm@huawei.com, stable@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 19/25] perf pmu: Fix uncore PMU alias list for ARM64 Date: Fri, 21 Jun 2019 14:38:25 -0300 Message-Id: <20190621173831.13780-20-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190621173831.13780-1-acme@kernel.org> References: <20190621173831.13780-1-acme@kernel.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Garry 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 --- tools/perf/util/pmu.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) -- 2.20.1 diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index e0429f4ef335..faa8eb231e1b 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -709,9 +709,7 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) { 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 list_head *head, struct perf_pmu *pmu) */ 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' */