CPU list should allow to be any list rather than only the cores that are
allowed to schedule for the current process.
Before this patch, cyclictest will fail with below condition:
$ taskset -pc $$
pid 2316's current affinity list: 0,2,4,6,8
$ sudo cyclictest -m -N -p 1 -a 1,3,5,7 -t 4
WARN: Couldn't setaffinity in main thread: Invalid argument
After this patch, it'll be allowed to run.
Cc: Daniel Wagner <dwagner@xxxxxxx>
Signed-off-by: Peter Xu <peterx@xxxxxxxxxx>
---
src/lib/rt-numa.c | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/src/lib/rt-numa.c b/src/lib/rt-numa.c
index babcc63..f581020 100644
--- a/src/lib/rt-numa.c
+++ b/src/lib/rt-numa.c
@@ -93,32 +93,6 @@ int cpu_for_thread_ua(int thread_num, int max_cpus)
return 0;
}
-/*
- * After this function is called, affinity_mask is the intersection of
- * the user supplied affinity mask and the affinity mask from the run
- * time environment
- */
-static void use_current_cpuset(int max_cpus, struct bitmask *cpumask)
-{
- struct bitmask *curmask;
- int i;
-
- curmask = numa_allocate_cpumask();
- numa_sched_getaffinity(getpid(), curmask);
-
- /*
- * Clear bits that are not set in both the cpuset from the
- * environment, and in the user specified affinity.
- */
- for (i = 0; i < max_cpus; i++) {
- if ((!numa_bitmask_isbitset(cpumask, i)) ||
- (!numa_bitmask_isbitset(curmask, i)))
- numa_bitmask_clearbit(cpumask, i);
- }
-
- numa_bitmask_free(curmask);
-}
-
int parse_cpumask(char *str, int max_cpus, struct bitmask **cpumask)
{
struct bitmask *mask;
@@ -133,7 +107,6 @@ int parse_cpumask(char *str, int max_cpus, struct bitmask **cpumask)
return 0;
}
- use_current_cpuset(max_cpus, mask);
*cpumask = mask;
return 0;
--
2.26.2
