提交 9500acc6 编写于 作者: H Harini Katakam 提交者: Jakub Kicinski

net: macb: Increment rx bd head after allocating skb and buffer

In gem_rx_refill rx_prepared_head is incremented at the beginning of
the while loop preparing the skb and data buffers. If the skb or data
buffer allocation fails, this BD will be unusable BDs until the head
loops back to the same BD (and obviously buffer allocation succeeds).
In the unlikely event that there's a string of allocation failures,
there will be an equal number of unusable BDs and an inconsistent RX
BD chain. Hence increment the head at the end of the while loop to be
clean.

Fixes: 4df95131 ("net/macb: change RX path for GEM")
Signed-off-by: NHarini Katakam <harini.katakam@xilinx.com>
Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
Signed-off-by: NRadhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Reviewed-by: NClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220512171900.32593-1-harini.katakam@xilinx.comSigned-off-by: NJakub Kicinski <kuba@kernel.org>
上级 d40dcaa4
...@@ -1219,7 +1219,6 @@ static void gem_rx_refill(struct macb_queue *queue) ...@@ -1219,7 +1219,6 @@ static void gem_rx_refill(struct macb_queue *queue)
/* Make hw descriptor updates visible to CPU */ /* Make hw descriptor updates visible to CPU */
rmb(); rmb();
queue->rx_prepared_head++;
desc = macb_rx_desc(queue, entry); desc = macb_rx_desc(queue, entry);
if (!queue->rx_skbuff[entry]) { if (!queue->rx_skbuff[entry]) {
...@@ -1258,6 +1257,7 @@ static void gem_rx_refill(struct macb_queue *queue) ...@@ -1258,6 +1257,7 @@ static void gem_rx_refill(struct macb_queue *queue)
dma_wmb(); dma_wmb();
desc->addr &= ~MACB_BIT(RX_USED); desc->addr &= ~MACB_BIT(RX_USED);
} }
queue->rx_prepared_head++;
} }
/* Make descriptor updates visible to hardware */ /* Make descriptor updates visible to hardware */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册