]> xenbits.xensource.com Git - people/aperard/xen-unstable.git/commitdiff
xen/sched: fix adding offline cpu to cpupool
authorJuergen Gross <jgross@suse.com>
Wed, 6 Dec 2023 09:49:29 +0000 (10:49 +0100)
committerJan Beulich <jbeulich@suse.com>
Wed, 6 Dec 2023 09:49:29 +0000 (10:49 +0100)
Trying to add an offline cpu to a cpupool can crash the hypervisor,
as the probably non-existing percpu area of the cpu is accessed before
the availability of the cpu is being tested. This can happen in case
the cpupool's granularity is "core" or "socket".

Fix that by testing the cpu to be online.

Fixes: cb563d7665f2 ("xen/sched: support core scheduling for moving cpus to/from cpupools")
Reported-by: René Winther Højgaard <renewin@proton.me>
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
master commit: 06e8d65d33896aa90f5b6d9b2bce7f11433b33c9
master date: 2023-12-05 09:57:38 +0100

xen/common/sched/cpupool.c

index bdf6030ab083d2e9d21db0ea4f6e1acca1ccd42b..400b27b7c791d884c8a197f5596fd294d672fe16 100644 (file)
@@ -892,6 +892,8 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op)
         if ( cpu >= nr_cpu_ids )
             goto addcpu_out;
         ret = -ENODEV;
+        if ( !cpu_online(cpu) )
+            goto addcpu_out;
         cpus = sched_get_opt_cpumask(c->gran, cpu);
         if ( !cpumask_subset(cpus, &cpupool_free_cpus) ||
              cpumask_intersects(cpus, &cpupool_locked_cpus) )