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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 700C1C433EF for ; Sat, 26 Mar 2022 14:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232727AbiCZOxN (ORCPT ); Sat, 26 Mar 2022 10:53:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233504AbiCZOxD (ORCPT ); Sat, 26 Mar 2022 10:53:03 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 925AE2467EB for ; Sat, 26 Mar 2022 07:51:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4D513B800A0 for ; Sat, 26 Mar 2022 14:51:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9FDFC2BBE4; Sat, 26 Mar 2022 14:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648306284; bh=ENd9kpaGg1JZb6jQlmhYTNPOJ1YdXU5r0h1/zNTgA0Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=bnJr4JAtP5B21bvpq3ucHVX0xf9lAurxPSHsfgtqEieIMickDelcGbbiwnvtbHSQK s31Q5M0tj1zJiFWtTLXzPcquFJjJXSwveQiKJl1odwJt2XmNfXBfJCo5YK8ohjxvKS O/kkWc21T+WRiNXH/L3A3bO64wVmeY4NQC7IAWaCemirlDXQ6wL8zCDet7j9pGGm7E LzFTHr875HfDWNyB7RZp78bY4vQu26zL8RR2qllZSTJip//bAKfhwTL3yTYH9oDEIY RDZLpWQ/UBYwdvUkxhyXwRxfuxq7tUfQryoPm9v41Pebo4bM/zuTW2oGQsfDLkwBr7 h9KIo2dMQgmug== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 6123740407; Sat, 26 Mar 2022 11:51:21 -0300 (-03) Date: Sat, 26 Mar 2022 11:51:21 -0300 From: Arnaldo Carvalho de Melo To: Andrii Nakryiko Cc: Kui-Feng Lee , Arnaldo Carvalho de Melo , dwarves@vger.kernel.org, Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann Subject: Re: [PATCH dwarves] pahole, btf_encoder: Collect info of per-cpu varaibles from threads. Message-ID: References: <20220321230837.855572-1-kuifeng@fb.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: dwarves@vger.kernel.org Em Fri, Mar 25, 2022 at 04:02:13PM -0700, Andrii Nakryiko escreveu: > On Mon, Mar 21, 2022 at 4:08 PM Kui-Feng Lee wrote: > > > > Collect the information of per-cpu variables from encoders of worker > > threads to the primary encoder. > > > > btf_encoder store per-cpu info separately, not in btf. Previously, it > > merged only btf types generated by worker threads. So, some of the > > per-cpu info was missing. > > > > Signed-off-by: Kui-Feng Lee > > --- > > I've applied this locally and tested, it all looks good, thanks! I'm > keeping this applied locally until Arnaldo pushes this to master :) > > Acked-by: Andrii Nakryiko > Tested-by: Andrii Nakryiko And from a quick look the code is really elegant, well done! Applied and will push to the next branch, later today/tomorrow I'll push it out to master after it passes the libbpf CI tests. Thanks! - Arnaldo > > btf_encoder.c | 21 +++++++++++++++++++++ > > btf_encoder.h | 2 ++ > > pahole.c | 2 +- > > 3 files changed, 24 insertions(+), 1 deletion(-) > > > > diff --git a/btf_encoder.c b/btf_encoder.c > > index fa29824..1a42094 100644 > > --- a/btf_encoder.c > > +++ b/btf_encoder.c > > @@ -606,6 +606,27 @@ static int32_t btf_encoder__add_var_secinfo(struct btf_encoder *encoder, uint32_ > > return gobuffer__add(&encoder->percpu_secinfo, &si, sizeof(si)); > > } > > > > +int32_t btf_encoder__add_encoder(struct btf_encoder *encoder, struct btf_encoder *other) > > +{ > > + struct gobuffer *var_secinfo_buf = &other->percpu_secinfo; > > + size_t sz = gobuffer__size(var_secinfo_buf); > > + uint16_t nr_var_secinfo = sz / sizeof(struct btf_var_secinfo); > > + uint32_t type_id; > > + uint32_t next_type_id = btf__type_cnt(encoder->btf); > > + int32_t i, id; > > + struct btf_var_secinfo *vsi; > > + > > + for (i = 0; i < nr_var_secinfo; i++) { > > + vsi = (struct btf_var_secinfo *)var_secinfo_buf->entries + i; > > + type_id = next_type_id + vsi->type - 1; /* Type ID starts from 1 */ > > + id = btf_encoder__add_var_secinfo(encoder, type_id, vsi->offset, vsi->size); > > + if (id < 0) > > + return id; > > + } > > + > > + return btf__add_btf(encoder->btf, other->btf); > > +} > > + > > static int32_t btf_encoder__add_datasec(struct btf_encoder *encoder, const char *section_name) > > { > > struct gobuffer *var_secinfo_buf = &encoder->percpu_secinfo; > > diff --git a/btf_encoder.h b/btf_encoder.h > > index 0f0eee8..339fae2 100644 > > --- a/btf_encoder.h > > +++ b/btf_encoder.h > > @@ -31,4 +31,6 @@ struct btf_encoder *btf_encoders__next(struct btf_encoder *encoder); > > > > struct btf *btf_encoder__btf(struct btf_encoder *encoder); > > > > +int btf_encoder__add_encoder(struct btf_encoder *encoder, struct btf_encoder *other); > > + > > #endif /* _BTF_ENCODER_H_ */ > > diff --git a/pahole.c b/pahole.c > > index f7c7966..a909b22 100644 > > --- a/pahole.c > > +++ b/pahole.c > > @@ -2867,7 +2867,7 @@ static int pahole_threads_collect(struct conf_load *conf, int nr_threads, void * > > */ > > if (!threads[i]->btf || threads[i]->encoder == btf_encoder) > > continue; /* The primary btf_encoder */ > > - err = btf__add_btf(btf_encoder__btf(btf_encoder), threads[i]->btf); > > + err = btf_encoder__add_encoder(btf_encoder, threads[i]->encoder); > > if (err < 0) > > goto out; > > btf_encoder__delete(threads[i]->encoder); > > -- > > 2.30.2 > > -- - Arnaldo