From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755935AbcCXHhK (ORCPT ); Thu, 24 Mar 2016 03:37:10 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42936 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751454AbcCXHhE (ORCPT ); Thu, 24 Mar 2016 03:37:04 -0400 Date: Thu, 24 Mar 2016 00:36:36 -0700 From: tip-bot for Sukadev Bhattiprolu Message-ID: Cc: jstancek@redhat.com, sukadev@linux.vnet.ibm.com, acme@redhat.com, jolsa@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, kan.liang@intel.com Reply-To: hpa@zytor.com, kan.liang@intel.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, jstancek@redhat.com, sukadev@linux.vnet.ibm.com, jolsa@redhat.com, acme@redhat.com In-Reply-To: <20151203233219.GA27696@us.ibm.com> References: <20151203233219.GA27696@us.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf test: Remove 'core_id' check in topo test Git-Commit-ID: 4c9d6c18fdebfcfb18918a656355a3c7c3d45e13 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4c9d6c18fdebfcfb18918a656355a3c7c3d45e13 Gitweb: http://git.kernel.org/tip/4c9d6c18fdebfcfb18918a656355a3c7c3d45e13 Author: Sukadev Bhattiprolu AuthorDate: Thu, 3 Dec 2015 18:26:40 -0500 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 11 Mar 2016 13:45:04 -0300 perf test: Remove 'core_id' check in topo test The topology test case of 'perf test' seems to be broken on my x86 system - due to the comparison of a "core-id" with # of CPUs online. There are 8 online CPUs: $ cat /sys/devices/system/cpu/online 0-7 but core-ids are not sequential and some core-ids exceed the number of online CPUs. $ cat /sys/devices/system/cpu/cpu?/topology/core_id 0 1 9 10 0 1 9 10 Looks like we can safely remove the check. Output before: $ perf --version perf version 4.4.rc1.g34258a $ perf test -v topo 36: Test topology in session : --- start --- test child forked, pid 5906 templ file: /tmp/perf-test-vCwWG3 core_id number is too big.You may need to upgrade the perf tool. test child interrupted ---- end ---- Test topology in session: FAILED! and after: $ perf test -v topo 36: Test topology in session : --- start --- test child forked, pid 6532 templ file: /tmp/perf-test-y10wFJ CPU 0, core 0, socket 0 CPU 1, core 1, socket 0 CPU 2, core 9, socket 0 CPU 3, core 10, socket 0 CPU 4, core 0, socket 1 CPU 5, core 1, socket 1 CPU 6, core 9, socket 1 CPU 7, core 10, socket 1 test child finished with 0 ---- end ---- Test topology in session: Ok Signed-off-by: Sukadev Bhattiprolu Cc: Jan Stancek Cc: Jiri Olsa Cc: Kan Liang Link: http://lkml.kernel.org/r/20151203233219.GA27696@us.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 73e38e4..90680ec 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1872,11 +1872,6 @@ static int process_cpu_topology(struct perf_file_section *section, if (ph->needs_swap) nr = bswap_32(nr); - if (nr > (u32)cpu_nr) { - pr_debug("core_id number is too big." - "You may need to upgrade the perf tool.\n"); - goto free_cpu; - } ph->env.cpu[i].core_id = nr; ret = readn(fd, &nr, sizeof(nr));