FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-01-30 08:32:52 +08:00
Code Issues Projects Releases Wiki Activity

modules/mqnic: Introduce proper error path on failing to allocate RX buffers

Browse Source 
This basically allows the "refilling" of RX buffers to fail. A fail to allocate
RX buffers can occur on bringing a network device up or when changing the number
of RX channels at run-time through `ethtool -L <ndev> rx <num>`.

Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
This commit is contained in:
Joachim Foerster 2022-06-29 11:56:22 +02:00 committed by Alex Forencich
parent 4d2c2071cc
commit 51d5712982
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mqnic/mqnic.h
View File

@ -624,7 +624,7 @@ void mqnic_rx_write_head_ptr(struct mqnic_ring *ring);
void mqnic_free_rx_desc(struct mqnic_ring *ring, int index); void mqnic_free_rx_desc(struct mqnic_ring *ring, int index);
int mqnic_free_rx_buf(struct mqnic_ring *ring); int mqnic_free_rx_buf(struct mqnic_ring *ring);
int mqnic_prepare_rx_desc(struct mqnic_ring *ring, int index); int mqnic_prepare_rx_desc(struct mqnic_ring *ring, int index);
void mqnic_refill_rx_buffers(struct mqnic_ring *ring); int mqnic_refill_rx_buffers(struct mqnic_ring *ring);
int mqnic_process_rx_cq(struct mqnic_cq *cq, int napi_budget); int mqnic_process_rx_cq(struct mqnic_cq *cq, int napi_budget);
void mqnic_rx_irq(struct mqnic_cq *cq); void mqnic_rx_irq(struct mqnic_cq *cq);
int mqnic_poll_rx_cq(struct napi_struct *napi, int budget); int mqnic_poll_rx_cq(struct napi_struct *napi, int budget);

23
modules/mqnic/mqnic_rx.c
View File

@ -96,7 +96,16 @@ int mqnic_open_rx_ring(struct mqnic_ring *ring, struct mqnic_priv *priv,
iowrite32(ilog2(ring->size) | (ring->log_desc_block_size << 8), iowrite32(ilog2(ring->size) | (ring->log_desc_block_size << 8),
ring->hw_addr + MQNIC_QUEUE_ACTIVE_LOG_SIZE_REG); ring->hw_addr + MQNIC_QUEUE_ACTIVE_LOG_SIZE_REG);
mqnic_refill_rx_buffers(ring); ret = mqnic_refill_rx_buffers(ring);
if (ret) {
netdev_err(priv->ndev, "failed to allocate RX buffer for RX queue index %d (of %u total) entry index %u (of %u total)",
ring->index, priv->rxq_count, ring->head_ptr, ring->size);
if (ret == -ENOMEM)
netdev_err(priv->ndev, "machine might not have enough DMA-capable RAM; try to decrease number of RX channels (currently %u) and/or RX ring parameters (entries; currently %u) and/or module parameter \"num_rxq_entries\" (currently %u)",
priv->rxq_count, ring->size, mqnic_num_rxq_entries);
goto fail;
}
return 0; return 0;
@ -229,7 +238,7 @@ int mqnic_prepare_rx_desc(struct mqnic_ring *ring, int index)
if (unlikely(!page)) { if (unlikely(!page)) {
dev_err(ring->dev, "%s: failed to allocate memory on interface %d", dev_err(ring->dev, "%s: failed to allocate memory on interface %d",
__func__, ring->interface->index); __func__, ring->interface->index);
return -1; return -ENOMEM;
} }
// map page // map page
@ -256,15 +265,17 @@ int mqnic_prepare_rx_desc(struct mqnic_ring *ring, int index)
return 0; return 0;
} }
void mqnic_refill_rx_buffers(struct mqnic_ring *ring) int mqnic_refill_rx_buffers(struct mqnic_ring *ring)
{ {
u32 missing = ring->size - (ring->head_ptr - ring->tail_ptr); u32 missing = ring->size - (ring->head_ptr - ring->tail_ptr);
int ret = 0;
if (missing < 8) if (missing < 8)
return; return 0;
for (; missing-- > 0;) { for (; missing-- > 0;) {
if (mqnic_prepare_rx_desc(ring, ring->head_ptr & ring->size_mask)) ret = mqnic_prepare_rx_desc(ring, ring->head_ptr & ring->size_mask);
if (ret)
break; break;
ring->head_ptr++; ring->head_ptr++;
} }
@ -272,6 +283,8 @@ void mqnic_refill_rx_buffers(struct mqnic_ring *ring)
// enqueue on NIC // enqueue on NIC
dma_wmb(); dma_wmb();
mqnic_rx_write_head_ptr(ring); mqnic_rx_write_head_ptr(ring);
return ret;
} }
int mqnic_process_rx_cq(struct mqnic_cq *cq, int napi_budget) int mqnic_process_rx_cq(struct mqnic_cq *cq, int napi_budget)