From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E425C32750 for ; Wed, 14 Aug 2019 02:31:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E862B20679 for ; Wed, 14 Aug 2019 02:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749865; bh=MH4pGW1opJBICeiPUlV7J9I+pgeYL38XqSA+nM+fqTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XjZmmXqvuA+hJ9F4YfMP4HrqP1PHyxW5UGRF+6Sj8p5khe07qZRgoJmJCVk6W2+kz 7fsyqRz2fupfE1i7Dz3bSTPgGpXxKcxkfremu9MMdXowH2ISa2Te31+mkSM2BLeQMw T+Ja3pBSCZZchKR0wnfYUjji/6mK9+tCKktduvTo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729215AbfHNCQw (ORCPT ); Tue, 13 Aug 2019 22:16:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:48244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728817AbfHNCQv (ORCPT ); Tue, 13 Aug 2019 22:16:51 -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 8F3CA2084D; Wed, 14 Aug 2019 02:16:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749010; bh=MH4pGW1opJBICeiPUlV7J9I+pgeYL38XqSA+nM+fqTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PH0UDZ+n/0ftzP7/bdNGPKZwUYBfKX/C4OAR1OkzoUoJq0ywZ+7BJyKQFJOUv3lmn 0K2mupYsKlkacX4CO5lsU04/GpdbudxIY32qpUkO+DD2/lOFKOoH+UHWbpg02+6PI8 TsmzlnEYI8TTz9+lk80hlBOZGVlvOfNPJjB0rGec= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiri Olsa , Michael Petlan , Alexander Shishkin , Andi Kleen , Namhyung Kim , Peter Zijlstra , Satheesh Rajendran , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 4.19 34/68] perf bench numa: Fix cpu0 binding Date: Tue, 13 Aug 2019 22:15:12 -0400 Message-Id: <20190814021548.16001-34-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021548.16001-1-sashal@kernel.org> References: <20190814021548.16001-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jiri Olsa [ Upstream commit 6bbfe4e602691b90ac866712bd4c43c51e546a60 ] Michael reported an issue with perf bench numa failing with binding to cpu0 with '-0' option. # perf bench numa mem -p 3 -t 1 -P 512 -s 100 -zZcm0 --thp 1 -M 1 -ddd # Running 'numa/mem' benchmark: # Running main, "perf bench numa numa-mem -p 3 -t 1 -P 512 -s 100 -zZcm0 --thp 1 -M 1 -ddd" binding to node 0, mask: 0000000000000001 => -1 perf: bench/numa.c:356: bind_to_memnode: Assertion `!(ret)' failed. Aborted (core dumped) This happens when the cpu0 is not part of node0, which is the benchmark assumption and we can see that's not the case for some powerpc servers. Using correct node for cpu0 binding. Reported-by: Michael Petlan Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Satheesh Rajendran Link: http://lkml.kernel.org/r/20190801142642.28004-1-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/bench/numa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c index fa56fde6e8d80..91c0a4434da27 100644 --- a/tools/perf/bench/numa.c +++ b/tools/perf/bench/numa.c @@ -378,8 +378,10 @@ static u8 *alloc_data(ssize_t bytes0, int map_flags, /* Allocate and initialize all memory on CPU#0: */ if (init_cpu0) { - orig_mask = bind_to_node(0); - bind_to_memnode(0); + int node = numa_node_of_cpu(0); + + orig_mask = bind_to_node(node); + bind_to_memnode(node); } bytes = bytes0 + HPSIZE; -- 2.20.1