From nobody Thu Apr 2 20:21:27 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 F11912D949C for ; Wed, 1 Apr 2026 23:38:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086684; cv=none; b=M6tuftkIU+H3Bi9QpBReTIoKGNOtxnBbF7a9TRO0mDk0AFF9o8udBTgBs3ItSYogCnQ97FV8xf1gBd/Evh0OfNlhTiIK7LZQd7KDxZdg2cWT3DzdFuwPoVbiMaTNDCO8+wAKpfAar1gl6+1QhB8coF+Bmkg4g6iDvpUH9J6t8HM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086684; c=relaxed/simple; bh=/QG4rq6stvRVzMtzKT515AeU34mX0x35NxKPcHuNDVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e+y31t59kLa9x+N0HzIqlUdj93aALog9WnDzsS8x0gurrL2Ict3OA/uCA5aSFPNm8jVkAOF1xDVXRg1qMZ/66V3ih6HGENJT7KBJGX7hgF9RnOScv4cCpyZn95XfkmuAWD625eP3jyEfqx3+sIDwkCz1YXzU7mo14tFp4Jupdb4= 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=pzadqI+x; arc=none smtp.client-ip=209.85.214.175 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="pzadqI+x" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2a871daa98fso1823765ad.1 for ; Wed, 01 Apr 2026 16:38:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086681; x=1775691481; 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=EvCUZz78UoCDWGO4l29n8jMLaU+MzNVlLAG9l7O/Ufo=; b=pzadqI+x+pxNtLLILzI2seV+tNyFyg3rbUvpuaFSGrp1CfWKlANLc6KNz0KNDfbPns 004lNWl+YdwV5EVWt0kBkKqNGKF3nvXMui/MyQ/yTSajNxIflGSnVx9EGcuy+gWvfDRV UeNO1uGZUka4SxE1OuDR+W7JoYviQf0rAtT1EgX24tTeEV7Fv+LF2L+PEVnHjEO92CcY H/hZE1b+uOlzIgWia+BSiIzcdJF9+UF45SCt+oEVLCCEwKsnJREt6OZrImwlh70Mz/ME nKzK6iM9+8vDy6zT6RSxCDOXqJVUqO3iH7X27w7hcgn+kY5m4GPwTDH4oOnjKUwj8FAE SiFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086681; x=1775691481; 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=EvCUZz78UoCDWGO4l29n8jMLaU+MzNVlLAG9l7O/Ufo=; b=QFkkcgk0Kw4RIqCUVwzQDlAoKbmp1akoBeD/DCKxr3/i9kMz0kuh7E5ZbiQRNHM2d1 wG+LJA26dpckZbzZhcBP2HiQOmu8Imz77iBu5y5Jt4MRdqaA0QMCmk3gQGyqxRnN+W8c 9auLSOnpU4iA7JLfLGLzZ7BVFv4TF5B7MNB73xyqsYSY4d8pgPPk6MzAdLgvTvoI42bY dt7RLcqI3LTlHcKS1gjcdUyFYdosl/KEk2Ml9i+ruolN3Z8o/5oITUk8RV2fmj4Ha7eE 4o5HQUn9pGX8dRGpMCy3xO9oUwjo6TxB7PN3EoZlFnL2nrSWhSDZ7lKR5GSpav/04QJY KUnw== X-Forwarded-Encrypted: i=1; AJvYcCUNULHPFW3rRSK859hcZrc1qKPJ0ngV0DRSzAgRkwxDvqkEyxQOvdm18fdB1ZAQmeZzJkntthTkqNwveys=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4oRvXnYXu5dQLfBeQV0zUjNruYWuudRU2OQuA62/oTWJl8Gg2 OO7Fk0IoO07EXnXhF7jop66JibJzEfuOpaRSbP7vHDdDOYu0iN1yKI3uEzCJOCKbCwI= X-Gm-Gg: ATEYQzzzKK6ra0OfEKVSrlsGEWF+D1TUDhA2RwoFVZL6k67k0sfPh5cinYJRNb40e27 CJJzu/SolGoemmh9EzxbC1ioCFt22Zrb2YwqOYuvJaNS0EkKEg0YQ+foQ1NUKlOLjT+otjdivSo wu1XddqNaFplVgA8hSgmf1WeYLm37izrMMXwRauzUHQFrkzzDbaHCBYN3iXuf3ld/lhg7mOsQbt HuNujo5ZNNcp39mJwr5kFmzwmt0j6CAeUiASylJU8HuTGgyNWurBTVc3j4K9B4b9xBzGPkhRmU9 pZqzYlR4oseZ1lcHaplDbe28NUFex6Xh5IWf2RDC6nQjei23g4RM9Br6gDRbnbgaBSbAjAp9qlG Iut+2+O6Xo5paS8EVU9sqm2KdCxLhnaW+nmcAzLEvyItdH8kB5fJ2+tCiHE86N+ocTM4KemtR8i chFwyOypSn5Ooqw0E= X-Received: by 2002:a17:902:c945:b0:2b2:5503:1b8d with SMTP id d9443c01a7336-2b269a8c563mr58851845ad.6.1775086681354; Wed, 01 Apr 2026 16:38:01 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:44::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2749b2423sm9869335ad.67.2026.04.01.16.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:38:00 -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 v7 04/10] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Wed, 1 Apr 2026 16:37:32 -0700 Message-ID: <20260401233745.2333858-5-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 6abe4bef8afd..acd76d9bf403 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