From patchwork Mon Jun 10 09:59:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 166301 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp826458ilk; Mon, 10 Jun 2019 03:01:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqxUOj1K0wqAzWDk5TiXadK7PgpWWQ/rPrAvT30BzESSZwuSks5aCVf3kCvaN/azJm1D7PTd X-Received: by 2002:a63:d416:: with SMTP id a22mr15065637pgh.218.1560160894290; Mon, 10 Jun 2019 03:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560160894; cv=none; d=google.com; s=arc-20160816; b=ytQW54nSklTX93FT750wbX7ZjqKwExxafJ+S+qBpqc9EMURbG3HwMHoWeTheqH1Aj5 VenJIawV2EPGeHk87Ei4YiUljX/T7BYbBDjr7VkFiUQdmZARozS2uhhL8Chx3/2gxE3a Eoqq24bb7VysJVhvemEpWpGWHbm7uJuJNvpR4UbJDrc4PEE8DsGDdb6cEFQ6ODgvBvyk IXwXh5Au6TsyHI+b+0fHZ7vmwgNbJEWMqMlkWoxTzZUyE7PMeQNBNMazAlurzegBNH1s TKaDPVbUHRpRd2BSw53cEgzomJDAWoM6r1+jsfc17hOdHCVC7cUhnlOeAZXByZbxt3lg QwUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=2JHw4q+rNN6ycpJ57FYqMmadlzcVET4O5Nxr0ofOUZI=; b=DWpmwfAWbOJz6VEYPSNamDv+skXATaxjXkON/Wo2M+DxSBrRnAhgXCDUTETYagmHxo DyMSHJ7pRdKlzszdGqJhXs55C0BDMRl4nRE+u3eB7Ydfob519evHLtGsCsNV7gl64KAW UCaQb4G0uYQiZhzRH586cUeYighW9so52IEWf6t6DPWx5Tk8NVlM3MW5EUr2edt7IHAj rz1Z1RMr32spLPALBlOgdyqQepyIIsKhXs0dBYBNQuwKIDEKkWmeR5z8L2YieteVz+n8 zOJycFyUi5aRniB+4Zh/1uhvTmkLvp6hTcJD3APtLIMMl13FGK01QEFI16sxV1sGPta2 D8Yg== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k13si8830729pll.64.2019.06.10.03.01.33; Mon, 10 Jun 2019 03:01:34 -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; 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 S2389079AbfFJKBN (ORCPT + 30 others); Mon, 10 Jun 2019 06:01:13 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:56520 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387977AbfFJKBN (ORCPT ); Mon, 10 Jun 2019 06:01:13 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 14F7449E51D9192BF918; Mon, 10 Jun 2019 18:01:11 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.439.0; Mon, 10 Jun 2019 18:00:51 +0800 From: John Garry To: , , , , , , , , , , , , CC: , , , , , John Garry Subject: [PATCH 1/5] perf pmu: Fix uncore PMU alias list for ARM64 Date: Mon, 10 Jun 2019 17:59:28 +0800 Message-ID: <1560160772-210844-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1560160772-210844-1-git-send-email-john.garry@huawei.com> References: <1560160772-210844-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In 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 --- tools/perf/util/pmu.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) -- 2.17.1 diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index e0429f4ef335..036047f56efa 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' */