From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 A0B8A3C873F for ; Fri, 20 Mar 2026 14:42:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774017721; cv=none; b=etQZxJFLMzR+Efk2NyA4GBXD4wKaDb6e5jfNY4DNVQ+o+nhWbrG5A+HCzGw4PLYbapQmeQaZpjBVrd8G6R3Uq91Wn7RePw4YPn4XYWOIE7iItn92EqH2KY1bjXfbns9efowO6vSVyUYdT61SyjrG2XTrbXYaMJH52E5a56qHCF4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774017721; c=relaxed/simple; bh=/xj4RkzD+6XcfT/WAnnGulmdWTK/JPmN4QtjonSYy/A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N5wnLBC9eEwY+ZUQxhn4rHGgDfgO+5MrRzQAaYr0YrLDyVAJ2xyZ8pt+ApG/I3NTea1/zHUFbIf90T5/5mdzVhxjc2bqJLvwmxjQw0axINAvshfJNB/AoMQLFM/c1KzIK3RsjaaJkQuD31FJLN8NCW9Al5fu6oBOSlAd2JRHGuc= 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=CFJ3le9G; arc=none smtp.client-ip=209.85.216.46 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="CFJ3le9G" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-358d80f60ccso1250683a91.3 for ; Fri, 20 Mar 2026 07:42:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1774017720; x=1774622520; 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=S9WgVeDTvAClfK2RzPtOGPk95x1pLaQKgMuXVPEY3A4=; b=CFJ3le9GV3s3+UygehuWsXhCF5BBZRBQ8KIATg62Sii55UptYuHI7AYCQu/rOqx3ew ibB+SZkp13zrTpbgWLTgJ0q4QxA7s+gtB9J/jJh2dy7f1DC9qaAKDFZ4+DtwV0CMTzbJ RWfoAWfucxdZ4O+kVeZEvgty/3v8ksZpWL+p/wiBzxhecKlklOeTSSlxWgzq3oANQMNy irFVRaoIqJQ9bljHK6PH7jeY2xqGfP5/AkWny6nkJyrQAlRQ+z0U/yk5YuMFSKQsaIGd iWFw00ZksWIKszb6vE1W8HfUDRO3/XS9biZZLxOpJ5IV1U+8hgre1NB3OLyXQQSHXMkt 3H3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774017720; x=1774622520; 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=S9WgVeDTvAClfK2RzPtOGPk95x1pLaQKgMuXVPEY3A4=; b=aQZ7w2t9NZnEvmwvHEPBvMmpA1qbzwPLZvXWXTrXV4ZCUEcIxPv3ZAFnsZsAMLBJ7G vKoH9vmvhDIyPVfAafNxOEM9FaD7klxIUp8gE5TuQUUXR90k6G1oDMN43Qg89rLRm/VQ vM/ItzKtw25pPUdECHnJa+5V4jNIA45EH092xQcEzWbGIM2p3sP+oQQXSpabYxE7mqwa ltnElIbdVydJ3AYJc6ek5eKheeaBGuJ4AV+XxHo5SMdVHRVN6cTuc+zEnWxLwrNaFCJ3 MUnXfyizYRUEAyaUJl90awL2Xiycpwbu01Sv563pq6yB5tx0tRP4Qww6gNOAIABOrCPI oKNQ== X-Gm-Message-State: AOJu0YwbmuTkTqDheLE5jODfsCJjZJFBnQs27jOyCtCL9dtEHy4XUI1b y4ULukSdbeugHOMfI28wqVQ03/Iw8cJ2Jm/EMEGVqblqCw0e5RAQVchZwWYaNJy9ainp4nqnk7v diZTHOAM= X-Gm-Gg: ATEYQzxGoA98/QUytLtJn/OylOqEw9AyN335AupRde4gTP7xsuU+/ZVgc2H0c9MTj0H 9/cB3qRSIu7pMrDISh+JuS+IJB/mi893leWpQyEjpDa5vYHO44OnWU5+/cwDA7TiosCqhmS5ieb U7ncxdINbynYrmI20Msnbr19/PXffOL68RBsw7ndTQyOLUrldq00CccRh6HmrrXmJUva8X9S1fO Fqjs3eQ0wWYR8U2YBBjAORZlyNlY/fCFjPx8VN1msF5JIKK6ZigkiF6hnyHUscQRLdC9gMB84lF WEMlYdkvK9tjQGh0oh1uBjiAvEvie09NhBQ6RVAigsZ40/qdOuHRrR9oLt5hon/fzMkvRT4IZdM SyNnDVPWXX57h6v8Y0zCmMtGbxj2+poe1nUpVlKpBVOziEvHa110pXgtiMP4iQjbxbP+VwPDx8W IEMWY= X-Received: by 2002:a17:90b:3d83:b0:35b:a7be:ae6e with SMTP id 98e67ed59e1d1-35bd2d53a91mr2925330a91.33.1774017719588; Fri, 20 Mar 2026 07:41:59 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c743a939af0sm1769216a12.16.2026.03.20.07.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 07:41:59 -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 v4 05/12] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Fri, 20 Mar 2026 07:41:26 -0700 Message-ID: <20260320144141.260246-6-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260320144141.260246-1-joe@dama.to> References: <20260320144141.260246-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 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; 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)) { @@ -3400,6 +3411,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; @@ -3410,10 +3423,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; @@ -3435,23 +3448,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