cpus: extract out kvm-specific code to accel/kvm
register a "CpusAccel" interface for KVM as well. Signed-off-by: Claudio Fontana <cfontana@suse.de> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> [added const] Signed-off-by: Claudio Fontana <cfontana@suse.de> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
1583a38988
commit
57038a92bb
|
@ -44,6 +44,9 @@
|
||||||
#include "qapi/qapi-types-common.h"
|
#include "qapi/qapi-types-common.h"
|
||||||
#include "qapi/qapi-visit-common.h"
|
#include "qapi/qapi-visit-common.h"
|
||||||
#include "sysemu/reset.h"
|
#include "sysemu/reset.h"
|
||||||
|
#include "qemu/guest-random.h"
|
||||||
|
#include "sysemu/hw_accel.h"
|
||||||
|
#include "kvm-cpus.h"
|
||||||
|
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
|
|
||||||
|
@ -378,7 +381,7 @@ err:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_destroy_vcpu(CPUState *cpu)
|
static int do_kvm_destroy_vcpu(CPUState *cpu)
|
||||||
{
|
{
|
||||||
KVMState *s = kvm_state;
|
KVMState *s = kvm_state;
|
||||||
long mmap_size;
|
long mmap_size;
|
||||||
|
@ -412,6 +415,14 @@ err:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void kvm_destroy_vcpu(CPUState *cpu)
|
||||||
|
{
|
||||||
|
if (do_kvm_destroy_vcpu(cpu) < 0) {
|
||||||
|
error_report("kvm_destroy_vcpu failed");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static int kvm_get_vcpu(KVMState *s, unsigned long vcpu_id)
|
static int kvm_get_vcpu(KVMState *s, unsigned long vcpu_id)
|
||||||
{
|
{
|
||||||
struct KVMParkedVcpu *cpu;
|
struct KVMParkedVcpu *cpu;
|
||||||
|
@ -2232,6 +2243,7 @@ static int kvm_init(MachineState *ms)
|
||||||
assert(!ret);
|
assert(!ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cpus_register_accel(&kvm_cpus);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err:
|
err:
|
||||||
|
|
|
@ -0,0 +1,88 @@
|
||||||
|
/*
|
||||||
|
* QEMU KVM support
|
||||||
|
*
|
||||||
|
* Copyright IBM, Corp. 2008
|
||||||
|
* Red Hat, Inc. 2008
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Anthony Liguori <aliguori@us.ibm.com>
|
||||||
|
* Glauber Costa <gcosta@redhat.com>
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "qemu/osdep.h"
|
||||||
|
#include "qemu/error-report.h"
|
||||||
|
#include "qemu/main-loop.h"
|
||||||
|
#include "sysemu/kvm_int.h"
|
||||||
|
#include "sysemu/runstate.h"
|
||||||
|
#include "sysemu/cpus.h"
|
||||||
|
#include "qemu/guest-random.h"
|
||||||
|
|
||||||
|
#include "kvm-cpus.h"
|
||||||
|
|
||||||
|
static void *kvm_vcpu_thread_fn(void *arg)
|
||||||
|
{
|
||||||
|
CPUState *cpu = arg;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
rcu_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;
|
||||||
|
|
||||||
|
r = kvm_init_vcpu(cpu);
|
||||||
|
if (r < 0) {
|
||||||
|
error_report("kvm_init_vcpu failed: %s", strerror(-r));
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
kvm_init_cpu_signals(cpu);
|
||||||
|
|
||||||
|
/* signal CPU creation */
|
||||||
|
cpu_thread_signal_created(cpu);
|
||||||
|
qemu_guest_random_seed_thread_part2(cpu->random_seed);
|
||||||
|
|
||||||
|
do {
|
||||||
|
if (cpu_can_run(cpu)) {
|
||||||
|
r = kvm_cpu_exec(cpu);
|
||||||
|
if (r == EXCP_DEBUG) {
|
||||||
|
cpu_handle_guest_debug(cpu);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
qemu_wait_io_event(cpu);
|
||||||
|
} while (!cpu->unplug || cpu_can_run(cpu));
|
||||||
|
|
||||||
|
kvm_destroy_vcpu(cpu);
|
||||||
|
cpu_thread_signal_destroyed(cpu);
|
||||||
|
qemu_mutex_unlock_iothread();
|
||||||
|
rcu_unregister_thread();
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void kvm_start_vcpu_thread(CPUState *cpu)
|
||||||
|
{
|
||||||
|
char thread_name[VCPU_THREAD_NAME_SIZE];
|
||||||
|
|
||||||
|
cpu->thread = g_malloc0(sizeof(QemuThread));
|
||||||
|
cpu->halt_cond = g_malloc0(sizeof(QemuCond));
|
||||||
|
qemu_cond_init(cpu->halt_cond);
|
||||||
|
snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/KVM",
|
||||||
|
cpu->cpu_index);
|
||||||
|
qemu_thread_create(cpu->thread, thread_name, kvm_vcpu_thread_fn,
|
||||||
|
cpu, QEMU_THREAD_JOINABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
const CpusAccel kvm_cpus = {
|
||||||
|
.create_vcpu_thread = kvm_start_vcpu_thread,
|
||||||
|
|
||||||
|
.synchronize_post_reset = kvm_cpu_synchronize_post_reset,
|
||||||
|
.synchronize_post_init = kvm_cpu_synchronize_post_init,
|
||||||
|
.synchronize_state = kvm_cpu_synchronize_state,
|
||||||
|
.synchronize_pre_loadvm = kvm_cpu_synchronize_pre_loadvm,
|
||||||
|
};
|
|
@ -0,0 +1,17 @@
|
||||||
|
/*
|
||||||
|
* Accelerator CPUS Interface
|
||||||
|
*
|
||||||
|
* 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 KVM_CPUS_H
|
||||||
|
#define KVM_CPUS_H
|
||||||
|
|
||||||
|
#include "sysemu/cpus.h"
|
||||||
|
|
||||||
|
extern const CpusAccel kvm_cpus;
|
||||||
|
|
||||||
|
#endif /* KVM_CPUS_H */
|
|
@ -1,5 +1,8 @@
|
||||||
kvm_ss = ss.source_set()
|
kvm_ss = ss.source_set()
|
||||||
kvm_ss.add(files('kvm-all.c'))
|
kvm_ss.add(files(
|
||||||
|
'kvm-all.c',
|
||||||
|
'kvm-cpus.c',
|
||||||
|
))
|
||||||
kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c'))
|
kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c'))
|
||||||
|
|
||||||
specific_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss)
|
specific_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss)
|
||||||
|
|
|
@ -32,9 +32,8 @@ bool kvm_readonly_mem_allowed;
|
||||||
bool kvm_ioeventfd_any_length_allowed;
|
bool kvm_ioeventfd_any_length_allowed;
|
||||||
bool kvm_msi_use_devid;
|
bool kvm_msi_use_devid;
|
||||||
|
|
||||||
int kvm_destroy_vcpu(CPUState *cpu)
|
void kvm_destroy_vcpu(CPUState *cpu)
|
||||||
{
|
{
|
||||||
return -ENOSYS;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_init_vcpu(CPUState *cpu)
|
int kvm_init_vcpu(CPUState *cpu)
|
||||||
|
|
|
@ -225,7 +225,7 @@ int kvm_has_intx_set_mask(void);
|
||||||
|
|
||||||
int kvm_init_vcpu(CPUState *cpu);
|
int kvm_init_vcpu(CPUState *cpu);
|
||||||
int kvm_cpu_exec(CPUState *cpu);
|
int kvm_cpu_exec(CPUState *cpu);
|
||||||
int kvm_destroy_vcpu(CPUState *cpu);
|
void kvm_destroy_vcpu(CPUState *cpu);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* kvm_arm_supports_user_irq
|
* kvm_arm_supports_user_irq
|
||||||
|
|
|
@ -179,9 +179,6 @@ void cpu_synchronize_state(CPUState *cpu)
|
||||||
if (cpus_accel && cpus_accel->synchronize_state) {
|
if (cpus_accel && cpus_accel->synchronize_state) {
|
||||||
cpus_accel->synchronize_state(cpu);
|
cpus_accel->synchronize_state(cpu);
|
||||||
}
|
}
|
||||||
if (kvm_enabled()) {
|
|
||||||
kvm_cpu_synchronize_state(cpu);
|
|
||||||
}
|
|
||||||
if (hax_enabled()) {
|
if (hax_enabled()) {
|
||||||
hax_cpu_synchronize_state(cpu);
|
hax_cpu_synchronize_state(cpu);
|
||||||
}
|
}
|
||||||
|
@ -195,9 +192,6 @@ void cpu_synchronize_post_reset(CPUState *cpu)
|
||||||
if (cpus_accel && cpus_accel->synchronize_post_reset) {
|
if (cpus_accel && cpus_accel->synchronize_post_reset) {
|
||||||
cpus_accel->synchronize_post_reset(cpu);
|
cpus_accel->synchronize_post_reset(cpu);
|
||||||
}
|
}
|
||||||
if (kvm_enabled()) {
|
|
||||||
kvm_cpu_synchronize_post_reset(cpu);
|
|
||||||
}
|
|
||||||
if (hax_enabled()) {
|
if (hax_enabled()) {
|
||||||
hax_cpu_synchronize_post_reset(cpu);
|
hax_cpu_synchronize_post_reset(cpu);
|
||||||
}
|
}
|
||||||
|
@ -211,9 +205,6 @@ void cpu_synchronize_post_init(CPUState *cpu)
|
||||||
if (cpus_accel && cpus_accel->synchronize_post_init) {
|
if (cpus_accel && cpus_accel->synchronize_post_init) {
|
||||||
cpus_accel->synchronize_post_init(cpu);
|
cpus_accel->synchronize_post_init(cpu);
|
||||||
}
|
}
|
||||||
if (kvm_enabled()) {
|
|
||||||
kvm_cpu_synchronize_post_init(cpu);
|
|
||||||
}
|
|
||||||
if (hax_enabled()) {
|
if (hax_enabled()) {
|
||||||
hax_cpu_synchronize_post_init(cpu);
|
hax_cpu_synchronize_post_init(cpu);
|
||||||
}
|
}
|
||||||
|
@ -227,9 +218,6 @@ void cpu_synchronize_pre_loadvm(CPUState *cpu)
|
||||||
if (cpus_accel && cpus_accel->synchronize_pre_loadvm) {
|
if (cpus_accel && cpus_accel->synchronize_pre_loadvm) {
|
||||||
cpus_accel->synchronize_pre_loadvm(cpu);
|
cpus_accel->synchronize_pre_loadvm(cpu);
|
||||||
}
|
}
|
||||||
if (kvm_enabled()) {
|
|
||||||
kvm_cpu_synchronize_pre_loadvm(cpu);
|
|
||||||
}
|
|
||||||
if (hax_enabled()) {
|
if (hax_enabled()) {
|
||||||
hax_cpu_synchronize_pre_loadvm(cpu);
|
hax_cpu_synchronize_pre_loadvm(cpu);
|
||||||
}
|
}
|
||||||
|
@ -384,14 +372,6 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data)
|
||||||
do_run_on_cpu(cpu, func, data, &qemu_global_mutex);
|
do_run_on_cpu(cpu, func, data, &qemu_global_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void qemu_kvm_destroy_vcpu(CPUState *cpu)
|
|
||||||
{
|
|
||||||
if (kvm_destroy_vcpu(cpu) < 0) {
|
|
||||||
error_report("kvm_destroy_vcpu failed");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void qemu_cpu_stop(CPUState *cpu, bool exit)
|
static void qemu_cpu_stop(CPUState *cpu, bool exit)
|
||||||
{
|
{
|
||||||
g_assert(qemu_cpu_is_self(cpu));
|
g_assert(qemu_cpu_is_self(cpu));
|
||||||
|
@ -436,48 +416,6 @@ void qemu_wait_io_event(CPUState *cpu)
|
||||||
qemu_wait_io_event_common(cpu);
|
qemu_wait_io_event_common(cpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *qemu_kvm_cpu_thread_fn(void *arg)
|
|
||||||
{
|
|
||||||
CPUState *cpu = arg;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
rcu_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;
|
|
||||||
|
|
||||||
r = kvm_init_vcpu(cpu);
|
|
||||||
if (r < 0) {
|
|
||||||
error_report("kvm_init_vcpu failed: %s", strerror(-r));
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
kvm_init_cpu_signals(cpu);
|
|
||||||
|
|
||||||
/* signal CPU creation */
|
|
||||||
cpu_thread_signal_created(cpu);
|
|
||||||
qemu_guest_random_seed_thread_part2(cpu->random_seed);
|
|
||||||
|
|
||||||
do {
|
|
||||||
if (cpu_can_run(cpu)) {
|
|
||||||
r = kvm_cpu_exec(cpu);
|
|
||||||
if (r == EXCP_DEBUG) {
|
|
||||||
cpu_handle_guest_debug(cpu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
qemu_wait_io_event(cpu);
|
|
||||||
} while (!cpu->unplug || cpu_can_run(cpu));
|
|
||||||
|
|
||||||
qemu_kvm_destroy_vcpu(cpu);
|
|
||||||
cpu_thread_signal_destroyed(cpu);
|
|
||||||
qemu_mutex_unlock_iothread();
|
|
||||||
rcu_unregister_thread();
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void *qemu_hax_cpu_thread_fn(void *arg)
|
static void *qemu_hax_cpu_thread_fn(void *arg)
|
||||||
{
|
{
|
||||||
CPUState *cpu = arg;
|
CPUState *cpu = arg;
|
||||||
|
@ -801,19 +739,6 @@ static void qemu_hax_start_vcpu(CPUState *cpu)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void qemu_kvm_start_vcpu(CPUState *cpu)
|
|
||||||
{
|
|
||||||
char thread_name[VCPU_THREAD_NAME_SIZE];
|
|
||||||
|
|
||||||
cpu->thread = g_malloc0(sizeof(QemuThread));
|
|
||||||
cpu->halt_cond = g_malloc0(sizeof(QemuCond));
|
|
||||||
qemu_cond_init(cpu->halt_cond);
|
|
||||||
snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/KVM",
|
|
||||||
cpu->cpu_index);
|
|
||||||
qemu_thread_create(cpu->thread, thread_name, qemu_kvm_cpu_thread_fn,
|
|
||||||
cpu, QEMU_THREAD_JOINABLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void qemu_hvf_start_vcpu(CPUState *cpu)
|
static void qemu_hvf_start_vcpu(CPUState *cpu)
|
||||||
{
|
{
|
||||||
char thread_name[VCPU_THREAD_NAME_SIZE];
|
char thread_name[VCPU_THREAD_NAME_SIZE];
|
||||||
|
@ -875,8 +800,6 @@ void qemu_init_vcpu(CPUState *cpu)
|
||||||
if (cpus_accel) {
|
if (cpus_accel) {
|
||||||
/* accelerator already implements the CpusAccel interface */
|
/* accelerator already implements the CpusAccel interface */
|
||||||
cpus_accel->create_vcpu_thread(cpu);
|
cpus_accel->create_vcpu_thread(cpu);
|
||||||
} else if (kvm_enabled()) {
|
|
||||||
qemu_kvm_start_vcpu(cpu);
|
|
||||||
} else if (hax_enabled()) {
|
} else if (hax_enabled()) {
|
||||||
qemu_hax_start_vcpu(cpu);
|
qemu_hax_start_vcpu(cpu);
|
||||||
} else if (hvf_enabled()) {
|
} else if (hvf_enabled()) {
|
||||||
|
|
Loading…
Reference in New Issue