diff mbox series

[35/39] PCI/MSI: Reject MSI-X early

Message ID	20221111122015.631728309@linutronix.de
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Message-ID: <20221111122015.631728309@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: x86@kernel.org, Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>, linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Marc Zyngier <maz@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jason Gunthorpe <jgg@mellanox.com>, Dave Jiang <dave.jiang@intel.com>, Alex Williamson <alex.williamson@redhat.com>, Kevin Tian <kevin.tian@intel.com>, Dan Williams <dan.j.williams@intel.com>, Logan Gunthorpe <logang@deltatee.com>, Ashok Raj <ashok.raj@intel.com>, Jon Mason <jdmason@kudzu.us>, Allen Hubbe <allenbh@gmail.com>, Michael Ellerman <mpe@ellerman.id.au>, Christophe Leroy <christophe.leroy@csgroup.eu>, linuxppc-dev@lists.ozlabs.org, "Ahmed S. Darwish" <darwi@linutronix.de>, Reinette Chatre <reinette.chatre@intel.com> Subject: [patch 35/39] PCI/MSI: Reject MSI-X early References: <20221111120501.026511281@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Fri, 11 Nov 2022 14:55:11 +0100 (CET) Precedence: bulk
Series	genirq, PCI/MSI: Support for per device MSI and PCI/IMS - Part 1 cleanups \| [00/39] genirq, PCI/MSI: Support for per device MSI and PCI/IMS - Part 1 cleanups [01/39] PCI/MSI: Check for MSI enabled in __pci_msix_enable() [02/39] iommu/vt-d: Remove bogus check for multi MSI-X [03/39] iommu/amd: Remove bogus check for multi MSI-X [04/39] genirq/msi: Use MSI_DESC_ALL in msi_add_simple_msi_descs() [05/39] genirq/msi: Remove filter from msi_free_descs_free_range() [06/39] genirq/msi: Add missing kernel doc to msi_next_desc() [07/39] genirq/msi: Make __msi_domain_alloc_irqs() static [08/39] genirq/msi: Provide msi_domain_ops::post_free() [09/39] powerpc/pseries/msi: Use msi_domain_ops::msi_post_free() [10/39] genirq/msi: Make __msi_domain_free_irqs() static [11/39] genirq/irqdomain: Move bus token enum into a seperate header [12/39] genirq/msi: Add bus token to struct msi_domain_info [13/39] PCI/MSI: Use msi_domain_info::bus_token [14/39] PCI/MSI: Let the MSI core free descriptors [15/39] PCI/MSI: Get rid of PCI_MSI_IRQ_DOMAIN [16/39] genirq: Get rid of GENERIC_MSI_IRQ_DOMAIN [17/39] PCI/MSI: Get rid of externs in msi.h [18/39] PCI/MSI: Move mask and unmask helpers to msi.h [19/39] PCI/MSI: Move pci_disable_msi() to api.c [20/39] PCI/MSI: Move pci_enable_msi() API to api.c [21/39] PCI/MSI: Move pci_enable_msix_range() to api.c [22/39] PCI/MSI: Move pci_alloc_irq_vectors() to api.c [23/39] PCI/MSI: Move pci_alloc_irq_vectors_affinity() to api.c [24/39] PCI/MSI: Move pci_irq_vector() to api.c [25/39] PCI/MSI: Move pci_free_irq_vectors() to api.c [26/39] PCI/MSI: Move pci_msix_vec_count() to api.c [27/39] PCI/MSI: Move pci_disable_msix() to api.c [28/39] PCI/MSI: Move pci_irq_get_affinity() to api.c [29/39] PCI/MSI: Move pci_msi_enabled() to api.c [30/39] PCI/MSI: Move pci_msi_restore_state() to api.c [31/39] Documentation: PCI: Add reference to PCI/MSI device driver APIs [32/39] PCI/MSI: Reorder functions in msi.c [33/39] PCI/MSI: Sanitize MSI-X checks [34/39] PCI/MSI: Reject multi-MSI early [35/39] PCI/MSI: Reject MSI-X early [36/39] PCI/MSI: Validate MSIX contiguous restriction early [37/39] PCI/MSI: Remove redundant msi_check() callback [38/39] genirq/msi: Remove msi_domain_ops::msi_check() [39/39] x86/apic: Remove X86_IRQ_ALLOC_CONTIGUOUS_VECTORS

Commit Message

Thomas Gleixner Nov. 11, 2022, 1:55 p.m. UTC

  Similar to PCI multi-MSI reject MSI-X enablement when a irq domain is
attached to the device which does not support MSI-X.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 drivers/pci/msi/msi.c |    4 ++++
 1 file changed, 4 insertions(+)

Comments

Bjorn Helgaas Nov. 16, 2022, 4:31 p.m. UTC | #1

On Fri, Nov 11, 2022 at 02:55:11PM +0100, Thomas Gleixner wrote:
> Similar to PCI multi-MSI reject MSI-X enablement when a irq domain is
> attached to the device which does not support MSI-X.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

> ---
>  drivers/pci/msi/msi.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> --- a/drivers/pci/msi/msi.c
> +++ b/drivers/pci/msi/msi.c
> @@ -760,6 +760,10 @@ int __pci_enable_msix_range(struct pci_d
>  	if (WARN_ON_ONCE(dev->msix_enabled))
>  		return -EINVAL;
>  
> +	/* Check MSI-X early on irq domain enabled architectures */
> +	if (!pci_msi_domain_supports(dev, MSI_FLAG_PCI_MSIX, ALLOW_LEGACY))
> +		return -ENOTSUPP;
> +
>  	if (!pci_msi_supported(dev, nvec) || dev->current_state != PCI_D0)
>  		return -EINVAL;
>  
>

Jason Gunthorpe Nov. 16, 2022, 6 p.m. UTC | #2

On Fri, Nov 11, 2022 at 02:55:11PM +0100, Thomas Gleixner wrote:
> Similar to PCI multi-MSI reject MSI-X enablement when a irq domain is
> attached to the device which does not support MSI-X.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
>  drivers/pci/msi/msi.c |    4 ++++
>  1 file changed, 4 insertions(+)

Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>

Jason

diff mbox series

Patch

--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -760,6 +760,10 @@  int __pci_enable_msix_range(struct pci_d
 	if (WARN_ON_ONCE(dev->msix_enabled))
 		return -EINVAL;
 
+	/* Check MSI-X early on irq domain enabled architectures */
+	if (!pci_msi_domain_supports(dev, MSI_FLAG_PCI_MSIX, ALLOW_LEGACY))
+		return -ENOTSUPP;
+
 	if (!pci_msi_supported(dev, nvec) || dev->current_state != PCI_D0)
 		return -EINVAL;