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

Merge tag 'kvm-x86-generic-6.5' of https://github.com/kvm-x86/linux into HEAD 

Common KVM changes for 6.5:

 - Fix unprotected vcpu->pid dereference via debugfs

 - Fix KVM_BUG() and KVM_BUG_ON() macros with 64-bit conditionals

 - Refactor failure path in kvm_io_bus_unregister_dev() to simplify the code

 - Misc cleanups
parents cc744042 cc77b95a

include/kvm/iodev.h

+0 −6
Original line number Diff line number Diff line
@@ -55,10 +55,4 @@ static inline int kvm_iodevice_write(struct kvm_vcpu *vcpu, 
				 : -EOPNOTSUPP;

}



static inline void kvm_iodevice_destructor(struct kvm_io_device *dev)

{

	if (dev->ops->destructor)

		dev->ops->destructor(dev);

}



#endif /* __KVM_IODEV_H__ */

include/linux/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static inline void kvm_vm_bugged(struct kvm *kvm) 


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

({								\

	int __ret = (cond);					\

	bool __ret = !!(cond);					\

								\

	if (WARN_ONCE(__ret && !(kvm)->vm_bugged, fmt))		\

		kvm_vm_bugged(kvm);				\
@@ -858,7 +858,7 @@ static inline void kvm_vm_bugged(struct kvm *kvm) 


#define KVM_BUG_ON(cond, kvm)					\

({								\

	int __ret = (cond);					\

	bool __ret = !!(cond);					\

								\

	if (WARN_ON_ONCE(__ret && !(kvm)->vm_bugged))		\

		kvm_vm_bugged(kvm);				\

include/uapi/linux/kvm.h

+1 −1
Original line number Diff line number Diff line
@@ -1617,7 +1617,7 @@ struct kvm_s390_ucas_mapping { 
#define KVM_GET_DEBUGREGS         _IOR(KVMIO,  0xa1, struct kvm_debugregs)

#define KVM_SET_DEBUGREGS         _IOW(KVMIO,  0xa2, struct kvm_debugregs)

/*

 * vcpu version available with KVM_ENABLE_CAP

 * vcpu version available with KVM_CAP_ENABLE_CAP

 * vm version available with KVM_CAP_ENABLE_CAP_VM

 */

#define KVM_ENABLE_CAP            _IOW(KVMIO,  0xa3, struct kvm_enable_cap)

virt/kvm/coalesced_mmio.c

+2 −7
Original line number Diff line number Diff line
@@ -186,15 +186,10 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, 
		    coalesced_mmio_in_range(dev, zone->addr, zone->size)) {

			r = kvm_io_bus_unregister_dev(kvm,

				zone->pio ? KVM_PIO_BUS : KVM_MMIO_BUS, &dev->dev);



			kvm_iodevice_destructor(&dev->dev);



			/*

			 * On failure, unregister destroys all devices on the

			 * bus _except_ the target device, i.e. coalesced_zones

			 * has been modified.  Bail after destroying the target

			 * device, there's no need to restart the walk as there

			 * aren't any zones left.

			 * bus, including the target device. There's no need

			 * to restart the walk as there aren't any zones left.

			 */

			if (r)

				break;

virt/kvm/eventfd.c

+3 −5
Original line number Diff line number Diff line
@@ -889,9 +889,9 @@ static int kvm_assign_ioeventfd_idx(struct kvm *kvm, 


unlock_fail:

	mutex_unlock(&kvm->slots_lock);

	kfree(p);



fail:

	kfree(p);

	eventfd_ctx_put(eventfd);



	return ret;
@@ -901,7 +901,7 @@ static int 
kvm_deassign_ioeventfd_idx(struct kvm *kvm, enum kvm_bus bus_idx,

			   struct kvm_ioeventfd *args)

{

	struct _ioeventfd        *p, *tmp;

	struct _ioeventfd        *p;

	struct eventfd_ctx       *eventfd;

	struct kvm_io_bus	 *bus;

	int                       ret = -ENOENT;
@@ -915,8 +915,7 @@ kvm_deassign_ioeventfd_idx(struct kvm *kvm, enum kvm_bus bus_idx, 


	mutex_lock(&kvm->slots_lock);



	list_for_each_entry_safe(p, tmp, &kvm->ioeventfds, list) {



	list_for_each_entry(p, &kvm->ioeventfds, list) {

		if (p->bus_idx != bus_idx ||

		    p->eventfd != eventfd  ||

		    p->addr != args->addr  ||
@@ -931,7 +930,6 @@ kvm_deassign_ioeventfd_idx(struct kvm *kvm, enum kvm_bus bus_idx, 
		bus = kvm_get_bus(kvm, bus_idx);

		if (bus)

			bus->ioeventfd_count--;

		ioeventfd_release(p);

		ret = 0;

		break;

	}