fix overly aggressive tls module base vaddr lookup cache retry

This commit is contained in:
Ryan Fleury committed 2026-08-27 19:24:16 -06:00
1 parent 313a51ba21
commit c97907a7b9
3 files changed
+26 -11

No files matched your search

+7 -1
View File
@@ -7,7 +7,6 @@ target:
working_directory: build
arguments: "--user:raddbg_test.user"
debug_subprocesses: 0
enabled: 1
}
target:
{
@@ -31,3 +30,10 @@ target:
executable: "build/ryan_scratch.exe"
working_directory: build
}
target:
{
executable: "build/raddbg"
working_directory: build
arguments: "--user:raddbg_test.user"
enabled: 1
}
+8 -2
View File
@@ -6317,6 +6317,7 @@ d_tls_vaddr_artifact_create(String8 key, B32 *cancel_signal, AC_Status *status_o
DMN_Handle module_dmn = d_dmn_from_handle(module);
// rjf: compute vaddr
U64 pre_run_gen = d_run_gen();
U64 tls_vaddr = 0;
B32 success = 1;
if(!dmn_handle_match(thread_dmn, dmn_handle_zero()) &&
@@ -6324,12 +6325,17 @@ d_tls_vaddr_artifact_create(String8 key, B32 *cancel_signal, AC_Status *status_o
{
success = dmn_thread_get_module_tls_vaddr(thread_dmn, module_dmn, &tls_vaddr);
}
U64 post_run_gen = d_run_gen();
// rjf: if not successful -> retry
if(!success)
// rjf: if not successful due to run -> retry
if(!success && (pre_run_gen != post_run_gen || d_ctrl_state->ctrl_thread_run_state))
{
status_out[0] = AC_Status_NeedRetry;
}
else if(!success)
{
status_out[0] = AC_Status_Failed;
}
// rjf: package as artifact
AC_Artifact artifact = {0};
+11 -8
View File
@@ -3350,16 +3350,19 @@ dmn_thread_get_module_tls_vaddr(DMN_Handle thread_handle, DMN_Handle module_hand
Arch arch = thread->process->ctx->arch;
U64 addr_size = byte_size_from_arch(arch);
U64 dtv_base_vaddr = thread->dtv_base_vaddr;
U64 dtv_entry_size = 2 * addr_size;
U64 module_dtv_ptr_vaddr = dtv_base_vaddr + module->tls_index * dtv_entry_size;
U64 module_dtv_vaddr = 0;
if(lnx_dmn_read(process->fd, r1u64(module_dtv_ptr_vaddr, module_dtv_ptr_vaddr+addr_size), &module_dtv_vaddr) == addr_size)
if(dtv_base_vaddr != 0)
{
U64 unallocated_dtv_vaddr_marker = (addr_size == 4 ? max_U32 : max_U64);
if(module_dtv_vaddr != unallocated_dtv_vaddr_marker)
U64 dtv_entry_size = 2 * addr_size;
U64 module_dtv_ptr_vaddr = dtv_base_vaddr + module->tls_index * dtv_entry_size;
U64 module_dtv_vaddr = 0;
if(lnx_dmn_read(process->fd, r1u64(module_dtv_ptr_vaddr, module_dtv_ptr_vaddr+addr_size), &module_dtv_vaddr) == addr_size)
{
vaddr_out[0] = module_dtv_vaddr + module->tls_offset;
result = 1;
U64 unallocated_dtv_vaddr_marker = (addr_size == 4 ? max_U32 : max_U64);
if(module_dtv_vaddr != unallocated_dtv_vaddr_marker)
{
vaddr_out[0] = module_dtv_vaddr + module->tls_offset;
result = 1;
}
}
}
}