AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

NPTL: Refactor cpu_set_t validation to be sysdeps-controlled

Browse Source 
This removes Linuxisms related to cpu_set_t validation from the
generic NPTL code and puts them into a new sysdeps header file.
This commit is contained in:
Roland McGrath 2015-01-08 10:49:40 -08:00
parent b92058573b
commit 59ff172f80
6 changed files with 91 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2015-01-08 Roland McGrath <roland@hack.frob.com>
* nptl/pthreadP.h (check_cpuset_attr): Moved ...
* sysdeps/unix/sysv/linux/check-cpuset.h: ... to this new file.
* nptl/pthread_attr_setaffinity.c: Include it.
* nptl/pthread_setattr_default_np.c: Likewise.
* nptl/check-cpuset.h: New file.
2015-01-08 Richard Henderson <rth@redhat.com>
* elf/Makefile (CFLAGS-tst-execstack-mod.c): Add -Wno-trampolines

32
nptl/check-cpuset.h Normal file
View File

@ -0,0 +1,32 @@
/* Validate cpu_set_t values for NPTL. Stub version.
Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <errno.h>
/* Returns 0 if CS and SZ are valid values for the cpuset and cpuset size
respectively. Otherwise it returns an error number. */
static inline int
check_cpuset_attr (const cpu_set_t *cs, const size_t sz)
{
if (sz == 0)
return 0;
/* This means pthread_attr_setaffinity will return ENOSYS, which
is the right thing when the cpu_set_t features are not available. */
return ENOSYS;
}

27
nptl/pthreadP.h
View File

@ -629,31 +629,4 @@ check_stacksize_attr (size_t st)
return EINVAL;
}
/* Defined in pthread_setaffinity.c. */
extern size_t __kernel_cpumask_size attribute_hidden;
extern int __determine_cpumask_size (pid_t tid);
/* Returns 0 if CS and SZ are valid values for the cpuset and cpuset size
respectively. Otherwise it returns an error number. */
static inline int
check_cpuset_attr (const cpu_set_t *cs, const size_t sz)
{
if (__kernel_cpumask_size == 0)
{
int res = __determine_cpumask_size (THREAD_SELF->tid);
if (res)
return res;
}
/* Check whether the new bitmask has any bit set beyond the
last one the kernel accepts. */
for (size_t cnt = __kernel_cpumask_size; cnt < sz; ++cnt)
if (((char *) cs)[cnt] != '\0')
/* Found a nonzero byte. This means the user request cannot be
fulfilled. */
return EINVAL;
return 0;
}
#endif /* pthreadP.h */

3
nptl/pthread_attr_setaffinity.c
View File

@ -23,8 +23,7 @@
#include <string.h>
#include <pthreadP.h>
#include <shlib-compat.h>
#include <check-cpuset.h>
int

2
nptl/pthread_setattr_default_np.c
View File

@ -21,6 +21,8 @@
#include <pthreadP.h>
#include <assert.h>
#include <string.h>
#include <check-cpuset.h>
int
pthread_setattr_default_np (const pthread_attr_t *in)

48
sysdeps/unix/sysv/linux/check-cpuset.h Normal file
View File

@ -0,0 +1,48 @@
/* Validate cpu_set_t values for NPTL. Linux version.
Copyright (C) 2002-2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <errno.h>
/* Defined in pthread_setaffinity.c. */
extern size_t __kernel_cpumask_size attribute_hidden;
extern int __determine_cpumask_size (pid_t tid);
/* Returns 0 if CS and SZ are valid values for the cpuset and cpuset size
respectively. Otherwise it returns an error number. */
static inline int
check_cpuset_attr (const cpu_set_t *cs, const size_t sz)
{
if (__kernel_cpumask_size == 0)
{
int res = __determine_cpumask_size (THREAD_SELF->tid);
if (res)
return res;
}
/* Check whether the new bitmask has any bit set beyond the
last one the kernel accepts. */
for (size_t cnt = __kernel_cpumask_size; cnt < sz; ++cnt)
if (((char *) cs)[cnt] != '\0')
/* Found a nonzero byte. This means the user request cannot be
fulfilled. */
return EINVAL;
return 0;
}