Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp984801rdb; Wed, 6 Dec 2023 05:49:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpx3ZO+Sgdu4B7pBaKoGM1hkqdCelVCGcRWS1ljHDp7SHr1sEojMElGpLO9W3/0Ee0aeo4 X-Received: by 2002:a17:902:c20c:b0:1d0:6ffd:610c with SMTP id 12-20020a170902c20c00b001d06ffd610cmr1332477pll.46.1701870571810; Wed, 06 Dec 2023 05:49:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701870571; cv=none; d=google.com; s=arc-20160816; b=mU4gFTw+GrKMFyYHvq+8x2A9EkVC2JDs4U8pU5hWfptvfTABkorCffnoMbzkYscF/4 i3Nk2e8X6mmWRX4NdxW5zPaMdk08npI+Fjzaz1xVem20wWhdchXvr57Yl+/nvR7++3m9 q9kU4L5xzERSMf9/rQWUZ4hqK+ijriOwxxmYB4531AUPP5RxVsIzTRayw0gA2qzum41C RXiExVQPptz98Znn8lTZhZP14Jn3+7q3Uj10A8i9tysNLtc3T956ZHGNTeTx8ZiBiObk GB0BGqPhcgLbuZlLLxOeO1rohHgb2kIu+TGuwWRDIYCeHTueDsX/Hab0AOBG4NxxTCHA Wa3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=EtbmQQn7jVMNm5BJB+1kVdUYYd5OSW3tnArd12QF/o4=; fh=DQJFzYhDw7s0aDcP4xCXMnXDV+wvgCJQmGzbcu5VG4A=; b=KeF8Z+qfJ3vG3ioY0ym8q76KNwf2J/xPiI15RtCuM0mswapPeTNiyPcNBY6VBVDNmx BMU5wAjMPW7waX/YkiiTw+szhZNaFiHsfzJ++/bkjw8WdIViw8GNQDilss1QquYTgJ9Q V2QVHstokMn/IT3acUcTp21TexXr87pFKJIHDA/QD6LAPcCBhmhx+icDgGObFQUtp7yu iemrrlqhvIjW+wamHPD9WfouFzeA3EyidJtjMv2mOCQ2qYKcmHGJ9UzqXy12NUEdE4HR ElJf+GizcYGuLzKoeDeXRxh5FG+US/qrf9W9TrVNFj9J/QDAJqBHChDH+xYR9hnipLcn rR5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gN3O5KWg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id y2-20020a170902864200b001cfb7ef2badsi11064788plt.155.2023.12.06.05.49.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 05:49:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gN3O5KWg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id D922E832658A; Wed, 6 Dec 2023 05:49:27 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378631AbjLFNtE (ORCPT + 99 others); Wed, 6 Dec 2023 08:49:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378613AbjLFNtB (ORCPT ); Wed, 6 Dec 2023 08:49:01 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A995CD42 for ; Wed, 6 Dec 2023 05:49:06 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0F3BC433C7; Wed, 6 Dec 2023 13:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701870546; bh=KwcL+QMUaNWDGFMmydKvEhIFDMXXnOhaUsKZ4f5cBFQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gN3O5KWgB3F4/UcpgqpBcAXIs6toKpdD5cBJOR/+ePMeHGdH60kLSkuz34u9NC0PF 1BEoZDdB6wQVdFl8Nyqboy1gaOofs1U315kCfG/LFa4Hc+B2fD/5nn7ztUaQCJ5Edb WHBBRvfBYQN3XV0arF2kSaxO7f+VWi/TqWghCENWhOqKog+JNgLm67eO6thHJeCPi3 JTLA8TOU02taQ9sdTJVAAGJsVUPLHBsSdX18Y+xt6SbOMSiXWyq1JpsUtRVDLeKsfC EqPX79Zj0+BIbY8D7FvsMz+XDdsYghp2c9MMtkB84KGVxkZEtLtOsYG/h37fU1NXhr /rlfODTCjkc8g== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id BA6D0403EF; Wed, 6 Dec 2023 10:49:03 -0300 (-03) Date: Wed, 6 Dec 2023 10:49:03 -0300 From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ian Rogers , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Nick Terrell , Kan Liang , Andi Kleen , Kajol Jain , Athira Rajeev , Huacai Chen , Masami Hiramatsu , Vincent Whitchurch , "Steinar H. Gunderson" , Liam Howlett , Miguel Ojeda , Colin Ian King , Dmitrii Dolgov <9erthalion6@gmail.com>, Yang Jihong , Ming Wang , James Clark , K Prateek Nayak , Sean Christopherson , Leo Yan , Ravi Bangoria , German Gomez , Changbin Du , Paolo Bonzini , Li Dong , Sandipan Das , liuwenyu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Guilherme Amadio Subject: Re: [PATCH v5 12/50] perf map: Simplify map_ip/unmap_ip and make map size smaller Message-ID: References: <20231127220902.1315692-1-irogers@google.com> <20231127220902.1315692-13-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Url: http://acmel.wordpress.com X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 06 Dec 2023 05:49:28 -0800 (PST) Em Mon, Dec 04, 2023 at 03:39:08PM -0800, Namhyung Kim escreveu: > Hi Ian, > > On Mon, Nov 27, 2023 at 2:09 PM Ian Rogers wrote: > > > > When mapping an IP it is either an identity mapping or a DSO relative > > mapping, so a single bit is required in the struct to identify > > this. The current code uses function pointers, adding 2 pointers per > > map and also pushing the size of a map beyond 1 cache line. Switch to > > using a byte to identify the mapping type (as well as priv and > > erange_warned), to avoid any masking. Change struct maps's layout to > > avoid holes. > > > > Before: > > ``` > > struct map { > > u64 start; /* 0 8 */ > > u64 end; /* 8 8 */ > > _Bool erange_warned:1; /* 16: 0 1 */ > > _Bool priv:1; /* 16: 1 1 */ > > > > /* XXX 6 bits hole, try to pack */ > > /* XXX 3 bytes hole, try to pack */ > > > > u32 prot; /* 20 4 */ > > u64 pgoff; /* 24 8 */ > > u64 reloc; /* 32 8 */ > > u64 (*map_ip)(const struct map *, u64); /* 40 8 */ > > u64 (*unmap_ip)(const struct map *, u64); /* 48 8 */ > > struct dso * dso; /* 56 8 */ > > /* --- cacheline 1 boundary (64 bytes) --- */ > > refcount_t refcnt; /* 64 4 */ > > u32 flags; /* 68 4 */ > > > > /* size: 72, cachelines: 2, members: 12 */ > > /* sum members: 68, holes: 1, sum holes: 3 */ > > /* sum bitfield members: 2 bits, bit holes: 1, sum bit holes: 6 bits */ > > /* last cacheline: 8 bytes */ > > }; > > ``` > > > > After: > > ``` > > struct map { > > u64 start; /* 0 8 */ > > u64 end; /* 8 8 */ > > u64 pgoff; /* 16 8 */ > > u64 reloc; /* 24 8 */ > > struct dso * dso; /* 32 8 */ > > refcount_t refcnt; /* 40 4 */ > > u32 prot; /* 44 4 */ > > u32 flags; /* 48 4 */ > > enum mapping_type mapping_type:8; /* 52: 0 4 */ > > > > /* Bitfield combined with next fields */ > > > > _Bool erange_warned; /* 53 1 */ > > _Bool priv; /* 54 1 */ > > > > /* size: 56, cachelines: 1, members: 11 */ > > /* padding: 1 */ > > /* last cacheline: 56 bytes */ > > }; > > ``` > > Thanks for doing this! I really wanted to clean up the map > code and to make it more intuitive. > > > > > Signed-off-by: Ian Rogers > > Acked-by: Namhyung Kim Applied > A few nitpicks below. Ian, please consider those for a follow up clarifying patch. - Arnaldo > > --- > > tools/perf/util/machine.c | 3 +- > > tools/perf/util/map.c | 20 +-------- > > tools/perf/util/map.h | 83 +++++++++++++++++++----------------- > > tools/perf/util/symbol-elf.c | 6 +-- > > tools/perf/util/symbol.c | 6 +-- > > 5 files changed, 50 insertions(+), 68 deletions(-) > > > > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c > > index be3dab9d5253..b6831a1f909d 100644 > > --- a/tools/perf/util/machine.c > > +++ b/tools/perf/util/machine.c > > @@ -1360,8 +1360,7 @@ __machine__create_kernel_maps(struct machine *machine, struct dso *kernel) > > if (machine->vmlinux_map == NULL) > > return -ENOMEM; > > > > - map__set_map_ip(machine->vmlinux_map, identity__map_ip); > > - map__set_unmap_ip(machine->vmlinux_map, identity__map_ip); > > + map__set_mapping_type(machine->vmlinux_map, MAPPING_TYPE__IDENTITY); > > return maps__insert(machine__kernel_maps(machine), machine->vmlinux_map); > > } > > > > diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c > > index f64b83004421..54c67cb7ecef 100644 > > --- a/tools/perf/util/map.c > > +++ b/tools/perf/util/map.c > > @@ -109,8 +109,7 @@ void map__init(struct map *map, u64 start, u64 end, u64 pgoff, struct dso *dso) > > map__set_pgoff(map, pgoff); > > map__set_reloc(map, 0); > > map__set_dso(map, dso__get(dso)); > > - map__set_map_ip(map, map__dso_map_ip); > > - map__set_unmap_ip(map, map__dso_unmap_ip); > > + map__set_mapping_type(map, MAPPING_TYPE__DSO); > > map__set_erange_warned(map, false); > > refcount_set(map__refcnt(map), 1); > > } > > @@ -172,7 +171,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, > > map__init(result, start, start + len, pgoff, dso); > > > > if (anon || no_dso) { > > - map->map_ip = map->unmap_ip = identity__map_ip; > > + map->mapping_type = MAPPING_TYPE__IDENTITY; > > > > /* > > * Set memory without DSO as loaded. All map__find_* > > @@ -630,18 +629,3 @@ struct maps *map__kmaps(struct map *map) > > } > > return kmap->kmaps; > > } > > - > > -u64 map__dso_map_ip(const struct map *map, u64 ip) > > -{ > > - return ip - map__start(map) + map__pgoff(map); > > -} > > - > > -u64 map__dso_unmap_ip(const struct map *map, u64 ip) > > -{ > > - return ip + map__start(map) - map__pgoff(map); > > -} > > - > > -u64 identity__map_ip(const struct map *map __maybe_unused, u64 ip) > > -{ > > - return ip; > > -} > > diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h > > index 1b53d53adc86..3a3b7757da5f 100644 > > --- a/tools/perf/util/map.h > > +++ b/tools/perf/util/map.h > > @@ -16,23 +16,25 @@ struct dso; > > struct maps; > > struct machine; > > > > +enum mapping_type { > > + /* map__map_ip/map__unmap_ip are given as offsets in the DSO. */ > > + MAPPING_TYPE__DSO, > > I slightly prefer __PIC than __DSO, but won't argue. :) > > > + /* map__map_ip/map__unmap_ip are just the given ip value. */ > > + MAPPING_TYPE__IDENTITY, > > +}; > > + > > DECLARE_RC_STRUCT(map) { > > u64 start; > > u64 end; > > - bool erange_warned:1; > > - bool priv:1; > > - u32 prot; > > u64 pgoff; > > u64 reloc; > > - > > - /* ip -> dso rip */ > > - u64 (*map_ip)(const struct map *, u64); > > - /* dso rip -> ip */ > > - u64 (*unmap_ip)(const struct map *, u64); > > - > > struct dso *dso; > > refcount_t refcnt; > > + u32 prot; > > u32 flags; > > + enum mapping_type mapping_type:8; > > + bool erange_warned; > > + bool priv; > > }; > > > > struct kmap; > > @@ -41,38 +43,11 @@ struct kmap *__map__kmap(struct map *map); > > struct kmap *map__kmap(struct map *map); > > struct maps *map__kmaps(struct map *map); > > > > -/* ip -> dso rip */ > > -u64 map__dso_map_ip(const struct map *map, u64 ip); > > -/* dso rip -> ip */ > > -u64 map__dso_unmap_ip(const struct map *map, u64 ip); > > -/* Returns ip */ > > -u64 identity__map_ip(const struct map *map __maybe_unused, u64 ip); > > - > > static inline struct dso *map__dso(const struct map *map) > > { > > return RC_CHK_ACCESS(map)->dso; > > } > > > > -static inline u64 map__map_ip(const struct map *map, u64 ip) > > -{ > > - return RC_CHK_ACCESS(map)->map_ip(map, ip); > > -} > > - > > -static inline u64 map__unmap_ip(const struct map *map, u64 ip) > > -{ > > - return RC_CHK_ACCESS(map)->unmap_ip(map, ip); > > -} > > - > > -static inline void *map__map_ip_ptr(struct map *map) > > -{ > > - return RC_CHK_ACCESS(map)->map_ip; > > -} > > - > > -static inline void* map__unmap_ip_ptr(struct map *map) > > -{ > > - return RC_CHK_ACCESS(map)->unmap_ip; > > -} > > - > > static inline u64 map__start(const struct map *map) > > { > > return RC_CHK_ACCESS(map)->start; > > @@ -123,6 +98,34 @@ static inline size_t map__size(const struct map *map) > > return map__end(map) - map__start(map); > > } > > > > +/* ip -> dso rip */ > > +static inline u64 map__dso_map_ip(const struct map *map, u64 ip) > > +{ > > + return ip - map__start(map) + map__pgoff(map); > > +} > > + > > +/* dso rip -> ip */ > > +static inline u64 map__dso_unmap_ip(const struct map *map, u64 ip) > > I think it's better to use 'rip' consistently in the variable name > if possible. > > Thanks, > Namhyung > > > > +{ > > + return ip + map__start(map) - map__pgoff(map); > > +} > > + > > +static inline u64 map__map_ip(const struct map *map, u64 ip) > > +{ > > + if ((RC_CHK_ACCESS(map)->mapping_type) == MAPPING_TYPE__DSO) > > + return map__dso_map_ip(map, ip); > > + else > > + return ip; > > +} > > + > > +static inline u64 map__unmap_ip(const struct map *map, u64 ip) > > +{ > > + if ((RC_CHK_ACCESS(map)->mapping_type) == MAPPING_TYPE__DSO) > > + return map__dso_unmap_ip(map, ip); > > + else > > + return ip; > > +} > > + > > /* rip/ip <-> addr suitable for passing to `objdump --start-address=` */ > > u64 map__rip_2objdump(struct map *map, u64 rip); > > > > @@ -294,13 +297,13 @@ static inline void map__set_dso(struct map *map, struct dso *dso) > > RC_CHK_ACCESS(map)->dso = dso; > > } > > > > -static inline void map__set_map_ip(struct map *map, u64 (*map_ip)(const struct map *map, u64 ip)) > > +static inline void map__set_mapping_type(struct map *map, enum mapping_type type) > > { > > - RC_CHK_ACCESS(map)->map_ip = map_ip; > > + RC_CHK_ACCESS(map)->mapping_type = type; > > } > > > > -static inline void map__set_unmap_ip(struct map *map, u64 (*unmap_ip)(const struct map *map, u64 rip)) > > +static inline enum mapping_type map__mapping_type(struct map *map) > > { > > - RC_CHK_ACCESS(map)->unmap_ip = unmap_ip; > > + return RC_CHK_ACCESS(map)->mapping_type; > > } > > #endif /* __PERF_MAP_H */ > > diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c > > index 9e7eeaf616b8..4b934ed3bfd1 100644 > > --- a/tools/perf/util/symbol-elf.c > > +++ b/tools/perf/util/symbol-elf.c > > @@ -1392,8 +1392,7 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map, > > map__set_start(map, shdr->sh_addr + ref_reloc(kmap)); > > map__set_end(map, map__start(map) + shdr->sh_size); > > map__set_pgoff(map, shdr->sh_offset); > > - map__set_map_ip(map, map__dso_map_ip); > > - map__set_unmap_ip(map, map__dso_unmap_ip); > > + map__set_mapping_type(map, MAPPING_TYPE__DSO); > > /* Ensure maps are correctly ordered */ > > if (kmaps) { > > int err; > > @@ -1455,8 +1454,7 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map, > > map__set_end(curr_map, map__start(curr_map) + shdr->sh_size); > > map__set_pgoff(curr_map, shdr->sh_offset); > > } else { > > - map__set_map_ip(curr_map, identity__map_ip); > > - map__set_unmap_ip(curr_map, identity__map_ip); > > + map__set_mapping_type(curr_map, MAPPING_TYPE__IDENTITY); > > } > > curr_dso->symtab_type = dso->symtab_type; > > if (maps__insert(kmaps, curr_map)) > > diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c > > index 82cc74b9358e..314c0263bf3c 100644 > > --- a/tools/perf/util/symbol.c > > +++ b/tools/perf/util/symbol.c > > @@ -956,8 +956,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, > > return -1; > > } > > > > - map__set_map_ip(curr_map, identity__map_ip); > > - map__set_unmap_ip(curr_map, identity__map_ip); > > + map__set_mapping_type(curr_map, MAPPING_TYPE__IDENTITY); > > if (maps__insert(kmaps, curr_map)) { > > dso__put(ndso); > > return -1; > > @@ -1475,8 +1474,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map, > > map__set_start(map, map__start(new_map)); > > map__set_end(map, map__end(new_map)); > > map__set_pgoff(map, map__pgoff(new_map)); > > - map__set_map_ip(map, map__map_ip_ptr(new_map)); > > - map__set_unmap_ip(map, map__unmap_ip_ptr(new_map)); > > + map__set_mapping_type(map, map__mapping_type(new_map)); > > /* Ensure maps are correctly ordered */ > > map_ref = map__get(map); > > maps__remove(kmaps, map_ref); > > -- > > 2.43.0.rc1.413.gea7ed67945-goog > > -- - Arnaldo