Commit f4d31653 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: generalize "bugged" VM to "dead" VM 



Generalize KVM_REQ_VM_BUGGED so that it can be called even in cases
where it is by design that the VM cannot be operated upon.  In this
case any KVM_BUG_ON should still warn, so introduce a new flag
kvm->vm_dead that is separate from kvm->vm_bugged.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b67a4cc3

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -9654,7 +9654,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) 
	}



	if (kvm_request_pending(vcpu)) {

		if (kvm_check_request(KVM_REQ_VM_BUGGED, vcpu)) {

		if (kvm_check_request(KVM_REQ_VM_DEAD, vcpu)) {

			r = -EIO;

			goto out;

		}

include/linux/kvm_host.h

+10 −2
Original line number Diff line number Diff line
@@ -150,7 +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_UNBLOCK           2

#define KVM_REQ_UNHALT            3

#define KVM_REQ_VM_BUGGED         (4 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_VM_DEAD           (4 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQUEST_ARCH_BASE     8



#define KVM_ARCH_REQ_FLAGS(nr, flags) ({ \
@@ -617,6 +617,7 @@ struct kvm { 
	unsigned int max_halt_poll_ns;

	u32 dirty_ring_size;

	bool vm_bugged;

	bool vm_dead;



#ifdef CONFIG_HAVE_KVM_PM_NOTIFIER

	struct notifier_block pm_notifier;
@@ -650,12 +651,19 @@ struct kvm { 
#define vcpu_err(vcpu, fmt, ...)					\

	kvm_err("vcpu%i " fmt, (vcpu)->vcpu_id, ## __VA_ARGS__)



static inline void kvm_vm_dead(struct kvm *kvm)

{

	kvm->vm_dead = true;

	kvm_make_all_cpus_request(kvm, KVM_REQ_VM_DEAD);

}



static inline void kvm_vm_bugged(struct kvm *kvm)

{

	kvm->vm_bugged = true;

	kvm_make_all_cpus_request(kvm, KVM_REQ_VM_BUGGED);

	kvm_vm_dead(kvm);

}





#define KVM_BUG(cond, kvm, fmt...)				\

({								\

	int __ret = (cond);					\

virt/kvm/kvm_main.c

+5 −5
Original line number Diff line number Diff line
@@ -3747,7 +3747,7 @@ static long kvm_vcpu_ioctl(struct file *filp, 
	struct kvm_fpu *fpu = NULL;

	struct kvm_sregs *kvm_sregs = NULL;



	if (vcpu->kvm->mm != current->mm || vcpu->kvm->vm_bugged)

	if (vcpu->kvm->mm != current->mm || vcpu->kvm->vm_dead)

		return -EIO;



	if (unlikely(_IOC_TYPE(ioctl) != KVMIO))
@@ -3957,7 +3957,7 @@ static long kvm_vcpu_compat_ioctl(struct file *filp, 
	void __user *argp = compat_ptr(arg);

	int r;



	if (vcpu->kvm->mm != current->mm || vcpu->kvm->vm_bugged)

	if (vcpu->kvm->mm != current->mm || vcpu->kvm->vm_dead)

		return -EIO;



	switch (ioctl) {
@@ -4023,7 +4023,7 @@ static long kvm_device_ioctl(struct file *filp, unsigned int ioctl, 
{

	struct kvm_device *dev = filp->private_data;



	if (dev->kvm->mm != current->mm || dev->kvm->vm_bugged)

	if (dev->kvm->mm != current->mm || dev->kvm->vm_dead)

		return -EIO;



	switch (ioctl) {
@@ -4345,7 +4345,7 @@ static long kvm_vm_ioctl(struct file *filp, 
	void __user *argp = (void __user *)arg;

	int r;



	if (kvm->mm != current->mm || kvm->vm_bugged)

	if (kvm->mm != current->mm || kvm->vm_dead)

		return -EIO;

	switch (ioctl) {

	case KVM_CREATE_VCPU:
@@ -4556,7 +4556,7 @@ static long kvm_vm_compat_ioctl(struct file *filp, 
	struct kvm *kvm = filp->private_data;

	int r;



	if (kvm->mm != current->mm || kvm->vm_bugged)

	if (kvm->mm != current->mm || kvm->vm_dead)

		return -EIO;

	switch (ioctl) {

#ifdef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT