File 0139-erts-Protect-__jit_debug_decriptor-with-mu... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0139-erts-Protect-__jit_debug_decriptor-with-mutex.patch of Package erlang (Revision edef1c3c1951d71988e62cd4a09a5104)

Currently displaying revision edef1c3c1951d71988e62cd4a09a5104 , Show latest

From 3508c7140c6519763519c2a59cb16ee0efc7342b Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Mon, 17 May 2021 19:50:11 +0200
Subject: [PATCH] erts: Protect __jit_debug_decriptor with mutex

---
 erts/emulator/beam/erl_lock_check.c     | 1 +
 erts/emulator/beam/jit/x86/beam_asm.cpp | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index a35bfe7a20..dd8a981353 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -167,6 +167,7 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"erts_alloc_hard_debug",		NULL			},
     {	"hard_dbg_mseg",		        NULL	                },
     {	"perf", 				NULL			},
+    {	"jit_debug_descriptor",			NULL			},
     {	"erts_mmap",				NULL			}
 };
 
diff --git a/erts/emulator/beam/jit/x86/beam_asm.cpp b/erts/emulator/beam/jit/x86/beam_asm.cpp
index 4368cc9479..c4b89c5788 100644
--- a/erts/emulator/beam/jit/x86/beam_asm.cpp
+++ b/erts/emulator/beam/jit/x86/beam_asm.cpp
@@ -624,6 +624,7 @@ struct jit_descriptor {
     jit_actions action_flag;
     struct jit_code_entry *relevant_entry;
     struct jit_code_entry *first_entry;
+    erts_mtx_t mutex;
 };
 
 extern "C"
@@ -665,6 +666,12 @@ static void beamasm_init_gdb_jit_info(void) {
     __jit_debug_descriptor.first_entry = entry;
     __jit_debug_descriptor.relevant_entry = entry;
     __jit_debug_register_code();
+
+    erts_mtx_init(&__jit_debug_descriptor.mutex,
+                  "jit_debug_descriptor",
+                  NIL,
+                  (ERTS_LOCK_FLAGS_PROPERTY_STATIC |
+                   ERTS_LOCK_FLAGS_CATEGORY_GENERIC));
 }
 
 void BeamAssembler::update_gdb_jit_info(std::string modulename,
@@ -711,6 +718,7 @@ void BeamAssembler::update_gdb_jit_info(std::string modulename,
     ASSERT(symfile_size == (symfile - entry->symfile_addr));
 
     /* Insert into linked list */
+    erts_mtx_lock(&__jit_debug_descriptor.mutex);
     entry->next_entry = __jit_debug_descriptor.first_entry;
     if (entry->next_entry) {
         entry->next_entry->prev_entry = entry;
@@ -723,6 +731,7 @@ void BeamAssembler::update_gdb_jit_info(std::string modulename,
     __jit_debug_descriptor.first_entry = entry;
     __jit_debug_descriptor.relevant_entry = entry;
     __jit_debug_register_code();
+    erts_mtx_unlock(&__jit_debug_descriptor.mutex);
 }
 
 extern "C"
-- 
2.26.2

Places

File 0139-erts-Protect-__jit_debug_decriptor-with-mutex.patch of Package erlang (Revision edef1c3c1951d71988e62cd4a09a5104)

Places