From nobody Thu Apr 2 20:22:00 2026 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 A40673BF698 for ; Thu, 26 Mar 2026 23:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774569180; cv=none; b=pmWwcVr7MT2Lq1p11N/aPzfQN0NmKRTiIy5YLK4NNJqrRL12Escemu8ynjuznw61cYk/D+j+olGhXGDA55GyHtLu4MNciyotLZXDtQWIr0ryeU3TDspg3uQdrJZ8vUuXJvXOkoNcG1BYMb+eSJ64mllErPGOqT4PguqIlVn1fFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774569180; c=relaxed/simple; bh=SwJnscTqxPzyr8NelnMCAqCLfGawssCKPE4MNXisLfA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i25mA1tn9gInClTWzKUaP8bMVGkTlN+ufdqLDjY2a6P94kjWMwSX7YbkP7+GQmdqGML5g+WFq4/OsnSl+65SE49YY2GzOgFuqJoVMfBllyMlNu9O7/N5+Vyg30B60wExV48ShLGOXNCEDN4marFoH53UJZWxi/p2d/3/VSInlyI= 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=TzKfwGeh; arc=none smtp.client-ip=209.85.215.178 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="TzKfwGeh" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c70f91776fcso681927a12.0 for ; Thu, 26 Mar 2026 16:52:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1774569179; x=1775173979; 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=FRCJMoiMQS5q76rcDSmZShmAqHh8lkp6y+PIztrt728=; b=TzKfwGehSgILdO2KmBSzIn69nEo4UUreOqHMqmsnuSDfgVBHHkUQcjDJF/qa+ruhkj I+QBbmTUQ5cOTDmGGNOwK2zV1FZQeiU/FXqShDvcTBzNFBv/9ysQ1GxwIY+xEDqJHkuH iV+/LVZgEyYS/iaZOl/PznQAJsykbVOSyPxaHaYcDpKeP44h3WxQBCo4f6gJwp3EhaIO kmEvdt5vVhruacHF7K/uEKphUXvfw+XM9OGptyuHRK6oAUa8CjhTSgOMQ51xpPzi9GW4 f30h5iCihp6+k39hFjkKolSv70fvcTNqGPShMc0JLBQYkhBjzFNtSfjUiEskJhODCu4l 75pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774569179; x=1775173979; 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=FRCJMoiMQS5q76rcDSmZShmAqHh8lkp6y+PIztrt728=; b=dP9nFDIupiwAfz6Cgx1MsuiRerDBdQZMAJaePoyV2kbgjRPgt167N4IrQuYGJjIt1V Ma3pZ4ykpxKfUluxjXMr0+GJz99ucY9q3BP6CkA4y51I6RfkvXmVPjDyFwSIjpaSasru UWrk+FlJTrYYMB5MnakPv+VLSUAkrY6tsl6i7Swi5xyAvY40hFq5n+2n1pVbGGf7LmcW u9QGhCCeiQKcKOCjpEEs1Y2YAb4v3XB/G5IKNlNdyFBEX6nVe6TDOZa/Yx74PgnShkwo shkt02tt0NqNyuYhPXuBua7h/wwR7f79mp2oZrnPK5I417BNnYxLoO9r2JxFfkrfWVpz czUw== X-Forwarded-Encrypted: i=1; AJvYcCX7Ht+amVeTcC2FE8u5ZGpZg5rJEI7MhEXt5OTMDZS4FObX3SBJgYu5ru51SYb7u3IASM+Xw6qdW+ib7to=@vger.kernel.org X-Gm-Message-State: AOJu0YycQQCc1QzPoU4d9o/fahN/mFVCeYwvrpsdH5o9dXy8Ok3qzy3M OO6dZjUDX33gBKR0GjuU4TnNYBM+1atCUdJWtcMORK8MGnBc3xAJX5CLqtAkzerEpjs= X-Gm-Gg: ATEYQzwHR7B2Ree4D+KCfW7Yq8NsWj0pa15ehb5KM2TJqz4vVOtc/AMTlvHEz187GvX mNkMfDBq4OUHfMtFGrAjJEFoYgqXdUZ9NN9EfsPOlE0uA21n1RnhzxYWAvDcboBl1l6TxyLq8Z7 OHgEQN58FhfgdH3xZ0YqWZKcL4tW7bgtZkIV/3aMhOid9hVStlwIA9ChiCQ4cpmcjFqSR87ge6j U1Svvd7/yPBmSug3v04AjAWOPhuENbc7nrJ1VCZvfQs5EIPAwn7bvAWHN2nooNgPm7UOdNOUTvZ 7Tn2ec+SQjxn4379abAch+CTzoZrq3X0K8NTAUGil8pS37bP3MnDNDPCXKeVV9zKX6MwmShPbPz Kh+RN+o+PVYJ3vnmc2U7bOMxFdO2bBTYyku4OVl5Ernhqsz0EjQlQMBojszRieqMKnkM71rs4nn ZLZY13wOebu0f/DW4= X-Received: by 2002:a05:6a20:6a08:b0:38e:9220:ebbe with SMTP id adf61e73a8af0-39c87951cefmr558778637.23.1774569178920; Thu, 26 Mar 2026 16:52:58 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c76739334e6sm3058068a12.18.2026.03.26.16.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 16:52:58 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, Michael Chan , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: andrew+netdev@lunn.ch, horms@kernel.org, pavan.chebbi@broadcom.com, linux-kernel@vger.kernel.org, leon@kernel.org, Joe Damato Subject: [net-next v6 05/12] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Thu, 26 Mar 2026 16:52:24 -0700 Message-ID: <20260326235238.2940471-6-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260326235238.2940471-1-joe@dama.to> References: <20260326235238.2940471-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 8515cd6e82fc..2ab588f8de84 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)) { @@ -3402,6 +3413,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 @@ -3412,10 +3425,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; @@ -3437,23 +3450,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