Skip to content

Commit 66600fa

Browse files
Furong XuPaolo Abeni
authored andcommitted
net: stmmac: TSO: Fix unbalanced DMA map/unmap for non-paged SKB data
In case the non-paged data of a SKB carries protocol header and protocol payload to be transmitted on a certain platform that the DMA AXI address width is configured to 40-bit/48-bit, or the size of the non-paged data is bigger than TSO_MAX_BUFF_SIZE on a certain platform that the DMA AXI address width is configured to 32-bit, then this SKB requires at least two DMA transmit descriptors to serve it. For example, three descriptors are allocated to split one DMA buffer mapped from one piece of non-paged data: dma_desc[N + 0], dma_desc[N + 1], dma_desc[N + 2]. Then three elements of tx_q->tx_skbuff_dma[] will be allocated to hold extra information to be reused in stmmac_tx_clean(): tx_q->tx_skbuff_dma[N + 0], tx_q->tx_skbuff_dma[N + 1], tx_q->tx_skbuff_dma[N + 2]. Now we focus on tx_q->tx_skbuff_dma[entry].buf, which is the DMA buffer address returned by DMA mapping call. stmmac_tx_clean() will try to unmap the DMA buffer _ONLY_IF_ tx_q->tx_skbuff_dma[entry].buf is a valid buffer address. The expected behavior that saves DMA buffer address of this non-paged data to tx_q->tx_skbuff_dma[entry].buf is: tx_q->tx_skbuff_dma[N + 0].buf = NULL; tx_q->tx_skbuff_dma[N + 1].buf = NULL; tx_q->tx_skbuff_dma[N + 2].buf = dma_map_single(); Unfortunately, the current code misbehaves like this: tx_q->tx_skbuff_dma[N + 0].buf = dma_map_single(); tx_q->tx_skbuff_dma[N + 1].buf = NULL; tx_q->tx_skbuff_dma[N + 2].buf = NULL; On the stmmac_tx_clean() side, when dma_desc[N + 0] is closed by the DMA engine, tx_q->tx_skbuff_dma[N + 0].buf is a valid buffer address obviously, then the DMA buffer will be unmapped immediately. There may be a rare case that the DMA engine does not finish the pending dma_desc[N + 1], dma_desc[N + 2] yet. Now things will go horribly wrong, DMA is going to access a unmapped/unreferenced memory region, corrupted data will be transmited or iommu fault will be triggered :( In contrast, the for-loop that maps SKB fragments behaves perfectly as expected, and that is how the driver should do for both non-paged data and paged frags actually. This patch corrects DMA map/unmap sequences by fixing the array index for tx_q->tx_skbuff_dma[entry].buf when assigning DMA buffer address. Tested and verified on DWXGMAC CORE 3.20a Reported-by: Suraj Jaiswal <[email protected]> Fixes: f748be5 ("stmmac: support new GMAC4") Signed-off-by: Furong Xu <[email protected]> Reviewed-by: Hariprasad Kelam <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent f84ef58 commit 66600fa

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4304,11 +4304,6 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)
43044304
if (dma_mapping_error(priv->device, des))
43054305
goto dma_map_err;
43064306

4307-
tx_q->tx_skbuff_dma[first_entry].buf = des;
4308-
tx_q->tx_skbuff_dma[first_entry].len = skb_headlen(skb);
4309-
tx_q->tx_skbuff_dma[first_entry].map_as_page = false;
4310-
tx_q->tx_skbuff_dma[first_entry].buf_type = STMMAC_TXBUF_T_SKB;
4311-
43124307
if (priv->dma_cap.addr64 <= 32) {
43134308
first->des0 = cpu_to_le32(des);
43144309

@@ -4327,6 +4322,23 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)
43274322

43284323
stmmac_tso_allocator(priv, des, tmp_pay_len, (nfrags == 0), queue);
43294324

4325+
/* In case two or more DMA transmit descriptors are allocated for this
4326+
* non-paged SKB data, the DMA buffer address should be saved to
4327+
* tx_q->tx_skbuff_dma[].buf corresponding to the last descriptor,
4328+
* and leave the other tx_q->tx_skbuff_dma[].buf as NULL to guarantee
4329+
* that stmmac_tx_clean() does not unmap the entire DMA buffer too early
4330+
* since the tail areas of the DMA buffer can be accessed by DMA engine
4331+
* sooner or later.
4332+
* By saving the DMA buffer address to tx_q->tx_skbuff_dma[].buf
4333+
* corresponding to the last descriptor, stmmac_tx_clean() will unmap
4334+
* this DMA buffer right after the DMA engine completely finishes the
4335+
* full buffer transmission.
4336+
*/
4337+
tx_q->tx_skbuff_dma[tx_q->cur_tx].buf = des;
4338+
tx_q->tx_skbuff_dma[tx_q->cur_tx].len = skb_headlen(skb);
4339+
tx_q->tx_skbuff_dma[tx_q->cur_tx].map_as_page = false;
4340+
tx_q->tx_skbuff_dma[tx_q->cur_tx].buf_type = STMMAC_TXBUF_T_SKB;
4341+
43304342
/* Prepare fragments */
43314343
for (i = 0; i < nfrags; i++) {
43324344
const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

0 commit comments

Comments
 (0)