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 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 29878C433F5 for ; Tue, 11 Jan 2022 19:34:39 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E365lHaLq4VA9XYg9in9owb8a6b2ZmQs0H8fNSfiDcI=; b=cwuePb+ogxwaIq Lga1NLNmQrrnFboxtZZqrisZ3LvNbKCmnQ5dp8YngbrK2ba9K5XK7zMnHD9f1Yttsor+ffi9W0OaV 19AXvFiHexNjmoTI9qzgiB4DOIhldbRjwD2NZAvdKn0uxG7Z59slmlxSsWXHv2PN5jUsqP/6/5fJY Ao97oHjS8h43SvcTam0s43q5siLIUfPHAalg0PbgE2nzrmJ4P0jghyBJcPiJjzcKB2w9Z6sJrP5kh nvzLQ/iadI0Ol4fxnLsgpW97sqtI56nYJgX7w//9GDo0DjmU4Q1z1j2hLnTkT8YpHyGqOzPgXznOE 4vmcMriIs79g49ON+b/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7MtI-00HR6O-Oi; Tue, 11 Jan 2022 19:33:08 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7MtH-00HR5h-BP for linux-arm-kernel@bombadil.infradead.org; Tue, 11 Jan 2022 19:33:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=8vJ4zyS7s2Gqv5Nhlc2q20Cuc6LIzH2fLn5ysAC7ABc=; b=iYzN6sj1tdZL+ztikmoz0MhVSV g6wF4kNo0lxaO9bul52UoxpKmOAQAgHpoIhIiYhVr67oMYoF76J3SWcL2KMPLDF5FDXY5b3Qay1JP mQCSZGK0JGcB/SediYv9irYRF4Pfy6IkSDlZ7vW+PR3NweEMF/Mh1YVg9uEdobb4QFw8onlfLtR+b qkeF/SPvvMtFkjNFZfA3hSfNWQq29kA3mQNmsXEQYOAOqFbfUQIWgKR2pFYUI1U/aRU6mwGZQ9Ltv t68USD09z1pCScrDOuYdfGbZ2fSb2yfHA5WSpxc9JSnjVF9rrSoK1Fc14JE1JIdl19HbuVfDxICIf ky7P3TMA==; Received: from [179.97.37.151] (helo=quaco.ghostprotocols.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7MtE-003Wg9-Vr; Tue, 11 Jan 2022 19:33:05 +0000 Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 7B34040714; Tue, 11 Jan 2022 16:33:01 -0300 (-03) Date: Tue, 11 Jan 2022 16:33:01 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , 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, zhengjun.xing@intel.com, eranian@google.com Subject: Re: [PATCH v4 02/48] perf stat: Add aggr creators that are passed a cpu. Message-ID: References: <20220105061351.120843-1-irogers@google.com> <20220105061351.120843-3-irogers@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220105061351.120843-3-irogers@google.com> X-Url: http://acmel.wordpress.com 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Em Tue, Jan 04, 2022 at 10:13:05PM -0800, Ian Rogers escreveu: > The cpu_map and index can get confused. Add variants of the cpu_map__get > routines that are passed a cpu. Make the existing cpu_map__get routines > use the new functions with a view to remove them when no longer used. > > Reviewed-by: James Clark > Signed-off-by: Ian Rogers > --- > tools/perf/util/cpumap.c | 79 +++++++++++++++++++++++----------------- > tools/perf/util/cpumap.h | 6 ++- > 2 files changed, 51 insertions(+), 34 deletions(-) > > diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c > index 87d3eca9b872..49fba2c53822 100644 > --- a/tools/perf/util/cpumap.c > +++ b/tools/perf/util/cpumap.c > @@ -128,21 +128,23 @@ int cpu_map__get_socket_id(int cpu) > return ret ?: value; > } > > -struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, > - void *data __maybe_unused) > +struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_unused) > { > - int cpu; > struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > > - if (idx > map->nr) > - return id; > - > - cpu = map->map[idx]; > - > id.socket = cpu_map__get_socket_id(cpu); > return id; > } > > +struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, > + void *data) > +{ > + if (idx < 0 || idx > map->nr) > + return cpu_map__empty_aggr_cpu_id(); > + > + return cpu_map__get_socket_aggr_by_cpu(map->map[idx], data); > +} > + This 'idx < 0' wasn't in the original code nor is described in the comment log message, please avoid doing this, this may be harmless or even a good hardening, but either way would be interesting to have it in a separate patch. This eases review as in the end this code is just a refactoring, moving things around but in the end should be equivalent code. There are a few more, please consider this and if you agree, to speed things up I can make the changes here, if I think this won't fallout in changes to subsequent patches touching this area. - Arnaldo > static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > { > struct aggr_cpu_id *a = (struct aggr_cpu_id *)a_pointer; > @@ -200,15 +202,10 @@ int cpu_map__get_die_id(int cpu) > return ret ?: value; > } > > -struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data) > +struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data) > { > - int cpu, die; > - struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > - > - if (idx > map->nr) > - return id; > - > - cpu = map->map[idx]; > + struct aggr_cpu_id id; > + int die; > > die = cpu_map__get_die_id(cpu); > /* There is no die_id on legacy system. */ > @@ -220,7 +217,7 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat > * with the socket ID and then add die to > * make a unique ID. > */ > - id = cpu_map__get_socket(map, idx, data); > + id = cpu_map__get_socket_aggr_by_cpu(cpu, data); > if (cpu_map__aggr_cpu_id_is_empty(id)) > return id; > > @@ -228,6 +225,15 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat > return id; > } > > +struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, > + void *data) > +{ > + if (idx < 0 || idx > map->nr) > + return cpu_map__empty_aggr_cpu_id(); Ditto > + > + return cpu_map__get_die_aggr_by_cpu(map->map[idx], data); > +} > + > int cpu_map__get_core_id(int cpu) > { > int value, ret = cpu__get_topology_int(cpu, "core_id", &value); > @@ -239,20 +245,13 @@ int cpu_map__get_node_id(int cpu) > return cpu__get_node(cpu); > } > > -struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data) > +struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data) > { > - int cpu; > - struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > - > - if (idx > map->nr) > - return id; > - > - cpu = map->map[idx]; > - > - cpu = cpu_map__get_core_id(cpu); > + struct aggr_cpu_id id; > + int core = cpu_map__get_core_id(cpu); > > /* cpu_map__get_die returns a struct with socket and die set*/ > - id = cpu_map__get_die(map, idx, data); > + id = cpu_map__get_die_aggr_by_cpu(cpu, data); > if (cpu_map__aggr_cpu_id_is_empty(id)) > return id; > > @@ -260,19 +259,33 @@ struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *da > * core_id is relative to socket and die, we need a global id. > * So we combine the result from cpu_map__get_die with the core id > */ > - id.core = cpu; > + id.core = core; > return id; > + > } > > -struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data __maybe_unused) > +struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data) > +{ > + if (idx < 0 || idx > map->nr) > + return cpu_map__empty_aggr_cpu_id(); Ditto > + > + return cpu_map__get_core_aggr_by_cpu(map->map[idx], data); > +} > + > +struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data __maybe_unused) > { > struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > > + id.node = cpu_map__get_node_id(cpu); > + return id; > +} > + > +struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data) > +{ > if (idx < 0 || idx >= map->nr) > - return id; > + return cpu_map__empty_aggr_cpu_id(); > > - id.node = cpu_map__get_node_id(map->map[idx]); > - return id; > + return cpu_map__get_node_aggr_by_cpu(map->map[idx], data); > } > > int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp) > diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h > index a27eeaf086e8..c62d67704425 100644 > --- a/tools/perf/util/cpumap.h > +++ b/tools/perf/util/cpumap.h > @@ -31,13 +31,17 @@ size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size); > size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size); > size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp); > int cpu_map__get_socket_id(int cpu); > +struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data); > struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, void *data); > int cpu_map__get_die_id(int cpu); > +struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data); > struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, 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); > struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data); > int cpu_map__get_node_id(int cpu); > -struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data); > +struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data); > +struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, 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); > int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep); > -- > 2.34.1.448.ga2b2bfdf31-goog -- - Arnaldo _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel