KVM: Fixes and a cleanup for coalesced MMIO
Sean Christopherson
reviewercover KVM: Fixes and a cleanup for coalesced MMIO
Fix two bugs that are exposed if unregistered a device on an I/O bus fails due to OOM. Tack on opportunistic cleanup in the related code.
Sean Christopherson (3):
KVM: Destroy I/O bus devices on unregister failure _after_ sync'ing
SRCU
KVM: Stop looking for coalesced MMIO zones if the bus is destroyed
KVM: Add proper lockdep assertion in I/O bus unregister
include/linux/kvm_host.h | 4 ++-- virt/kvm/coalesced_mmio.c | 19 +++++++++++++++++-- virt/kvm/kvm_main.c | 26 ++++++++++++++++---------- 3 files changed, 35 insertions(+), 14 deletions(-)
Signature · 1 line
2.31.1.295.g9ea45b61b8-goog
Sean Christopherson
reviewerPATCH 1/3 KVM: Destroy I/O bus devices on unregister failure _after_ sync'ing SRCU
If allocating a new instance of an I/O bus fails when unregistering a device, wait to destroy the device until after all readers are guaranteed to see the new null bus. Destroying devices before the bus is nullified could lead to use-after-free since readers expect the devices on their reference of the bus to remain valid.
--- virt/kvm/kvm_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
virt/kvm/kvm_main.c +7 -3
@@ -4511,7 +4511,13 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, new_bus->dev_count--;memcpy (new_bus->range + i, bus->range + i +1 ,flex_array_size (new_bus, range, new_bus->dev_count - i)); - }else { + } + +rcu_assign_pointer (kvm->buses[bus_idx], new_bus); +synchronize_srcu_expedited (&kvm->srcu); + +/* Destroy the old bus _after_ installing the (null) bus. */ +if (!new_bus) {pr_err ("kvm: failed to shrink bus, removing it completely\n" );for (j =0 ; j < bus->dev_count; j++) {if (j == i)
@@ -4520,8 +4526,6 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, } } -rcu_assign_pointer (kvm->buses[bus_idx], new_bus); -synchronize_srcu_expedited (&kvm->srcu);kfree (bus);return ; }
Signature · 1 line
2.31.1.295.g9ea45b61b8-goog
Re: [PATCH 1/3] KVM: Destroy I/O bus devices on unregister failure _after_ sync'ing SRCU
Quoted 10 lines · Sean Christopherson
If allocating a new instance of an I/O bus fails when unregistering a device, wait to destroy the device until after all readers are guaranteed to see the new null bus. Destroying devices before the bus is nullified could lead to use-after-free since readers expect the devices on their reference of the bus to remain valid.
Fixes f65886606c2d ("KVM: fix memory leak in kvm_io_bus_unregister_dev()")Signed-off-by Sean Christopherson <[email protected]>
Sean Christopherson
reviewerPATCH 2/3 KVM: Stop looking for coalesced MMIO zones if the bus is destroyed
In reply to Sean ChristophersonAbort the walk of coalesced MMIO zones if kvm_io_bus_unregister_dev() fails to allocate memory for the new instance of the bus. If it can't instantiate a new bus, unregister_dev() destroys all devices _except_ the
target device. But, it doesn't tell the caller that it obliterated the
bus and invoked the destructor for all devices that were on the bus. In the coalesced MMIO case, this can result in a deleted list entry dereference due to attempting to continue iterating on coalesced_zones after future entries (in the walk) have been deleted.
Opportunistically add curly braces to the for-loop, which encompasses many lines but sneaks by without braces due to the guts being a single if statement.
--- include/linux/kvm_host.h | 4 ++-- virt/kvm/coalesced_mmio.c | 19 +++++++++++++++++-- virt/kvm/kvm_main.c | 10 +++++----- 3 files changed, 24 insertions(+), 9 deletions(-)
include/linux/kvm_host.h +2 -2
@@ -192,8 +192,8 @@ int kvm_io_bus_read(struct kvm_vcpu *vcpu, enum kvm_bus bus_idx, gpa_t addr, int len, void *val);int kvm_io_bus_register_dev (struct kvm *kvm,enum kvm_bus bus_idx,gpa_t addr,int len,struct kvm_io_device *dev); -void kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx, -struct kvm_io_device *dev); +int kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx, +struct kvm_io_device *dev);struct kvm_io_device *kvm_io_bus_get_dev (struct kvm *kvm,enum kvm_bus bus_idx,gpa_t addr);
virt/kvm/coalesced_mmio.c +17 -2
@@ -174,21 +174,36 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, struct kvm_coalesced_mmio_zone *zone) {struct kvm_coalesced_mmio_dev *dev, *tmp; +int r;if (zone->pio !=1 && zone->pio !=0 )return -EINVAL ;mutex_lock (&kvm->slots_lock); -list_for_each_entry_safe (dev, tmp, &kvm->coalesced_zones, list) +list_for_each_entry_safe (dev, tmp, &kvm->coalesced_zones, list) {if (zone->pio == dev->zone.pio &&coalesced_mmio_in_range (dev, zone->addr, zone->size)) { -kvm_io_bus_unregister_dev (kvm, + 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. No need to restart the walk as +* there aren't any zones left. +*/ +if (r) +break ; } + }mutex_unlock (&kvm->slots_lock); +/* +* Ignore the result of kvm_io_bus_unregister_dev(), from userspace's +* perspective, the coalesced MMIO is most definitely unregistered. +*/ return 0 ; }
virt/kvm/kvm_main.c +5 -5
@@ -4486,15 +4486,15 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, }/* Caller must hold slots_lock. */ -void kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx, -struct kvm_io_device *dev) +int kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx, +struct kvm_io_device *dev) {int i, j;struct kvm_io_bus *new_bus, *bus; bus =kvm_get_bus (kvm, bus_idx);if (!bus) -return ; +return 0 ;for (i =0 ; i < bus->dev_count; i++)if (bus->range[i].dev == dev) {
@@ -4502,7 +4502,7 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, }if (i == bus->dev_count) -return ; +return 0 ; new_bus =kmalloc (struct_size (bus, range, bus->dev_count -1 ),GFP_KERNEL_ACCOUNT );
@@ -4527,7 +4527,7 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, }kfree (bus); -return ; +return new_bus ?0 : -ENOMEM ; } struct kvm_io_device *kvm_io_bus_get_dev(struct kvm *kvm, enum kvm_bus bus_idx,
Signature · 1 line
2.31.1.295.g9ea45b61b8-goog
Re: [PATCH 2/3] KVM: Stop looking for coalesced MMIO zones if the bus is destroyed
Quoted 10 lines · Sean Christopherson
Abort the walk of coalesced MMIO zones if
kvm_io_bus_unregister_dev()fails to allocate memory for the new instance of the bus. If it can't instantiate a new bus,unregister_dev()destroys all devices _except_ the
target device. But, it doesn't tell the caller that it obliterated the
bus and invoked the destructor for all devices that were on the bus. In the coalesced MMIO case, this can result in a deleted list entry dereference due to attempting to continue iterating oncoalesced_zonesafter future entries (in the walk) have been deleted.
Quoted 8 lines
Opportunistically add curly braces to the for-loop, which encompasses many lines but sneaks by without braces due to the guts being a single if statement.
Fixes f65886606c2d ("KVM: fix memory leak in kvm_io_bus_unregister_dev()")Reported-by Hao Sun <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Sean Christopherson
reviewerPATCH 3/3 KVM: Add proper lockdep assertion in I/O bus unregister
In reply to Sean ChristophersonConvert a comment above kvm_io_bus_unregister_dev() into an actual lockdep assertion, and opportunistically add curly braces to a multi-line for-loop.
--- virt/kvm/kvm_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
virt/kvm/kvm_main.c +4 -2
@@ -4485,21 +4485,23 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,return 0 ; } -/* Caller must hold slots_lock. */ int kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx,struct kvm_io_device *dev) {int i, j;struct kvm_io_bus *new_bus, *bus; +lockdep_assert_held (&kvm->slots_lock); + bus =kvm_get_bus (kvm, bus_idx);if (!bus)return 0 ; -for (i =0 ; i < bus->dev_count; i++) +for (i =0 ; i < bus->dev_count; i++) {if (bus->range[i].dev == dev) {break ; } + }if (i == bus->dev_count)return 0 ;
Signature · 1 line
2.31.1.295.g9ea45b61b8-goog
Re: [PATCH 3/3] KVM: Add proper lockdep assertion in I/O bus unregister
Quoted 27 lines · Sean Christopherson
Convert a comment above
kvm_io_bus_unregister_dev()into an actual lockdep assertion, and opportunistically add curly braces to a multi-line for-loop.Signed-off-by Sean Christopherson <[email protected]>--- virt/kvm/kvm_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)virt/kvm/kvm_main.c +2
-1@@ -4485,21 +4485,23 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,return 0 ; } -/* Caller must hold slots_lock. */ int kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx,struct kvm_io_device *dev) {int i, j;struct kvm_io_bus *new_bus, *bus; +lockdep_assert_held (&kvm->slots_lock); +
virt/kvm/kvm_main.c int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, · line 4504
Quoted 10 lines
virt/kvm/kvm_main.c +2
-1bus =kvm_get_bus (kvm, bus_idx);if (!bus)return 0 ; -for (i =0 ; i < bus->dev_count; i++) +for (i =0 ; i < bus->dev_count; i++) {if (bus->range[i].dev == dev) {break ; } + }
Per coding-style.rst, neither the for loop nor the if-block should have braces.
"Do not unnecessarily use braces where a single statement will do."
Stylistic nits aside,
Sean Christopherson
reviewerRe: [PATCH 3/3] KVM: Add proper lockdep assertion in I/O bus unregister
Quoted 40 lines · Jim Mattson
Quoted 27 lines · Sean Christopherson
Convert a comment above
kvm_io_bus_unregister_dev()into an actual lockdep assertion, and opportunistically add curly braces to a multi-line for-loop.Signed-off-by Sean Christopherson <[email protected]>--- virt/kvm/kvm_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)virt/kvm/kvm_main.c +2
-1@@ -4485,21 +4485,23 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,return 0 ; } -/* Caller must hold slots_lock. */ int kvm_io_bus_unregister_dev (struct kvm *kvm,enum kvm_bus bus_idx,struct kvm_io_device *dev) {int i, j;struct kvm_io_bus *new_bus, *bus; +lockdep_assert_held (&kvm->slots_lock); +virt/kvm/kvm_main.c int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, · line 4504
Quoted 10 lines
virt/kvm/kvm_main.c +2
-1bus =kvm_get_bus (kvm, bus_idx);if (!bus)return 0 ; -for (i =0 ; i < bus->dev_count; i++) +for (i =0 ; i < bus->dev_count; i++) {if (bus->range[i].dev == dev) {break ; } + }Per
coding-style.rst, neither the for loop nor the if-block should have braces.
Quoted 1 line
"Do not unnecessarily use braces where a single statement will do."
Doh, the if-statement should indeed not use braces. I think I meant to clean that up, and then saw something shiny...
But the for-loop... keep reading :-D
Also, use braces when a loop contains more than a single simple statement:
.. code-block:: c
while (condition) {
if (test)
do_something();
}Quoted 9 lines · Sean Christopherson
Fix two bugs that are exposed if unregistered a device on an I/O bus fails due to OOM. Tack on opportunistic cleanup in the related code.
Sean Christopherson (3):
KVM: Destroy I/O bus devices on unregister failure _after_ sync'ing
SRCU
KVM: Stop looking for coalesced MMIO zones if the bus is destroyed
KVM: Add proper lockdep assertion in I/O bus unregister
Quoted 5 lines
include/linux/kvm_host.h | 4 ++-- virt/kvm/coalesced_mmio.c | 19 +++++++++++++++++-- virt/kvm/kvm_main.c | 26 ++++++++++++++++---------- 3 files changed, 35 insertions(+), 14 deletions(-)
Queued, thanks.
Paolo