kern_cpuset: allow using the explicit form of own pid/tid

DankBSD · Jul 2, 2020 · 5ef7056 · 5ef7056
1 parent e9979ca
commit 5ef7056
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c
@@ -1745,7 +1745,9 @@ kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which,
 			return (ECAPMODE);
 		if (which != CPU_WHICH_TID && which != CPU_WHICH_PID)
 			return (ECAPMODE);
-		if (id != -1)
+		if (id != -1 &&
+		    !(which == CPU_WHICH_TID && id == curthread->td_tid) &&
+		    !(which == CPU_WHICH_PID && id == curproc->p_pid))
 			return (ECAPMODE);
 	}
 	size = cpusetsize;
@@ -1862,7 +1864,9 @@ kern_cpuset_setaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which,
 			return (ECAPMODE);
 		if (which != CPU_WHICH_TID && which != CPU_WHICH_PID)
 			return (ECAPMODE);
-		if (id != -1)
+		if (id != -1 &&
+		    !(which == CPU_WHICH_TID && id == curthread->td_tid) &&
+		    !(which == CPU_WHICH_PID && id == curproc->p_pid))
 			return (ECAPMODE);
 	}
 	mask = malloc(cpusetsize, M_TEMP, M_WAITOK | M_ZERO);
@@ -1993,7 +1997,9 @@ kern_cpuset_getdomain(struct thread *td, cpulevel_t level, cpuwhich_t which,
 			return (ECAPMODE);
 		if (which != CPU_WHICH_TID && which != CPU_WHICH_PID)
 			return (ECAPMODE);
-		if (id != -1)
+		if (id != -1 &&
+		    !(which == CPU_WHICH_TID && id == curthread->td_tid) &&
+		    !(which == CPU_WHICH_PID && id == curproc->p_pid))
 			return (ECAPMODE);
 	}
 	mask = malloc(domainsetsize, M_TEMP, M_WAITOK | M_ZERO);
@@ -2128,7 +2134,9 @@ kern_cpuset_setdomain(struct thread *td, cpulevel_t level, cpuwhich_t which,
 			return (ECAPMODE);
 		if (which != CPU_WHICH_TID && which != CPU_WHICH_PID)
 			return (ECAPMODE);
-		if (id != -1)
+		if (id != -1 &&
+		    !(which == CPU_WHICH_TID && id == curthread->td_tid) &&
+		    !(which == CPU_WHICH_PID && id == curproc->p_pid))
 			return (ECAPMODE);
 	}
 	memset(&domain, 0, sizeof(domain));