From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 194663CBE60 for ; Fri, 20 Mar 2026 14:42:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774017728; cv=none; b=u2biCeJtaXV/4rtofRdCriXhS6HSRMcmZQZ04M7NxX2czwisnkDixNAGMH0IoDnvXEjwh6YxUSwFVnL/iFKhPIkIwsLLDN99ocp3WLfoMD4bGl1GBhDEpNV6I/iC9eTv6aJPTzzK+0dGjLgJbO6qmz2muidTf+ejuNvI25PL24A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774017728; c=relaxed/simple; bh=J79iNL/SAQ9qgtYX0VM4PuGUhLVLRwjcZiUAvSV9Klw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l3elCTFhd/YLc59h+j/V04VFvOPamkv+DU3sSthHeFFZ94E9FV/f38T7AJOReb2Oe6lyDFHVTG/k7fLbbhyPNBeC3pTyEvLS+TEPvzX64YaKqrD7l6qoqeEbCxZr52h6eelymHPSCyhwBiC6MxnhBmN76e9//8T/wPHN7VwL4KI= 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=U6eZ0L3c; arc=none smtp.client-ip=209.85.215.176 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="U6eZ0L3c" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c763c294cccso164924a12.1 for ; Fri, 20 Mar 2026 07:42:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1774017726; x=1774622526; 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=1CazIVEaRv3LnqWR08+/3SmBxoY0fNfgKVHWCxFfOpM=; b=U6eZ0L3cGWvJhXDH35ceGKv/AysyXNwYVNq7GVa6X1XbHcVyKMQ6OobSqRtJNsn3DZ NxQxvnrx4lHvqSqpO5yNkGobV6NI7RzM1OJ+Ys88cfEgbwCVja6B2jgAab+qmGWUC4UY F1NV0XcLrjAgc6dftywxF/DGPf/V6RIh5obEL2a31xRec9GITb57LLxDO+0FUPadJbDd xRgtNuyWUh0CWKzivkLUFEXD2oL3Eg1iDU/uVa1sbLOqEnTvb7ZJMiYpTg0fmKJzY+d4 QF4poL02h5aSd+oyeyEdSx0h/AO/EI8gAhAnumw/5kbktMlhoO0JSbyByGoEW4nq3TmO KCbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774017726; x=1774622526; 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=1CazIVEaRv3LnqWR08+/3SmBxoY0fNfgKVHWCxFfOpM=; b=SHuy/6iqjgJbHPogmcrMD3xfui7o8MSwu8NmehdqfgiKvm3IyumFekb5T/z+ssXid5 PCLUJzUYqgOaE+FCSetpBTUKMTz/19xcCmkbWBJHwmVXiF5YRD+KMDzVOzqiXokJICkR IX8SnQD9XM9CL3A4ko1d9fokw3jNyIc/4e7NZ8wdm4QsOBh917CCAAmQm2h3BfCt8vad uW2eqFv/qdeSt8KRv2p9thiRRv21gyk0VNQDxrEndGaiLc9kzJGA1zaTxfYQ0WSxgVFL oNIUIMwVXFaPnvdS0U9y7VuRBeCcJiIhxYjPCxfb+PYGmOEdm1HUV8fdEMJtGSNFikMl u7iw== X-Gm-Message-State: AOJu0YwjNSuXMEmCayckV+PD5QknHTUCCB6p9Oiz8PJlohPUktu/uvyH EaNSluY/IkERYkPdX66CIS7GvUBjyepgDSRvUIoxTnT/56LJ7y8wazuPTozz/lz+k/tWOhyRqMn DQrlM8D0= X-Gm-Gg: ATEYQzzSa/UYsXgJmuPPwmjE3gzjTEMH7FmDqnxw+tVAo4g8sSUr3yaUoqENrS99NzZ VPudRqnhY1NLe0sdtFH6DZggHQj5p2Q4yT6Wb+/uMjP11GfyAEmWUpd0mjU2v4MGXqR+1SJCNSA oYa+L260wMe2Glcw5h/PvrmCAY5l+k03QBBR2i8eCN2H3+kgMcYT/zhom9KHPLkRW+BwPJG2V5U U3s5pdta41cNk0xF7bVQyFt135jXtX8e5KkHxUpploZkNl/F6pwfkKafB9uS7i5wAaHm4J/3xdP H9y4pcySlo9MURIspj9fkjLnT6v/tOl/UrOt4gwMkLZ22iwBCy1+EPVUWKT9FpdfKEzSaC+TJMH 7E+ApeJaxyCzBnn1gHEqjiwPlfMD2kg6Z7sopChrVb5lD4jYyZBxH8wr7tM0ZUQ+B93k1rp/PC6 wnp9gD X-Received: by 2002:a05:6a20:9191:b0:39b:8dcb:f377 with SMTP id adf61e73a8af0-39bcebf74a7mr2883374637.53.1774017725932; Fri, 20 Mar 2026 07:42:05 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c74665ca206sm2435823a12.18.2026.03.20.07.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 07:42:05 -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 08/12] net: bnxt: Implement software USO Date: Fri, 20 Mar 2026 07:41:29 -0700 Message-ID: <20260320144141.260246-9-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 Implement bnxt_sw_udp_gso_xmit() using the core tso_dma_map API and the pre-allocated TX inline buffer for per-segment headers. The xmit path: 1. Calls tso_start() to initialize TSO state 2. Stack-allocates a tso_dma_map and calls tso_dma_map_init() to DMA-map the linear payload and all frags upfront. 3. For each segment: - Copies and patches headers via tso_build_hdr() into the pre-allocated tx_inline_buf (DMA-synced per segment) - Counts payload BDs via tso_dma_map_count() - Emits long BD (header) + ext BD + payload BDs - Payload BDs use tso_dma_map_next() which yields (dma_addr, chunk_len, mapping_len) tuples. Header BDs set dma_unmap_len=0 since the inline buffer is pre-allocated and unmapped only at ring teardown. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- v4: - Fixed the early return issue Pavan pointed out when num_segs <= 1; use the drop label instead of returning. v3: - Added iova_state and iova_total_len to struct bnxt_sw_tx_bd. - Stores iova_state on the last segment's tx_buf during xmit. rfcv2: - set the unmap len on the last descriptor, so that when completions fire only the last completion unmaps the region. drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 + drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c | 206 ++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 593b78672be8..0afa0b731063 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -11,6 +11,8 @@ #ifndef BNXT_H #define BNXT_H +#include + #define DRV_MODULE_NAME "bnxt_en" /* DO NOT CHANGE DRV_VER_* defines @@ -897,6 +899,8 @@ struct bnxt_sw_tx_bd { u16 rx_prod; u16 txts_prod; }; + struct dma_iova_state iova_state; + size_t iova_total_len; }; #define BNXT_SW_GSO_MID 1 diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c index b296769ee4fe..4287afe0fd72 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c @@ -19,11 +19,217 @@ #include "bnxt.h" #include "bnxt_gso.h" +static u32 bnxt_sw_gso_lhint(unsigned int len) +{ + if (len <= 512) + return TX_BD_FLAGS_LHINT_512_AND_SMALLER; + else if (len <= 1023) + return TX_BD_FLAGS_LHINT_512_TO_1023; + else if (len <= 2047) + return TX_BD_FLAGS_LHINT_1024_TO_2047; + else + return TX_BD_FLAGS_LHINT_2048_AND_LARGER; +} + netdev_tx_t bnxt_sw_udp_gso_xmit(struct bnxt *bp, struct bnxt_tx_ring_info *txr, struct netdev_queue *txq, struct sk_buff *skb) { + struct bnxt_sw_tx_bd *last_unmap_buf = NULL; + unsigned int hdr_len, mss, num_segs; + unsigned int last_unmap_len = 0; + struct pci_dev *pdev = bp->pdev; + dma_addr_t last_unmap_addr = 0; + unsigned int total_payload; + int i, bds_needed, slots; + struct tso_dma_map map; + u32 vlan_tag_flags = 0; + struct tso_t tso; + u16 cfa_action; + u16 prod; + + hdr_len = tso_start(skb, &tso); + mss = skb_shinfo(skb)->gso_size; + total_payload = skb->len - hdr_len; + num_segs = DIV_ROUND_UP(total_payload, mss); + + /* Zero the csum fields so tso_build_hdr will propagate zeroes into + * every segment header. HW csum offload will recompute from scratch. + */ + udp_hdr(skb)->check = 0; + if (!tso.ipv6) + ip_hdr(skb)->check = 0; + + if (unlikely(num_segs <= 1)) + goto drop; + + /* Upper bound on the number of descriptors needed. + * + * Each segment uses 1 long BD + 1 ext BD + payload BDs, which is + * at most num_segs + nr_frags (each frag boundary crossing adds at + * most 1 extra BD). + */ + bds_needed = 3 * num_segs + skb_shinfo(skb)->nr_frags + 1; + + if (unlikely(bnxt_tx_avail(bp, txr) < bds_needed)) { + netif_txq_try_stop(txq, bnxt_tx_avail(bp, txr), + bp->tx_wake_thresh); + return NETDEV_TX_BUSY; + } + + slots = BNXT_SW_USO_MAX_SEGS - (txr->tx_inline_prod - txr->tx_inline_cons); + + if (unlikely(slots < num_segs)) { + netif_txq_try_stop(txq, bnxt_tx_avail(bp, txr), + bp->tx_wake_thresh); + return NETDEV_TX_BUSY; + } + + if (unlikely(tso_dma_map_init(&map, &pdev->dev, skb, hdr_len))) + goto drop; + + cfa_action = bnxt_xmit_get_cfa_action(skb); + if (skb_vlan_tag_present(skb)) { + vlan_tag_flags = TX_BD_CFA_META_KEY_VLAN | + skb_vlan_tag_get(skb); + if (skb->vlan_proto == htons(ETH_P_8021Q)) + vlan_tag_flags |= 1 << TX_BD_CFA_META_TPID_SHIFT; + } + + prod = txr->tx_prod; + + for (i = 0; i < num_segs; i++) { + unsigned int seg_payload = min_t(unsigned int, mss, + total_payload - i * mss); + u16 slot = (txr->tx_inline_prod + i) & + (BNXT_SW_USO_MAX_SEGS - 1); + struct bnxt_sw_tx_bd *tx_buf; + unsigned int mapping_len; + dma_addr_t this_hdr_dma; + unsigned int chunk_len; + unsigned int offset; + dma_addr_t dma_addr; + struct tx_bd *txbd; + void *this_hdr; + int bd_count; + __le32 csum; + bool last; + u32 flags; + + last = (i == num_segs - 1); + offset = slot * TSO_HEADER_SIZE; + this_hdr = txr->tx_inline_buf + offset; + this_hdr_dma = txr->tx_inline_dma + offset; + + tso_build_hdr(skb, this_hdr, &tso, seg_payload, last); + + dma_sync_single_for_device(&pdev->dev, this_hdr_dma, + hdr_len, DMA_TO_DEVICE); + + bd_count = tso_dma_map_count(&map, seg_payload); + + tx_buf = &txr->tx_buf_ring[RING_TX(bp, prod)]; + txbd = &txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; + + tx_buf->skb = skb; + tx_buf->nr_frags = bd_count; + tx_buf->is_push = 0; + tx_buf->is_ts_pkt = 0; + + dma_unmap_addr_set(tx_buf, mapping, this_hdr_dma); + dma_unmap_len_set(tx_buf, len, 0); + + tx_buf->is_sw_gso = last ? BNXT_SW_GSO_LAST : BNXT_SW_GSO_MID; + + /* Store IOVA state on the last segment for completion */ + if (last && tso_dma_map_use_iova(&map)) { + tx_buf->iova_state = map.iova_state; + tx_buf->iova_total_len = map.total_len; + } + + flags = (hdr_len << TX_BD_LEN_SHIFT) | + TX_BD_TYPE_LONG_TX_BD | + TX_BD_CNT(2 + bd_count); + + flags |= bnxt_sw_gso_lhint(hdr_len + seg_payload); + + txbd->tx_bd_len_flags_type = cpu_to_le32(flags); + txbd->tx_bd_haddr = cpu_to_le64(this_hdr_dma); + txbd->tx_bd_opaque = SET_TX_OPAQUE(bp, txr, prod, + 2 + bd_count); + + csum = cpu_to_le32(TX_BD_FLAGS_TCP_UDP_CHKSUM | + TX_BD_FLAGS_IP_CKSUM); + + prod = NEXT_TX(prod); + bnxt_init_ext_bd(bp, txr, prod, csum, + vlan_tag_flags, cfa_action); + + /* set dma_unmap_len on the LAST BD touching each + * region. Since completions are in-order, the last segment + * completes after all earlier ones, so the unmap is safe. + */ + while (tso_dma_map_next(&map, &dma_addr, &chunk_len, + &mapping_len, seg_payload)) { + prod = NEXT_TX(prod); + txbd = &txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; + tx_buf = &txr->tx_buf_ring[RING_TX(bp, prod)]; + + txbd->tx_bd_haddr = cpu_to_le64(dma_addr); + dma_unmap_addr_set(tx_buf, mapping, dma_addr); + dma_unmap_len_set(tx_buf, len, 0); + tx_buf->skb = NULL; + tx_buf->is_sw_gso = 0; + + if (mapping_len) { + if (last_unmap_buf) { + dma_unmap_addr_set(last_unmap_buf, + mapping, + last_unmap_addr); + dma_unmap_len_set(last_unmap_buf, + len, + last_unmap_len); + } + last_unmap_addr = dma_addr; + last_unmap_len = mapping_len; + } + last_unmap_buf = tx_buf; + + flags = chunk_len << TX_BD_LEN_SHIFT; + txbd->tx_bd_len_flags_type = cpu_to_le32(flags); + txbd->tx_bd_opaque = 0; + + seg_payload -= chunk_len; + } + + txbd->tx_bd_len_flags_type |= + cpu_to_le32(TX_BD_FLAGS_PACKET_END); + + prod = NEXT_TX(prod); + } + + if (last_unmap_buf) { + dma_unmap_addr_set(last_unmap_buf, mapping, last_unmap_addr); + dma_unmap_len_set(last_unmap_buf, len, last_unmap_len); + } + + txr->tx_inline_prod += num_segs; + + netdev_tx_sent_queue(txq, skb->len); + + WRITE_ONCE(txr->tx_prod, prod); + /* Sync BDs before doorbell */ + wmb(); + bnxt_db_write(bp, &txr->tx_db, prod); + + if (unlikely(bnxt_tx_avail(bp, txr) <= bp->tx_wake_thresh)) + netif_txq_try_stop(txq, bnxt_tx_avail(bp, txr), + bp->tx_wake_thresh); + + return NETDEV_TX_OK; + +drop: dev_kfree_skb_any(skb); dev_core_stats_tx_dropped_inc(bp->dev); return NETDEV_TX_OK; -- 2.52.0