From nobody Mon Apr 6 18:29:07 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 BE2193F1665 for ; Wed, 18 Mar 2026 19:13:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861227; cv=none; b=PzJ4nkvk0e03wmDkmZiTdlXiWVLY6w863cxUMUq9e5PCbzOBNzBHhV4X+JcS50tgSmAErnti0ahKiqn0+tO5Nu+hITdnU5i+qjUmgYup5wvYY5aWfIvBfObrQUYcC2w85tEdcUuzvdH2CXSnmxkwUi1V1jI1QDzi/Y7C2lJaIws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861227; c=relaxed/simple; bh=qLU6Qupx3PDp3jST+ZazaL48meSvYnVw5Dt9vzCSwFk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HRISGpvt7skMA+j/PUbVTwg1RamR+YoSZDq3+qNfbSPo7LOqHL/BSlfnwDHPJ89cLTqbZkmhVgmI2Dn1DxD/rmVeW0mikVq2LyoTPtwcxxWhcHvBUt0XCkiGCBQg44IaNBZOvyDI1hLM5bNcO4DuoHSz3PyhBga6JDgJpqo81hg= 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=vrMNtvCw; arc=none smtp.client-ip=209.85.214.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="vrMNtvCw" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2ab077e3f32so616035ad.3 for ; Wed, 18 Mar 2026 12:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861224; x=1774466024; 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=WJyTxUd6u+yzwsu9Uzqyo58WkKimIItw6uQu3GFh36E=; b=vrMNtvCwZDGjuAg0ICWh+24CTCtB3hYRe6LKdh+5QQQxQa7GMEMFFH/JOdCsNnehKE BENRnQNMK6Ni1MY8PXlZ6J+4r/47HvzmmkZp9cl9q68g9/GE3/8NuXrg4XTZA7SviD7i tYekp3T0eIXEYllVaUjeLGIi7Pptee1gGxI5ISnHRMuS4g8UNpIpI2UD8GvRrijpnYmM lJZ/7O/d+oQcQ95SAZ6QpMwkZBWXmTZyZgDiU3cyX/ILwXyvaf9+RyL5HqVP9XGBARCF +dZF6sCkcM6oleEGcmk12xRmhPuFjiCNfw1pEuUDDh4gKZoKA1jPnGvKcVTSIuptvrF1 5mPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861224; x=1774466024; 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=WJyTxUd6u+yzwsu9Uzqyo58WkKimIItw6uQu3GFh36E=; b=Xgb9yfIHhngAuEM6Dq4kWA6Jw8FHYCh+dHn7piombqaG0ZOzbqrW6nb6udSlZsM5o7 R7BQ8NIGKoPLdOugyhpM/dGsP7l7RnDX/k4z4BU4nhC6RuDqNHyK7sdpEoo593JiuCEL 76Dj6hgC8hezyzEB/Vjuxv2X9D3nJ7pP0DRshR7mcOT1/D4dHfccxb4vI2SYHkV5LZwR JDF/RPqFb5zbvna0Hl0UqrHZXhXuol40iqz/FTIegY0HYyZ58mmwDvapUfyt14XsDGwZ PM9quAI99wTliwlHiElV391+AlpH8EkJ7KkeiT2auSoIIVg3lvNNPJrwMRKVGUaEKupu /x9w== X-Forwarded-Encrypted: i=1; AJvYcCV3QT4UKWHWLvfWKN6+llU24TCAFlU2Wj/WGVcaFGScAJdOQvKnFfttX1IRjveFQ4dLHUnqJa3ecXzpObc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1gwsPFYDYfSU0DG6DLy7o8ZQ+Dx1pQTNDRUAy7AIS6+Gq4fra YAWeLekNhu0pcwviazflAwjwZYJd0SizR4zXJOfSiMFVP1gBG1ssh0tz/6eFKKBWaOIYyMg3+gx gg3DIAzw= X-Gm-Gg: ATEYQzzbiDGaJVzAJZ27Q2QejOR0259xwBwVbPwOvuiO607BrW+uQND+OCF1w56iIj7 asLjtxFEHVHatXcVvnPmwLSaAm+ETVg7w9DH5jvBQP/aKA0lFP5IdeqvMlqEkFjXZ7xnkCAWYsV B9QjJflSNUxJgZGy/+khBts+T/QLPVUkDFmCWEXWuSAoaZ4tE5ktjkh36IY/hDG+Vs0FElsqNhg TkKbEi0+Q9JFn0fb62ad5thjD5rQcqOhOuTcMfoepcutmJCLWNnvc2Twwamhmv1IJKNP8HOQ/2u lmGfjUOiQqMK3WSkJXQIGZ0UpOEFuexCCCfKAECbxG0IJlaOTTF+KhSmU0yqJF3kF60gJIukXB0 0cjNanC/pADU0LpTsAHh/Yu7V2l7DKdIOS425CBSLWPXqZZlZoJYH7fXiSbYR2pVmx5wZSLbKdO dEohdY X-Received: by 2002:a17:903:8d0:b0:2b0:5738:9817 with SMTP id d9443c01a7336-2b06e3d2f5amr51358485ad.31.1773861223849; Wed, 18 Mar 2026 12:13:43 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b0704ccc67sm29706125ad.15.2026.03.18.12.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:43 -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 v3 05/12] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Wed, 18 Mar 2026 12:13:10 -0700 Message-ID: <20260318191325.1819881-6-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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 Reviewed-by: Pavan Chebbi --- rfcv2: - Use some local variables to shortern 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 d12e4fcd5063..ea8081aeb5ae 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)) { @@ -3400,6 +3411,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 @@ -3410,10 +3423,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; @@ -3435,23 +3448,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