From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517180121-2-13472914358738271205 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180121; b=nj0J0lhHRNCHqVJiKrgHK4mU/TEiALGmYZeobT0UPLKmJhD R4wNXCtY2qqqQuMtE5yf6otK7GC0rG/zKkfGM3gMjpOJxLiw/vUB2dpFYIk2ZQdr 34dniS6cANqmTKItd0fGJeGCm2rAwSGfcgUoEpaSMp7Ezu5byDp5tePg1ObVTWTb oVZvJ19Qg8NPd06wUR9G6Zdg9N4VbTAXtQd6qYtau3anaedxtWUIUTMokfrpCjAe IR0/ZhyXtvSKGZFtzmk7Z50hY+Xi3/B7WwvCt7AdPvMwKidp/9nuRwKFzGnY6ukg LWIzDqnnfwDrfQgEFPK6HA5Xq1XiFXdc0Tr/85Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180121; bh=wD0L9+ 0J+F/V8RjC5uVNW1HVLL0n/x0wMRHP7z5OdxQ=; b=PyRzhFZDuOl9GjluOALcyc X5XxZu+rV4VYsTBxZvmE0Z+LD7VSy4x0QtPgrfZf3mKIeQhIjljH6CGSfDjJg9zA R8iRhOIV3TnIuVEpTcQXqJk5dBI8xivW6Jtd3+SKuUYGnUlVvNXT5f14fxH3MkRN T34gpa8OminQB2x/YZJNt1bzIFdSAtY6qqMj1Vb9f/8B3qy/3lpY8AxpN6rrkVdp tRS1pP/4rJVtJlZr/oWorpXdbiPB6PivkQYgJWbrc0wy+S9ICx+OXpWVB5tKEB/0 +d9NUnmH4WbBsuJw4MzMWO/kFllN6VnLej8+qCj7P4ILwJL46i72OAUMlRFETIvQ == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Wie7DOy+ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Wie7DOy+ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932204AbeA1WyT (ORCPT ); Sun, 28 Jan 2018 17:54:19 -0500 Received: from mail-by2nam03on0130.outbound.protection.outlook.com ([104.47.42.130]:20166 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753683AbeA1W2a (ORCPT ); Sun, 28 Jan 2018 17:28:30 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Satheesh Rajendran , Balamuruhan S , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 10/49] perf bench numa: Fixup discontiguous/sparse numa nodes Thread-Topic: [PATCH AUTOSEL for 4.9 10/49] perf bench numa: Fixup discontiguous/sparse numa nodes Thread-Index: AQHTmIc2mFqR3lE9x0eXjTZVUDWmIw== Date: Sun, 28 Jan 2018 22:27:42 +0000 Message-ID: <20180128222727.22404-10-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1017;7:LXj1oH2qnqPrE2y+F74kYaVKKEMtlaMrHXFb0P7Y3DkI+xixejAVvx5svYByofXfjViLBWT7lIPbUlu5KBbZ9KxvdNlvD0+egw0vi1gHCkjcaAueEVbXR/OtwNyN9/EVmG1/B9/0Pxa+66VFV4d6AVehElXUoBk7Ar39dNM8QtruFrTN6VVYg6UxGwPXzKL+WTS/2qsyeynQVcGsMzHBiqVviFnLV0cGSmliY1zz15qbccXHKEnpX5i+20k0bnW3 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 03c82f2e-62cf-4d8a-fdbf-08d5669e71b9 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1017; x-ms-traffictypediagnostic: MW2PR2101MB1017: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(42068640409301)(104084551191319); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231101)(944501161)(3002001)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB1017;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1017; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39860400002)(39380400002)(366004)(346002)(376002)(189003)(199004)(81156014)(6666003)(305945005)(2900100001)(76176011)(68736007)(86612001)(3660700001)(8676002)(3280700002)(6506007)(102836004)(6116002)(105586002)(7736002)(2950100002)(3846002)(1076002)(106356001)(36756003)(5660300001)(2906002)(8936002)(66066001)(10090500001)(6486002)(6512007)(25786009)(53936002)(186003)(316002)(6436002)(86362001)(14454004)(478600001)(6306002)(2501003)(966005)(5250100002)(72206003)(99286004)(97736004)(107886003)(4326008)(54906003)(81166006)(110136005)(26005)(10290500003)(22452003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1017;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: vkgQ5Nnaz9RcSppQ143HBuYf58wdjSYNV1z248DiNkpOoKSxlv570eOAHPEqZc+4dfKPosu/3yPb2XFaIYfXng== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03c82f2e-62cf-4d8a-fdbf-08d5669e71b9 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:42.3547 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1017 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Satheesh Rajendran [ Upstream commit 321a7c35c90cc834851ceda18a8ee18f1d032b92 ] Certain systems are designed to have sparse/discontiguous nodes. On such systems, 'perf bench numa' hangs, shows wrong number of nodes and shows values for non-existent nodes. Handle this by only taking nodes that are exposed by kernel to userspace. Signed-off-by: Satheesh Rajendran Reviewed-by: Srikar Dronamraju Acked-by: Naveen N. Rao Link: http://lkml.kernel.org/r/1edbcd353c009e109e93d78f2f46381930c340fe.151= 1368645.git.sathnaga@linux.vnet.ibm.com Signed-off-by: Balamuruhan S Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/bench/numa.c | 56 ++++++++++++++++++++++++++++++++++++++++++++-= ---- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c index 9e5a02d6b9a9..23cce5e5197a 100644 --- a/tools/perf/bench/numa.c +++ b/tools/perf/bench/numa.c @@ -211,6 +211,47 @@ static const char * const numa_usage[] =3D { NULL }; =20 +/* + * To get number of numa nodes present. + */ +static int nr_numa_nodes(void) +{ + int i, nr_nodes =3D 0; + + for (i =3D 0; i < g->p.nr_nodes; i++) { + if (numa_bitmask_isbitset(numa_nodes_ptr, i)) + nr_nodes++; + } + + return nr_nodes; +} + +/* + * To check if given numa node is present. + */ +static int is_node_present(int node) +{ + return numa_bitmask_isbitset(numa_nodes_ptr, node); +} + +/* + * To check given numa node has cpus. + */ +static bool node_has_cpus(int node) +{ + struct bitmask *cpu =3D numa_allocate_cpumask(); + unsigned int i; + + if (cpu && !numa_node_to_cpus(node, cpu)) { + for (i =3D 0; i < cpu->size; i++) { + if (numa_bitmask_isbitset(cpu, i)) + return true; + } + } + + return false; /* lets fall back to nocpus safely */ +} + static cpu_set_t bind_to_cpu(int target_cpu) { cpu_set_t orig_mask, mask; @@ -239,12 +280,12 @@ static cpu_set_t bind_to_cpu(int target_cpu) =20 static cpu_set_t bind_to_node(int target_node) { - int cpus_per_node =3D g->p.nr_cpus/g->p.nr_nodes; + int cpus_per_node =3D g->p.nr_cpus / nr_numa_nodes(); cpu_set_t orig_mask, mask; int cpu; int ret; =20 - BUG_ON(cpus_per_node*g->p.nr_nodes !=3D g->p.nr_cpus); + BUG_ON(cpus_per_node * nr_numa_nodes() !=3D g->p.nr_cpus); BUG_ON(!cpus_per_node); =20 ret =3D sched_getaffinity(0, sizeof(orig_mask), &orig_mask); @@ -644,7 +685,7 @@ static int parse_setup_node_list(void) int i; =20 for (i =3D 0; i < mul; i++) { - if (t >=3D g->p.nr_tasks) { + if (t >=3D g->p.nr_tasks || !node_has_cpus(bind_node)) { printf("\n# NOTE: ignoring bind NODEs starting at NODE#%d\n", bind_no= de); goto out; } @@ -959,6 +1000,8 @@ static void calc_convergence(double runtime_ns_max, do= uble *convergence) sum =3D 0; =20 for (node =3D 0; node < g->p.nr_nodes; node++) { + if (!is_node_present(node)) + continue; nr =3D nodes[node]; nr_min =3D min(nr, nr_min); nr_max =3D max(nr, nr_max); @@ -979,8 +1022,11 @@ static void calc_convergence(double runtime_ns_max, d= ouble *convergence) process_groups =3D 0; =20 for (node =3D 0; node < g->p.nr_nodes; node++) { - int processes =3D count_node_processes(node); + int processes; =20 + if (!is_node_present(node)) + continue; + processes =3D count_node_processes(node); nr =3D nodes[node]; tprintf(" %2d/%-2d", nr, processes); =20 @@ -1286,7 +1332,7 @@ static void print_summary(void) =20 printf("\n ###\n"); printf(" # %d %s will execute (on %d nodes, %d CPUs):\n", - g->p.nr_tasks, g->p.nr_tasks =3D=3D 1 ? "task" : "tasks", g->p.nr_nodes,= g->p.nr_cpus); + g->p.nr_tasks, g->p.nr_tasks =3D=3D 1 ? "task" : "tasks", nr_numa_nodes(= ), g->p.nr_cpus); printf(" # %5dx %5ldMB global shared mem operations\n", g->p.nr_loops, g->p.bytes_global/1024/1024); printf(" # %5dx %5ldMB process shared mem operations\n", --=20 2.11.0