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.2 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 2AC8AC31680 for ; Mon, 21 Jan 2019 18:35:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E744921726 for ; Mon, 21 Jan 2019 18:35:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548095753; bh=RzGwnTqpGe1Rlt8yzYB6gHp+B0HwJ0TtlzLL1VBG4QU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xkWWKufBxptvuMHN4W41GnISWHuloqsqsgmmsFWSASTYMCflSjKdhQTxVBgbxLLcA KU4F9fq4zuYTG9z4ILoILud55XzzSz97jLMaFFD7H6ovtIySTcYf45qFspaSCIO89K TUQjXcs6EkuUoUa5f97pquFL/IgZw8WzcC/L05WM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728284AbfAUSfw (ORCPT ); Mon, 21 Jan 2019 13:35:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:43178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727358AbfAUSfv (ORCPT ); Mon, 21 Jan 2019 13:35:51 -0500 Received: from quaco.ghostprotocols.net (unknown [179.97.41.186]) (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 C1CB120989; Mon, 21 Jan 2019 18:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548095750; bh=RzGwnTqpGe1Rlt8yzYB6gHp+B0HwJ0TtlzLL1VBG4QU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t2J9A+ddL9EjHfcf+P0OKBn/BgCLMqgZ7tJQSFGK45QvBVOh8UzWVcBI0TV78HKjy TTu3zhh4+4mYckVSTlRepRjwcXKgpyGbv+L4sxgZ0g5iToqFvDfAm414amcMqCGkNs h01xPj3DCPhn+2I+hlqJOxjTcPJ1RCE8iQOvhjNA= From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Stephane Eranian , Jiri Olsa , Andi Kleen , Kan Liang , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 5/7] perf tools: Handle TOPOLOGY headers with no CPU Date: Mon, 21 Jan 2019 15:35:05 -0300 Message-Id: <20190121183507.23490-6-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121183507.23490-1-acme@kernel.org> References: <20190121183507.23490-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: Stephane Eranian This patch fixes an issue in cpumap.c when used with the TOPOLOGY header. In some configurations, some NUMA nodes may have no CPU (empty cpulist). Yet a cpumap map must be created otherwise perf abort with an error. This patch handles this case by creating a dummy map. Before: $ perf record -o - -e cycles noploop 2 | perf script -i - 0x6e8 [0x6c]: failed to process type: 80 After: $ perf record -o - -e cycles noploop 2 | perf script -i - noploop for 2 seconds Signed-off-by: Stephane Eranian Acked-by: Jiri Olsa Cc: Andi Kleen Cc: Kan Liang Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1547885559-1657-1-git-send-email-eranian@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cpumap.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index 1ccbd3342069..383674f448fc 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -134,7 +134,12 @@ struct cpu_map *cpu_map__new(const char *cpu_list) if (!cpu_list) return cpu_map__read_all_cpu_map(); - if (!isdigit(*cpu_list)) + /* + * must handle the case of empty cpumap to cover + * TOPOLOGY header for NUMA nodes with no CPU + * ( e.g., because of CPU hotplug) + */ + if (!isdigit(*cpu_list) && *cpu_list != '\0') goto out; while (isdigit(*cpu_list)) { @@ -181,8 +186,10 @@ struct cpu_map *cpu_map__new(const char *cpu_list) if (nr_cpus > 0) cpus = cpu_map__trim_new(nr_cpus, tmp_cpus); - else + else if (*cpu_list != '\0') cpus = cpu_map__default_new(); + else + cpus = cpu_map__dummy_new(); invalid: free(tmp_cpus); out: -- 2.20.1