From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: dwarves@vger.kernel.org
Cc: "Jiri Olsa" <jolsa@kernel.org>,
"Clark Williams" <williams@redhat.com>,
"Kate Carcia" <kcarcia@redhat.com>,
bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" <acme@redhat.com>,
"Alan Maguire" <alan.maguire@oracle.com>,
"Kui-Feng Lee" <kuifeng@fb.com>,
"Thomas Weißschuh" <linux@weissschuh.net>
Subject: [PATCH 04/12] dwarf_loader: Introduce dwarf_cus__process_cu()
Date: Tue, 2 Apr 2024 16:39:37 -0300 [thread overview]
Message-ID: <20240402193945.17327-5-acme@kernel.org> (raw)
In-Reply-To: <20240402193945.17327-1-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Finishing the separation of creating a dcu/cu pair from processing it,
as we'll need to add the new dcu/cu pair to the list under cus__lock(),
so that we process it in order to keep a reproducible BTF encoding.
Cc: Alan Maguire <alan.maguire@oracle.com>
Cc: Kui-Feng Lee <kuifeng@fb.com>
Cc: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
dwarf_loader.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/dwarf_loader.c b/dwarf_loader.c
index 125e361ef2bf3f7b..5090509309446890 100644
--- a/dwarf_loader.c
+++ b/dwarf_loader.c
@@ -3233,6 +3233,16 @@ static struct dwarf_cu *dwarf_cus__create_cu(struct dwarf_cus *dcus, Dwarf_Die *
return dcu;
}
+static int dwarf_cus__process_cu(struct dwarf_cus *dcus, Dwarf_Die *cu_die,
+ struct cu *cu, void *thr_data)
+{
+ if (die__process_and_recode(cu_die, cu, dcus->conf) != 0 ||
+ cus__finalize(dcus->cus, cu, dcus->conf, thr_data) == LSK__STOP_LOADING)
+ return DWARF_CB_ABORT;
+
+ return DWARF_CB_OK;
+}
+
static int dwarf_cus__create_and_process_cu(struct dwarf_cus *dcus, Dwarf_Die *cu_die,
uint8_t pointer_size, void *thr_data)
{
@@ -3241,13 +3251,7 @@ static int dwarf_cus__create_and_process_cu(struct dwarf_cus *dcus, Dwarf_Die *c
if (dcu == NULL)
return DWARF_CB_ABORT;
- struct cu *cu = dcu->cu;
-
- if (die__process_and_recode(cu_die, cu, dcus->conf) != 0 ||
- cus__finalize(dcus->cus, cu, dcus->conf, thr_data) == LSK__STOP_LOADING)
- return DWARF_CB_ABORT;
-
- return DWARF_CB_OK;
+ return dwarf_cus__process_cu(dcus, cu_die, dcu->cu, thr_data);
}
static int dwarf_cus__nextcu(struct dwarf_cus *dcus, Dwarf_Die *die_mem, Dwarf_Die **cu_die, uint8_t *pointer_size, uint8_t *offset_size)
--
2.44.0
next prev parent reply other threads:[~2024-04-02 19:40 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 19:39 [RFC/PATCHES 00/12] pahole: Reproducible parallel DWARF loading/serial BTF encoding Arnaldo Carvalho de Melo
2024-04-02 19:39 ` [PATCH 01/12] core: Allow asking for a reproducible build Arnaldo Carvalho de Melo
2024-04-02 19:39 ` [PATCH 02/12] pahole: Disable BTF multithreaded encoded when doing reproducible builds Arnaldo Carvalho de Melo
2024-04-03 18:19 ` Andrii Nakryiko
2024-04-03 21:38 ` Arnaldo Carvalho de Melo
2024-04-03 21:43 ` Andrii Nakryiko
2024-04-04 9:42 ` Jiri Olsa
2024-04-02 19:39 ` [PATCH 03/12] dwarf_loader: Separate creating the cu/dcu pair from processing it Arnaldo Carvalho de Melo
2024-04-04 9:42 ` Jiri Olsa
2024-04-02 19:39 ` Arnaldo Carvalho de Melo [this message]
2024-04-02 19:39 ` [PATCH 05/12] dwarf_loader: Create the cu/dcu pair in dwarf_cus__nextcu() Arnaldo Carvalho de Melo
2024-04-02 19:39 ` [PATCH 06/12] dwarf_loader: Remove unused 'thr_data' arg from dwarf_cus__create_and_process_cu() Arnaldo Carvalho de Melo
2024-04-02 19:39 ` [PATCH 07/12] core: Add unlocked cus__add() variant Arnaldo Carvalho de Melo
2024-04-02 19:39 ` [PATCH 08/12] core: Add cus__remove(), counterpart of cus__add() Arnaldo Carvalho de Melo
2024-04-02 19:39 ` [PATCH 09/12] dwarf_loader: Add the cu to the cus list early, remove on LSK_DELETE Arnaldo Carvalho de Melo
2024-04-02 19:39 ` [PATCH 10/12] core/dwarf_loader: Add functions to set state of CU processing Arnaldo Carvalho de Melo
2024-04-02 19:39 ` [PATCH 11/12] pahole: Encode BTF serially in a reproducible build Arnaldo Carvalho de Melo
2024-04-02 19:39 ` [PATCH 12/12] tests: Add a BTF reproducible generation test Arnaldo Carvalho de Melo
2024-04-04 0:08 ` [RFC/PATCHES 00/12] pahole: Reproducible parallel DWARF loading/serial BTF encoding Eduard Zingerman
2024-04-04 8:05 ` Alan Maguire
2024-04-09 14:34 ` Eduard Zingerman
2024-04-09 14:56 ` Alexei Starovoitov
2024-04-09 15:01 ` Eduard Zingerman
2024-04-09 18:45 ` Arnaldo Carvalho de Melo
2024-04-09 19:29 ` Eduard Zingerman
2024-04-09 19:34 ` Alexei Starovoitov
2024-04-09 19:57 ` Arnaldo Carvalho de Melo
2024-04-12 20:37 ` Arnaldo Carvalho de Melo
2024-04-12 20:40 ` Eduard Zingerman
2024-04-12 21:09 ` Arnaldo Carvalho de Melo
2024-04-12 21:10 ` Eduard Zingerman
2024-04-04 8:58 ` Alan Maguire
2024-04-08 12:00 ` Alan Maguire
2024-04-08 14:39 ` Arnaldo Carvalho de Melo
2024-04-12 20:36 ` Arnaldo Carvalho de Melo
2024-04-04 9:42 ` Jiri Olsa
-- strict thread matches above, loose matches on Subject: below --
2024-04-12 21:15 [PATCH 00/12] Arnaldo Carvalho de Melo
2024-04-12 21:15 ` [PATCH 04/12] dwarf_loader: Introduce dwarf_cus__process_cu() Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240402193945.17327-5-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=alan.maguire@oracle.com \
--cc=bpf@vger.kernel.org \
--cc=dwarves@vger.kernel.org \
--cc=jolsa@kernel.org \
--cc=kcarcia@redhat.com \
--cc=kuifeng@fb.com \
--cc=linux@weissschuh.net \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox