Skip to content
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

i#3556 w^x: Fix reachable address to executable view. #3752

Merged
merged 10 commits into from
Jul 25, 2019
Merged

i#3556 w^x: Fix reachable address to executable view. #3752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c60e8cd
i#1312 AVX-512 support: Fix reachable address to executable view.
Jul 24, 2019
4c13f23
vm_base lowered to 32-bit range.
Jul 24, 2019
65da081
Added comment.
Jul 24, 2019
951a5ff
Added assertion for DR_ALLOC_CACHE_REACHABLE.
Jul 24, 2019
debe960
Changed back vm_base to 64 bit value.
Jul 24, 2019
384d656
Exclude ARM/AArch64.
Jul 25, 2019
ae231b9
Name the option in the comment.
Jul 25, 2019
cc0f74d
Removed newline
Jul 25, 2019
bbe8814
Removed test for protection bits.
Jul 25, 2019
b65bea4
Updated comments in options.x
Jul 25, 2019
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
14 changes: 10 additions & 4 deletions core/arch/x86/emit_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1363,8 +1363,11 @@ append_restore_simd_reg(dcontext_t *dcontext, instrlist_t *ilist, bool absolute)
post_restore = INSTR_CREATE_label(dcontext);
pre_avx512_restore = INSTR_CREATE_label(dcontext);
APP(ilist,
INSTR_CREATE_cmp(dcontext, OPND_CREATE_ABSMEM(d_r_avx512_code_in_use, OPSZ_1),
OPND_CREATE_INT8(0)));
INSTR_CREATE_cmp(
dcontext,
OPND_CREATE_ABSMEM(
vmcode_get_executable_addr((byte *)d_r_avx512_code_in_use), OPSZ_1),
hgreving2304 marked this conversation as resolved.
Show resolved Hide resolved
hgreving2304 marked this conversation as resolved.
Show resolved Hide resolved
OPND_CREATE_INT8(0)));
APP(ilist,
INSTR_CREATE_jcc(dcontext, OP_jnz, opnd_create_instr(pre_avx512_restore)));
}
Expand Down Expand Up @@ -1622,8 +1625,11 @@ append_save_simd_reg(dcontext_t *dcontext, instrlist_t *ilist, bool absolute)
post_save = INSTR_CREATE_label(dcontext);
pre_avx512_save = INSTR_CREATE_label(dcontext);
APP(ilist,
INSTR_CREATE_cmp(dcontext, OPND_CREATE_ABSMEM(d_r_avx512_code_in_use, OPSZ_1),
OPND_CREATE_INT8(0)));
INSTR_CREATE_cmp(
dcontext,
OPND_CREATE_ABSMEM(
vmcode_get_executable_addr((byte *)d_r_avx512_code_in_use), OPSZ_1),
OPND_CREATE_INT8(0)));
APP(ilist,
INSTR_CREATE_jcc(dcontext, OP_jnz, opnd_create_instr(pre_avx512_save)));
}
Expand Down
6 changes: 5 additions & 1 deletion core/heap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,11 @@ void
nonpersistent_heap_free(dcontext_t *dcontext, void *p,
size_t size HEAPACCT(which_heap_t which));

/* Passing dcontext == GLOBAL_DCONTEXT allocates from a global pool. */
/* Passing dcontext == GLOBAL_DCONTEXT allocates from a global pool.
* Important note: within the W^X scheme (-satisfy_w_xor_x), this will return an address
* of the writeable view. vmcode_get_executable_addr() needs to be called in order to get
* the reachable address.
*/
void *
heap_reachable_alloc(dcontext_t *dcontext, size_t size HEAPACCT(which_heap_t which));
void
Expand Down
4 changes: 4 additions & 0 deletions core/lib/instrument.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3048,6 +3048,10 @@ custom_memory_shared(bool alloc, void *drcontext, dr_alloc_flags_t flags, size_t
!TEST(DR_ALLOC_COMMIT_ONLY, flags),
"dr_custom_alloc: cannot combine reserve-only + commit-only");
# endif
CLIENT_ASSERT(!TEST(DR_ALLOC_CACHE_REACHABLE, flags) ||
!DYNAMO_OPTION(satisfy_w_xor_x),
"dr_custom_alloc: DR_ALLOC_CACHE_REACHABLE memory is not "
"supported with -satisfy_w_xor_x");
hgreving2304 marked this conversation as resolved.
Show resolved Hide resolved
if (TEST(DR_ALLOC_NON_HEAP, flags)) {
CLIENT_ASSERT(drcontext == NULL,
"dr_custom_alloc: drcontext must be NULL for non-heap");
Expand Down
2 changes: 1 addition & 1 deletion core/optionsx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,10 +1479,10 @@ DYNAMIC_OPTION(bool, pause_via_loop,
#endif
/* XXX i#3566: Support for W^X has some current limitations:
* + It is not implemented for Windows or Mac.
* + Fork is not perfectly supported: there is overhead and a race.
* + Pcaches are not supported.
* + -native_exec_list is not supported.
* + dr_nonheap_alloc(rwx) is not supported.
* + DR_ALLOC_CACHE_REACHABLE is not supported.
* Clients using other non-vmcode sources of +wx memory will also not comply.
*/
OPTION_DEFAULT(bool, satisfy_w_xor_x, false,
Expand Down
11 changes: 9 additions & 2 deletions suite/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2536,8 +2536,15 @@ endif ()
"" "-thread_private -cache_bb_unit_init 4K" "")
endif ()

if (X86) # Tests x86 reachability.
tobuild_ci(client.reachability client-interface/reachability.c "" "" "")
if (X86)
if (X64) # Tests x86 reachability.
tobuild_ci(client.reachability client-interface/reachability.c ""
# The vm_base options were added in order to expose bugs that fail to xl8 reachable
# addresses to the executable view within the scheme of satisfy_w_xor_x.
"-no_vm_base_near_app -vm_base 0x100000000" "")
else ()
tobuild_ci(client.reachability client-interface/reachability.c "" "" "")
endif ()
endif ()

if (X86) # FIXME i#1551, i#1569: fix bugs on ARM and AArch64
Expand Down