This is a note to let you know that I've just added the patch titled
Revert "KVM: Save/restore state of assigned PCI device"
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-kvm-save-restore-state-of-assigned-pci-device.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From [email protected] Thu Jul 7 16:30:24 2011
From: Marcelo Tosatti <[email protected]>
Date: Thu, 23 Jun 2011 13:35:22 -0300
Subject: Revert "KVM: Save/restore state of assigned PCI device"
To: [email protected]
Cc: [email protected], [email protected], [email protected], Alex Williamson
<[email protected]>, "Acked-by: Jan Kiszka" <[email protected]>
Message-ID: <[email protected]>
From: Alex Williamson <[email protected]>
This reverts ed78661f2614d3c9f69c23e280db3bafdabdf5bb as it assumes
the saved PCI state will remain valid for the entire length of time
that it is attached to a guest. This fails when userspace makes use
of the pci-sysfs reset interface, which invalidates the saved device
state, leaving nothing to be restored after the device is reset on
de-assignment. This leaves the device in an unusable state.
3.0.0 will add an interface for KVM to save the PCI state in a
buffer unaffected by other callers of pci_reset_function(), but the
most appropriate stable fix seems to be reverting this change since
the original assumption about the device saved state persisting is
incorrect.
Signed-off-by: Alex Williamson <[email protected]>
Acked-by: Jan Kiszka <[email protected]>
Signed-off-by: Avi Kivity <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
virt/kvm/assigned-dev.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/virt/kvm/assigned-dev.c
+++ b/virt/kvm/assigned-dev.c
@@ -197,8 +197,7 @@ static void kvm_free_assigned_device(str
{
kvm_free_assigned_irq(kvm, assigned_dev);
- __pci_reset_function(assigned_dev->dev);
- pci_restore_state(assigned_dev->dev);
+ pci_reset_function(assigned_dev->dev);
pci_release_regions(assigned_dev->dev);
pci_disable_device(assigned_dev->dev);
@@ -515,7 +514,6 @@ static int kvm_vm_ioctl_assign_device(st
}
pci_reset_function(dev);
- pci_save_state(dev);
match->assigned_dev_id = assigned_dev->assigned_dev_id;
match->host_segnr = assigned_dev->segnr;
@@ -546,7 +544,6 @@ out:
mutex_unlock(&kvm->lock);
return r;
out_list_del:
- pci_restore_state(dev);
list_del(&match->list);
pci_release_regions(dev);
out_disable:
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.39/kvm-fix-register-corruption-in-pvclock_scale_delta.patch
queue-2.6.39/revert-kvm-save-restore-state-of-assigned-pci-device.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
