Module Name: src
Committed By: christos
Date: Fri Jul 3 02:24:28 UTC 2015
Modified Files:
src/sys/compat/linux/common: linux_sched.c
Log Message:
PR/50021: Rin Okuyama: Fix linux affinity syscalls
XXX: pullup-7
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/compat/linux/common/linux_sched.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_sched.c
diff -u src/sys/compat/linux/common/linux_sched.c:1.67 src/sys/compat/linux/common/linux_sched.c:1.68
--- src/sys/compat/linux/common/linux_sched.c:1.67 Sun Nov 9 12:48:08 2014
+++ src/sys/compat/linux/common/linux_sched.c Thu Jul 2 22:24:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sched.c,v 1.67 2014/11/09 17:48:08 maxv Exp $ */
+/* $NetBSD: linux_sched.c,v 1.68 2015/07/03 02:24:28 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.67 2014/11/09 17:48:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.68 2015/07/03 02:24:28 christos Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -65,6 +65,9 @@ __KERNEL_RCSID(0, "$NetBSD: linux_sched.
static int linux_clone_nptl(struct lwp *, const struct linux_sys_clone_args *,
register_t *);
+/* Unlike Linux, dynamically calculate CPU mask size */
+#define LINUX_CPU_MASK_SIZE (sizeof(long) * ((ncpu + LONG_BIT - 1) / LONG_BIT))
+
#if DEBUG_LINUX
#define DPRINTF(x) uprintf x
#else
@@ -627,6 +630,10 @@ linux_sys_gettid(struct lwp *l, const vo
return 0;
}
+/*
+ * The affinity syscalls assume that the layout of our cpu kcpuset is
+ * the same as linux's: a linear bitmask.
+ */
int
linux_sys_sched_getaffinity(struct lwp *l, const struct linux_sys_sched_getaffinity_args *uap, register_t *retval)
{
@@ -635,39 +642,45 @@ linux_sys_sched_getaffinity(struct lwp *
syscallarg(unsigned int) len;
syscallarg(unsigned long *) mask;
} */
- proc_t *p;
- unsigned long *lp, *data;
- int error, size, nb = ncpu;
+ struct lwp *t;
+ kcpuset_t *kcset;
+ size_t size;
+ cpuid_t i;
+ int error;
- /* Unlike Linux, dynamically calculate cpu mask size */
- size = sizeof(long) * ((ncpu + LONG_BIT - 1) / LONG_BIT);
+ size = LINUX_CPU_MASK_SIZE;
if (SCARG(uap, len) < size)
return EINVAL;
- /* XXX: Pointless check. TODO: Actually implement this. */
- mutex_enter(proc_lock);
- p = proc_find(SCARG(uap, pid));
- mutex_exit(proc_lock);
- if (p == NULL) {
+ /* Lock the LWP */
+ t = lwp_find2(SCARG(uap, pid), l->l_lid);
+ if (t == NULL)
return ESRCH;
- }
-
- /*
- * return the actual number of CPU, tag all of them as available
- * The result is a mask, the first CPU being in the least significant
- * bit.
- */
- data = kmem_zalloc(size, KM_SLEEP);
- lp = data;
- while (nb > LONG_BIT) {
- *lp++ = ~0UL;
- nb -= LONG_BIT;
- }
- if (nb)
- *lp = (1 << ncpu) - 1;
- error = copyout(data, SCARG(uap, mask), size);
- kmem_free(data, size);
+ /* Check the permission */
+ if (kauth_authorize_process(l->l_cred,
+ KAUTH_PROCESS_SCHEDULER_GETAFFINITY, t->l_proc, NULL, NULL, NULL)) {
+ mutex_exit(t->l_proc->p_lock);
+ return EPERM;
+ }
+
+ kcpuset_create(&kcset, true);
+ lwp_lock(t);
+ if (t->l_affinity != NULL)
+ kcpuset_copy(kcset, t->l_affinity);
+ else {
+ /*
+ * All available CPUs should be masked when affinity has not
+ * been set.
+ */
+ kcpuset_zero(kcset);
+ for (i = 0; i < ncpu; i++)
+ kcpuset_set(kcset, i);
+ }
+ lwp_unlock(t);
+ mutex_exit(t->l_proc->p_lock);
+ error = kcpuset_copyout(kcset, (cpuset_t *)SCARG(uap, mask), size);
+ kcpuset_unuse(kcset, NULL);
*retval = size;
return error;
}
@@ -680,17 +693,17 @@ linux_sys_sched_setaffinity(struct lwp *
syscallarg(unsigned int) len;
syscallarg(unsigned long *) mask;
} */
- proc_t *p;
+ struct sys__sched_setaffinity_args ssa;
+ size_t size;
- /* XXX: Pointless check. TODO: Actually implement this. */
- mutex_enter(proc_lock);
- p = proc_find(SCARG(uap, pid));
- mutex_exit(proc_lock);
- if (p == NULL) {
- return ESRCH;
- }
+ size = LINUX_CPU_MASK_SIZE;
+ if (SCARG(uap, len) < size)
+ return EINVAL;
- /* Let's ignore it */
- DPRINTF(("%s\n", __func__));
- return 0;
+ SCARG(&ssa, pid) = SCARG(uap, pid);
+ SCARG(&ssa, lid) = l->l_lid;
+ SCARG(&ssa, size) = size;
+ SCARG(&ssa, cpuset) = (cpuset_t *)SCARG(uap, mask);
+
+ return sys__sched_setaffinity(l, &ssa, retval);
}
