niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

KVM: Add infrastructure and macro to mark VM as bugged

Browse source 
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <3a0998645c328bf0895f1290e61821b70f048549.1625186503.git.isaku.yamahata@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2021-07-02 15:04:23 -07:00 • committed by Paolo Bonzini
parent fa7a549d32
commit 0b8f11737c
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/linux/kvm_host.h
View file

@ -150,6 +150,7 @@ static inline bool is_error_page(struct page *page)
#define KVM_REQ_MMU_RELOAD (1 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) #define KVM_REQ_MMU_RELOAD (1 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
#define KVM_REQ_UNBLOCK 2 #define KVM_REQ_UNBLOCK 2
#define KVM_REQ_UNHALT 3 #define KVM_REQ_UNHALT 3
#define KVM_REQ_VM_BUGGED (4 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
#define KVM_REQUEST_ARCH_BASE 8 #define KVM_REQUEST_ARCH_BASE 8
#define KVM_ARCH_REQ_FLAGS(nr, flags) ({ \ #define KVM_ARCH_REQ_FLAGS(nr, flags) ({ \
@ -596,6 +597,7 @@ struct kvm {
pid_t userspace_pid; pid_t userspace_pid;
unsigned int max_halt_poll_ns; unsigned int max_halt_poll_ns;
u32 dirty_ring_size; u32 dirty_ring_size;
bool vm_bugged;
#ifdef CONFIG_HAVE_KVM_PM_NOTIFIER #ifdef CONFIG_HAVE_KVM_PM_NOTIFIER
struct notifier_block pm_notifier; struct notifier_block pm_notifier;
@ -629,6 +631,31 @@ struct kvm {
#define vcpu_err(vcpu, fmt, ...) \ #define vcpu_err(vcpu, fmt, ...) \
kvm_err("vcpu%i " fmt, (vcpu)->vcpu_id, ## __VA_ARGS__) kvm_err("vcpu%i " fmt, (vcpu)->vcpu_id, ## __VA_ARGS__)
bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req);
static inline void kvm_vm_bugged(struct kvm *kvm)
{
kvm->vm_bugged = true;
kvm_make_all_cpus_request(kvm, KVM_REQ_VM_BUGGED);
}
#define KVM_BUG(cond, kvm, fmt...) \
({ \
int __ret = (cond); \
\
if (WARN_ONCE(__ret && !(kvm)->vm_bugged, fmt)) \
kvm_vm_bugged(kvm); \
unlikely(__ret); \
})
#define KVM_BUG_ON(cond, kvm) \
({ \
int __ret = (cond); \
\
if (WARN_ON_ONCE(__ret && !(kvm)->vm_bugged)) \
kvm_vm_bugged(kvm); \
unlikely(__ret); \
})
static inline bool kvm_dirty_log_manual_protect_and_init_set(struct kvm *kvm) static inline bool kvm_dirty_log_manual_protect_and_init_set(struct kvm *kvm)
{ {
return !!(kvm->manual_dirty_log_protect & KVM_DIRTY_LOG_INITIALLY_SET); return !!(kvm->manual_dirty_log_protect & KVM_DIRTY_LOG_INITIALLY_SET);
@ -946,7 +973,6 @@ void *kvm_mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc);
bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req, bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req,
struct kvm_vcpu *except, struct kvm_vcpu *except,
unsigned long *vcpu_bitmap, cpumask_var_t tmp); unsigned long *vcpu_bitmap, cpumask_var_t tmp);
bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req);
bool kvm_make_all_cpus_request_except(struct kvm *kvm, unsigned int req, bool kvm_make_all_cpus_request_except(struct kvm *kvm, unsigned int req,
struct kvm_vcpu *except); struct kvm_vcpu *except);
bool kvm_make_cpus_request_mask(struct kvm *kvm, unsigned int req, bool kvm_make_cpus_request_mask(struct kvm *kvm, unsigned int req,

10
virt/kvm/kvm_main.c
View file

@ -3598,7 +3598,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
struct kvm_fpu *fpu = NULL; struct kvm_fpu *fpu = NULL;
struct kvm_sregs *kvm_sregs = NULL; struct kvm_sregs *kvm_sregs = NULL;
if (vcpu->kvm->mm != current->mm) if (vcpu->kvm->mm != current->mm || vcpu->kvm->vm_bugged)
return -EIO; return -EIO;
if (unlikely(_IOC_TYPE(ioctl) != KVMIO)) if (unlikely(_IOC_TYPE(ioctl) != KVMIO))
@ -3808,7 +3808,7 @@ static long kvm_vcpu_compat_ioctl(struct file *filp,
void __user *argp = compat_ptr(arg); void __user *argp = compat_ptr(arg);
int r; int r;
if (vcpu->kvm->mm != current->mm) if (vcpu->kvm->mm != current->mm || vcpu->kvm->vm_bugged)
return -EIO; return -EIO;
switch (ioctl) { switch (ioctl) {
@ -3874,7 +3874,7 @@ static long kvm_device_ioctl(struct file *filp, unsigned int ioctl,
{ {
struct kvm_device *dev = filp->private_data; struct kvm_device *dev = filp->private_data;
if (dev->kvm->mm != current->mm) if (dev->kvm->mm != current->mm || dev->kvm->vm_bugged)
return -EIO; return -EIO;
switch (ioctl) { switch (ioctl) {
@ -4196,7 +4196,7 @@ static long kvm_vm_ioctl(struct file *filp,
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
int r; int r;
if (kvm->mm != current->mm) if (kvm->mm != current->mm || kvm->vm_bugged)
return -EIO; return -EIO;
switch (ioctl) { switch (ioctl) {
case KVM_CREATE_VCPU: case KVM_CREATE_VCPU:
@ -4407,7 +4407,7 @@ static long kvm_vm_compat_ioctl(struct file *filp,
struct kvm *kvm = filp->private_data; struct kvm *kvm = filp->private_data;
int r; int r;
if (kvm->mm != current->mm) if (kvm->mm != current->mm || kvm->vm_bugged)
return -EIO; return -EIO;
switch (ioctl) { switch (ioctl) {
#ifdef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT #ifdef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT