From nobody Fri Apr 3 19:05:52 2026 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 BCAF730B50D for ; Mon, 23 Mar 2026 18:39:09 +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=1774291153; cv=none; b=H2syHOQFFeByancMVm13QvqSpHmY1jEhBqAJhrplfcIFrr+7BlrL0DbI3PMAV+g4CW2DEiww+nXxLSGy13B2ccEGCjAnOvBR+seKlN41lwUHBCtnRp2bTqG8I1t6I4PctV50JyVUIfnlRU5BmMM3DOG+Sy9vq5klaUPoXY3mF8E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774291153; c=relaxed/simple; bh=QZEPYt8xTmiyony78MCUXZEL4YpGdh1C5eyW5Y+WVnk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RWbIRwsuT5wY0NDIYK8LY5Zxe6jyd0NNC35jWhahNJ9t5Ruw0e6bxBv0lwYmYXCZuTWtOLnpcyr0pLJUlKlhWUsWTXiaX0FcRhVC78AzJZpW54zFwC2qaebKriokVaBX9Q6GCYGLE0BDHpAY9FvsGo4+HpXpXkKpsxPyZVfy95c= 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=GRcEtjXf; 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="GRcEtjXf" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-35ba749f441so406564a91.1 for ; Mon, 23 Mar 2026 11:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1774291149; x=1774895949; 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=VlYbsuuA0c6fnb8KG9NYIAfHIVUNtAjohKtZhGZnEFE=; b=GRcEtjXf9wFvu+xYEDTlC95J3t5Afl7j8vWfiVFtz72GOOyjdm4wmLfK1Q9lErmpj7 6aEp1oZ1DJ75crjkDcQ469jouSJVZBwDmf835cRb7vzShS81Mcpw3pHVKY4+nLMwB4Rh kVezPNPewbC+zxlPoDKYtJhRa2DQ3jCXLxrt6QKMNI7CHeNtS0pvUJW5Db8KIx/72eDi /Abe/I+M12vbqN90J8br2WAvO+xqJxiIbYsSv5dxN0N7rIbhMGTtWu84wuzGEm4mtA5a oJ1YHKxoicHDNPl/cj8r+xE+o8/NpmE9eH/0niTttWK5BT5h+prIPh1fA1AKNt/X9FHw ND/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774291149; x=1774895949; 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=VlYbsuuA0c6fnb8KG9NYIAfHIVUNtAjohKtZhGZnEFE=; b=CmGTneuH/pFcmZZWSy5TZmvf29I+GV7Jvs6TvA7y+TVI5vcfTba9T8Q/nTgMWgReMx EewbFA34ueMzu32LgiHFCo57BNwEhrCEcEHFzIVW+y8oVLIdxkogkned5Am8CLdCcvbx sL6a4+5R3EKIGKWkNQFUA0QCcnXcYmly+XhJjGft9edtARERkwQYG6cqzY81X5Coqlp2 afuIHN2zTsGZoF3STQiCl5ubiZtwaI5W/xJYQeSH1r/36DQ4XYC1wDFD8BVXJjpsfcff mRcaBqg1oLvThy42XVWFDp2QmPhEM88rnxehUQZL53Tv9XYlVqfYRbm6JKsX1CEoBIog C/eQ== X-Forwarded-Encrypted: i=1; AJvYcCXzJK8WjM+emBuV+vCx3vAn5l6v/aTJsu9vI0v2wqIW+cYxBQrjePHil8Kn24OjPJ8SllSuInU1RuH7X7A=@vger.kernel.org X-Gm-Message-State: AOJu0YzS2UCfosdqEqAA1ftZrJiTB8i17b8XGpdYqf0BDVy54WQ4Q4PF XQsYppKxvkXvr3dt9QRX1fCOxM8HbWjX1z/dBOzbE3FfdQsIcN3tKt5ARiej3jUK2pk= X-Gm-Gg: ATEYQzyvhDbZfgqYVt/Oz+9jW7xWeD0fKCXZ2wKdGqOK1rhezuNKu9V0C+l/FON4kqP T7qSv89gNeKX4x5Twxukb44I6H82WzZHS8E7Lg4I0g3CItAR93lwTcW4MLEtqsgTnrlYND1gj2C u1IexTDEPRuigOGbtLOe1r2KgKmWGQYWXz36yjPz4db+0SnpN4zxqI5JGRodPWEqjZPDsuHNogE 3uzTVHCxTDFVAkcHmFPcqD14CSqRbmQFnz+7/PIHLnwXDNsZ5DsxGm3/OsuaWLcJbi+/HFd3/E+ eEjSXo98H+s131LqkDzVEw9a1Z8wzNqJkyIe3Og7kxxdhVN9He0x8IkPVQ4Yk/owDoZWlawr7ZD 3VSJGiXwXrzO5hq/In1SDYPWcM22UyDuCV7ivVRTwKUb+8XUCkKUBiz6yKZoeNGbatDSgCvQVOw i/nf0= X-Received: by 2002:a17:90b:1b0e:b0:35b:9dba:be26 with SMTP id 98e67ed59e1d1-35bd2c0885cmr11136098a91.10.1774291148765; Mon, 23 Mar 2026 11:39:08 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:5::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35bd3f34b2bsm10304089a91.8.2026.03.23.11.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 11:39:08 -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 v5 05/12] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Mon, 23 Mar 2026 11:38:30 -0700 Message-ID: <20260323183844.3146982-6-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260323183844.3146982-1-joe@dama.to> References: <20260323183844.3146982-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 4d4e7643f7dd..fe15b32b12e7 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