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;
Date:   Thu, 15 Aug 2019 02:35:59 -0700
From:   tip-bot for Tan Xiaojun <tipbot@zytor.com>
Message-ID: <tip-0a4d8fb229dd78f9e0752817339e19e903b37a60@git.kernel.org>
Cc:     peterz@infradead.org, alexander.shishkin@linux.intel.com,
        alexey.budankov@linux.intel.com, rostedt@goodmis.org,
        tglx@linutronix.de, tanxiaojun@huawei.com, mingo@kernel.org,
        namhyung@kernel.org, jolsa@kernel.org, acme@redhat.com,
        linux-kernel@vger.kernel.org, tz.stoyanov@gmail.com,
        kan.liang@linux.intel.com, songliubraving@fb.com, hpa@zytor.com
Reply-To: kan.liang@linux.intel.com, tz.stoyanov@gmail.com,
          acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@kernel.org,
          namhyung@kernel.org, tanxiaojun@huawei.com, mingo@kernel.org,
          rostedt@goodmis.org, tglx@linutronix.de,
          alexey.budankov@linux.intel.com, peterz@infradead.org,
          alexander.shishkin@linux.intel.com, hpa@zytor.com,
          songliubraving@fb.com
In-Reply-To: <1564717737-21602-1-git-send-email-tanxiaojun@huawei.com>
References: <1564717737-21602-1-git-send-email-tanxiaojun@huawei.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:perf/core] perf record: Support aarch64 random socket_id
 assignment
Git-Commit-ID: 0a4d8fb229dd78f9e0752817339e19e903b37a60
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  0a4d8fb229dd78f9e0752817339e19e903b37a60
Gitweb:     https://git.kernel.org/tip/0a4d8fb229dd78f9e0752817339e19e903b37a60
Author:     Tan Xiaojun <tanxiaojun@huawei.com>
AuthorDate: Fri, 2 Aug 2019 11:48:57 +0800
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 14 Aug 2019 11:00:00 -0300

perf record: Support aarch64 random socket_id assignment

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 <tanxiaojun@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Link: http://lkml.kernel.org/r/1564717737-21602-1-git-send-email-tanxiaojun@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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 b04c2b6b28b3..1f2965a07bef 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2252,8 +2252,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++) {