aboutsummaryrefslogtreecommitdiff
path: root/nptl/descr.h
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2017-12-06 13:05:50 +0000
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2018-01-08 19:02:11 +0000
commit630f4cc3aa019ede55976ea561f1a7af2f068639 (patch)
tree67f9cc70df8a9b90122106ec5be5ac7495f00dda /nptl/descr.h
parentc70e4e9c9efff9df4c847dd7cfd81bae674219ab (diff)
downloadglibc-630f4cc3aa019ede55976ea561f1a7af2f068639.zip
glibc-630f4cc3aa019ede55976ea561f1a7af2f068639.tar.gz
glibc-630f4cc3aa019ede55976ea561f1a7af2f068639.tar.bz2
[BZ #22637] Fix stack guard size accounting
Previously if user requested S stack and G guard when creating a thread, the total mapping was S and the actual available stack was S - G - static_tls, which is not what the user requested. This patch fixes the guard size accounting by pretending the user requested S+G stack. This way all later logic works out except when reporting the user requested stack size (pthread_getattr_np) or when computing the minimal stack size (__pthread_get_minstack). Normally this will increase thread stack allocations by one page. TLS accounting is not affected, that will require a separate fix. [BZ #22637] * nptl/descr.h (stackblock, stackblock_size): Update comments. * nptl/allocatestack.c (allocate_stack): Add guardsize to stacksize. * nptl/nptl-init.c (__pthread_get_minstack): Remove guardsize from stacksize. * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
Diffstat (limited to 'nptl/descr.h')
-rw-r--r--nptl/descr.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/nptl/descr.h b/nptl/descr.h
index da9c567..1cc6b09 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -383,9 +383,9 @@ struct pthread
/* Machine-specific unwind info. */
struct _Unwind_Exception exc;
- /* If nonzero pointer to area allocated for the stack and its
- size. */
+ /* If nonzero, pointer to the area allocated for the stack and guard. */
void *stackblock;
+ /* Size of the stackblock area including the guard. */
size_t stackblock_size;
/* Size of the included guard area. */
size_t guardsize;