| Message ID | b16e4f01-4c85-46e2-b602-fce529293559@stanley.mountain (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c2ddb619fa8d535af968965181656c20a6de3f81 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,net-next] ice: Fix signedness bug in ice_init_interrupt_scheme() | expand |
On Thu, Feb 13, 2025 at 09:31:41AM +0300, Dan Carpenter wrote: > If pci_alloc_irq_vectors() can't allocate the minimum number of vectors > then it returns -ENOSPC so there is no need to check for that in the > caller. In fact, because pf->msix.min is an unsigned int, it means that > any negative error codes are type promoted to high positive values and > treated as success. So here, the "return -ENOMEM;" is unreachable code. > Check for negatives instead. > > Now that we're only dealing with error codes, it's easier to propagate > the error code from pci_alloc_irq_vectors() instead of hardcoding > -ENOMEM. > > Fixes: 79d97b8cf9a8 ("ice: remove splitting MSI-X between features") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > v2: Fix my scripts to say [PATCH net-next] > Propagate the error code. > > drivers/net/ethernet/intel/ice/ice_irq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_irq.c b/drivers/net/ethernet/intel/ice/ice_irq.c > index cbae3d81f0f1..30801fd375f0 100644 > --- a/drivers/net/ethernet/intel/ice/ice_irq.c > +++ b/drivers/net/ethernet/intel/ice/ice_irq.c > @@ -149,8 +149,8 @@ int ice_init_interrupt_scheme(struct ice_pf *pf) > > vectors = pci_alloc_irq_vectors(pf->pdev, pf->msix.min, vectors, > PCI_IRQ_MSIX); > - if (vectors < pf->msix.min) > - return -ENOMEM; > + if (vectors < 0) > + return vectors; > > ice_init_irq_tracker(pf, pf->msix.max, vectors); > Thanks, Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > -- > 2.47.2 >
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Thu, 13 Feb 2025 09:31:41 +0300 you wrote: > If pci_alloc_irq_vectors() can't allocate the minimum number of vectors > then it returns -ENOSPC so there is no need to check for that in the > caller. In fact, because pf->msix.min is an unsigned int, it means that > any negative error codes are type promoted to high positive values and > treated as success. So here, the "return -ENOMEM;" is unreachable code. > Check for negatives instead. > > [...] Here is the summary with links: - [v2,net-next] ice: Fix signedness bug in ice_init_interrupt_scheme() https://git.kernel.org/netdev/net-next/c/c2ddb619fa8d You are awesome, thank you!
diff --git a/drivers/net/ethernet/intel/ice/ice_irq.c b/drivers/net/ethernet/intel/ice/ice_irq.c index cbae3d81f0f1..30801fd375f0 100644 --- a/drivers/net/ethernet/intel/ice/ice_irq.c +++ b/drivers/net/ethernet/intel/ice/ice_irq.c @@ -149,8 +149,8 @@ int ice_init_interrupt_scheme(struct ice_pf *pf) vectors = pci_alloc_irq_vectors(pf->pdev, pf->msix.min, vectors, PCI_IRQ_MSIX); - if (vectors < pf->msix.min) - return -ENOMEM; + if (vectors < 0) + return vectors; ice_init_irq_tracker(pf, pf->msix.max, vectors);
If pci_alloc_irq_vectors() can't allocate the minimum number of vectors then it returns -ENOSPC so there is no need to check for that in the caller. In fact, because pf->msix.min is an unsigned int, it means that any negative error codes are type promoted to high positive values and treated as success. So here, the "return -ENOMEM;" is unreachable code. Check for negatives instead. Now that we're only dealing with error codes, it's easier to propagate the error code from pci_alloc_irq_vectors() instead of hardcoding -ENOMEM. Fixes: 79d97b8cf9a8 ("ice: remove splitting MSI-X between features") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- v2: Fix my scripts to say [PATCH net-next] Propagate the error code. drivers/net/ethernet/intel/ice/ice_irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)