tcg-cpus: split into 3 tcg variants
v3 cover tcg-cpus: split into 3 tcg variants
The purpose of this series is to split the tcg-cpus into 3 variants:
tcg_cpus_mttcg (multithreaded tcg vcpus) tcg_cpus_rr (single threaded round robin vcpus) tcg_cpus_icount (same as RR, but using icount)
Ciao,
Claudio
v2 -> v3:
* comments: remove some, replace "vcpu" with "vCPU" (Philippe)
* tcg_cpus_mttcg.h: remove include completely after the last export is gone. (Richard)
v1 -> v2:
* fixed file preambles to be clearer (Philippe)
* reworked includes (Philippe)
* made a few symbols static, as they are private now.
* added a rename patch at the end to make naming more consistent.
* added Suggested-by: Richard, since it is his idea originally.
Claudio Fontana (3):
accel/tcg: split CpusAccel into three TCG variants accel/tcg: split tcg_start_vcpu_thread accel/tcg: rename tcg-cpus functions to match module name
accel/tcg/meson.build | 9 +- accel/tcg/tcg-all.c | 13 +- accel/tcg/tcg-cpus-icount.c | 147 +++++++++++ accel/tcg/tcg-cpus-icount.h | 17 ++ accel/tcg/tcg-cpus-mttcg.c | 140 ++++++++++ accel/tcg/tcg-cpus-rr.c | 305 ++++++++++++++++++++++ accel/tcg/tcg-cpus-rr.h | 21 ++ accel/tcg/tcg-cpus.c | 504 +----------------------------------- accel/tcg/tcg-cpus.h | 12 +- softmmu/icount.c | 2 +- 10 files changed, 669 insertions(+), 501 deletions(-) create mode 100644 accel/tcg/tcg-cpus-icount.c create mode 100644 accel/tcg/tcg-cpus-icount.h create mode 100644 accel/tcg/tcg-cpus-mttcg.c create mode 100644 accel/tcg/tcg-cpus-rr.c create mode 100644 accel/tcg/tcg-cpus-rr.h
Signature · 1 line
2.26.2
PATCH v3 1/3 accel/tcg: split CpusAccel into three TCG variants
split up the CpusAccel tcg_cpus into three TCG variants:
tcg_cpus_rr (single threaded, round robin cpus) tcg_cpus_icount (same as rr, but with instruction counting enabled) tcg_cpus_mttcg (multi-threaded cpus)
--- accel/tcg/meson.build | 9 +- accel/tcg/tcg-all.c | 8 +- accel/tcg/tcg-cpus-icount.c | 147 +++++++++++ accel/tcg/tcg-cpus-icount.h | 17 ++ accel/tcg/tcg-cpus-mttcg.c | 117 +++++++++ accel/tcg/tcg-cpus-mttcg.h | 21 ++ accel/tcg/tcg-cpus-rr.c | 270 ++++++++++++++++++++ accel/tcg/tcg-cpus-rr.h | 20 ++ accel/tcg/tcg-cpus.c | 484 ++---------------------------------- accel/tcg/tcg-cpus.h | 13 +- softmmu/icount.c | 2 +- 11 files changed, 646 insertions(+), 462 deletions(-) create mode 100644 accel/tcg/tcg-cpus-icount.c create mode 100644 accel/tcg/tcg-cpus-icount.h create mode 100644 accel/tcg/tcg-cpus-mttcg.c create mode 100644 accel/tcg/tcg-cpus-mttcg.h create mode 100644 accel/tcg/tcg-cpus-rr.c create mode 100644 accel/tcg/tcg-cpus-rr.h
accel/tcg/meson.build +8 -1
@@ -12,4 +12,11 @@ tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c')) tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c'), libdl]) specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) -specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files('tcg-all.c', 'cputlb.c', 'tcg-cpus.c')) +specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files( + 'tcg-all.c', + 'cputlb.c', + 'tcg-cpus.c', + 'tcg-cpus-mttcg.c', + 'tcg-cpus-icount.c', + 'tcg-cpus-rr.c' +))
accel/tcg/tcg-all.c +7 -1
@@ -104,8 +104,14 @@ static int tcg_init(MachineState *ms)tcg_exec_init (s->tb_size *1024 *1024 ); mttcg_enabled = s->mttcg_enabled; -cpus_register_accel (&tcg_cpus); +if (mttcg_enabled) { +cpus_register_accel (&tcg_cpus_mttcg); + }else if (icount_enabled ()) { +cpus_register_accel (&tcg_cpus_icount); + }else { +cpus_register_accel (&tcg_cpus_rr); + }return 0 ; }
accel/tcg/tcg-cpus-icount.c new file +147 -0
147 lines not on this page · raw message
accel/tcg/tcg-cpus-icount.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* QEMU TCG Single Threaded vCPUs implementation using instruction counting +* +* Copyright 2020 SUSE LLC +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifndef TCG_CPUS_ICOUNT_H +#define TCG_CPUS_ICOUNT_H + +void handle_icount_deadline (void ); +void prepare_icount_for_run (CPUState *cpu); +void process_icount_data (CPUState *cpu); + +#endif /* TCG_CPUS_ICOUNT_H */
accel/tcg/tcg-cpus-mttcg.c new file +117 -0
117 lines not on this page · raw message
accel/tcg/tcg-cpus-mttcg.h new file +21 -0
@@ -0,0 +1,21 @@ +/* +* QEMU TCG Multi Threaded vCPUs implementation +* +* Copyright 2020 SUSE LLC +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifndef TCG_CPUS_MTTCG_H +#define TCG_CPUS_MTTCG_H + +/* +* In the multi-threaded case each vCPU has its own thread. The TLS +* variable current_cpu can be used deep in the code to find the +* current CPUState for a given thread. +*/ + +void *tcg_cpu_thread_fn (void *arg); + +#endif /* TCG_CPUS_MTTCG_H */
accel/tcg/tcg-cpus-rr.c new file +270 -0
270 lines not on this page · raw message
accel/tcg/tcg-cpus-rr.h new file +20 -0
@@ -0,0 +1,20 @@ +/* +* QEMU TCG Single Threaded vCPUs implementation +* +* Copyright 2020 SUSE LLC +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifndef TCG_CPUS_RR_H +#define TCG_CPUS_RR_H + +#define TCG_KICK_PERIOD (NANOSECONDS_PER_SECOND / 10) + +/* Kick all RR vCPUs. */ +void qemu_cpu_kick_rr_cpus (CPUState *unused); + +void *tcg_rr_cpu_thread_fn (void *arg); + +#endif /* TCG_CPUS_RR_H */
accel/tcg/tcg-cpus.c +27 -457
517 lines not on this page · raw message
accel/tcg/tcg-cpus.h +11 -2
@@ -1,5 +1,7 @@/* -* Accelerator CPUS Interface +* QEMU TCG vCPU common functionality +* +* Functionality common to all TCG vcpu variants: mttcg, rr and icount. * * Copyright 2020 SUSE LLC *
@@ -12,6 +14,13 @@#include "sysemu/cpus.h" -extern const CpusAccel tcg_cpus; +extern const CpusAccel tcg_cpus_mttcg; +extern const CpusAccel tcg_cpus_icount; +extern const CpusAccel tcg_cpus_rr; + +void tcg_start_vcpu_thread (CPUState *cpu); +void qemu_tcg_destroy_vcpu (CPUState *cpu); +int tcg_cpu_exec (CPUState *cpu); +void tcg_handle_interrupt (CPUState *cpu,int mask);#endif /* TCG_CPUS_H */
softmmu/icount.c +1 -1
@@ -396,7 +396,7 @@ void icount_start_warp_timer(void)void icount_account_warp_timer (void ) { -if (!icount_enabled () || !icount_sleep) { +if (!icount_sleep) {return ; }
Signature · 1 line
2.26.2
PATCH v3 2/3 accel/tcg: split tcg_start_vcpu_thread
In reply to Claudio Fontanaafter the initial split into 3 tcg variants, we proceed to also split tcg_start_vcpu_thread.
We actually split it in 2 this time, since the icount variant just uses the round robin function.
--- accel/tcg/tcg-all.c | 5 ++++ accel/tcg/tcg-cpus-icount.c | 2 +- accel/tcg/tcg-cpus-mttcg.c | 29 +++++++++++++++++-- accel/tcg/tcg-cpus-mttcg.h | 21 -------------- accel/tcg/tcg-cpus-rr.c | 39 +++++++++++++++++++++++-- accel/tcg/tcg-cpus-rr.h | 3 +- accel/tcg/tcg-cpus.c | 58 ------------------------------------- accel/tcg/tcg-cpus.h | 1 - 8 files changed, 71 insertions(+), 87 deletions(-) delete mode 100644 accel/tcg/tcg-cpus-mttcg.h
accel/tcg/tcg-all.c +5 -0
@@ -105,6 +105,11 @@ static int tcg_init(MachineState *ms)tcg_exec_init (s->tb_size *1024 *1024 ); mttcg_enabled = s->mttcg_enabled; +/* +* Initialize TCG regions +*/ +tcg_region_init (); +if (mttcg_enabled) {cpus_register_accel (&tcg_cpus_mttcg); }else if (icount_enabled ()) {
accel/tcg/tcg-cpus-icount.c +1 -1
@@ -138,7 +138,7 @@ static void icount_handle_interrupt(CPUState *cpu, int mask) }const CpusAccel tcg_cpus_icount = { - .create_vcpu_thread = tcg_start_vcpu_thread, + .create_vcpu_thread = rr_start_vcpu_thread, .kick_vcpu_thread = qemu_cpu_kick_rr_cpus, .handle_interrupt = icount_handle_interrupt,
accel/tcg/tcg-cpus-mttcg.c +26 -3
@@ -33,7 +33,6 @@#include "hw/boards.h" #include "tcg-cpus.h" -#include "tcg-cpus-mttcg.h" /* * In the multi-threaded case each vCPU has its own thread. The TLS
@@ -41,7 +40,7 @@* current CPUState for a given thread. */ -void *tcg_cpu_thread_fn (void *arg) +static void *tcg_cpu_thread_fn (void *arg) {CPUState *cpu = arg;
@@ -109,8 +108,32 @@ static void mttcg_kick_vcpu_thread(CPUState *cpu)cpu_exit (cpu); } +static void mttcg_start_vcpu_thread (CPUState *cpu) +{ +char thread_name[VCPU_THREAD_NAME_SIZE ]; + +g_assert (tcg_enabled ()); + + parallel_cpus = (current_machine->smp.max_cpus >1 ); + + cpu->thread =g_malloc0 (sizeof (QemuThread)); + cpu->halt_cond =g_malloc0 (sizeof (QemuCond)); +qemu_cond_init (cpu->halt_cond); + +/* create a thread per vCPU with TCG (MTTCG) */ +snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/TCG" , + cpu->cpu_index); + +qemu_thread_create (cpu->thread, thread_name, tcg_cpu_thread_fn, + cpu,QEMU_THREAD_JOINABLE ); + +#ifdef _WIN32 + cpu->hThread =qemu_thread_get_handle (cpu->thread); +#endif +} +const CpusAccel tcg_cpus_mttcg = { - .create_vcpu_thread = tcg_start_vcpu_thread, + .create_vcpu_thread = mttcg_start_vcpu_thread, .kick_vcpu_thread = mttcg_kick_vcpu_thread, .handle_interrupt = tcg_handle_interrupt,
accel/tcg/tcg-cpus-mttcg.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* -* QEMU TCG Multi Threaded vCPUs implementation -* -* Copyright 2020 SUSE LLC -* -* This work is licensed under the terms of the GNU GPL, version 2 or later. -* See the COPYING file in the top-level directory. -*/ - -#ifndef TCG_CPUS_MTTCG_H -#define TCG_CPUS_MTTCG_H - -/* -* In the multi-threaded case each vCPU has its own thread. The TLS -* variable current_cpu can be used deep in the code to find the -* current CPUState for a given thread. -*/ - -void *tcg_cpu_thread_fn (void *arg); - -#endif /* TCG_CPUS_MTTCG_H */
accel/tcg/tcg-cpus-rr.c +37 -2
@@ -144,7 +144,7 @@ static void deal_with_unplugged_cpus(void)* elsewhere. */ -void *tcg_rr_cpu_thread_fn (void *arg) +static void *tcg_rr_cpu_thread_fn (void *arg) {CPUState *cpu = arg;
@@ -262,8 +262,43 @@ void *tcg_rr_cpu_thread_fn(void *arg)return NULL ; } +void rr_start_vcpu_thread (CPUState *cpu) +{ +char thread_name[VCPU_THREAD_NAME_SIZE ]; +static QemuCond *single_tcg_halt_cond; +static QemuThread *single_tcg_cpu_thread; + +g_assert (tcg_enabled ()); + parallel_cpus = false; + +if (!single_tcg_cpu_thread) { + cpu->thread =g_malloc0 (sizeof (QemuThread)); + cpu->halt_cond =g_malloc0 (sizeof (QemuCond)); +qemu_cond_init (cpu->halt_cond); + +/* share a single thread for all cpus with TCG */ +snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"ALL CPUs/TCG" ); +qemu_thread_create (cpu->thread, thread_name, + tcg_rr_cpu_thread_fn, + cpu,QEMU_THREAD_JOINABLE ); + + single_tcg_halt_cond = cpu->halt_cond; + single_tcg_cpu_thread = cpu->thread; +#ifdef _WIN32 + cpu->hThread =qemu_thread_get_handle (cpu->thread); +#endif + }else { +/* we share the thread */ + cpu->thread = single_tcg_cpu_thread; + cpu->halt_cond = single_tcg_halt_cond; + cpu->thread_id = first_cpu->thread_id; + cpu->can_do_io =1 ; + cpu->created = true; + } +} +const CpusAccel tcg_cpus_rr = { - .create_vcpu_thread = tcg_start_vcpu_thread, + .create_vcpu_thread = rr_start_vcpu_thread, .kick_vcpu_thread = qemu_cpu_kick_rr_cpus, .handle_interrupt = tcg_handle_interrupt,
accel/tcg/tcg-cpus-rr.h +2 -1
@@ -15,6 +15,7 @@/* Kick all RR vCPUs. */ void qemu_cpu_kick_rr_cpus (CPUState *unused); -void *tcg_rr_cpu_thread_fn (void *arg); +/* start the round robin vcpu thread */ +void rr_start_vcpu_thread (CPUState *cpu);#endif /* TCG_CPUS_RR_H */
accel/tcg/tcg-cpus.c +0 -58
67 lines not on this page · raw message
accel/tcg/tcg-cpus.h +0 -1
@@ -18,7 +18,6 @@ extern const CpusAccel tcg_cpus_mttcg;extern const CpusAccel tcg_cpus_icount;extern const CpusAccel tcg_cpus_rr; -void tcg_start_vcpu_thread (CPUState *cpu);void qemu_tcg_destroy_vcpu (CPUState *cpu);int tcg_cpu_exec (CPUState *cpu);void tcg_handle_interrupt (CPUState *cpu,int mask);
Signature · 1 line
2.26.2
Re: [PATCH v3 2/3] accel/tcg: split tcg_start_vcpu_thread
Hi all,
is this one ok now in your view?
Thanks,
Claudio
Quoted 287 lines · Claudio Fontana
after the initial split into 3 tcg variants, we proceed to also split
tcg_start_vcpu_thread.We actually split it in 2 this time, since the icount variant just uses the round robin function.
Suggested-by Richard Henderson <[email protected]>Signed-off-by Claudio Fontana <[email protected]>--- accel/tcg/tcg-all.c | 5 ++++ accel/tcg/tcg-cpus-icount.c | 2 +- accel/tcg/tcg-cpus-mttcg.c | 29 +++++++++++++++++-- accel/tcg/tcg-cpus-mttcg.h | 21 -------------- accel/tcg/tcg-cpus-rr.c | 39 +++++++++++++++++++++++-- accel/tcg/tcg-cpus-rr.h | 3 +- accel/tcg/tcg-cpus.c | 58 ------------------------------------- accel/tcg/tcg-cpus.h | 1 - 8 files changed, 71 insertions(+), 87 deletions(-) delete mode 100644 accel/tcg/tcg-cpus-mttcg.haccel/tcg/tcg-all.c +5
-0@@ -105,6 +105,11 @@ static int tcg_init(MachineState *ms)tcg_exec_init (s->tb_size *1024 *1024 ); mttcg_enabled = s->mttcg_enabled; +/* +* Initialize TCG regions +*/ +tcg_region_init (); +if (mttcg_enabled) {cpus_register_accel (&tcg_cpus_mttcg); }else if (icount_enabled ()) {accel/tcg/tcg-cpus-icount.c +1
-1@@ -138,7 +138,7 @@ static void icount_handle_interrupt(CPUState *cpu, int mask) }const CpusAccel tcg_cpus_icount = { - .create_vcpu_thread = tcg_start_vcpu_thread, + .create_vcpu_thread = rr_start_vcpu_thread, .kick_vcpu_thread = qemu_cpu_kick_rr_cpus, .handle_interrupt = icount_handle_interrupt,accel/tcg/tcg-cpus-mttcg.c +26
-3@@ -33,7 +33,6 @@#include "hw/boards.h" #include "tcg-cpus.h" -#include "tcg-cpus-mttcg.h" /* * In the multi-threaded case each vCPU has its own thread. The TLS @@ -41,7 +40,7 @@* current CPUState for a given thread. */ -void *tcg_cpu_thread_fn (void *arg) +static void *tcg_cpu_thread_fn (void *arg) {CPUState *cpu = arg;@@ -109,8 +108,32 @@ static void mttcg_kick_vcpu_thread(CPUState *cpu)cpu_exit (cpu); } +static void mttcg_start_vcpu_thread (CPUState *cpu) +{ +char thread_name[VCPU_THREAD_NAME_SIZE ]; + +g_assert (tcg_enabled ()); + + parallel_cpus = (current_machine->smp.max_cpus >1 ); + + cpu->thread =g_malloc0 (sizeof (QemuThread)); + cpu->halt_cond =g_malloc0 (sizeof (QemuCond)); +qemu_cond_init (cpu->halt_cond); + +/* create a thread per vCPU with TCG (MTTCG) */ +snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/TCG" , + cpu->cpu_index); + +qemu_thread_create (cpu->thread, thread_name, tcg_cpu_thread_fn, + cpu,QEMU_THREAD_JOINABLE ); + +#ifdef _WIN32 + cpu->hThread =qemu_thread_get_handle (cpu->thread); +#endif +} +const CpusAccel tcg_cpus_mttcg = { - .create_vcpu_thread = tcg_start_vcpu_thread, + .create_vcpu_thread = mttcg_start_vcpu_thread, .kick_vcpu_thread = mttcg_kick_vcpu_thread, .handle_interrupt = tcg_handle_interrupt,accel/tcg/tcg-cpus-mttcg.h deleted +0
-21@@ -1,21 +0,0 @@ -/* -* QEMU TCG Multi Threaded vCPUs implementation -* -* Copyright 2020 SUSE LLC -* -* This work is licensed under the terms of the GNU GPL, version 2 or later. -* See the COPYING file in the top-level directory. -*/ - -#ifndef TCG_CPUS_MTTCG_H -#define TCG_CPUS_MTTCG_H - -/* -* In the multi-threaded case each vCPU has its own thread. The TLS -* variable current_cpu can be used deep in the code to find the -* current CPUState for a given thread. -*/ - -void *tcg_cpu_thread_fn (void *arg); - -#endif /* TCG_CPUS_MTTCG_H */ accel/tcg/tcg-cpus-rr.c +37
-2@@ -144,7 +144,7 @@ static void deal_with_unplugged_cpus(void)* elsewhere. */ -void *tcg_rr_cpu_thread_fn (void *arg) +static void *tcg_rr_cpu_thread_fn (void *arg) {CPUState *cpu = arg;@@ -262,8 +262,43 @@ void *tcg_rr_cpu_thread_fn(void *arg)return NULL ; } +void rr_start_vcpu_thread (CPUState *cpu) +{ +char thread_name[VCPU_THREAD_NAME_SIZE ]; +static QemuCond *single_tcg_halt_cond; +static QemuThread *single_tcg_cpu_thread; + +g_assert (tcg_enabled ()); + parallel_cpus = false; + +if (!single_tcg_cpu_thread) { + cpu->thread =g_malloc0 (sizeof (QemuThread)); + cpu->halt_cond =g_malloc0 (sizeof (QemuCond)); +qemu_cond_init (cpu->halt_cond); + +/* share a single thread for all cpus with TCG */ +snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"ALL CPUs/TCG" ); +qemu_thread_create (cpu->thread, thread_name, + tcg_rr_cpu_thread_fn, + cpu,QEMU_THREAD_JOINABLE ); + + single_tcg_halt_cond = cpu->halt_cond; + single_tcg_cpu_thread = cpu->thread; +#ifdef _WIN32 + cpu->hThread =qemu_thread_get_handle (cpu->thread); +#endif + }else { +/* we share the thread */ + cpu->thread = single_tcg_cpu_thread; + cpu->halt_cond = single_tcg_halt_cond; + cpu->thread_id = first_cpu->thread_id; + cpu->can_do_io =1 ; + cpu->created = true; + } +} +const CpusAccel tcg_cpus_rr = { - .create_vcpu_thread = tcg_start_vcpu_thread, + .create_vcpu_thread = rr_start_vcpu_thread, .kick_vcpu_thread = qemu_cpu_kick_rr_cpus, .handle_interrupt = tcg_handle_interrupt,accel/tcg/tcg-cpus-rr.h +2
-1@@ -15,6 +15,7 @@/* Kick all RR vCPUs. */ void qemu_cpu_kick_rr_cpus (CPUState *unused); -void *tcg_rr_cpu_thread_fn (void *arg); +/* start the round robin vcpu thread */ +void rr_start_vcpu_thread (CPUState *cpu);#endif /* TCG_CPUS_RR_H */ accel/tcg/tcg-cpus.c +0
-58@@ -35,67 +35,9 @@#include "hw/boards.h" #include "tcg-cpus.h" -#include "tcg-cpus-mttcg.h" -#include "tcg-cpus-rr.h" /* common functionality among all TCG variants */ -void tcg_start_vcpu_thread (CPUState *cpu) -{ -char thread_name[VCPU_THREAD_NAME_SIZE ]; -static QemuCond *single_tcg_halt_cond; -static QemuThread *single_tcg_cpu_thread; -static int tcg_region_inited; - -assert (tcg_enabled ()); -/* -* Initialize TCG regions--once. Now is a good time, because: -* (1) TCG's init context, prologue and target globals have been set up. -* (2) qemu_tcg_mttcg_enabled() works now (TCG init code runs before the -* -accel flag is processed, so the check doesn't work then). -*/ -if (!tcg_region_inited) { - tcg_region_inited =1 ; -tcg_region_init (); - parallel_cpus =qemu_tcg_mttcg_enabled () && current_machine->smp.max_cpus >1 ; - } - -if (qemu_tcg_mttcg_enabled () || !single_tcg_cpu_thread) { - cpu->thread =g_malloc0 (sizeof (QemuThread)); - cpu->halt_cond =g_malloc0 (sizeof (QemuCond)); -qemu_cond_init (cpu->halt_cond); - -if (qemu_tcg_mttcg_enabled ()) { -/* create a thread per vCPU with TCG (MTTCG) */ -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/TCG" , - cpu->cpu_index); - -qemu_thread_create (cpu->thread, thread_name, tcg_cpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE ); - - }else { -/* share a single thread for all cpus with TCG */ -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"ALL CPUs/TCG" ); -qemu_thread_create (cpu->thread, thread_name, - tcg_rr_cpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE ); - - single_tcg_halt_cond = cpu->halt_cond; - single_tcg_cpu_thread = cpu->thread; - } -#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); -#endif - }else { -/* For non-MTTCG cases we share the thread */ - cpu->thread = single_tcg_cpu_thread; - cpu->halt_cond = single_tcg_halt_cond; - cpu->thread_id = first_cpu->thread_id; - cpu->can_do_io =1 ; - cpu->created = true; - } -} -void qemu_tcg_destroy_vcpu (CPUState *cpu) {cpu_thread_signal_destroyed (cpu);accel/tcg/tcg-cpus.h +0
-1@@ -18,7 +18,6 @@ extern const CpusAccel tcg_cpus_mttcg;extern const CpusAccel tcg_cpus_icount;extern const CpusAccel tcg_cpus_rr; -void tcg_start_vcpu_thread (CPUState *cpu);void qemu_tcg_destroy_vcpu (CPUState *cpu);int tcg_cpu_exec (CPUState *cpu);void tcg_handle_interrupt (CPUState *cpu,int mask);
PATCH v3 3/3 accel/tcg: rename tcg-cpus functions to match module name
In reply to Claudio Fontana--- accel/tcg/tcg-cpus-icount.c | 24 ++++++------ accel/tcg/tcg-cpus-icount.h | 6 +-- accel/tcg/tcg-cpus-mttcg.c | 10 ++--- accel/tcg/tcg-cpus-rr.c | 74 ++++++++++++++++++------------------- accel/tcg/tcg-cpus-rr.h | 2 +- accel/tcg/tcg-cpus.c | 6 +-- accel/tcg/tcg-cpus.h | 6 +-- 7 files changed, 64 insertions(+), 64 deletions(-)
accel/tcg/tcg-cpus-icount.c +12 -12
@@ -36,7 +36,7 @@#include "tcg-cpus-icount.h" #include "tcg-cpus-rr.h" -static int64_t tcg_get_icount_limit (void ) +static int64_t icount_get_limit (void ) {int64_t deadline;
@@ -68,37 +68,37 @@ static int64_t tcg_get_icount_limit(void) } } -static void notify_aio_contexts (void ) +static void icount_notify_aio_contexts (void ) {/* Wake up other AioContexts. */ qemu_clock_notify (QEMU_CLOCK_VIRTUAL );qemu_clock_run_timers (QEMU_CLOCK_VIRTUAL ); } -void handle_icount_deadline (void ) +void icount_handle_deadline (void ) {assert (qemu_in_vcpu_thread ());int64_t deadline =qemu_clock_deadline_ns_all (QEMU_CLOCK_VIRTUAL ,QEMU_TIMER_ATTR_ALL );if (deadline ==0 ) { -notify_aio_contexts (); +icount_notify_aio_contexts (); } } -void prepare_icount_for_run (CPUState *cpu) +void icount_prepare_for_run (CPUState *cpu) {int insns_left;/* -* These should always be cleared by process_icount_data after +* These should always be cleared by icount_process_data after * each vCPU execution. However u16.high can be raised -* asynchronously by cpu_exit/cpu_interrupt/tcg_handle_interrupt +* asynchronously by cpu_exit/cpu_interrupt/tcg_cpus_handle_interrupt */ g_assert (cpu_neg (cpu)->icount_decr.u16.low ==0 );g_assert (cpu->icount_extra ==0 ); - cpu->icount_budget =tcg_get_icount_limit (); + cpu->icount_budget =icount_get_limit (); insns_left =MIN (0xffff , cpu->icount_budget);cpu_neg (cpu)->icount_decr.u16.low = insns_left; cpu->icount_extra = cpu->icount_budget - insns_left;
@@ -106,11 +106,11 @@ void prepare_icount_for_run(CPUState *cpu)replay_mutex_lock ();if (cpu->icount_budget ==0 &&replay_has_checkpoint ()) { -notify_aio_contexts (); +icount_notify_aio_contexts (); } } -void process_icount_data (CPUState *cpu) +void icount_process_data (CPUState *cpu) {/* Account for executed instructions */ icount_update (cpu);
@@ -129,7 +129,7 @@ static void icount_handle_interrupt(CPUState *cpu, int mask) {int old_mask = cpu->interrupt_request; -tcg_handle_interrupt (cpu, mask); +tcg_cpus_handle_interrupt (cpu, mask);if (qemu_cpu_is_self (cpu) && !cpu->can_do_io && (mask & ~old_mask) !=0 ) {
@@ -139,7 +139,7 @@ static void icount_handle_interrupt(CPUState *cpu, int mask)const CpusAccel tcg_cpus_icount = { .create_vcpu_thread = rr_start_vcpu_thread, - .kick_vcpu_thread = qemu_cpu_kick_rr_cpus, + .kick_vcpu_thread = rr_kick_vcpu_thread, .handle_interrupt = icount_handle_interrupt, .get_virtual_clock = icount_get,
accel/tcg/tcg-cpus-icount.h +3 -3
@@ -10,8 +10,8 @@#ifndef TCG_CPUS_ICOUNT_H #define TCG_CPUS_ICOUNT_H -void handle_icount_deadline (void ); -void prepare_icount_for_run (CPUState *cpu); -void process_icount_data (CPUState *cpu); +void icount_handle_deadline (void ); +void icount_prepare_for_run (CPUState *cpu); +void icount_process_data (CPUState *cpu);#endif /* TCG_CPUS_ICOUNT_H */
accel/tcg/tcg-cpus-mttcg.c +5 -5
@@ -40,7 +40,7 @@* current CPUState for a given thread. */ -static void *tcg_cpu_thread_fn (void *arg) +static void *mttcg_cpu_thread_fn (void *arg) {CPUState *cpu = arg;
@@ -66,7 +66,7 @@ static void *tcg_cpu_thread_fn(void *arg)if (cpu_can_run (cpu)) {int r;qemu_mutex_unlock_iothread (); - r =tcg_cpu_exec (cpu); + r =tcg_cpus_exec (cpu);qemu_mutex_lock_iothread ();switch (r) {case EXCP_DEBUG :
@@ -97,7 +97,7 @@ static void *tcg_cpu_thread_fn(void *arg)qemu_wait_io_event (cpu); }while (!cpu->unplug ||cpu_can_run (cpu)); -qemu_tcg_destroy_vcpu (cpu); +tcg_cpus_destroy (cpu);qemu_mutex_unlock_iothread ();rcu_unregister_thread ();return NULL ;
@@ -124,7 +124,7 @@ static void mttcg_start_vcpu_thread(CPUState *cpu)snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/TCG" , cpu->cpu_index); -qemu_thread_create (cpu->thread, thread_name, tcg_cpu_thread_fn, +qemu_thread_create (cpu->thread, thread_name, mttcg_cpu_thread_fn, cpu,QEMU_THREAD_JOINABLE );#ifdef _WIN32
@@ -136,5 +136,5 @@ const CpusAccel tcg_cpus_mttcg = { .create_vcpu_thread = mttcg_start_vcpu_thread, .kick_vcpu_thread = mttcg_kick_vcpu_thread, - .handle_interrupt = tcg_handle_interrupt, + .handle_interrupt = tcg_cpus_handle_interrupt, };
accel/tcg/tcg-cpus-rr.c +37 -37
187 lines not on this page · raw message
accel/tcg/tcg-cpus-rr.h +1 -1
@@ -13,7 +13,7 @@#define TCG_KICK_PERIOD (NANOSECONDS_PER_SECOND / 10)/* Kick all RR vCPUs. */ -void qemu_cpu_kick_rr_cpus (CPUState *unused); +void rr_kick_vcpu_thread (CPUState *unused);/* start the round robin vcpu thread */ void rr_start_vcpu_thread (CPUState *cpu);
accel/tcg/tcg-cpus.c +3 -3
@@ -38,12 +38,12 @@/* common functionality among all TCG variants */ -void qemu_tcg_destroy_vcpu (CPUState *cpu) +void tcg_cpus_destroy (CPUState *cpu) {cpu_thread_signal_destroyed (cpu); } -int tcg_cpu_exec (CPUState *cpu) +int tcg_cpus_exec (CPUState *cpu) {int ret;#ifdef CONFIG_PROFILER
@@ -64,7 +64,7 @@ int tcg_cpu_exec(CPUState *cpu) }/* mask must never be zero, except for A20 change call */ -void tcg_handle_interrupt (CPUState *cpu,int mask) +void tcg_cpus_handle_interrupt (CPUState *cpu,int mask) {g_assert (qemu_mutex_iothread_locked ());
accel/tcg/tcg-cpus.h +3 -3
@@ -18,8 +18,8 @@ extern const CpusAccel tcg_cpus_mttcg;extern const CpusAccel tcg_cpus_icount;extern const CpusAccel tcg_cpus_rr; -void qemu_tcg_destroy_vcpu (CPUState *cpu); -int tcg_cpu_exec (CPUState *cpu); -void tcg_handle_interrupt (CPUState *cpu,int mask); +void tcg_cpus_destroy (CPUState *cpu); +int tcg_cpus_exec (CPUState *cpu); +void tcg_cpus_handle_interrupt (CPUState *cpu,int mask);#endif /* TCG_CPUS_H */
Signature · 1 line
2.26.2
Quoted 4 lines · Claudio Fontana
Claudio Fontana (3):
accel/tcg: split CpusAccel into three TCG variants accel/tcg: splittcg_start_vcpu_threadaccel/tcg: rename tcg-cpus functions to match module name
r~
Quoted 11 lines · Richard Henderson
Quoted 4 lines · Claudio Fontana
Claudio Fontana (3):
accel/tcg: split CpusAccel into three TCG variants accel/tcg: splittcg_start_vcpu_threadaccel/tcg: rename tcg-cpus functions to match module nameReviewed-by Richard Henderson <[email protected]>r~
Hi all, just pinging about the status of this series, is it already in someone's queue?
Otherwise it's fine of course to delay it if there are concerns about tightening up the upcoming release.
Thanks,
Claudio
Quoted 9 lines · Claudio Fontana
Quoted 8 lines · Richard Henderson
Quoted 4 lines · Claudio Fontana
Claudio Fontana (3):
accel/tcg: split CpusAccel into three TCG variants accel/tcg: splittcg_start_vcpu_threadaccel/tcg: rename tcg-cpus functions to match module nameReviewed-by Richard Henderson <[email protected]>
Quoted 7 lines
Quoted 3 lines
r~
Hi all, just pinging about the status of this series, is it already in someone's queue?
Otherwise it's fine of course to delay it if there are concerns about tightening up the upcoming release.
Oof da. It has been a month. Since Paolo picked up the first part, I assumed he'd get the second too.
Since it's not critical, I'll queue it for 6.0.
But at least it'll be queued somewhere...
r~