PCI MSI: let drivers retry when not enough vectors (57fbf52c) · Commits · 戴 / test

pci_enable_msix currently returns -EINVAL if you ask for more vectors than supported by the device, which would typically cause fallback to regular interrupts. It's better to return the table size, making the driver retry MSI-X with less vectors. Reviewed-by:

Matthew Wilcox <willy@linux.intel.com> Signed-off-by:

Michael S. Tsirkin <mst@redhat.com> Signed-off-by:

Jesse Barnes <jbarnes@virtuousgeek.org>

drivers/pci/msi.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -691,8 +691,8 @@ int pci_msix_table_size(struct pci_dev *dev)
		* indicates the successful configuration of MSI-X capability structure
		* with new allocated MSI-X irqs. A return of < 0 indicates a failure.
		* Or a return of > 0 indicates that driver request is exceeding the number
		* of irqs available. Driver should use the returned value to re-send
		* its request.
		* of irqs or MSI-X vectors available. Driver should use the returned value to
		* re-send its request.
		**/
		int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)
		{
		@@ -708,7 +708,7 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)

		nr_entries = pci_msix_table_size(dev);
		if (nvec > nr_entries)
		return -EINVAL;
		return nr_entries;

		/* Check for any invalid entries */
		for (i = 0; i < nvec; i++) {

Admin message