diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-10 10:31:41 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-10 10:31:41 +0200 |
| commit | ee07b3a7222746fafc5d5cb2163c9609b81615ef (patch) | |
| tree | 7caf22c5b0b8df32fe26a1fee1dfa78aadc66091 /nptl/allocatestack.c | |
| parent | 9d124d81f09d2097bfde444b2a6228a725a00efd (diff) | |
| download | glibc-ee07b3a7222746fafc5d5cb2163c9609b81615ef.tar.gz glibc-ee07b3a7222746fafc5d5cb2163c9609b81615ef.tar.xz glibc-ee07b3a7222746fafc5d5cb2163c9609b81615ef.zip | |
nptl: Simplify the change_stack_perm calling convention
Only ia64 needs the page mask, and it is straightforward to compute the value within the function itself. Tested-by: Carlos O'Donell <carlos@redhat.com> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'nptl/allocatestack.c')
| -rw-r--r-- | nptl/allocatestack.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 71cfa874d1..46089163f4 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -293,13 +293,10 @@ queue_stack (struct pthread *stack) static int -change_stack_perm (struct pthread *pd -#ifdef NEED_SEPARATE_REGISTER_STACK - , size_t pagemask -#endif - ) +change_stack_perm (struct pthread *pd) { #ifdef NEED_SEPARATE_REGISTER_STACK + size_t pagemask = __getpagesize () - 1; void *stack = (pd->stackblock + (((((pd->stackblock_size - pd->guardsize) / 2) & pagemask) + pd->guardsize) & pagemask)); @@ -628,11 +625,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, if (__builtin_expect ((GL(dl_stack_flags) & PF_X) != 0 && (prot & PROT_EXEC) == 0, 0)) { - int err = change_stack_perm (pd -#ifdef NEED_SEPARATE_REGISTER_STACK - , ~pagesize_m1 -#endif - ); + int err = change_stack_perm (pd); if (err != 0) { /* Free the stack memory we just allocated. */ @@ -796,20 +789,12 @@ __make_stacks_executable (void **stack_endp) if (err != 0) return err; -#ifdef NEED_SEPARATE_REGISTER_STACK - const size_t pagemask = ~(__getpagesize () - 1); -#endif - lll_lock (GL (dl_stack_cache_lock), LLL_PRIVATE); list_t *runp; list_for_each (runp, &GL (dl_stack_used)) { - err = change_stack_perm (list_entry (runp, struct pthread, list) -#ifdef NEED_SEPARATE_REGISTER_STACK - , pagemask -#endif - ); + err = change_stack_perm (list_entry (runp, struct pthread, list)); if (err != 0) break; } @@ -820,11 +805,7 @@ __make_stacks_executable (void **stack_endp) if (err == 0) list_for_each (runp, &GL (dl_stack_cache)) { - err = change_stack_perm (list_entry (runp, struct pthread, list) -#ifdef NEED_SEPARATE_REGISTER_STACK - , pagemask -#endif - ); + err = change_stack_perm (list_entry (runp, struct pthread, list)); if (err != 0) break; } |