[PATCH 0/4] cpus: Cleanups around cpu running state changes

[PATCH 0/4] cpus: Cleanups around cpu running state changes

[Philippe Mathieu-Daudé]

Few cleanups following Paolo's recent "accel, cpus: clean up
cpu->exit_request" work (now merged), extracted from my
"split-accel" work.

Philippe Mathieu-Daudé (4):
  cpus: Only resume halted CPUs
  cpus: Access CPUState::thread_kicked atomically
  accel/hvf: Make async_safe_run_on_cpu() safe
  accel/tcg: Use cpu_is_stopped() helper to access CPUState::stopped

 accel/tcg/tcg-accel-ops-rr.c | 2 +-
 system/cpus.c                | 8 +++++---
 target/arm/hvf/hvf.c         | 2 ++
 target/i386/hvf/hvf.c        | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

-- 
2.51.0

[PATCH 1/4] cpus: Only resume halted CPUs

[Philippe Mathieu-Daudé]

Avoid kicking running CPUs, trying to resume them.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 system/cpus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/cpus.c b/system/cpus.c
index aa7bfcf56e5..6062226d4ac 100644
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -666,7 +666,9 @@ void resume_all_vcpus(void)
 
     qemu_clock_enable(QEMU_CLOCK_VIRTUAL, true);
     CPU_FOREACH(cpu) {
-        cpu_resume(cpu);
+        if (cpu->halted) {
+            cpu_resume(cpu);
+        }
     }
 }
 
-- 
2.51.0

Re: [PATCH 1/4] cpus: Only resume halted CPUs

[Philippe Mathieu-Daudé]

On 25/9/25 04:55, Philippe Mathieu-Daudé wrote:
> Avoid kicking running CPUs, trying to resume them.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   system/cpus.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/system/cpus.c b/system/cpus.c
> index aa7bfcf56e5..6062226d4ac 100644
> --- a/system/cpus.c
> +++ b/system/cpus.c
> @@ -666,7 +666,9 @@ void resume_all_vcpus(void)
>   
>       qemu_clock_enable(QEMU_CLOCK_VIRTUAL, true);
>       CPU_FOREACH(cpu) {
> -        cpu_resume(cpu);
> +        if (cpu->halted) {
> +            cpu_resume(cpu);
> +        }
>       }
>   }
>   

Please disregard this patch for now, as other changes (non
included in this series) are required before this change is
correct.

[PATCH 2/4] cpus: Access CPUState::thread_kicked atomically

[Philippe Mathieu-Daudé]

