Support for disable MSI
v2 cover Support for disable MSI
Change from v2:
Discard first two patches, instead fix bugs in update_intx(). Finally, I purpose to use kvm_free_assigned_irq(), but before that, I think I have to split kvm->lock due to cancel_work_sync() implicit need kvm->lock. So leave it a little later.
--
include/linux/kvm.h | 1 + virt/kvm/kvm_main.c | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)
--
regards
Yang, Sheng
PATCH v2 1/2 KVM: Fix INTx for device assignment
Missing buckets and wrong parameter for free_irq()
--- virt/kvm/kvm_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
virt/kvm/kvm_main.c +2 -2
@@ -296,8 +296,8 @@ static int assigned_device_update_intx(struct kvm *kvm,if (irqchip_in_kernel (kvm)) {if (!msi2intx && - adev->irq_requested_type &KVM_ASSIGNED_DEV_HOST_MSI ) { -free_irq (adev->host_irq, (void *)kvm); + (adev->irq_requested_type &KVM_ASSIGNED_DEV_HOST_MSI )) { +free_irq (adev->host_irq, (void *)adev);pci_disable_msi (adev->dev); }
Signature · 1 line
1.5.4.5
PATCH v2 2/2 KVM: Add support to disable MSI for assigned device
In reply to Sheng YangMSI is always enabled by default for msi2intx=1. But if msi2intx=0, we have to disable MSI if guest require to do so.
The patch also discard unnecessary msi2intx judgment if guest want to update MSI state.
Notice KVM_DEV_IRQ_ASSIGN_MSI_ACTION is a mask which should cover all MSI related operations, though we only got one for now.
--- include/linux/kvm.h | 1 + virt/kvm/kvm_main.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
include/linux/kvm.h +1 -0
@@ -550,6 +550,7 @@ struct kvm_assigned_irq {#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) +#define KVM_DEV_IRQ_ASSIGN_MSI_ACTION KVM_DEV_IRQ_ASSIGN_ENABLE_MSI#define KVM_DEV_IRQ_ASSIGN_ENABLE_MSI (1 << 0)#endif
virt/kvm/kvm_main.c +16 -2
@@ -343,6 +343,14 @@ static int assigned_device_update_msi(struct kvm *kvm, adev->irq_requested_type &= ~KVM_ASSIGNED_DEV_GUEST_MSI ; adev->guest_irq = airq->guest_irq; adev->ack_notifier.gsi = airq->guest_irq; + }else { +/* +* Guest require to disable device MSI, we disable MSI and +* re-enable INTx by default again. Notice it's only for +* non-msi2intx. +*/ +assigned_device_update_intx (kvm, adev, airq); +return 0 ; }if (adev->irq_requested_type &KVM_ASSIGNED_DEV_HOST_MSI )
@@ -379,6 +387,7 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm, {int r =0 ;struct kvm_assigned_dev_kernel *match; +u32 current_flags =0 , changed_flags;mutex_lock (&kvm->lock);
@@ -416,8 +425,13 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm, } } -if ((!msi2intx && - (assigned_irq->flags &KVM_DEV_IRQ_ASSIGN_ENABLE_MSI )) || +if ((match->irq_requested_type &KVM_ASSIGNED_DEV_HOST_MSI ) && + (match->irq_requested_type &KVM_ASSIGNED_DEV_GUEST_MSI )) + current_flags |=KVM_DEV_IRQ_ASSIGN_ENABLE_MSI ; + + changed_flags = assigned_irq->flags ^ current_flags; + +if ((changed_flags &KVM_DEV_IRQ_ASSIGN_MSI_ACTION ) || (msi2intx && match->dev->msi_enabled)) {#ifdef CONFIG_X86 r =assigned_device_update_msi (kvm, match, assigned_irq);
Signature · 1 line
1.5.4.5
Avi Kivity
AppliedQuoted 7 lines · Sheng Yang
Change from v2:
Discard first two patches, instead fix bugs inupdate_intx(). Finally, I purpose to usekvm_free_assigned_irq(), but before that, I think I have to splitkvm->lockdue tocancel_work_sync()implicit needkvm->lock. So leave it a little later.
Applied, thanks.
Signature · 1 line
error compiling committee.c: too many arguments to function