]> Git Repo - qemu.git/commitdiff
cpus-common: ensure auto-assigned cpu_indexes don't clash
authorAlex Bennée <[email protected]>
Wed, 20 May 2020 14:05:38 +0000 (15:05 +0100)
committerAlex Bennée <[email protected]>
Wed, 27 May 2020 13:26:49 +0000 (14:26 +0100)
Basing the cpu_index on the number of currently allocated vCPUs fails
when vCPUs aren't removed in a LIFO manner. This is especially true
when we are allocating a cpu_index for each guest thread in
linux-user where there is no ordering constraint on their allocation
and de-allocation.

[I've dropped the assert which is there to guard against out-of-order
removal as this should probably be caught higher up the stack. Maybe
we could just ifdef CONFIG_SOFTTMU it?]

Signed-off-by: Alex Bennée <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Acked-by: Igor Mammedow <[email protected]>
Cc: Nikolay Igotti <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Eduardo Habkost <[email protected]>
Message-Id: <20200520140541[email protected]>

cpus-common.c

index 55d5df89237ff625ec75d2048f7f04a6664d76ad..70a9d12981a243fd8134cabcb6a93002f00c3726 100644 (file)
@@ -61,13 +61,15 @@ static bool cpu_index_auto_assigned;
 static int cpu_get_free_index(void)
 {
     CPUState *some_cpu;
-    int cpu_index = 0;
+    int max_cpu_index = 0;
 
     cpu_index_auto_assigned = true;
     CPU_FOREACH(some_cpu) {
-        cpu_index++;
+        if (some_cpu->cpu_index >= max_cpu_index) {
+            max_cpu_index = some_cpu->cpu_index + 1;
+        }
     }
-    return cpu_index;
+    return max_cpu_index;
 }
 
 void cpu_list_add(CPUState *cpu)
@@ -90,8 +92,6 @@ void cpu_list_remove(CPUState *cpu)
         return;
     }
 
-    assert(!(cpu_index_auto_assigned && cpu != QTAILQ_LAST(&cpus)));
-
     QTAILQ_REMOVE_RCU(&cpus, cpu, node);
     cpu->cpu_index = UNASSIGNED_CPU_INDEX;
 }
This page took 0.029922 seconds and 4 git commands to generate.