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

Merge commit 'refs/top-bases/fix-branch' into fix-branch

This commit is contained in:
Brian Behlendorf 2010-07-23 11:42:21 -07:00
parent e16508d660 4471454be8
commit d43294230a
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libzpool/include/sys/zfs_context.h
View File

@ -211,6 +211,12 @@ _NOTE(CONSTCOND) } while (0)
#define STACK_SIZE 24576 /* Solaris */ #define STACK_SIZE 24576 /* Solaris */
#endif #endif
#ifdef NPTL_GUARD_WITHIN_STACK
#define EXTRA_GUARD_BYTES PAGESIZE
#else
#define EXTRA_GUARD_BYTES 0
#endif
/* in libzpool, p0 exists only to have its address taken */ /* in libzpool, p0 exists only to have its address taken */
typedef struct proc { typedef struct proc {
uintptr_t this_is_never_used_dont_dereference_it; uintptr_t this_is_never_used_dont_dereference_it;

10
lib/libzpool/kernel.c
View File

@ -162,8 +162,16 @@ zk_thread_create(caddr_t stk, size_t stksize, thread_func_t func, void *arg,
* kernel space. PTHREAD_STACK_MIN is the minimum stack * kernel space. PTHREAD_STACK_MIN is the minimum stack
* required for a NULL procedure in user space and is added * required for a NULL procedure in user space and is added
* in to the stack requirements. * in to the stack requirements.
*
* Some buggy NPTL threading implementations include the
* guard area within the stack size allocations. In
* this case we allocate an extra page to account for the
* guard area since we only have two pages of usable stack
* on Linux.
*/ */
stack = PTHREAD_STACK_MIN + MAX(stksize, STACK_SIZE);
stack = PTHREAD_STACK_MIN + MAX(stksize, STACK_SIZE) +
EXTRA_GUARD_BYTES;
VERIFY3S(pthread_attr_init(&attr), ==, 0); VERIFY3S(pthread_attr_init(&attr), ==, 0);
VERIFY3S(pthread_attr_setstacksize(&attr, stack), ==, 0); VERIFY3S(pthread_attr_setstacksize(&attr, stack), ==, 0);