github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: macb: propagate RX ring refill errors

Browse Source 
gem_rx_refill() is responsible for Rx SKB allocation, including at open,
but its prototype indicates a void return value.

Therefore we change the code to propagate allocation and DMA mapping
errors back up the stack, making sure the open fails if no descriptors
were allocated. Change all those to return errno-style ints:
 - gem_rx_refill()
 - its parent gem_init_rx_ring()
 - its grand-parent gem_init_rings()
 - the macbgem_ops.mog_init_rings function pointer
 - its grand-uncle macb_init_rings()

We tolerate some allocation failures: we accept running with the rx ring
only partially filled with successful descriptors. It is important we
refuse the zero-valid-descriptor case: nothing would ever trigger a
refill, which only happens once a frame has been received.

Theoretical bugfix, never encountered in practice. To reproduce,
introduce memory pressure (less than 512 SKBs of free memory) and open
the interface. I expect the last queue to be unusable because it has
zero usable rx buffers.

Note that other callers of refill (resume, HRESP error task, NAPI)
cannot do anything useful with that error and keep their best-effort
refill, hoping it will improve.

Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
Reviewed-by: Nicolai Buchwitz <nb@tipi-net.de>
Link: https://patch.msgid.link/20260925-macb-close-v2-2-360efa565914@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Théo Lebrun 2026-09-25 15:59:35 +02:00 committed by Jakub Kicinski
parent efd90b64ce
commit 9ea465c4fb
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/cadence/macb.h
View File

@ -1197,7 +1197,7 @@ struct macb_queue;
struct macb_or_gem_ops {
int (*mog_alloc_rx_buffers)(struct macb *bp);
void (*mog_free_rx_buffers)(struct macb *bp);
void (*mog_init_rings)(struct macb *bp);
int (*mog_init_rings)(struct macb *bp);
int (*mog_rx)(struct macb_queue *queue, struct napi_struct *napi,
int budget);
};

33
drivers/net/ethernet/cadence/macb_main.c
View File

@ -1505,7 +1505,7 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)
return packets;
}
static void gem_rx_refill(struct macb_queue *queue)
static int gem_rx_refill(struct macb_queue *queue)
{
struct macb *bp = queue->bp;
struct macb_dma_desc *desc;
@ -1577,6 +1577,14 @@ static void gem_rx_refill(struct macb_queue *queue)
netdev_vdbg(bp->netdev, "rx ring: queue: %p, prepared head %d, tail %d\n",
queue, queue->rx_prepared_head, queue->rx_tail);
/* Fail if queue has zero prepared descriptors. This is critical because
* nothing will ever trigger a refill again.
*/
if (queue->rx_prepared_head == queue->rx_tail)
return -ENOMEM;
return 0;
}
/* Mark DMA descriptors from begin up to and not including end as unused */
@ -2823,7 +2831,7 @@ static int macb_alloc(struct macb *bp)
return -ENOMEM;
}
static void gem_init_rx_ring(struct macb_queue *queue)
static int gem_init_rx_ring(struct macb_queue *queue)
{
unsigned int i;
@ -2833,14 +2841,16 @@ static void gem_init_rx_ring(struct macb_queue *queue)
for (i = 0; i < queue->bp->rx_ring_size; i++)
macb_rx_desc(queue, i)->addr |= MACB_BIT(RX_USED);
gem_rx_refill(queue);
return gem_rx_refill(queue);
}
static void gem_init_rings(struct macb *bp)
static int gem_init_rings(struct macb *bp)
{
struct macb_queue *queue;
struct macb_dma_desc *desc = NULL;
int last_err = 0;
unsigned int q;
int err;
int i;
for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
@ -2853,11 +2863,15 @@ static void gem_init_rings(struct macb *bp)
queue->tx_head = 0;
queue->tx_tail = 0;
gem_init_rx_ring(queue);
err = gem_init_rx_ring(queue);
if (err)
last_err = err;
}
return last_err;
}
static void macb_init_rings(struct macb *bp)
static int macb_init_rings(struct macb *bp)
{
int i;
struct macb_dma_desc *desc = NULL;
@ -2872,6 +2886,8 @@ static void macb_init_rings(struct macb *bp)
bp->queues[0].tx_head = 0;
bp->queues[0].tx_tail = 0;
desc->ctrl |= MACB_BIT(TX_WRAP);
return 0;
}
static void macb_reset_hw(struct macb *bp)
@ -3202,7 +3218,9 @@ static int macb_open(struct net_device *netdev)
goto pm_exit;
}
bp->macbgem_ops.mog_init_rings(bp);
err = bp->macbgem_ops.mog_init_rings(bp);
if (err)
goto free_rings;
macb_init_buffers(bp);
for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
@ -3240,6 +3258,7 @@ static int macb_open(struct net_device *netdev)
napi_disable(&queue->napi_rx);
napi_disable(&queue->napi_tx);
}
free_rings:
macb_free(bp);
pm_exit:
pm_runtime_put_sync(&bp->pdev->dev);