From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 C54883815CF for ; Tue, 7 Apr 2026 22:03:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775599413; cv=none; b=r4KdeVynE3L1sTWN/l4UgvU81277wYY4eVLbinmd4rKZyKw0ESKR6rZSieIv0SMR0Yrvoo0D9grAmQ1Qp0kQtO+hEHLVr4raHLyrahOI+sce2Qqa8qIFPm0NHBJK+LPiO0+wmf/6ZW1IzZeomrFg6rr9j/dwu70173EObOX5KCw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775599413; c=relaxed/simple; bh=OUk9q5Arkhanj5HtzwfH5k7t5KwEKJDygKJt0djc3kM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ICWH0Ho4O6cF5yWdSvmnpkjIymXJMeqxHl4jKxoC2qULXpBSGDNjcW+f3vvGv/wN0kVvZdBFfiveMwEio4MxJO/UVtcRFGgfQa3w3SdLZEG3wDsZofSiJn1OKmjkFEZSf7A+/0jTHlslwPi3KKuUItGUWQDIxDeXRAQnfnH9Gz8= 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=GYJQ7ruw; arc=none smtp.client-ip=209.85.210.171 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="GYJQ7ruw" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-82a7539851fso2443669b3a.1 for ; Tue, 07 Apr 2026 15:03:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775599411; x=1776204211; 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=GYJQ7ruwj8IuMz0Ozwm723RHbKUTVZ23OG13rvyllVTHaaryQmAsf1hvM/pSl4U65t ULDS74axnhxO+Yq40kH/wqqd33KRL7CFNAd1bd2yBDgmsd5JP94RG4R/8nC4ehT2vk1p pUPA47U317MgZBVIS+bEEAy/gQQdMnezwA8o+ZpBf11PQwLwM+0VkExjyIANHHLvUa/m vSmF7V4dRzjuftm2i13Ib6ZLqoOM8A5jFebyZsFBoQA4LkxeZrTQGprCwnCOU6d115aG A0qQAh53wIASHt37tbevBgSTA2g00NKC55qw2ORQzZlOSHGPod5OdILi3QGFqVfoM0Cf JVOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775599411; x=1776204211; 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=BHIQNhqXSzXuTr4uDKyNnLPNTuTZ7yZtAUtQsSZpb1K98vYkjRQ5Pv2UrESxfN0nOB FWG1Ouh8m9jvUBGELKOtIwkuxZYEaNoItxdBwYig0LYIGo7CPpwMooMVSppxRAnSjcum cxteiW7NpgkmKZ/poOe0/6f1H+atcaqMboSO7NDZIHhCLjV9zA4CtkrlNFBtC+z0s/sW VDVLotTf7nUxteprrQIFU7YOs4kmC1DnfINWhcQ2YNIzUKXbgry6YdAbx+NeWEtwBF4u jO64skb2LZ8n0aukPhmx2GK/CofLQBnuxfapwJmwcqfRYigpSL4QUXMoXUOf6tYPv/Oo vR/A== X-Gm-Message-State: AOJu0YxT/nQrmk4N4CuTu8BOPVOxDc8Rgh72dv6/uSXrW/3PB1OrTFjW Ywf3RxE6or2RMBKh3B/m9kyWp4BLgBbGDKc77R8p6xRoIu1ax5MCFfRSedBuSUEIumIhptOEiV0 CuUzL X-Gm-Gg: AeBDieuyVsJ26ulDK718Z4jez5z5rgwPA3eJsHBBYWW4UmxOPCvO0xcRnMke6GQpq/S DS2i3yfEW5sldgsY7vSKY9F6PQETO2wCyPSEHWAg3G00zxIKdoqrI/mUoBOT3NCdHkG7xy6nU0p 413XsXN2d0nWVcWBasc3Rme9brddB00Cr8S/MwE85HYCNfxkTj1qgwzvfpGqdE9AVGhQXidPsd2 V0o4qYsTBAV0BslvwjYbS8X2AuKXDuM7Mny20HP7JbBa7Bc8AczS8WDHjtDZi7xoUlhtYIOqa4I IcpXH1GooIYY4txM6R1lqy5lhMJlBNLdagKWO115Uf9Eo/uwcrMPrAVMnBw4qYvmw+vdBCe64V7 VKFBQqjHWqwOFB9sIXYLLIJIM/Kh9CzaMMM0QVJQKs7Bq60Q8SaaGhC17re2LJJgIxE9RQr6Bfk H879c= X-Received: by 2002:a05:6a00:3e15:b0:82c:2241:ab71 with SMTP id d2e1a72fcca58-82d0db9b250mr18799352b3a.42.1775599410724; Tue, 07 Apr 2026 15:03:30 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:6::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9b27064sm23353085b3a.9.2026.04.07.15.03.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 15:03:30 -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 v9 04/10] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Tue, 7 Apr 2026 15:03:00 -0700 Message-ID: <20260407220313.3990909-5-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260407220313.3990909-1-joe@dama.to> References: <20260407220313.3990909-1-joe@dama.to> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 from 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/ethernet/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; dma_unmap_addr_set(tx_buf, mapping, mapping); + dma_unmap_len_set(tx_buf, len, len); flags = (len << TX_BD_LEN_SHIFT) | TX_BD_TYPE_LONG_TX_BD | TX_BD_CNT(last_frag + 2); @@ -720,6 +721,7 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) tx_buf = &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); txbd->tx_bd_haddr = cpu_to_le64(mapping); @@ -809,7 +811,8 @@ static bool __bnxt_tx_int(struct bnxt *bp, struct bnxt_tx_ring_info *txr, u16 hw_cons = txr->tx_hw_cons; unsigned int tx_bytes = 0; u16 cons = txr->tx_cons; - skb_frag_t *frag; + unsigned int dma_len; + dma_addr_t dma_addr; int tx_pkts = 0; bool rc = false; @@ -844,19 +847,27 @@ static bool __bnxt_tx_int(struct bnxt *bp, struct bnxt_tx_ring_info *txr, goto next_tx_int; } - 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 = dma_unmap_addr(tx_buf, mapping); + dma_len = dma_unmap_len(tx_buf, len); + + dma_unmap_single(&pdev->dev, dma_addr, dma_len, + DMA_TO_DEVICE); + } + last = tx_buf->nr_frags; for (j = 0; j < last; j++) { - frag = &skb_shinfo(skb)->frags[j]; cons = NEXT_TX(cons); tx_buf = &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 = dma_unmap_addr(tx_buf, mapping); + dma_len = 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 *bp, { int i, max_idx; struct pci_dev *pdev = bp->pdev; + unsigned int dma_len; + dma_addr_t dma_addr; max_idx = bp->tx_nr_pages * TX_DESC_CNT; @@ -3404,10 +3417,10 @@ static void bnxt_free_one_tx_ring_skbs(struct bnxt *bp, if (idx < bp->tx_nr_rings_xdp && tx_buf->action == XDP_REDIRECT) { - dma_unmap_single(&pdev->dev, - dma_unmap_addr(tx_buf, mapping), - dma_unmap_len(tx_buf, len), - DMA_TO_DEVICE); + dma_addr = dma_unmap_addr(tx_buf, mapping); + dma_len = 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 = 0; tx_buf->xdpf = NULL; @@ -3429,23 +3442,27 @@ static void bnxt_free_one_tx_ring_skbs(struct bnxt *bp, continue; } - 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 = dma_unmap_addr(tx_buf, mapping); + dma_len = dma_unmap_len(tx_buf, len); + + dma_unmap_single(&pdev->dev, dma_addr, dma_len, DMA_TO_DEVICE); + } last = tx_buf->nr_frags; i += 2; for (j = 0; j < last; j++, i++) { int ring_idx = i & bp->tx_ring_mask; - skb_frag_t *frag = &skb_shinfo(skb)->frags[j]; tx_buf = &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 = dma_unmap_addr(tx_buf, mapping); + dma_len = 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); } -- 2.52.0