Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3092145ybj; Mon, 23 Sep 2019 14:42:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxrJUqcyBBJDelqL7lAhIBXkmFD4X1gSRZ6zVn2OF7j5eoL4b2N0hypUQ/Ha0nDJwj8WSJk X-Received: by 2002:a17:906:8308:: with SMTP id j8mr1639792ejx.142.1569274944619; Mon, 23 Sep 2019 14:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569274944; cv=none; d=google.com; s=arc-20160816; b=OmU2BJawlZ1Qb4g/yqVb16LeXDG/XhecrN2ym852NM72759FvrPhDjhxrSO4biE5PX CnoNZ+W6/UDBVRA/C7i0LzzgRv7TYPAse/y8m9RnbtoK+3aXAIWzWFL1CVGYtmIqJFGs Kn59vzao0Krek73Es7AhvEGI/oCxyapuqJd6xfVk88qHOZs1ykIETWK6JWnNwrgxhqEo CPvWd75GxfKJTXf5Mh9P2bWOOlhSMsTn7TVKgoReIxGSEHuouv4HKtzcQD9CzkKLKGXT 5XJUwWaugbXA7nGz8Ufg8md/VnhEP09nbeLlctxEVwisgUJsPgxFy+yhGt3zX1wmnRfm CSzg== 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=lM2ARTfQYd1xgwUfbgXdTcRLsW5NHmDBvhUiFFUzfns=; b=s3Sr+tvDvFEokWMPLjm0wUlLp325FNEWJO7eN5jfekW62ARQ67maIKOYRE0eDDXlaQ QF7xpRIdcaZs9/iwO4GvmwqDv7x9vOfls2y3lIVTmgejqzwM3lBh2wPlZdxI4miJCPmW oz7rs84BSG3IqL8/4w9UGN/s5R7ywIKH8PrKwXGJqvN19FX+Uh8V4kyt93/WlA+RsxIi S2TMQUqpup0BvLQuYtwvf/kfxFHFwP8wp7jyZVV16jwenbSPKCEnyBMdWekLPgSXIJH6 92pD2TeWBkteSWUCu3htyewc2WnbhYMzB8EJy4C+rI/cXF6GxAnUHEg1EGqRvmhlq0e8 q0Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=z+teSN6j; 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; 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 v39si7226953edc.234.2019.09.23.14.42.01; Mon, 23 Sep 2019 14:42:24 -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=z+teSN6j; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389949AbfIVSqc (ORCPT + 99 others); Sun, 22 Sep 2019 14:46:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:42566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389892AbfIVSq2 (ORCPT ); Sun, 22 Sep 2019 14:46:28 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2D167206C2; Sun, 22 Sep 2019 18:46:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177987; bh=6wQX0xJ/q3Ed4fG+/mE1pswdwSLXVm2+9rffNMTgyZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z+teSN6j7hL2dJdWgGXaxgTj+LHAhKpZozRWmmEbVwzNzSJKOG3Rt3r55ssyKD95y 23eMM9ZKF2jZdOpwUl0oj4rVm0FTuKF2RS+2LPtkr3jrdrhAgGwXVLoisuc3gJcmwu XqD611yxgfRePxgPwXnBAscSgW39NAwf4do9R7Fo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tan Xiaojun , Jiri Olsa , Alexander Shishkin , Alexey Budankov , Kan Liang , Namhyung Kim , Peter Zijlstra , Song Liu , Steven Rostedt , Tzvetomir Stoyanov , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 5.3 080/203] perf record: Support aarch64 random socket_id assignment Date: Sun, 22 Sep 2019 14:41:46 -0400 Message-Id: <20190922184350.30563-80-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tan Xiaojun [ Upstream commit 0a4d8fb229dd78f9e0752817339e19e903b37a60 ] Same as in the commit 01766229533f ("perf record: Support s390 random socket_id assignment"), aarch64 also have this problem. Without this fix: [root@localhost perf]# ./perf report --header -I -v ... socket_id number is too big.You may need to upgrade the perf tool. # ======== # captured on : Thu Aug 1 22:58:38 2019 # header version : 1 ... # Core ID and Socket ID information is not available ... With this fix: [root@localhost perf]# ./perf report --header -I -v ... cpumask list: 0-31 cpumask list: 32-63 cpumask list: 64-95 cpumask list: 96-127 # ======== # captured on : Thu Aug 1 22:58:38 2019 # header version : 1 ... # CPU 0: Core ID 0, Socket ID 36 # CPU 1: Core ID 1, Socket ID 36 ... # CPU 126: Core ID 126, Socket ID 8442 # CPU 127: Core ID 127, Socket ID 8442 ... Signed-off-by: Tan Xiaojun Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Alexey Budankov Cc: Kan Liang Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Song Liu Cc: Steven Rostedt (VMware) Cc: Tzvetomir Stoyanov (VMware) Link: http://lkml.kernel.org/r/1564717737-21602-1-git-send-email-tanxiaojun@huawei.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/header.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 1903d7ec97976..bf7cf12495539 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -2251,8 +2251,10 @@ static int process_cpu_topology(struct feat_fd *ff, void *data __maybe_unused) /* On s390 the socket_id number is not related to the numbers of cpus. * The socket_id number might be higher than the numbers of cpus. * This depends on the configuration. + * AArch64 is the same. */ - if (ph->env.arch && !strncmp(ph->env.arch, "s390", 4)) + if (ph->env.arch && (!strncmp(ph->env.arch, "s390", 4) + || !strncmp(ph->env.arch, "aarch64", 7))) do_core_id_test = false; for (i = 0; i < (u32)cpu_nr; i++) { -- 2.20.1