| Message ID | 20240815143634.3413679-1-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [for-9.2] accel/tcg: Remove dead code from rr_cpu_thread_fn() | expand |
On 8/16/24 00:36, Peter Maydell wrote: > The main loop in rr_cpu_thread_fn() can never terminate, so the > code at the end of the function to clean up the RCU subsystem is > dead code. Replace it with g_assert_not_reached(). > > (This is different from the other cpu_thread_fn for e.g. MTTCG or > for the KVM accelerator -- those can exit, if the vCPU they > are responsible for is unplugged. But the RR cpu thread fn > handles all CPUs in the system in a round-robin way, so even > if one is unplugged it keeps looping.) > > Resolves: Coverity CID 1547782 > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > accel/tcg/tcg-accel-ops-rr.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c > index 48c38714bd6..38ab16244e3 100644 > --- a/accel/tcg/tcg-accel-ops-rr.c > +++ b/accel/tcg/tcg-accel-ops-rr.c > @@ -302,9 +302,7 @@ static void *rr_cpu_thread_fn(void *arg) > rr_deal_with_unplugged_cpus(); > } > > - rcu_remove_force_rcu_notifier(&force_rcu); > - rcu_unregister_thread(); > - return NULL; > + g_assert_not_reached(); > } > > void rr_start_vcpu_thread(CPUState *cpu) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c index 48c38714bd6..38ab16244e3 100644 --- a/accel/tcg/tcg-accel-ops-rr.c +++ b/accel/tcg/tcg-accel-ops-rr.c @@ -302,9 +302,7 @@ static void *rr_cpu_thread_fn(void *arg) rr_deal_with_unplugged_cpus(); } - rcu_remove_force_rcu_notifier(&force_rcu); - rcu_unregister_thread(); - return NULL; + g_assert_not_reached(); } void rr_start_vcpu_thread(CPUState *cpu)
The main loop in rr_cpu_thread_fn() can never terminate, so the code at the end of the function to clean up the RCU subsystem is dead code. Replace it with g_assert_not_reached(). (This is different from the other cpu_thread_fn for e.g. MTTCG or for the KVM accelerator -- those can exit, if the vCPU they are responsible for is unplugged. But the RR cpu thread fn handles all CPUs in the system in a round-robin way, so even if one is unplugged it keeps looping.) Resolves: Coverity CID 1547782 Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- accel/tcg/tcg-accel-ops-rr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)