mana_create_rxq() returns a struct mana_rxq pointer and returns NULL on
any failure. The caller, mana_add_rx_queues(), cannot tell what went
wrong and hardcodes the error as -ENOMEM. As a result the actual failure
reported by the lower layers (for example -EPROTO from a failed HW
request) is masked and every RX queue creation failure looks like an
out-of-memory error.

Return an ERR_PTR() encoded error code from mana_create_rxq() on failure
instead of NULL. The caller now propagates the returned error code
directly instead of substituting -ENOMEM.

Fixes: ca9c54d2d6a5 ("net: mana: Add a driver for Microsoft Azure Network 
Adapter (MANA)")
Signed-off-by: Aditya Garg <[email protected]>
---
Changes in v2:
 - Use ERR_PTR() to return the error from mana_create_rxq() instead of
   adding an output parameter, keeping the pointer return type.

v1: 
https://lore.kernel.org/all/[email protected]/

 drivers/net/ethernet/microsoft/mana/mana_en.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c 
b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 9d9bfd116dab..92bb55935c1c 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -2829,7 +2829,7 @@ static struct mana_rxq *mana_create_rxq(struct 
mana_port_context *apc,
 
        rxq = kvzalloc_flex(*rxq, rx_oobs, apc->rx_queue_size);
        if (!rxq)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        rxq->ndev = ndev;
        rxq->num_rx_buf = apc->rx_queue_size;
@@ -2930,7 +2930,7 @@ static struct mana_rxq *mana_create_rxq(struct 
mana_port_context *apc,
 
        mana_destroy_rxq(apc, rxq, false);
 
-       return NULL;
+       return ERR_PTR(err);
 }
 
 static void mana_create_rxq_debugfs(struct mana_port_context *apc, int idx)
@@ -2964,8 +2964,8 @@ static int mana_add_rx_queues(struct mana_port_context 
*apc,
 
        for (i = 0; i < apc->num_queues; i++) {
                rxq = mana_create_rxq(apc, i, &apc->eqs[i], ndev);
-               if (!rxq) {
-                       err = -ENOMEM;
+               if (IS_ERR(rxq)) {
+                       err = PTR_ERR(rxq);
                        netdev_err(ndev, "Failed to create rxq %d : %d\n", i, 
err);
                        goto out;
                }
-- 
2.43.0


Reply via email to