net: mana: Return error code from mana_create_rxq()
PATCH 1/1 net: mana: Return error code from mana_create_rxq()
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.
Change mana_create_rxq() to return an int and pass the created rxq back to the caller through an output parameter. The caller now propagates the returned error code directly instead of substituting -ENOMEM.
--- drivers/net/ethernet/microsoft/mana/mana_en.c | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/net/ethernet/microsoft/mana/mana_en.c +11 -10
@@ -2811,9 +2811,9 @@ static int mana_create_page_pool(struct mana_rxq *rxq, struct gdma_context *gc)return 0 ; } -static struct mana_rxq *mana_create_rxq (struct mana_port_context *apc, -u32 rxq_idx,struct mana_eq *eq, -struct net_device *ndev) +static int mana_create_rxq (struct mana_port_context *apc,u32 rxq_idx, +struct mana_eq *eq,struct net_device *ndev, +struct mana_rxq **rxq_out) {struct gdma_dev *gd = apc->ac->gdma_dev;struct mana_obj_spec wq_spec;
@@ -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 -ENOMEM ; rxq->ndev = ndev; rxq->num_rx_buf = apc->rx_queue_size;
@@ -2923,14 +2923,16 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc,mana_gd_ring_cq (cq->gdma_cq,SET_ARM_BIT ); out: -if (!err) -return rxq; +if (!err) { + *rxq_out = rxq; +return 0 ; + }netdev_err (ndev,"Failed to create RXQ: err = %d\n" , err);mana_destroy_rxq (apc, rxq, false); -return NULL ; +return err; }static void mana_create_rxq_debugfs (struct mana_port_context *apc,int idx)
@@ -2963,9 +2965,8 @@ static int mana_add_rx_queues(struct mana_port_context *apc,int i;for (i =0 ; i < apc->num_queues; i++) { - rxq =mana_create_rxq (apc, i, &apc->eqs[i], ndev); -if (!rxq) { - err = -ENOMEM ; + err =mana_create_rxq (apc, i, &apc->eqs[i], ndev, &rxq); +if (err) {netdev_err (ndev,"Failed to create rxq %d : %d\n" , i, err); goto out; }
Signature · 1 line
2.43.0
Jakub Kicinski
maintainerQuoted 3 lines · On Fri, 17 Jul 2026 19:48:18 -0700 Aditya Garg wrote:
Change
mana_create_rxq()to return an int and pass the created rxq back to the caller through an output parameter. The caller now propagates the returned error code directly instead of substituting-ENOMEM.
We generally prefer the use of ERR_PTR to output arguments in the kernel. Looks like it'd work here nicely.
Signature · 1 line
pw-bot: cr
Quoted 7 lines · Jakub Kicinski
Quoted 3 lines · On Fri, 17 Jul 2026 19:48:18 -0700 Aditya Garg wrote:
Change
mana_create_rxq()to return an int and pass the created rxq back to the caller through an output parameter. The caller now propagates the returned error code directly instead of substituting-ENOMEM.We generally prefer the use of
ERR_PTRto output arguments in the kernel. Looks like it'd work here nicely.
Thanks for the review Jakub,
I'll post a v2 using ERR_PTR/PTR_ERR
Regards,
Aditya