From nobody Sun Apr 5 18:08:29 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6ABFC263C8F for ; Fri, 3 Apr 2026 00:35:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176556; cv=none; b=oGq7FGIEODX7p092zYIz/2E3R7oW2Fmvg5bfGh9sAJfXWDCY/RaNgCCiKDUwiQ0LOXleeWMnerN3KfHcpqH+83M82hEIcBicjhQ0El+G3pKUI0n1sjpiFu6DhKW61bO8cMEaWh//V2BEBvln8R1L03LgvqIHdIdtaiolmvZP5Iw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176556; c=relaxed/simple; bh=OUk9q5Arkhanj5HtzwfH5k7t5KwEKJDygKJt0djc3kM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BGaUWIqAChEZFK9RpkD+3WwsgbMOLSQAYktsbk6Nd3Xx4Tk3LLji3TKJPRV5MEBDXHOc7cmPF1PD2zthmo2XTkGPb/w7qLtiPM7T3gpLstepGRvUPwSFNen1WMWwSCmNazebXgiQmTmG7r5KkzHIld3/JapkH6dFpblBF7rkr4s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20251104.gappssmtp.com header.i=@dama-to.20251104.gappssmtp.com header.b=UDZK5rbU; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20251104.gappssmtp.com header.i=@dama-to.20251104.gappssmtp.com header.b="UDZK5rbU" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2b258d93ffeso8416705ad.3 for ; Thu, 02 Apr 2026 17:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176555; x=1775781355; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ErHvbnQsFM396o0wOypHE+KSBfNaqH86ZoLPZibNI5c=; b=UDZK5rbUGHpRfDsIgWCQEp5bvnaMwrZb+jSrzUfiJBaw3aqk2Xmc8r7BW6Ti2dg0vb au8TMpGaSBLuOcdd/19IoFs9slDRNiisedsfK3aXb7aMlcId9LiFkG+knaiJ99M/QwK/ +s2mvyFvwfs1m79vDZ4WbU0j5TFTm538xG1OopUfI7/kXN2spuvQKsPlK2LJCW0Zbhp4 LhQDom7F6f75GEeytvz2QR/kLz5osTsRMDAZJlckVLaVYktLJVXsHjiEabfl6c6pJgVf UZVO2kOCvgcDuA5g3tprZE6wgyZRbxYM22b2DAgCeU9HpRcZXV2nMWi+0Nkzqwpp/VkN 4/sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176555; x=1775781355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ErHvbnQsFM396o0wOypHE+KSBfNaqH86ZoLPZibNI5c=; b=hXatoGcyUIVjCnYtejOftyTFa+xmHiz11XHjcgyN43G/PXT/REfN+zhYBUZ+lBvzeg FNAJbaAt6mrFNRaZbvYnsM+MOpxEysJURK6hpaDW9eqVE241uvi6P5LYUffMC7YVH9QL sCg+fHKeWAA6q7Queu5yLM11+TtiBYdCLUt4GxKq4lEO0Ve747bBiNwV2jOLTQ7VHpjC T9SC9pzIqCkP6GJLUYn+WgiOP01pTftuDyLucIzY4lPZKiHxvGyUULdyaSoVJ+fX0NRE uiu3h/WYpWiihFtGoQBshfiROqGgWDLJ3iF7ISqAlFxNv10+F1/Vz4E6/v71NnyUXTBp jZHg== X-Forwarded-Encrypted: i=1; AJvYcCUV711xK8SJaOtj6CJGn5N/vd6Jr92ElT0ON9D5smzCj0KLvRPAj5x8P3mJXcqsX6qPaXuxplUa16JaBnk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8YZpZHR5COJPs4x6Ul/m1OXt3jUTnvCug/UJDJDc/KXnhPGHR 8Efb18AMM6aBq61T7viWhLSc1MxAVZMuNtimPjuKZv3LEImQ8SarUv4gzRhozqGSJqM= X-Gm-Gg: AeBDietSsTQKoOtXJCrICHMjcNTomNeZD/Wh5mgCFlCzbcepf3hj95xC7sDaDLF2Uup B50IoXn9LYfyzOCj41bNUSgTvfz3LprU3v5tMxyvonHotCo8NLrkzhYqdzZATuC6dCaUaKrdrZu ARKDpltfWMLNCCSci/Ds5fugGxdY6/wP1p13kFOIt2uXoTrzgPHqQuaE3uIXAgSp7p8grGUFdIp oYpljRLWVzhw3KybyhdI4sokK5W01ld/v13kAZvtFEsUAH5wuj+ESMNHFRR2Ck2ftOMTJnAf6MM 0e1hCenpbN7CxfjGh5AE9T+c+1lRX8WEjVlP1NJEsVc8IICVdav8g6sFRHL4YMF6kgd1NSxOZgk WocJ+acWowaYUeDjWB7RJ4Yo1fkhWWbI8mXElBzrucAswHN2rHg3k/2mEZMMUFHUlUaLADN7M3l nnFpE= X-Received: by 2002:a17:903:b8d:b0:2ae:fc60:2650 with SMTP id d9443c01a7336-2b2817b24c3mr11828475ad.39.1775176554885; Thu, 02 Apr 2026 17:35:54 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b27472d688sm41830405ad.8.2026.04.02.17.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:35:54 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, Michael Chan , Pavan Chebbi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: horms@kernel.org, linux-kernel@vger.kernel.org, leon@kernel.org, Joe Damato Subject: [net-next v8 04/10] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Thu, 2 Apr 2026 17:35:11 -0700 Message-ID: <20260403003524.2564973-5-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-1-joe@dama.to> 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 Content-Type: text/plain; charset="utf-8" Store the DMA mapping length in each TX buffer descriptor via dma_unmap_len_set at submit time, and use dma_unmap_len at completion time. This is a no-op for normal packets but prepares for software USO, where header BDs set dma_unmap_len to 0 because the header buffer is unmapped collectively rather than per-segment. Suggested-by: Jakub Kicinski Reviewed-by: Pavan Chebbi Signed-off-by: Joe Damato --- v4: - Added Pavan's Reviewed-by tag. No functional changes. rfcv2: - Use some local variables to shorten long lines. No functional change f= rom rfcv1. drivers/net/ethernet/broadcom/bnxt/bnxt.c | 63 ++++++++++++++--------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index d1f0969b781c..32a0e71e9fb7 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -656,6 +656,7 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb,= struct net_device *dev) goto tx_free; =20 dma_unmap_addr_set(tx_buf, mapping, mapping); + dma_unmap_len_set(tx_buf, len, len); flags =3D (len << TX_BD_LEN_SHIFT) | TX_BD_TYPE_LONG_TX_BD | TX_BD_CNT(last_frag + 2); =20 @@ -720,6 +721,7 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb,= struct net_device *dev) tx_buf =3D &txr->tx_buf_ring[RING_TX(bp, prod)]; netmem_dma_unmap_addr_set(skb_frag_netmem(frag), tx_buf, mapping, mapping); + dma_unmap_len_set(tx_buf, len, len); =20 txbd->tx_bd_haddr =3D cpu_to_le64(mapping); =20 @@ -809,7 +811,8 @@ static bool __bnxt_tx_int(struct bnxt *bp, struct bnxt_= tx_ring_info *txr, u16 hw_cons =3D txr->tx_hw_cons; unsigned int tx_bytes =3D 0; u16 cons =3D txr->tx_cons; - skb_frag_t *frag; + unsigned int dma_len; + dma_addr_t dma_addr; int tx_pkts =3D 0; bool rc =3D false; =20 @@ -844,19 +847,27 @@ static bool __bnxt_tx_int(struct bnxt *bp, struct bnx= t_tx_ring_info *txr, goto next_tx_int; } =20 - dma_unmap_single(&pdev->dev, dma_unmap_addr(tx_buf, mapping), - skb_headlen(skb), DMA_TO_DEVICE); + if (dma_unmap_len(tx_buf, len)) { + dma_addr =3D dma_unmap_addr(tx_buf, mapping); + dma_len =3D dma_unmap_len(tx_buf, len); + + dma_unmap_single(&pdev->dev, dma_addr, dma_len, + DMA_TO_DEVICE); + } + last =3D tx_buf->nr_frags; =20 for (j =3D 0; j < last; j++) { - frag =3D &skb_shinfo(skb)->frags[j]; cons =3D NEXT_TX(cons); tx_buf =3D &txr->tx_buf_ring[RING_TX(bp, cons)]; - netmem_dma_unmap_page_attrs(&pdev->dev, - dma_unmap_addr(tx_buf, - mapping), - skb_frag_size(frag), - DMA_TO_DEVICE, 0); + if (dma_unmap_len(tx_buf, len)) { + dma_addr =3D dma_unmap_addr(tx_buf, mapping); + dma_len =3D dma_unmap_len(tx_buf, len); + + netmem_dma_unmap_page_attrs(&pdev->dev, + dma_addr, dma_len, + DMA_TO_DEVICE, 0); + } } if (unlikely(is_ts_pkt)) { if (BNXT_CHIP_P5(bp)) { @@ -3394,6 +3405,8 @@ static void bnxt_free_one_tx_ring_skbs(struct bnxt *b= p, { int i, max_idx; struct pci_dev *pdev =3D bp->pdev; + unsigned int dma_len; + dma_addr_t dma_addr; =20 max_idx =3D bp->tx_nr_pages * TX_DESC_CNT; =20 @@ -3404,10 +3417,10 @@ static void bnxt_free_one_tx_ring_skbs(struct bnxt = *bp, =20 if (idx < bp->tx_nr_rings_xdp && tx_buf->action =3D=3D XDP_REDIRECT) { - dma_unmap_single(&pdev->dev, - dma_unmap_addr(tx_buf, mapping), - dma_unmap_len(tx_buf, len), - DMA_TO_DEVICE); + dma_addr =3D dma_unmap_addr(tx_buf, mapping); + dma_len =3D dma_unmap_len(tx_buf, len); + + dma_unmap_single(&pdev->dev, dma_addr, dma_len, DMA_TO_DEVICE); xdp_return_frame(tx_buf->xdpf); tx_buf->action =3D 0; tx_buf->xdpf =3D NULL; @@ -3429,23 +3442,27 @@ static void bnxt_free_one_tx_ring_skbs(struct bnxt = *bp, continue; } =20 - dma_unmap_single(&pdev->dev, - dma_unmap_addr(tx_buf, mapping), - skb_headlen(skb), - DMA_TO_DEVICE); + if (dma_unmap_len(tx_buf, len)) { + dma_addr =3D dma_unmap_addr(tx_buf, mapping); + dma_len =3D dma_unmap_len(tx_buf, len); + + dma_unmap_single(&pdev->dev, dma_addr, dma_len, DMA_TO_DEVICE); + } =20 last =3D tx_buf->nr_frags; i +=3D 2; for (j =3D 0; j < last; j++, i++) { int ring_idx =3D i & bp->tx_ring_mask; - skb_frag_t *frag =3D &skb_shinfo(skb)->frags[j]; =20 tx_buf =3D &txr->tx_buf_ring[ring_idx]; - netmem_dma_unmap_page_attrs(&pdev->dev, - dma_unmap_addr(tx_buf, - mapping), - skb_frag_size(frag), - DMA_TO_DEVICE, 0); + if (dma_unmap_len(tx_buf, len)) { + dma_addr =3D dma_unmap_addr(tx_buf, mapping); + dma_len =3D dma_unmap_len(tx_buf, len); + + netmem_dma_unmap_page_attrs(&pdev->dev, + dma_addr, dma_len, + DMA_TO_DEVICE, 0); + } } dev_kfree_skb(skb); } --=20 2.52.0