tcg-cpus: split into 3 tcg variants
v2 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
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 | 142 ++++++++++ accel/tcg/tcg-cpus-mttcg.h | 13 + accel/tcg/tcg-cpus-rr.c | 307 ++++++++++++++++++++++ accel/tcg/tcg-cpus-rr.h | 21 ++ accel/tcg/tcg-cpus.c | 504 +----------------------------------- accel/tcg/tcg-cpus.h | 12 +- softmmu/icount.c | 2 +- 11 files changed, 686 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-mttcg.h 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 v2 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 | 119 +++++++++ accel/tcg/tcg-cpus-mttcg.h | 23 ++ accel/tcg/tcg-cpus-rr.c | 272 ++++++++++++++++++++ accel/tcg/tcg-cpus-rr.h | 21 ++ accel/tcg/tcg-cpus.c | 484 ++---------------------------------- accel/tcg/tcg-cpus.h | 13 +- softmmu/icount.c | 2 +- 11 files changed, 653 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 +119 -0
119 lines not on this page · raw message
accel/tcg/tcg-cpus-mttcg.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* 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 + +/* +* Multi-threaded TCG +* +* 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 +272 -0
272 lines not on this page · raw message
accel/tcg/tcg-cpus-rr.h new file +21 -0
@@ -0,0 +1,21 @@ +/* +* 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); + +/* Single-threaded TCG */ +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
Re: [PATCH v2 1/3] accel/tcg: split CpusAccel into three TCG variants
Quoted 21 lines · Claudio Fontana
split up the CpusAccel
tcg_cpusinto 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)Suggested-by Richard Henderson <[email protected]>Signed-off-by Claudio Fontana <[email protected]>--- 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 | 119 +++++++++ accel/tcg/tcg-cpus-mttcg.h | 23 ++ accel/tcg/tcg-cpus-rr.c | 272 ++++++++++++++++++++ accel/tcg/tcg-cpus-rr.h | 21 ++ accel/tcg/tcg-cpus.c | 484 ++---------------------------------- accel/tcg/tcg-cpus.h | 13 +- softmmu/icount.c | 2 +- 11 files changed, 653 insertions(+), 462 deletions(-)
...
Quoted 35 lines
accel/tcg/tcg-cpus-mttcg.c new file +29
-0@@ -0,0 +1,119 @@ +/* +* QEMU TCG Multi Threaded vCPUs implementation +* +* Copyright (c) 2003-2008 Fabrice Bellard +* Copyright (c) 2014 Red Hat Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "sysemu/tcg.h" +#include "sysemu/replay.h"
accel/tcg/tcg-cpus-mttcg.c line 39
Quoted 10 lines
accel/tcg/tcg-cpus-mttcg.c new file +10
-0+#include "qemu/main-loop.h" +#include "qemu/guest-random.h" +#include "exec/exec-all.h" +#include "hw/boards.h" + +#include "tcg-cpus.h" +#include "tcg-cpus-mttcg.h" + +/* +* Multi-threaded TCG
Can drop this comment ^ and keep v.
Quoted 68 lines
accel/tcg/tcg-cpus-mttcg.c new file +68
-0+* +* 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) +{ +CPUState *cpu = arg; + +assert (tcg_enabled ()); +g_assert (!icount_enabled ()); + +rcu_register_thread (); +tcg_register_thread (); + +qemu_mutex_lock_iothread (); +qemu_thread_get_self (cpu->thread); + + cpu->thread_id =qemu_get_thread_id (); + cpu->can_do_io =1 ; + current_cpu = cpu; +cpu_thread_signal_created (cpu); +qemu_guest_random_seed_thread_part2 (cpu->random_seed); + +/* process any pending work */ + cpu->exit_request =1 ; + +do { +if (cpu_can_run (cpu)) { +int r; +qemu_mutex_unlock_iothread (); + r =tcg_cpu_exec (cpu); +qemu_mutex_lock_iothread (); +switch (r) { +case EXCP_DEBUG : +cpu_handle_guest_debug (cpu); +break ; +case EXCP_HALTED : +/* +* during start-up the vCPU is reset and the thread is +* kicked several times. If we don't ensure we go back +* to sleep in the halted state we won't cleanly +* start-up when the vCPU is enabled. +* +* cpu->halted should ensure we sleep in wait_io_event +*/ +g_assert (cpu->halted); +break ; +case EXCP_ATOMIC : +qemu_mutex_unlock_iothread (); +cpu_exec_step_atomic (cpu); +qemu_mutex_lock_iothread (); +default : +/* Ignore everything else? */ +break ; + } + } + +qatomic_mb_set (&cpu->exit_request,0 ); +qemu_wait_io_event (cpu); + }while (!cpu->unplug ||cpu_can_run (cpu)); + +qemu_tcg_destroy_vcpu (cpu); +qemu_mutex_unlock_iothread (); +rcu_unregister_thread (); +return NULL ; +}
...
Quoted 10 lines
accel/tcg/tcg-cpus-mttcg.h new file +4
-0@@ -0,0 +1,23 @@ +/* +* QEMU TCG Multi Threaded vCPUs implementation +* +* Copyright 2020 SUSE LLC
accel/tcg/tcg-cpus-mttcg.h line 14
Quoted 10 lines
accel/tcg/tcg-cpus-mttcg.h new file +10
-0+* +* 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 + +/* +* Multi-threaded TCG
Drop too ^
Quoted 145 lines
accel/tcg/tcg-cpus-mttcg.h new file +9
-0+* +* 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 +130
-0@@ -0,0 +1,272 @@ +/* +* QEMU TCG Single Threaded vCPUs implementation +* +* Copyright (c) 2003-2008 Fabrice Bellard +* Copyright (c) 2014 Red Hat Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "sysemu/tcg.h" +#include "sysemu/replay.h" +#include "qemu/main-loop.h" +#include "qemu/guest-random.h" +#include "exec/exec-all.h" +#include "hw/boards.h" + +#include "tcg-cpus.h" +#include "tcg-cpus-rr.h" +#include "tcg-cpus-icount.h" + +/* Kick all RR vCPUs */ +void qemu_cpu_kick_rr_cpus (CPUState *unused) +{ +CPUState *cpu; + +CPU_FOREACH (cpu) { +cpu_exit (cpu); + }; +} + +/* +* TCG vCPU kick timer +* +* The kick timer is responsible for moving single threaded vCPU +* emulation on to the next vCPU. If more than one vCPU is running a +* timer event with force a cpu->exit so the next vCPU can get +* scheduled. +* +* The timer is removed if all vCPUs are idle and restarted again once +* idleness is complete. +*/ + +static QEMUTimer *tcg_kick_vcpu_timer; +static CPUState *tcg_current_rr_cpu; + +#define TCG_KICK_PERIOD (NANOSECONDS_PER_SECOND / 10) + +static inline int64_t qemu_tcg_next_kick (void ) +{ +return qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +TCG_KICK_PERIOD ; +} + +/* Kick the currently round-robin scheduled vCPU to next */ +static void qemu_cpu_kick_rr_next_cpu (void ) +{ +CPUState *cpu; +do { + cpu =qatomic_mb_read (&tcg_current_rr_cpu); +if (cpu) { +cpu_exit (cpu); + } + }while (cpu !=qatomic_mb_read (&tcg_current_rr_cpu)); +} + +static void kick_tcg_thread (void *opaque) +{ +timer_mod (tcg_kick_vcpu_timer,qemu_tcg_next_kick ()); +qemu_cpu_kick_rr_next_cpu (); +} + +static void start_tcg_kick_timer (void ) +{ +if (!tcg_kick_vcpu_timer &&CPU_NEXT (first_cpu)) { + tcg_kick_vcpu_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + kick_tcg_thread,NULL ); + } +if (tcg_kick_vcpu_timer && !timer_pending (tcg_kick_vcpu_timer)) { +timer_mod (tcg_kick_vcpu_timer,qemu_tcg_next_kick ()); + } +} + +static void stop_tcg_kick_timer (void ) +{ +if (tcg_kick_vcpu_timer &&timer_pending (tcg_kick_vcpu_timer)) { +timer_del (tcg_kick_vcpu_timer); + } +} + +static void qemu_tcg_rr_wait_io_event (void ) +{ +CPUState *cpu; + +while (all_cpu_threads_idle ()) { +stop_tcg_kick_timer (); +qemu_cond_wait_iothread (first_cpu->halt_cond); + } + +start_tcg_kick_timer (); + +CPU_FOREACH (cpu) { +qemu_wait_io_event_common (cpu); + } +} + +/* +* Destroy any remaining vCPUs which have been unplugged and have +* finished running +*/ +static void deal_with_unplugged_cpus (void ) +{ +CPUState *cpu; +
accel/tcg/tcg-cpus-rr.c line 140
Quoted 10 lines
accel/tcg/tcg-cpus-rr.c new file +10
-0+CPU_FOREACH (cpu) { +if (cpu->unplug && !cpu_can_run (cpu)) { +qemu_tcg_destroy_vcpu (cpu); +break ; + } + } +} + +/* +* Single-threaded TCG
Drop ^
Quoted 7 lines
accel/tcg/tcg-cpus-rr.c new file +7
-0+* +* In the single-threaded case each vCPU is simulated in turn. If +* there is more than a single vCPU we create a simple timer to kick +* the vCPU and ensure we don't get stuck in a tight loop in one vCPU. +* This is done explicitly rather than relying on side-effects +* elsewhere. +*/
...
Quoted 14 lines
accel/tcg/tcg-cpus-rr.h new file +8
-0@@ -0,0 +1,21 @@ +/* +* 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. +*/
accel/tcg/tcg-cpus-rr.h line 18
Quoted 10 lines
accel/tcg/tcg-cpus-rr.h new file +10
-0+ +#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); + +/* Single-threaded TCG */
Comment not helpful.
accel/tcg/tcg-cpus.c line 2
Quoted 11 lines
accel/tcg/tcg-cpus-rr.h new file +3
-0+void *tcg_rr_cpu_thread_fn (void *arg); + +#endif /* TCG_CPUS_RR_H */ accel/tcg/tcg-cpus.c +1
-1@@ -1,5 +1,7 @@/* -* QEMU System Emulator +* QEMU TCG vcpu common functionality
"vCPU" as used elsewhere.
Quoted 16 lines
accel/tcg/tcg-cpus.c +4
-0+* +* Functionality common to all TCG vcpu variants: mttcg, rr and icount. * * Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2014 Red Hat Inc. @@ -33,436 +35,12 @@#include "hw/boards.h" #include "tcg-cpus.h" +#include "tcg-cpus-mttcg.h" +#include "tcg-cpus-rr.h" accel/tcg/tcg-cpus.h +0
-0
accel/tcg/tcg-cpus.h line 2
Quoted 3 lines
accel/tcg/tcg-cpus.h +1
-1@@ -1,5 +1,7 @@/* -* Accelerator CPUS Interface +* QEMU TCG vcpu common functionality
"vCPU"
Re: [PATCH v2 1/3] accel/tcg: split CpusAccel into three TCG variants
In reply to Claudio FontanaQuoted 9 lines · Claudio Fontana
split up the CpusAccel
tcg_cpusinto 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)Suggested-by Richard Henderson <[email protected]>Signed-off-by Claudio Fontana <[email protected]>---
r~
PATCH v2 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 | 10 ------- accel/tcg/tcg-cpus-rr.c | 39 +++++++++++++++++++++++-- accel/tcg/tcg-cpus-rr.h | 4 +-- accel/tcg/tcg-cpus.c | 58 ------------------------------------- accel/tcg/tcg-cpus.h | 1 - 8 files changed, 71 insertions(+), 77 deletions(-)
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" /* * Multi-threaded TCG
@@ -43,7 +42,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;
@@ -111,8 +110,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 +0 -10
@@ -10,14 +10,4 @@#ifndef TCG_CPUS_MTTCG_H #define TCG_CPUS_MTTCG_H -/* -* Multi-threaded TCG -* -* 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
@@ -146,7 +146,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;
@@ -264,8 +264,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 -2
@@ -15,7 +15,7 @@/* Kick all RR vCPUs. */ void qemu_cpu_kick_rr_cpus (CPUState *unused); -/* Single-threaded TCG */ -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 v2 2/3] accel/tcg: split tcg_start_vcpu_thread
Quoted 6 lines · Claudio Fontana
+++
b/accel/tcg/tcg-cpus-mttcg.haccel/tcg/tcg-cpus-mttcg.h +0
-1@@ -10,14 +10,4 @@#ifndef TCG_CPUS_MTTCG_H #define TCG_CPUS_MTTCG_H -/*
accel/tcg/tcg-cpus-mttcg.h line 13
Quoted 10 lines
accel/tcg/tcg-cpus-mttcg.h +0
-9-* Multi-threaded TCG -* -* 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 */
Hum. Do we really need to create these headers in the previous patch? Because now we have an empty one.
Why not just put all of tcg-cpus-*.h into tcg-cpus.h?
Otherwise this looks ok.
r~
Re: [PATCH v2 2/3] accel/tcg: split tcg_start_vcpu_thread
Quoted 21 lines · Richard Henderson
Quoted 6 lines · Claudio Fontana
+++
b/accel/tcg/tcg-cpus-mttcg.haccel/tcg/tcg-cpus-mttcg.h +0
-1@@ -10,14 +10,4 @@#ifndef TCG_CPUS_MTTCG_H #define TCG_CPUS_MTTCG_H -/* accel/tcg/tcg-cpus-mttcg.h line 13
Quoted 10 lines
accel/tcg/tcg-cpus-mttcg.h +0
-9-* Multi-threaded TCG -* -* 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 */ Hum. Do we really need to create these headers in the previous patch? Because now we have an empty one.
Quoted 7 lines
Why not just put all of tcg-cpus-*.h into
tcg-cpus.h?Otherwise this looks ok.
r~
There are some symbols required between -icount, -rr, and -mttcg, and in particular in the -mttcg case, this requirement goes away after start_vcpu is also refactored.
Will take a look again, at the very least the mttcg.h should be removed completely.
Ciao,
Claudio
Re: [PATCH v2 2/3] accel/tcg: split tcg_start_vcpu_thread
Quoted 30 lines · Claudio Fontana
Quoted 21 lines · Richard Henderson
Quoted 6 lines · Claudio Fontana
+++
b/accel/tcg/tcg-cpus-mttcg.haccel/tcg/tcg-cpus-mttcg.h +0
-1@@ -10,14 +10,4 @@#ifndef TCG_CPUS_MTTCG_H #define TCG_CPUS_MTTCG_H -/* accel/tcg/tcg-cpus-mttcg.h line 13
Quoted 10 lines
accel/tcg/tcg-cpus-mttcg.h +0
-9-* Multi-threaded TCG -* -* 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 */ Hum. Do we really need to create these headers in the previous patch? Because now we have an empty one.
Quoted 7 lines
Why not just put all of tcg-cpus-*.h into
tcg-cpus.h?Otherwise this looks ok.
r~
Quoted 8 lines
There are some symbols required between -icount, -rr, and -mttcg, and in particular in the -mttcg case, this requirement goes away after
start_vcpuis also refactored.Will take a look again, at the very least the
mttcg.hshould be removed completely.Ciao,
Claudio
To be more precise,
tcg-cpus-icount.h ends up with functions that icount provides (to -rr) to be able to consider icount in the part of the code that is mostly rr.
tcg-cpus-rr.h contains the functions that "rr" provides (to -icount), since icount just reuses those.
Ciao,
Claudio
PATCH v2 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
@@ -42,7 +42,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;
@@ -68,7 +68,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 :
@@ -99,7 +99,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 ;
@@ -126,7 +126,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
@@ -138,5 +138,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
Re: [PATCH v2 3/3] accel/tcg: rename tcg-cpus functions to match module name
Quoted 10 lines · Claudio Fontana
Signed-off-by Claudio Fontana <[email protected]>--- 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(-)
Maybe squash earlier, regardless: