[PATCH 05/12] dwarf_loader: Create the cu/dcu pair in dwarf_cus__nextcu()

Arnaldo Carvalho de Melo
2024-04-02T19:40:08Z

From: Arnaldo Carvalho de Melo <acme@redhat.com>

dwarf_cus__nextcu() is only used in parallel DWARF loading, and we want
to make sure that we preserve the order of the CUs in the DWARF file
being loaded, so move creating the cu/dcu to under that lock.

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 | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/dwarf_loader.c b/dwarf_loader.c
index 5090509309446890..a7a8b2bea112ba75 100644
--- a/dwarf_loader.c
+++ b/dwarf_loader.c
@@ -3254,7 +3254,9 @@ static int dwarf_cus__create_and_process_cu(struct dwarf_cus *dcus, Dwarf_Die *c
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)
+static int dwarf_cus__nextcu(struct dwarf_cus *dcus, struct dwarf_cu **dcu,
+ Dwarf_Die *die_mem, Dwarf_Die **cu_die,
+ uint8_t *pointer_size, uint8_t *offset_size)
{
Dwarf_Off noff;
size_t cuhl;
@@ -3274,6 +3276,15 @@ static int dwarf_cus__nextcu(struct dwarf_cus *dcus, Dwarf_Die *die_mem, Dwarf_D
dcus->off = noff;
}

+ if (ret == 0 && *cu_die != NULL) {
+ *dcu = dwarf_cus__create_cu(dcus, *cu_die, *pointer_size);
+ if (*dcu == NULL) {
+ dcus->error = ENOMEM;
+ ret = -1;
+ goto out_unlock;
+ }
+ }
+
out_unlock:
cus__unlock(dcus->cus);

@@ -3286,13 +3297,13 @@ static void *dwarf_cus__process_cu_thread(void *arg)
struct dwarf_cus *dcus = dthr->dcus;
uint8_t pointer_size, offset_size;
Dwarf_Die die_mem, *cu_die;
+ struct dwarf_cu *dcu;

- while (dwarf_cus__nextcu(dcus, &die_mem, &cu_die, &pointer_size, &offset_size) == 0) {
+ while (dwarf_cus__nextcu(dcus, &dcu, &die_mem, &cu_die, &pointer_size, &offset_size) == 0) {
if (cu_die == NULL)
break;

- if (dwarf_cus__create_and_process_cu(dcus, cu_die,
- pointer_size, dthr->data) == DWARF_CB_ABORT)
+ if (dwarf_cus__process_cu(dcus, cu_die, dcu->cu, dthr->data) == DWARF_CB_ABORT)
goto out_abort;
}

--
2.44.0