Skip to content

Commit 4c49f38

Browse files
Russell King (Oracle)kuba-moo
Russell King (Oracle)
authored andcommitted
net: stmmac: fix TSO DMA API usage causing oops
Commit 66600fa ("net: stmmac: TSO: Fix unbalanced DMA map/unmap for non-paged SKB data") moved the assignment of tx_skbuff_dma[]'s members to be later in stmmac_tso_xmit(). The buf (dma cookie) and len stored in this structure are passed to dma_unmap_single() by stmmac_tx_clean(). The DMA API requires that the dma cookie passed to dma_unmap_single() is the same as the value returned from dma_map_single(). However, by moving the assignment later, this is not the case when priv->dma_cap.addr64 > 32 as "des" is offset by proto_hdr_len. This causes problems such as: dwc-eth-dwmac 2490000.ethernet eth0: Tx DMA map failed and with DMA_API_DEBUG enabled: DMA-API: dwc-eth-dwmac 2490000.ethernet: device driver tries to +free DMA memory it has not allocated [device address=0x000000ffffcf65c0] [size=66 bytes] Fix this by maintaining "des" as the original DMA cookie, and use tso_des to pass the offset DMA cookie to stmmac_tso_allocator(). Full details of the crashes can be found at: https://lore.kernel.org/all/[email protected]/ https://lore.kernel.org/all/klkzp5yn5kq5efgtrow6wbvnc46bcqfxs65nz3qy77ujr5turc@bwwhelz2l4dw/ Reported-by: Jon Hunter <[email protected]> Reported-by: Thierry Reding <[email protected]> Fixes: 66600fa ("net: stmmac: TSO: Fix unbalanced DMA map/unmap for non-paged SKB data") Tested-by: Jon Hunter <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]> Reviewed-by: Furong Xu <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 0f6ede9 commit 4c49f38

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4192,8 +4192,8 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)
41924192
struct stmmac_txq_stats *txq_stats;
41934193
struct stmmac_tx_queue *tx_q;
41944194
u32 pay_len, mss, queue;
4195+
dma_addr_t tso_des, des;
41954196
u8 proto_hdr_len, hdr;
4196-
dma_addr_t des;
41974197
bool set_ic;
41984198
int i;
41994199

@@ -4289,14 +4289,15 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)
42894289

42904290
/* If needed take extra descriptors to fill the remaining payload */
42914291
tmp_pay_len = pay_len - TSO_MAX_BUFF_SIZE;
4292+
tso_des = des;
42924293
} else {
42934294
stmmac_set_desc_addr(priv, first, des);
42944295
tmp_pay_len = pay_len;
4295-
des += proto_hdr_len;
4296+
tso_des = des + proto_hdr_len;
42964297
pay_len = 0;
42974298
}
42984299

4299-
stmmac_tso_allocator(priv, des, tmp_pay_len, (nfrags == 0), queue);
4300+
stmmac_tso_allocator(priv, tso_des, tmp_pay_len, (nfrags == 0), queue);
43004301

43014302
/* In case two or more DMA transmit descriptors are allocated for this
43024303
* non-paged SKB data, the DMA buffer address should be saved to

0 commit comments

Comments
 (0)