| Message ID | 1596058592-12025-1-git-send-email-tlfalcon@linux.ibm.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] ibmvnic: Fix IRQ mapping disposal in error path | expand |
On Wed, 29 Jul 2020 16:36:32 -0500 Thomas Falcon wrote: > RX queue IRQ mappings are disposed in both the TX IRQ and RX IRQ > error paths. Fix this and dispose of TX IRQ mappings correctly in > case of an error. > > Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com> Thomas, please remember about Fixes tags (for networking patches, at least): Fixes: ea22d51a7831 ("ibmvnic: simplify and improve driver probe function")
From: Thomas Falcon <tlfalcon@linux.ibm.com> Date: Wed, 29 Jul 2020 16:36:32 -0500 > RX queue IRQ mappings are disposed in both the TX IRQ and RX IRQ > error paths. Fix this and dispose of TX IRQ mappings correctly in > case of an error. > > Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com> Applied with Fixes: tag added and queued up for -stable.
On 7/29/20 5:28 PM, Jakub Kicinski wrote: > On Wed, 29 Jul 2020 16:36:32 -0500 Thomas Falcon wrote: >> RX queue IRQ mappings are disposed in both the TX IRQ and RX IRQ >> error paths. Fix this and dispose of TX IRQ mappings correctly in >> case of an error. >> >> Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com> > Thomas, please remember about Fixes tags (for networking patches, > at least): > > Fixes: ea22d51a7831 ("ibmvnic: simplify and improve driver probe function") Sorry, Jakub, I will try not to forget next time. Thanks.
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 0fd7eae..5afb3c9 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -3206,7 +3206,7 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter) req_tx_irq_failed: for (j = 0; j < i; j++) { free_irq(adapter->tx_scrq[j]->irq, adapter->tx_scrq[j]); - irq_dispose_mapping(adapter->rx_scrq[j]->irq); + irq_dispose_mapping(adapter->tx_scrq[j]->irq); } release_sub_crqs(adapter, 1); return rc;
RX queue IRQ mappings are disposed in both the TX IRQ and RX IRQ error paths. Fix this and dispose of TX IRQ mappings correctly in case of an error. Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)