Skip to content

erts: Fix lock order violation during crash dump #11460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sverker merged 1 commit into from
Aug 12, 2026
+9 −10
Merged

erts: Fix lock order violation during crash dump #11460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions erts/emulator/beam/break.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,9 @@ loaded(fmtfn_t to, void *to_arg)
ErtsCodeIndex code_ix;

code_ix = erts_active_code_ix();
erts_rlock_old_code(code_ix);
if (!ERTS_IS_CRASH_DUMPING) {
erts_rlock_old_code(code_ix);
}

/*
* Calculate and print totals.
Expand Down Expand Up @@ -556,7 +558,9 @@ loaded(fmtfn_t to, void *to_arg)
}
}
}
erts_runlock_old_code(code_ix);
if (!ERTS_IS_CRASH_DUMPING) {
erts_runlock_old_code(code_ix);
}
}


Expand Down
11 changes: 3 additions & 8 deletions erts/emulator/beam/erl_process_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,9 @@ init_literal_areas(void)
ErtsCodeIndex code_ix;
ErtsLiteralArea** area_p;

ERTS_LC_ASSERT(ERTS_IS_CRASH_DUMPING);

code_ix = erts_active_code_ix();
erts_rlock_old_code(code_ix);

lit_areas = area_p = erts_dump_lit_areas;
num_lit_areas = 0;
Expand Down Expand Up @@ -836,8 +837,6 @@ init_literal_areas(void)

qsort(erts_persistent_areas, erts_num_persistent_areas,
sizeof(ErtsLiteralArea *), compare_areas);

erts_runlock_old_code(code_ix);
}

static int search_areas(const void * a, const void * b) {
Expand Down Expand Up @@ -879,12 +878,10 @@ static void mark_literal(Eterm* ptr)
static void
dump_literals(fmtfn_t to, void *to_arg)
{
ErtsCodeIndex code_ix;
int i;
Uint idx;

code_ix = erts_active_code_ix();
erts_rlock_old_code(code_ix);
ERTS_LC_ASSERT(ERTS_IS_CRASH_DUMPING);

erts_print(to, to_arg, "=literals\n");

Expand All @@ -899,8 +896,6 @@ dump_literals(fmtfn_t to, void *to_arg)
}
}

erts_runlock_old_code(code_ix);

for (idx = 0; idx < erts_num_persistent_areas; idx++) {
dump_module_literals(to, to_arg, erts_persistent_areas[idx]);
}
Expand Down
Loading