From nobody Thu Apr 9 18:55:12 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC92836F42E; Fri, 6 Mar 2026 06:18:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772777901; cv=none; b=VtpYKMvJ99uHq82agmVfO/5fKqzVbYCTK0mCQWrPvo6XFY57d+TtLiXW3rAUuQ1w+jIwrUkSEEYd8ePvA7/phMGLefd+K8a7BiJKy5Cose3A07SsanJo1WqP4qBAZoAoXPGYq4rvr9IaDV1/r1Gc/1i27hzDkPczmOFMU7cxqik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772777901; c=relaxed/simple; bh=uTeKMHJ3rEGJkdXw1TuZbblDVL9wqS+DDqNqwSngy0k=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=THq/Jt8ob7M+Z4C3uxXipqY8EVG0BrLL+PR6DYH7nbuljJBcItrufTCT4w774CRNW1tAdlxdSnOGYwiUNmbksdXttE9eNlI4B2MPaum3WywrE8p5acoPAgHThIi5wm7SGsuSgDC03Pl7SBT9THZJRjEvdsHhF5t1ibNNLrFtU1U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=bmSWtd/F; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="bmSWtd/F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=1e WQetRKBATVmII+lfHWjD+l426wMkib6aQ0CWLE+GM=; b=bmSWtd/FY2fh1JkIL2 qnJtPgThe7Ed9sNaigF8jGBF8EbJq8FhrMzd7uhCxFyyhRVnYn/i1qIZ/1MQ08/a tbvKSDA6mRLcF949dD6yfYz5D+i5+W/AL9dyIjDPQ3ZQhXX3TnLN8RLvX3CvgQHL Rj1u2AQV5uNCqiVayNgzu/tcY= Received: from pek-lpg-core6.wrs.com (unknown []) by gzsmtp1 (Coremail) with SMTP id PCgvCgBHNfV3cappGPACQg--.1548S2; Fri, 06 Mar 2026 14:17:28 +0800 (CST) From: Rahul Sharma To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "Russell King (Oracle)" , Jon Hunter , Thierry Reding , Furong Xu <0x1207@gmail.com>, Jakub Kicinski , Rahul Sharma Subject: [PATCH 6.1.y] net: stmmac: fix TSO DMA API usage causing oops Date: Fri, 6 Mar 2026 14:17:26 +0800 Message-Id: <20260306061726.712258-1-black.hawk@163.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PCgvCgBHNfV3cappGPACQg--.1548S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxWFW3WryrGr15Cr45ZFyUAwb_yoW5KF17pF W3ua1Skrn8tr47Jw4kGw4ruF98Kay5KayDK3y8G343uay7trnI9FySgFWaqFWDurn5uF12 yr1j93WqkF4DJ37anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRDrc7UUUUU= X-CM-SenderInfo: 5eoduy4okd4yi6rwjhhfrp/xtbC+Rl-GWmqcXkFsQAA35 Content-Type: text/plain; charset="utf-8" From: "Russell King (Oracle)" [ Upstream commit 4c49f38e20a57f8abaebdf95b369295b153d1f8e ] Commit 66600fac7a98 ("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=3D0x000000ffffcf65c0] [size=3D= 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/d8112193-0386-4e14-b516-37c2d838171a@nvidia.com/ https://lore.kernel.org/all/klkzp5yn5kq5efgtrow6wbvnc46bcqfxs65nz3qy77ujr5t= urc@bwwhelz2l4dw/ Reported-by: Jon Hunter Reported-by: Thierry Reding Fixes: 66600fac7a98 ("net: stmmac: TSO: Fix unbalanced DMA map/unmap for no= n-paged SKB data") Tested-by: Jon Hunter Signed-off-by: Russell King (Oracle) Reviewed-by: Furong Xu <0x1207@gmail.com> Link: https://patch.msgid.link/E1tJXcx-006N4Z-PC@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski [ The context change is due to the commit 041cc86b3653 ("net: stmmac: Enable TSO on VLANs") in v6.11 which is irrelevant to the logic of this patch. ] Signed-off-by: Rahul Sharma --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index b5de07b84f77..ca95944f247f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4126,10 +4126,10 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *= skb, struct net_device *dev) int tmp_pay_len =3D 0, first_tx; struct stmmac_tx_queue *tx_q; bool has_vlan, set_ic; + dma_addr_t tso_des, des; u8 proto_hdr_len, hdr; unsigned long flags; u32 pay_len, mss; - dma_addr_t des; int i; =20 tx_q =3D &priv->dma_conf.tx_queue[queue]; @@ -4214,14 +4214,15 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *= skb, struct net_device *dev) =20 /* If needed take extra descriptors to fill the remaining payload */ tmp_pay_len =3D pay_len - TSO_MAX_BUFF_SIZE; + tso_des =3D des; } else { stmmac_set_desc_addr(priv, first, des); tmp_pay_len =3D pay_len; - des +=3D proto_hdr_len; + tso_des =3D des + proto_hdr_len; pay_len =3D 0; } =20 - stmmac_tso_allocator(priv, des, tmp_pay_len, (nfrags =3D=3D 0), queue); + stmmac_tso_allocator(priv, tso_des, tmp_pay_len, (nfrags =3D=3D 0), queue= ); =20 /* In case two or more DMA transmit descriptors are allocated for this * non-paged SKB data, the DMA buffer address should be saved to --=20 2.34.1