| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Wanpeng Li <wanpengli@tencent.com> |
| Date: Thu, 26 Apr 2018 17:55:03 -0700 |
| Subject: KVM: Extend MAX_IRQ_ROUTES to 4096 for all archs |
| |
| From: Wanpeng Li <wanpengli@tencent.com> |
| |
| [ Upstream commit ddc9cfb79c1096a0855839631c091aa7e9602052 ] |
| |
| Our virtual machines make use of device assignment by configuring |
| 12 NVMe disks for high I/O performance. Each NVMe device has 129 |
| MSI-X Table entries: |
| Capabilities: [50] MSI-X: Enable+ Count=129 Masked-Vector table: BAR=0 offset=00002000 |
| The windows virtual machines fail to boot since they will map the number of |
| MSI-table entries that the NVMe hardware reported to the bus to msi routing |
| table, this will exceed the 1024. This patch extends MAX_IRQ_ROUTES to 4096 |
| for all archs, in the future this might be extended again if needed. |
| |
| Reviewed-by: Cornelia Huck <cohuck@redhat.com> |
| Cc: Paolo Bonzini <pbonzini@redhat.com> |
| Cc: Radim KrÄmář <rkrcmar@redhat.com> |
| Cc: Cornelia Huck <cohuck@redhat.com> |
| Cc: Christian Borntraeger <borntraeger@de.ibm.com> |
| Signed-off-by: Wanpeng Li <wanpengli@tencent.com> |
| Signed-off-by: Tonny Lu <tonnylu@tencent.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| include/linux/kvm_host.h | 8 +------- |
| 1 file changed, 1 insertion(+), 7 deletions(-) |
| |
| --- a/include/linux/kvm_host.h |
| +++ b/include/linux/kvm_host.h |
| @@ -1045,13 +1045,7 @@ static inline int mmu_notifier_retry(str |
| |
| #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING |
| |
| -#ifdef CONFIG_S390 |
| -#define KVM_MAX_IRQ_ROUTES 4096 //FIXME: we can have more than that... |
| -#elif defined(CONFIG_ARM64) |
| -#define KVM_MAX_IRQ_ROUTES 4096 |
| -#else |
| -#define KVM_MAX_IRQ_ROUTES 1024 |
| -#endif |
| +#define KVM_MAX_IRQ_ROUTES 4096 /* might need extension/rework in the future */ |
| |
| bool kvm_arch_can_set_irq_routing(struct kvm *kvm); |
| int kvm_set_irq_routing(struct kvm *kvm, |
