Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Increase the stack space in userspace. 

In 1e33ac1e26, the maximum stack size for
userspace tools was set to 8k to mimic the available kernel stack size.

Unfortunately, due to differences in how the stack is used in userspace
vs kernel space, spurious stack overflows could occur in userspace
tools due to the limited stack size. This is especially true in ztest
when debugging is enabled.

This patch multiplies the userspace stack size by 4, which fixes the
stack overflow issues. This comes at the price of not being able to
catch stack size issues in userspace, but the previous solution proved
unreliable anyway.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Fixes #934.
This commit is contained in:
Etienne Dechamps 2012-09-06 11:06:05 +02:00 committed by Brian Behlendorf
parent ebcfc8a534
commit 4b2f65b253
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libzpool/kernel.c
View File

@ -159,9 +159,14 @@ zk_thread_create(caddr_t stk, size_t stksize, thread_func_t func, void *arg,
* *
* We reduce the default stack size in userspace, to ensure * We reduce the default stack size in userspace, to ensure
* we observe stack overruns in user space as well as in * we observe stack overruns in user space as well as in
* kernel space. PTHREAD_STACK_MIN is the minimum stack * kernel space. In practice we can't set the userspace stack
* required for a NULL procedure in user space and is added * size to 8k because differences in stack usage between kernel
* in to the stack requirements. * space and userspace could lead to spurious stack overflows
* (especially when debugging is enabled). Nevertheless, we try
* to set it to the lowest value that works (currently 8k*4).
* PTHREAD_STACK_MIN is the minimum stack required for a NULL
* procedure in user space and is added in to the stack
* requirements.
* *
* Some buggy NPTL threading implementations include the * Some buggy NPTL threading implementations include the
* guard area within the stack size allocations. In * guard area within the stack size allocations. In
@ -170,7 +175,7 @@ zk_thread_create(caddr_t stk, size_t stksize, thread_func_t func, void *arg,
* on Linux. * on Linux.
*/ */
stack = PTHREAD_STACK_MIN + MAX(stksize, STACK_SIZE) + stack = PTHREAD_STACK_MIN + MAX(stksize, STACK_SIZE) * 4 +
EXTRA_GUARD_BYTES; EXTRA_GUARD_BYTES;
VERIFY3S(pthread_attr_init(&attr), ==, 0); VERIFY3S(pthread_attr_init(&attr), ==, 0);