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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 9BCEEC43381 for ; Thu, 7 Mar 2019 17:46:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C8A320661 for ; Thu, 7 Mar 2019 17:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551980812; bh=RP1Hy8PULoVPLu3HhXWRQXRp4CPV/X3mZ45NSxPJVa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eD/uQAQ7kRCJ1VXa75bGCJRDqwi/d/XJswjXOCdGF6yrRYorFE3Z7K4E9hxO5qCnf 6zEXuRGkqR5Uwnq0HrZB1TZ/RLmkLGEmtA/V2ie0ipi7vFhOd+h6x8A8/wJz1oSwFb Bg+Bw4selvlL/+sgo756saQCHg9vtaXD+ao+wj+g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726939AbfCGRqu (ORCPT ); Thu, 7 Mar 2019 12:46:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:39442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726285AbfCGRqt (ORCPT ); Thu, 7 Mar 2019 12:46:49 -0500 Received: from quaco.ghostprotocols.net (unknown [190.15.121.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 695122133F; Thu, 7 Mar 2019 17:46:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551980808; bh=RP1Hy8PULoVPLu3HhXWRQXRp4CPV/X3mZ45NSxPJVa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IrgBonSqZrSC88MpihkRhR2Ti+F79nVTvPCajzr2CBmkdijrxOuROD/9g2vQDcFv1 tNZZVbHiCL2TLoVmNb+g2/wLlsHbhyiycbhFVJIRcTNWVgsZbqHRy5j1hhZeKNrSMC NKkKUXMLpQ1W08oai19wP1rwc9zjEcGc9RLtt+uQ= From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Jiri Olsa , Nageswara R Sastry , Ravi Bangoria , Alexander Shishkin , Andi Kleen , Jonas Rabenstein , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 29/35] perf c2c: Fix c2c report for empty numa node Date: Thu, 7 Mar 2019 14:44:27 -0300 Message-Id: <20190307174433.28819-30-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307174433.28819-1-acme@kernel.org> References: <20190307174433.28819-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa Ravi Bangoria reported that we fail with an empty NUMA node with the following message: $ lscpu NUMA node0 CPU(s): NUMA node1 CPU(s): 0-4 $ sudo ./perf c2c report node/cpu topology bugFailed setup nodes Fix this by detecting the empty node and keeping its CPU set empty. Reported-by: Nageswara R Sastry Signed-off-by: Jiri Olsa Tested-by: Ravi Bangoria Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jonas Rabenstein Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20190305152536.21035-2-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-c2c.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index 4272763a5e96..9e6cc868bdb4 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -2056,6 +2056,12 @@ static int setup_nodes(struct perf_session *session) if (!set) return -ENOMEM; + nodes[node] = set; + + /* empty node, skip */ + if (cpu_map__empty(map)) + continue; + for (cpu = 0; cpu < map->nr; cpu++) { set_bit(map->map[cpu], set); @@ -2064,8 +2070,6 @@ static int setup_nodes(struct perf_session *session) cpu2node[map->map[cpu]] = node; } - - nodes[node] = set; } setup_nodes_header(); -- 2.20.1