From patchwork Thu Dec 23 07:45:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 12697994 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6625C433EF for ; Thu, 23 Dec 2021 07:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=eg7PkZcezENOkeWeHnIGrhBH9W2KPaCL7/MkDMr0Hc0=; b=uClPOmM5v26/4PZw2SWHAyUoz2 DKxGVpIHOFhpu6Fg6GdFchrVnwa/OUND49yA4i8q+ncyrlQjC9PrBPRUderHFlMmZ21o78Q/Zr7AR DdYMpFaVAgW+Glbyt4NkrJW+DaBH3YZt8TNE5r0oCKxeBI+hGfVMhb/5rGlL25472rg+/m4q9b0eI Ji5ik1jg+KOFK5QhJqFsVoTpayfnk5PS4JKcS18viz4ROid+mq/gbdZmfy18EQKmZ23MEp39CsNRW yeyAbGVcxn8E8j0LjoS5l7In6jSqOhH9k7ullReUOJyEZLX+CAJiGu8l6DRh1yRkhCtif2mGR8FiN MWuR+dOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0IvU-00C2im-Ib; Thu, 23 Dec 2021 07:54:13 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0IoI-00Bzcc-Ny for linux-arm-kernel@lists.infradead.org; Thu, 23 Dec 2021 07:46:48 +0000 Received: by mail-yb1-xb49.google.com with SMTP id t184-20020a2546c1000000b006008b13c80bso8745517yba.1 for ; Wed, 22 Dec 2021 23:46:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=oK4z5E5fiyzkgFCJbjPVTXl+1a3iQ4V/763qtnP+njI=; b=FJ470XTGu1n28V1ATGzFkx+a6y6IY7sA8YqbHakatI88rGF0HcROWHQ7c+agHMxVGQ ipZRdI2SLwQ6Q4zx0go2BxMm9pWQrnTq1w1xsgCZPWvIL0oT8/09FwThJFmBKh9kwQw1 eaLr3iKbvTNJtLGZN44476RGQaz+qCAvrAFRn5kvTi9hrWPVGJD6OnjmaGaar2/g2vit C2kYNb42EjdduHlZMy1cRWyL0DeNfakffPV2owzKsQWI34nNvfESCEwnKvRxQOgb1I32 Q67p2LBNN46xiesFBCBufpIcfId3DLncPFbxrhDFoJv0lniPufGKQYSTo+gY4a30MDwM p/ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=oK4z5E5fiyzkgFCJbjPVTXl+1a3iQ4V/763qtnP+njI=; b=EKoywlwfeEGCs9cmZAToWV1cJhjYRtGq2iFkBQLkzH6WzW9uODBtKLFxGjU6CpjmEv j3DeR6jKCojY6PRqNLe2Uk0l3ww4NFL1pZI2v9ihls2QwWGk9F63jfqHs0D+Y7CAB39Z 5e0SVQIwQjLqQGsMdFhhTVBEbpY7DfnJ7rrD0sGVbVSlOUAVsG+6ZTU79ioJ3A4UVQoD kzLxoICopMRXwwe0/So81kuHQKhNYuH12nBQuAijbpeUijq1RiKyVclmXa9f8ZjhoSjN oAdf/LqdynCKApSPpvIkmIqDExeX/QQ2hGj+1BowMQvFywfiY6RzYejeS8qRHNGtXUWT f/3w== X-Gm-Message-State: AOAM53112VXyeKxoG3W6cIKgkozXeKpWazq/cWj3HG9jbL7R/Kaj27g6 n4Yo2VMxwLnEVSpd8PVDdPxxHaZbXOrA X-Google-Smtp-Source: ABdhPJymUOB7LGtIX2a9eR7ad1c348HlWb3l8JGGmoCGMzqjqRvlco6jPwBosbOtjOlDzUZa4aiCJXzdmfAn X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:4fef:90ff:589d:24ca]) (user=irogers job=sendgmr) by 2002:a25:abe3:: with SMTP id v90mr1636040ybi.315.1640245605233; Wed, 22 Dec 2021 23:46:45 -0800 (PST) Date: Wed, 22 Dec 2021 23:45:08 -0800 In-Reply-To: <20211223074541.3318938-1-irogers@google.com> Message-Id: <20211223074541.3318938-16-irogers@google.com> Mime-Version: 1.0 References: <20211223074541.3318938-1-irogers@google.com> X-Mailer: git-send-email 2.34.1.307.g9b7440fafd-goog Subject: [PATCH v2 15/48] perf cpumap: Document cpu__get_node and remove redundant function From: Ian Rogers To: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh , James Clark , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org Cc: eranian@google.com, Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211222_234646_834884_EE53F729 X-CRM114-Status: GOOD ( 12.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org cpu_map__get_node_id isn't used externally and merely delegates to cpu__get_node. Reviewed-by: James Clark Signed-off-by: Ian Rogers --- tools/perf/util/cpumap.c | 11 +++++------ tools/perf/util/cpumap.h | 5 ++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index b3e1304aca0c..1626b0991408 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -16,6 +16,10 @@ static int max_cpu_num; static int max_present_cpu_num; static int max_node_num; +/** + * The numa node X as read from /sys/devices/system/node/nodeX indexed by the + * CPU number. + */ static int *cpunode_map; static struct perf_cpu_map *cpu_map__from_entries(struct cpu_map_entries *cpus) @@ -222,11 +226,6 @@ int cpu_map__get_core_id(int cpu) return ret ?: value; } -int cpu_map__get_node_id(int cpu) -{ - return cpu__get_node(cpu); -} - struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data) { struct aggr_cpu_id id; @@ -250,7 +249,7 @@ struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data __maybe_unu { struct aggr_cpu_id id = aggr_cpu_id__empty(); - id.node = cpu_map__get_node_id(cpu); + id.node = cpu__get_node(cpu); return id; } diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h index 9589b0001a28..f849f01c5860 100644 --- a/tools/perf/util/cpumap.h +++ b/tools/perf/util/cpumap.h @@ -45,7 +45,6 @@ int cpu_map__get_die_id(int cpu); struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data); int cpu_map__get_core_id(int cpu); struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data); -int cpu_map__get_node_id(int cpu); struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data); int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp); int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep); @@ -58,6 +57,10 @@ int cpu__setup_cpunode_map(void); int cpu__max_node(void); int cpu__max_cpu(void); int cpu__max_present_cpu(void); +/** + * cpu__get_node - Returns the numa node X as read from + * /sys/devices/system/node/nodeX for the given CPU. + */ int cpu__get_node(int cpu); int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,