clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-08-26 16:28:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: Fix MSI-X table size set up

Browse Source 
We at most have VIRTIO_PCI_MAX_VQ entries for virt queue,
VIRTIO_PCI_MAX_CONFIG entries for config.

To quote the PCI spec:

    System software reads this field to determine the
    MSI-X Table Size N, which is encoded as N-1.
    For example, a returned value of "00000000011"
    indicates a table size of 4.

So, we should set table size to

    VIRTIO_PCI_MAX_VQ + VIRTIO_PCI_MAX_CONFIG - 1

not

    VIRTIO_PCI_MAX_VQ + VIRTIO_PCI_MAX_CONFIG

Acked-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Asias He
2011-10-27 21:14:33 +08:00
committed by Will Deacon
parent 507e02d818
commit 14bba8a09c
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/kvm/virtio-pci.h
+3 -2
View File
@@ -5,7 +5,8 @@
#include <linux/types.h>
#define VIRTIO_PCI_MAX_VQ 3
#define VIRTIO_PCI_MAX_VQ 3
#define VIRTIO_PCI_MAX_CONFIG 1
struct kvm;
@@ -44,7 +45,7 @@ struct virtio_pci {
u32 msix_io_block;
u32 msix_pba_block;
u64 msix_pba;
struct msix_table msix_table[VIRTIO_PCI_MAX_VQ + 1];
struct msix_table msix_table[VIRTIO_PCI_MAX_VQ + VIRTIO_PCI_MAX_CONFIG];
/* virtio queue */
u16 queue_selector;
virtio/pci.c
+12 -1
View File
@@ -287,7 +287,18 @@ int virtio_pci__init(struct kvm *kvm, struct virtio_pci *vpci, void *dev,
vpci->pci_hdr.msix.cap = PCI_CAP_ID_MSIX;
vpci->pci_hdr.msix.next = 0;
vpci->pci_hdr.msix.ctrl = (VIRTIO_PCI_MAX_VQ + 1);
/*
* We at most have VIRTIO_PCI_MAX_VQ entries for virt queue,
* VIRTIO_PCI_MAX_CONFIG entries for config.
*
* To quote the PCI spec:
*
* System software reads this field to determine the
* MSI-X Table Size N, which is encoded as N-1.
* For example, a returned value of "00000000011"
* indicates a table size of 4.
*/
vpci->pci_hdr.msix.ctrl = (VIRTIO_PCI_MAX_VQ + VIRTIO_PCI_MAX_CONFIG - 1);
/*
* Both table and PBA could be mapped on the same BAR, but for now