From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932304AbcCXHim (ORCPT ); Thu, 24 Mar 2016 03:38:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42998 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754590AbcCXHif (ORCPT ); Thu, 24 Mar 2016 03:38:35 -0400 Date: Thu, 24 Mar 2016 00:37:49 -0700 From: tip-bot for Jakub Jelen Message-ID: Cc: peterz@infradead.org, jjelen@redhat.com, tglx@linutronix.de, hpa@zytor.com, jakuje@gmail.com, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, acme@redhat.com, mingo@kernel.org Reply-To: alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org, jjelen@redhat.com, tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com, jakuje@gmail.com In-Reply-To: <1458388687-24421-1-git-send-email-jakuje@gmail.com> References: <1458388687-24421-1-git-send-email-jakuje@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf bench numa: Fix assertion for nodes bitfield Git-Commit-ID: 3c52b658b8e4fbbf7975932bbdc4798421dbcb15 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: 3c52b658b8e4fbbf7975932bbdc4798421dbcb15 Gitweb: http://git.kernel.org/tip/3c52b658b8e4fbbf7975932bbdc4798421dbcb15 Author: Jakub Jelen AuthorDate: Sat, 19 Mar 2016 12:58:07 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 21 Mar 2016 17:46:57 -0300 perf bench numa: Fix assertion for nodes bitfield Comparing bits and bytes in numa benchmark assertion I hit the issue on two socket Power8 machine presenting its numa nodes as 0,1,16,17 (according to numactl). Therefore I got error (and hang of parent process): perf: bench/numa.c:296: bind_to_memnode: Assertion `!(g->p.nr_nodes > (int)sizeof(nodemask))' failed. This is obviously false positive. We can fit all the 18 nodes into bitfield of 8 bytes (long on 64b architecture). Signed-off-by: Jakub Jelen Cc: Alexander Shishkin Cc: Jakub Jelen Cc: Peter Zijlstra Cc: trivial@kernel.org Link: http://lkml.kernel.org/r/1458388687-24421-1-git-send-email-jakuje@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/bench/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c index 5049d63..7500d95 100644 --- a/tools/perf/bench/numa.c +++ b/tools/perf/bench/numa.c @@ -293,7 +293,7 @@ static void bind_to_memnode(int node) if (node == -1) return; - BUG_ON(g->p.nr_nodes > (int)sizeof(nodemask)); + BUG_ON(g->p.nr_nodes > (int)sizeof(nodemask)*8); nodemask = 1L << node; ret = set_mempolicy(MPOL_BIND, &nodemask, sizeof(nodemask)*8);