accel/kvm: Sanitize KVM_HAVE_MCE_INJECTION definition
cover accel/kvm: Sanitize KVM_HAVE_MCE_INJECTION definition
Trivial replacement of KVM_HAVE_MCE_INJECTION by KVM_ARCH_HAVE_MCE_INJECTION (not the "ARCH_" difference).
Philippe Mathieu-Daudé (2):
accel/kvm: Define KVM_ARCH_HAVE_MCE_INJECTION in each target accel/kvm: Directly check KVM_ARCH_HAVE_MCE_INJECTION value in place
include/sysemu/kvm.h | 7 ++++++- target/arm/cpu-param.h | 5 +++++ target/arm/cpu.h | 4 ---- target/i386/cpu-param.h | 2 ++ target/i386/cpu.h | 2 -- target/loongarch/cpu-param.h | 2 ++ target/mips/cpu-param.h | 2 ++ target/ppc/cpu-param.h | 2 ++ target/riscv/cpu-param.h | 2 ++ target/s390x/cpu-param.h | 2 ++ accel/kvm/kvm-all.c | 10 +++++----- 11 files changed, 28 insertions(+), 12 deletions(-)
Signature · 1 line
2.41.0
PATCH 1/2 accel/kvm: Define KVM_ARCH_HAVE_MCE_INJECTION in each target
Instead of having KVM_HAVE_MCE_INJECTION optionally defined, always define KVM_ARCH_HAVE_MCE_INJECTION for each target, and set KVM_HAVE_MCE_INJECTION if it is not zero.
It is now clearer for KVM targets to detect if they lack the MCE injection implementation. Also, moving headers around is no more painful, because if a target neglects to define KVM_ARCH_HAVE_MCE_INJECTION, the build will fail.
---
I'd rather keep "cpu-param.h" simple/short.
Is a per-target "kvm-param.h" any better?
Or per-target "accel-param.h"? For example TCG_GUEST_DEFAULT_MO is TCG specific and could also go there. Otherwise it will go in "cpu-param.h".
--- include/sysemu/kvm.h | 5 +++++ target/arm/cpu-param.h | 5 +++++ target/arm/cpu.h | 4 ---- target/i386/cpu-param.h | 2 ++ target/i386/cpu.h | 2 -- target/loongarch/cpu-param.h | 2 ++ target/mips/cpu-param.h | 2 ++ target/ppc/cpu-param.h | 2 ++ target/riscv/cpu-param.h | 2 ++ target/s390x/cpu-param.h | 2 ++ 10 files changed, 22 insertions(+), 6 deletions(-)
include/sysemu/kvm.h +5 -0
@@ -212,6 +212,7 @@ int kvm_on_sigbus(int code, void *addr);#ifdef NEED_CPU_H #include "cpu.h" +#include "cpu-param.h" void kvm_flush_coalesced_mmio_buffer (void );
@@ -349,6 +350,10 @@ bool kvm_vcpu_id_is_valid(int vcpu_id);/* Returns VCPU ID to be used on KVM_CREATE_VCPU ioctl() */ unsigned long kvm_arch_vcpu_id (CPUState *cpu); +#if KVM_ARCH_HAVE_MCE_INJECTION +#define KVM_HAVE_MCE_INJECTION +#endif +#ifdef KVM_HAVE_MCE_INJECTION void kvm_arch_on_sigbus_vcpu (CPUState *cpu,int code,void *addr);#endif
target/arm/cpu-param.h +5 -0
@@ -30,7 +30,12 @@*/ # define TARGET_PAGE_BITS_VARY # define TARGET_PAGE_BITS_MIN 10 +#endif +#ifdef TARGET_AARCH64 +#define KVM_ARCH_HAVE_MCE_INJECTION 1 +#else +#define KVM_ARCH_HAVE_MCE_INJECTION 0#endif #endif
target/arm/cpu.h +0 -4
@@ -30,10 +30,6 @@/* ARM processors have a weak memory model */ #define TCG_GUEST_DEFAULT_MO (0) -#ifdef TARGET_AARCH64 -#define KVM_HAVE_MCE_INJECTION 1 -#endif -#define EXCP_UDEF 1/* undefined instruction */ #define EXCP_SWI 2/* software interrupt */ #define EXCP_PREFETCH_ABORT 3
target/i386/cpu-param.h +2 -0
@@ -24,4 +24,6 @@#endif #define TARGET_PAGE_BITS 12 +#define KVM_ARCH_HAVE_MCE_INJECTION 1 +#endif
target/i386/cpu.h +0 -2
@@ -33,8 +33,6 @@/* The x86 has a strong memory model with some store-after-load re-ordering */ #define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) -#define KVM_HAVE_MCE_INJECTION 1 -/* support for self modifying code even if the modified instruction is close to the modifying instruction */ #define TARGET_HAS_PRECISE_SMC
target/loongarch/cpu-param.h +2 -0
@@ -14,4 +14,6 @@#define TARGET_PAGE_BITS 12 +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif
target/mips/cpu-param.h +2 -0
@@ -30,4 +30,6 @@#define TARGET_PAGE_BITS_MIN 12#endif +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif
target/ppc/cpu-param.h +2 -0
@@ -33,4 +33,6 @@#endif #define TARGET_PAGE_BITS 12 +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif
target/riscv/cpu-param.h +2 -0
@@ -28,4 +28,6 @@* - M mode HLV/HLVX/HSV 0b111 */ +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif
target/s390x/cpu-param.h +2 -0
@@ -13,4 +13,6 @@#define TARGET_PHYS_ADDR_SPACE_BITS 64#define TARGET_VIRT_ADDR_SPACE_BITS 64 +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif
Signature · 1 line
2.41.0
Re: [PATCH 1/2] accel/kvm: Define KVM_ARCH_HAVE_MCE_INJECTION in each target
It might be good to replace "MCE" in kvm-all.c with a generic abstraction for error injection to avoid carrying the MCE constructs into non-x86 sigbus handlers.
thanks,
-john
Quoted 164 lines · Philippe Mathieu-Daudé
Instead of having
KVM_HAVE_MCE_INJECTIONoptionally defined, always defineKVM_ARCH_HAVE_MCE_INJECTIONfor each target, and setKVM_HAVE_MCE_INJECTIONif it is not zero.It is now clearer for KVM targets to detect if they lack the MCE injection implementation. Also, moving headers around is no more painful, because if a target neglects to define
KVM_ARCH_HAVE_MCE_INJECTION, the build will fail.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
I'd rather keep "cpu-param.h" simple/short.Is a per-target "
kvm-param.h" any better?
Or per-target "accel-param.h"? For exampleTCG_GUEST_DEFAULT_MOis TCG specific and could also go there. Otherwise it will go in "cpu-param.h".--- include/sysemu/kvm.h | 5 +++++ target/arm/cpu-param.h | 5 +++++ target/arm/cpu.h | 4 ---- target/i386/cpu-param.h | 2 ++ target/i386/cpu.h | 2 -- target/loongarch/cpu-param.h | 2 ++ target/mips/cpu-param.h | 2 ++ target/ppc/cpu-param.h | 2 ++ target/riscv/cpu-param.h | 2 ++ target/s390x/cpu-param.h | 2 ++ 10 files changed, 22 insertions(+), 6 deletions(-)include/sysemu/kvm.h +5
-0@@ -212,6 +212,7 @@ int kvm_on_sigbus(int code, void *addr);#ifdef NEED_CPU_H #include "cpu.h" +#include "cpu-param.h" void kvm_flush_coalesced_mmio_buffer (void );@@ -349,6 +350,10 @@ bool kvm_vcpu_id_is_valid(int vcpu_id);/* Returns VCPU ID to be used on KVM_CREATE_VCPU ioctl() */ unsigned long kvm_arch_vcpu_id (CPUState *cpu); +#if KVM_ARCH_HAVE_MCE_INJECTION +#define KVM_HAVE_MCE_INJECTION +#endif +#ifdef KVM_HAVE_MCE_INJECTION void kvm_arch_on_sigbus_vcpu (CPUState *cpu,int code,void *addr);#endif target/arm/cpu-param.h +5
-0@@ -30,7 +30,12 @@*/ # define TARGET_PAGE_BITS_VARY # define TARGET_PAGE_BITS_MIN 10 +#endif +#ifdef TARGET_AARCH64 +#define KVM_ARCH_HAVE_MCE_INJECTION 1 +#else +#define KVM_ARCH_HAVE_MCE_INJECTION 0#endif #endif target/arm/cpu.h +0
-4@@ -30,10 +30,6 @@/* ARM processors have a weak memory model */ #define TCG_GUEST_DEFAULT_MO (0) -#ifdef TARGET_AARCH64 -#define KVM_HAVE_MCE_INJECTION 1 -#endif -#define EXCP_UDEF 1/* undefined instruction */ #define EXCP_SWI 2/* software interrupt */ #define EXCP_PREFETCH_ABORT 3target/i386/cpu-param.h +2
-0@@ -24,4 +24,6 @@#endif #define TARGET_PAGE_BITS 12 +#define KVM_ARCH_HAVE_MCE_INJECTION 1 +#endif target/i386/cpu.h +0
-2@@ -33,8 +33,6 @@/* The x86 has a strong memory model with some store-after-load re-ordering */ #define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) -#define KVM_HAVE_MCE_INJECTION 1 -/* support for self modifying code even if the modified instruction is close to the modifying instruction */ #define TARGET_HAS_PRECISE_SMC target/loongarch/cpu-param.h +2
-0@@ -14,4 +14,6 @@#define TARGET_PAGE_BITS 12 +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif target/mips/cpu-param.h +2
-0@@ -30,4 +30,6 @@#define TARGET_PAGE_BITS_MIN 12#endif +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif target/ppc/cpu-param.h +2
-0@@ -33,4 +33,6 @@#endif #define TARGET_PAGE_BITS 12 +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif target/riscv/cpu-param.h +2
-0@@ -28,4 +28,6 @@* - M mode HLV/HLVX/HSV 0b111 */ +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif target/s390x/cpu-param.h +2
-0@@ -13,4 +13,6 @@#define TARGET_PHYS_ADDR_SPACE_BITS 64#define TARGET_VIRT_ADDR_SPACE_BITS 64 +#define KVM_ARCH_HAVE_MCE_INJECTION 0 +#endif
PATCH 2/2 accel/kvm: Directly check KVM_ARCH_HAVE_MCE_INJECTION value in place
In reply to Philippe Mathieu-DaudéDirectly use KVM_ARCH_HAVE_MCE_INJECTION instead of KVM_HAVE_MCE_INJECTION.
--- include/sysemu/kvm.h | 6 +++--- accel/kvm/kvm-all.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-)
include/sysemu/kvm.h +3 -3
@@ -350,11 +350,11 @@ bool kvm_vcpu_id_is_valid(int vcpu_id);/* Returns VCPU ID to be used on KVM_CREATE_VCPU ioctl() */ unsigned long kvm_arch_vcpu_id (CPUState *cpu); -#if KVM_ARCH_HAVE_MCE_INJECTION -#define KVM_HAVE_MCE_INJECTION +#ifndef KVM_ARCH_HAVE_MCE_INJECTION +#error Missing KVM_ARCH_HAVE_MCE_INJECTION definition in "cpu.h"#endif -#ifdef KVM_HAVE_MCE_INJECTION +#if KVM_ARCH_HAVE_MCE_INJECTION void kvm_arch_on_sigbus_vcpu (CPUState *cpu,int code,void *addr);#endif
accel/kvm/kvm-all.c +5 -5
@@ -2750,7 +2750,7 @@ void kvm_cpu_synchronize_pre_loadvm(CPUState *cpu)run_on_cpu (cpu, do_kvm_cpu_synchronize_pre_loadvm,RUN_ON_CPU_NULL ); } -#ifdef KVM_HAVE_MCE_INJECTION +#if KVM_ARCH_HAVE_MCE_INJECTION static __threadvoid *pending_sigbus_addr;static __threadint pending_sigbus_code;static __threadbool have_sigbus_pending;
@@ -2855,7 +2855,7 @@ int kvm_cpu_exec(CPUState *cpu) attrs =kvm_arch_post_run (cpu, run); -#ifdef KVM_HAVE_MCE_INJECTION +#if KVM_ARCH_HAVE_MCE_INJECTION if (unlikely (have_sigbus_pending)) {bql_lock (); kvm_arch_on_sigbus_vcpu(cpu, pending_sigbus_code,
@@ -3339,7 +3339,7 @@ void kvm_init_cpu_signals(CPUState *cpu)sigaction (SIG_IPI , &sigact,NULL );pthread_sigmask (SIG_BLOCK ,NULL , &set); -#if definedKVM_HAVE_MCE_INJECTION +#if KVM_ARCH_HAVE_MCE_INJECTION sigdelset (&set,SIGBUS );pthread_sigmask (SIG_SETMASK , &set,NULL );#endif
@@ -3358,7 +3358,7 @@ void kvm_init_cpu_signals(CPUState *cpu)/* Called asynchronously in VCPU thread. */ int kvm_on_sigbus_vcpu (CPUState *cpu,int code,void *addr) { -#ifdef KVM_HAVE_MCE_INJECTION +#if KVM_ARCH_HAVE_MCE_INJECTION if (have_sigbus_pending) {return 1 ; }
@@ -3375,7 +3375,7 @@ int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr)/* Called synchronously (via signalfd) in main thread. */ int kvm_on_sigbus (int code,void *addr) { -#ifdef KVM_HAVE_MCE_INJECTION +#if KVM_ARCH_HAVE_MCE_INJECTION /* Action required MCE kills the process if SIGBUS is blocked. Because * that's what happens in the I/O thread, where we handle MCE via signalfd, * we can only get action optional here.
Signature · 1 line
2.41.0
Paolo Bonzini
maintainerQuoted 3 lines · Philippe Mathieu-Daudé
Trivial replacement of
KVM_HAVE_MCE_INJECTIONbyKVM_ARCH_HAVE_MCE_INJECTION(not the "ARCH_" difference).
I am confused, why can't you just rename the symbol and instead you go through this change?
Paolo
Quoted 20 lines
Philippe Mathieu-Daudé (2):
accel/kvm: DefineKVM_ARCH_HAVE_MCE_INJECTIONin each target accel/kvm: Directly checkKVM_ARCH_HAVE_MCE_INJECTIONvalue in placeinclude/sysemu/kvm.h | 7 ++++++- target/arm/cpu-param.h | 5 +++++ target/arm/cpu.h | 4 ---- target/i386/cpu-param.h | 2 ++ target/i386/cpu.h | 2 -- target/loongarch/cpu-param.h | 2 ++ target/mips/cpu-param.h | 2 ++ target/ppc/cpu-param.h | 2 ++ target/riscv/cpu-param.h | 2 ++ target/s390x/cpu-param.h | 2 ++ accel/kvm/kvm-all.c | 10 +++++----- 11 files changed, 28 insertions(+), 12 deletions(-)--
2.41.0