From nobody Wed Apr 8 04:41:04 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 D079B3EAC6A for ; Tue, 10 Mar 2026 21:22:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773177775; cv=none; b=VtbiYlPCzdgVQGoqIwxomWQAfquQWx1Mdwx3i5Z2nITSM8dYcQb9GTou3KJ4vCpSTe3sIWA6ThfywfEo9qczyZTeu9ALkb2MXpmOSsVjYs5ahXiKPJMwx6CSW/cEPAXbiLm8gHZYGZogZG9XV35iM9an1xPIySDDsd6YDHOzkSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773177775; c=relaxed/simple; bh=DcJ0BGCersFrhp9VNVWRnvjOToN0C6ltP0u8NNPqSUU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ajv4Hy8YNRSw0inIpgZTP3ZnC1bpEnKg2digtrVW4s/S00E1ZTxUO/E9FawtzdQzb9ZAgfw+CQq7OPccHqwSiXD/irswwGUcnkAUsIE1c0SgfJOlCv4xlr/hidsFIE/Cen6WNcBskiJ4MMkV3GaCdmmUtr9K4cypZ/tHBtPsroA= 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.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=eRUilQAn; arc=none smtp.client-ip=209.85.210.179 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.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="eRUilQAn" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-829a568f3ccso2362828b3a.0 for ; Tue, 10 Mar 2026 14:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773177771; x=1773782571; 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=MsF+ejVwY/S1YOmLcgZAjHITHgFQNlN9mt3hAKMMsTQ=; b=eRUilQAnd3BT2AfN13wpviVz2IcV+OcnRYfCJSOh15m1Qit80Fp1vUU1hPN2sE48tm TpEe1Ps4lm6PMxAAukD5bKI5/ydurCeP15KhZDJGYkcgMzLy8wlt2drPP/V/dShozV/H rLd0K0s8QBQRagSkMe4p8SgKjdlEqPT22ary5pM6zf7uMZRJzUIj/JA+MoqQYuIuiblu wyrJI/6wenxCZLhZQqLEzelu6NLYFzE3d+emhoeqZ7QotBbtdEUNscgKI66BgSawx7bw mtESwUM+RYbtxjXN2dJn0Bpwnd36AVsmdM8Ow+ma9RWZZWWiGCNsqdJfYg7oeOFd2Qti LJqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773177771; x=1773782571; 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=MsF+ejVwY/S1YOmLcgZAjHITHgFQNlN9mt3hAKMMsTQ=; b=PrWJiSEsePnaay9Qp4wqvr+8zBkM5NRelQjfbLOlR/UioSPJXXDz1o/iKG3YzQ2RI2 199S6NfNymk3ZUEklPCZiYXkZ8WRmxQVF4driyufheoBYQI39PXth4tP0UYFTkfNOKrL zshuyozY6rYS0PlUxEQlc8s11brdJKPKeAIL0NwnZab0EQ+A0r+5eoM+33qrO8Kd7haw +kUZfsWkjc7kPPH4Kx4GAGMQG52fDEW2Ybw4WCXXgTd7W1SLKZAMijb0p8V1zU5a54A+ HgeN6/6grF26OQxJxVd3+MlhtzUcdH4s9RvT4jPcMkyLX/cGKQM1tvpy2CT1geaDgqwM JNjg== X-Gm-Message-State: AOJu0Yy5M24/qKOikPwNLn17hz1RCN4pGEt9kbYvPL0g4ktlJTlwEqwr jGvv1tPIjpad+RYHNTbzhxU/zxGX8KXndr7IQJoDkfLAuQF6P/cmqAoViXH7f6GdEf8= X-Gm-Gg: ATEYQzyzvyWj6W4CoLgUV6nhlt3rsZ0uTL7Ibj5uzb5dt+rmEyqyiCPj9QIsPtnUKH2 ecPu+JWECXQvPKNfARdSINwk6bPBCASzuFhjLVoMpawjmm7lTukRq6CQKaZa7yY9uyztot4v1u6 Sj2VUtQgkveGgMg+YNsCVWMUpWArmYkEJB3SA7jSub6TgoO6JNb7oi512Xiom8Y6JS66W68h/Ax gOoYoVe1H4g0q1p82z2DRUKVIONgdj69uxkgbj7jaIEPe4yIc7tfu4nicuzyiSsQqMeFytp36nG CXo1OqMPgrE3aaMYOVjgVG+QWA8tgc9bb0RcuhzfbxykReHQzbSjRrr/9DOCO+t1LVPq1InyLRv A7DJxzPLSxCDmd5UlvY89Mu+rOKscaf7zeLPGUeKkP+jgXnu/WpTa7AABvWBZNxRb4u6vDRYU9A fgXgw= X-Received: by 2002:a05:6a20:729e:b0:398:c1d8:f584 with SMTP id adf61e73a8af0-398c616642dmr51010637.62.1773177771100; Tue, 10 Mar 2026 14:22:51 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c73cdf24baasm126350a12.8.2026.03.10.14.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 14:22:50 -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: linux-kernel@vger.kernel.org, Joe Damato Subject: [RFC net-next 05/10] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Tue, 10 Mar 2026 14:21:53 -0700 Message-ID: <20260310212209.2263939-6-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260310212209.2263939-1-joe@dama.to> References: <20260310212209.2263939-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 Signed-off-by: Joe Damato --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 51 ++++++++++++++--------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index c52db7135ded..b801daf3f328 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -657,6 +657,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 @@ -721,6 +722,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 @@ -810,7 +812,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 @@ -845,19 +848,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)) { @@ -3436,23 +3447,25 @@ 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_unmap_single(&pdev->dev, + dma_unmap_addr(tx_buf, mapping), + dma_unmap_len(tx_buf, 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)) + netmem_dma_unmap_page_attrs(&pdev->dev, + dma_unmap_addr(tx_buf, + mapping), + dma_unmap_len(tx_buf, + len), + DMA_TO_DEVICE, 0); } dev_kfree_skb(skb); } --=20 2.52.0