cpus_kick_thread() is called via cpu_exit() -> qemu_cpu_kick(),
and also via gdb_syscall_handling(). Access the CPUState field
using atomic accesses. See commit 8ac2ca02744 ("accel: use atomic
accesses for exit_request") for rationale.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 system/cpus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/cpus.c b/system/cpus.c
index 6062226d4ac..818a8047198 100644
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -480,10 +480,10 @@ void qemu_process_cpu_events(CPUState *cpu)
 
 void cpus_kick_thread(CPUState *cpu)
 {
-    if (cpu->thread_kicked) {
+    if (qatomic_read(&cpu->thread_kicked)) {
         return;
     }
-    cpu->thread_kicked = true;
+    qatomic_set(&cpu->thread_kicked, true);
 
 #ifndef _WIN32
     int err = pthread_kill(cpu->thread->thread, SIG_IPI);
-- 
2.51.0

Re: [PATCH 2/4] cpus: Access CPUState::thread_kicked atomically

[Manos Pitsidianakis]

On Thu, Sep 25, 2025 at 5:55 AM Philippe Mathieu-Daudé
<philmd@linaro.org> wrote:
>
> cpus_kick_thread() is called via cpu_exit() -> qemu_cpu_kick(),
> and also via gdb_syscall_handling(). Access the CPUState field
> using atomic accesses. See commit 8ac2ca02744 ("accel: use atomic
> accesses for exit_request") for rationale.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  system/cpus.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/system/cpus.c b/system/cpus.c
> index 6062226d4ac..818a8047198 100644
> --- a/system/cpus.c
> +++ b/system/cpus.c
> @@ -480,10 +480,10 @@ void qemu_process_cpu_events(CPUState *cpu)
>
>  void cpus_kick_thread(CPUState *cpu)
>  {
> -    if (cpu->thread_kicked) {
> +    if (qatomic_read(&cpu->thread_kicked)) {
>          return;
>      }
> -    cpu->thread_kicked = true;
> +    qatomic_set(&cpu->thread_kicked, true);
>
>  #ifndef _WIN32
>      int err = pthread_kill(cpu->thread->thread, SIG_IPI);
> --
> 2.51.0
>

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

[PATCH 3/4] accel/hvf: Make async_safe_run_on_cpu() safe

[Philippe Mathieu-Daudé]

Wrap hv_vcpu_run() calls with cpu_exec_start/end() in order to
have the main loop perform more exclusive sections while all
vCPUs are quiescent.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
Could be related to the dubious thread_kicked access and pselect() in
hvf_wait_for_ipi() (commit 219c101fa7f "arm/hvf: Add a WFI handler").

Cc: Peter Collingbourne <pcc@google.com>
Cc: Alexander Graf <agraf@csgraf.de>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Cc: Sergio Lopez <slp@redhat.com>
---
 target/arm/hvf/hvf.c  | 2 ++
 target/i386/hvf/hvf.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index b77db99079e..377eb4bbc6b 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -1927,7 +1927,9 @@ int hvf_vcpu_exec(CPUState *cpu)
     flush_cpu_state(cpu);
 
     bql_unlock();
+    cpu_exec_start(cpu);
     r = hv_vcpu_run(cpu->accel->fd);
+    cpu_exec_end(cpu);
     bql_lock();
     switch (r) {
     case HV_SUCCESS:
diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index 8445cadecec..913ad47f3d8 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -749,8 +749,10 @@ int hvf_vcpu_exec(CPUState *cpu)
             return EXCP_HLT;
         }
 
+        cpu_exec_start(cpu);
         hv_return_t r = hv_vcpu_run_until(cpu->accel->fd, HV_DEADLINE_FOREVER);
         assert_hvf_ok(r);
+        cpu_exec_end(cpu);
 
         /* handle VMEXIT */
         uint64_t exit_reason = rvmcs(cpu->accel->fd, VMCS_EXIT_REASON);
-- 
2.51.0

Re: [PATCH 3/4] accel/hvf: Make async_safe_run_on_cpu() safe

[Richard Henderson]

On 9/24/25 19:55, Philippe Mathieu-Daudé wrote:
> Wrap hv_vcpu_run() calls with cpu_exec_start/end() in order to
> have the main loop perform more exclusive sections while all
> vCPUs are quiescent.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> Could be related to the dubious thread_kicked access and pselect() in
> hvf_wait_for_ipi() (commit 219c101fa7f "arm/hvf: Add a WFI handler").
> 
> Cc: Peter Collingbourne <pcc@google.com>
> Cc: Alexander Graf <agraf@csgraf.de>
> Cc: Roman Bolshakov <r.bolshakov@yadro.com>
> Cc: Sergio Lopez <slp@redhat.com>
> ---
>   target/arm/hvf/hvf.c  | 2 ++
>   target/i386/hvf/hvf.c | 2 ++
>   2 files changed, 4 insertions(+)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

> 
> diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
> index b77db99079e..377eb4bbc6b 100644
> --- a/target/arm/hvf/hvf.c
> +++ b/target/arm/hvf/hvf.c
> @@ -1927,7 +1927,9 @@ int hvf_vcpu_exec(CPUState *cpu)
>       flush_cpu_state(cpu);
>   
>       bql_unlock();
> +    cpu_exec_start(cpu);
>       r = hv_vcpu_run(cpu->accel->fd);
> +    cpu_exec_end(cpu);
>       bql_lock();
>       switch (r) {
>       case HV_SUCCESS:
> diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
> index 8445cadecec..913ad47f3d8 100644
> --- a/target/i386/hvf/hvf.c
> +++ b/target/i386/hvf/hvf.c
> @@ -749,8 +749,10 @@ int hvf_vcpu_exec(CPUState *cpu)
>               return EXCP_HLT;
>           }
>   
> +        cpu_exec_start(cpu);
>           hv_return_t r = hv_vcpu_run_until(cpu->accel->fd, HV_DEADLINE_FOREVER);
>           assert_hvf_ok(r);
> +        cpu_exec_end(cpu);
>   
>           /* handle VMEXIT */
>           uint64_t exit_reason = rvmcs(cpu->accel->fd, VMCS_EXIT_REASON);

[PATCH 4/4] accel/tcg: Use cpu_is_stopped() helper to access CPUState::stopped

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 accel/tcg/tcg-accel-ops-rr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
index 2fb46439971..f84342e0449 100644
--- a/accel/tcg/tcg-accel-ops-rr.c
+++ b/accel/tcg/tcg-accel-ops-rr.c
@@ -197,7 +197,7 @@ static void *rr_cpu_thread_fn(void *arg)
     qemu_guest_random_seed_thread_part2(cpu->random_seed);
 
     /* wait for initial kick-off after machine start */
-    while (first_cpu->stopped) {
+    while (cpu_is_stopped(first_cpu)) {
         qemu_cond_wait_bql(first_cpu->halt_cond);
 
         /* process any pending work */
-- 
2.51.0

Re: [PATCH 4/4] accel/tcg: Use cpu_is_stopped() helper to access CPUState::stopped

[Richard Henderson]

On 9/24/25 19:55, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   accel/tcg/tcg-accel-ops-rr.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
> index 2fb46439971..f84342e0449 100644
> --- a/accel/tcg/tcg-accel-ops-rr.c
> +++ b/accel/tcg/tcg-accel-ops-rr.c
> @@ -197,7 +197,7 @@ static void *rr_cpu_thread_fn(void *arg)
>       qemu_guest_random_seed_thread_part2(cpu->random_seed);
>   
>       /* wait for initial kick-off after machine start */
> -    while (first_cpu->stopped) {
> +    while (cpu_is_stopped(first_cpu)) {
>           qemu_cond_wait_bql(first_cpu->halt_cond);
>   
>           /* process any pending work */


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~