From nobody Sun Apr 5 16:26:20 2026 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 EB6BC23A9B3 for ; Fri, 3 Apr 2026 00:35:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176551; cv=none; b=IXKGGPa+P7Os2+850JxZ1a8OEJsTbL13pZMe+TuBFK1Ad/qDFBrwojkmJOoABc4FAGqzQdOdGj5ytgPgo4YM7h4eccysXNYWJzlv5n7bqJBkEVvjtVE1laGPjbWg3YvA6nZ9CTRZlroH4jLW03/nJkUlmMBEwHLvhcPUgzPi0RM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176551; c=relaxed/simple; bh=aocsnZ96VmK29khd6F+PQ7orwzWSe+c8kQ2igvf/n34=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S5JWApiuQsrGpTF1i8AjMxgZijXoamXwjd8Y/q2+BoaTuLoCukdPoIPqirm5VqylzfxvnxKcLMtThyu93UyoqY3ARYKZO77ok5L9/u+zw0M9t6j7U58VjPEvBOZni3UJCoItjTi+poovTXmuPkVtiBuaQDyPeSM1n1rscWGQKbQ= 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=DeUWS0Ya; arc=none smtp.client-ip=209.85.216.41 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="DeUWS0Ya" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-35da2d35eccso916898a91.0 for ; Thu, 02 Apr 2026 17:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176549; x=1775781349; 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=3nUdbRbDP4j+PIfnlCM8F+wfqa8xn/bf/ZjUPUuyqR4=; b=DeUWS0Ya8wgCGTbXPf7qkK4oEl+p5W5i5F+hcC5F/2gVU/6BO/d6hYloAlV9EABjZG +32+QQT0FmIxHsRomT3trbFpGXEe6JargAN88D0M3iTuCBs79Lro+pzCfueE7N6G40ll 1p1SX0X4XHt9TdCJJXrqFonXvE9/yBltwA46hsxnGo9Fkq6sbKFGgHud/UwvN1daavgh +9zDG4GuT+V/V2gdsKJ1cburWxg6f45L5AekA1a+dOcuIU/cXxi2MWMZq9pxi2CQRN8s MDT9d5yafyS7SJtekKE3UNJf95FOiOYNUwm6mxzjWfKJZVQm+2pWZXUa722kYFvzYiah xzkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176549; x=1775781349; 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=3nUdbRbDP4j+PIfnlCM8F+wfqa8xn/bf/ZjUPUuyqR4=; b=rbAz8Zxftue/lp+gh27XnaHv6AxHlaDYyUzIWzEnuuMasdJF0m9aeEo0bKb47wc3dX uj95d8AeNpfp8gPg/6p5BP+WnglRa39sFOEXO198ZjPloMcxyKa8sWBTMDvrf7Q5rQ7e WKLbayMzoPwQe3BMNVSbwudVcbBkkxlfgkWkt/yw18s3fBURm1oLEcO6ls2jugo5cxQ0 aM7s/MrrpQEdzU3zAEiVOTIsRJ9LsfsKBzFWGFrTTidD7LBUqbaciBWY2xJzYl5+hga7 n1VYnF5agroFaHZ9PGUiw0Mt/kgoA+rlK2VBuHfjIUi4NQPdJP3FUvzc9gsFT2KkCDR7 prog== X-Forwarded-Encrypted: i=1; AJvYcCWUiwFDKJg3fadr1+1xFnrQzwmU84H4HfS3cNDh8agzfK4LacBe5WdhWLt0sRk4SNQx6oGymIqI8rWfh0U=@vger.kernel.org X-Gm-Message-State: AOJu0YyIDFvxQqpFoY2BjLhWYRyziaVBpY8zxs5CorocQV9FDC7E9/2r dMxILLO8wn9Ft7YIup9VSZXryY/HKf7bLpL54fSokpJdMix617sTYi1dkxxU/FVWK0c= X-Gm-Gg: AeBDiev3sc46T3QJN6dZoyE+VeRAkNyJ6oRuauTUSNkEq4COVc1yf6yDPWIZx8p/fcy KylJqKjfHyfIpbb0aK/so1bWU6ewsmRdnyhCXgTHlP/KgIxkhgJ/P+MpehT41QcyGjUIIfOKqi6 aiCQfykGlVhQUK4KM7eCtWKltks3B16EsMPbB18noGIYayD8kOYRMNuIcYcf4e44WstGBtBee+w XArRiRgZ/KDT3UIkX1P+Waed1HTmF238MnXr+ubOuY0KELs6oH6PvmLqBH+U9aZwD5ZZwAjYqaU we+i+KlRo+NCjz2WsRrwx3DGOQkfI7n6+qZv5ynHx/m35W+aBYpOAgres1LmofNsvw1Ot+5E1Gc YR9oNJQLNCx2owR3ZyTqD0eaqxQKdBmYHpmSkgVy5Rzrdc9AQeBLhVH0N60/n2HncbYm2qgmh7I Ayx+YM1GIOq7AnlQ== X-Received: by 2002:a17:90b:3952:b0:35b:a9f3:62ee with SMTP id 98e67ed59e1d1-35de69d6c96mr816530a91.27.1775176549198; Thu, 02 Apr 2026 17:35:49 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:2::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35dd368f538sm5544798a91.14.2026.04.02.17.35.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:35:48 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: andrew+netdev@lunn.ch, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, linux-kernel@vger.kernel.org, leon@kernel.org, Joe Damato Subject: [net-next v8 01/10] net: tso: Introduce tso_dma_map and helpers Date: Thu, 2 Apr 2026 17:35:08 -0700 Message-ID: <20260403003524.2564973-2-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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" Add struct tso_dma_map to tso.h for tracking DMA addresses of mapped GSO payload data and tso_dma_map_completion_state. The tso_dma_map combines DMA mapping storage with iterator state, allowing drivers to walk pre-mapped DMA regions linearly. Includes fields for the DMA IOVA path (iova_state, iova_offset, total_len) and a fallback per-region path (linear_dma, frags[], frag_idx, offset). The tso_dma_map_completion_state makes the IOVA completion state opague for drivers. Drivers are expected to allocate this and use the added helpers to update the completion state. Adds skb_frag_phys() to skbuff.h, returning the physical address of a paged fragment's data, which is used by the tso_dma_map helpers introduced in this commit described below. The added TSO DMA map helpers are: tso_dma_map_init(): DMA-maps the linear payload region and all frags upfront. Prefers the DMA IOVA API for a single contiguous mapping with one IOTLB sync; falls back to per-region dma_map_phys() otherwise. Returns 0 on success, cleans up partial mappings on failure. tso_dma_map_cleanup(): Handles both IOVA and fallback teardown paths. tso_dma_map_count(): counts how many descriptors the next N bytes of payload will need. Returns 1 if IOVA is used since the mapping is contiguous. tso_dma_map_next(): yields the next (dma_addr, chunk_len) pair. On the IOVA path, each segment is a single contiguous chunk. On the fallback path, indicates when a chunk starts a new DMA mapping so the driver can set dma_unmap_len on that descriptor for completion-time unmapping. tso_dma_map_completion_save(): updates the completion state. Drivers will call this at xmit time. tso_dma_map_complete(): tears down the mapping at completion time and returns true if the IOVA path was used. If it was not used, this is a no-op and returns false. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- v7: - Squashed the struct and helpers (patch 1 and 2 from v6) into this one patch. - Added tso_dma_map_completion_state and helpers tso_dma_map_completion_save and tso_dma_map_complete to operate on the struct and keep the DMA IOVA completely opaque from drivers. - Removed unnecessary duplicated code in tso_dma_map_next and tso_dma_map_cleanup. v4: - Fix the kdoc for the TSO helpers. No functional changes. v3: - struct tso_dma_map extended to track IOVA state and a fallback per-region path. - Added skb_frag_phys helper include/linux/skbuff.h. - Added tso_dma_map_use_iova() inline helper in tso.h. - Updated the helpers to use the DMA IOVA API and falls back to per-regi= on mapping instead. include/linux/skbuff.h | 11 ++ include/net/tso.h | 100 +++++++++++++++ net/core/tso.c | 269 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 380 insertions(+) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index fbfa9852e82a..d204faab1e1e 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3758,6 +3758,17 @@ static inline void *skb_frag_address_safe(const skb_= frag_t *frag) return ptr + skb_frag_off(frag); } =20 +/** + * skb_frag_phys - gets the physical address of the data in a paged fragme= nt + * @frag: the paged fragment buffer + * + * Returns: the physical address of the data within @frag. + */ +static inline phys_addr_t skb_frag_phys(const skb_frag_t *frag) +{ + return page_to_phys(skb_frag_page(frag)) + skb_frag_off(frag); +} + /** * skb_frag_page_copy() - sets the page in a fragment from another fragment * @fragto: skb fragment where page is set diff --git a/include/net/tso.h b/include/net/tso.h index e7e157ae0526..33f7dc9ed42e 100644 --- a/include/net/tso.h +++ b/include/net/tso.h @@ -3,6 +3,7 @@ #define _TSO_H =20 #include +#include #include =20 #define TSO_HEADER_SIZE 256 @@ -28,4 +29,103 @@ void tso_build_hdr(const struct sk_buff *skb, char *hdr= , struct tso_t *tso, void tso_build_data(const struct sk_buff *skb, struct tso_t *tso, int size= ); int tso_start(struct sk_buff *skb, struct tso_t *tso); =20 +/** + * struct tso_dma_map - DMA mapping state for GSO payload + * @dev: device used for DMA mapping + * @skb: the GSO skb being mapped + * @hdr_len: per-segment header length + * @iova_state: DMA IOVA state (when IOMMU available) + * @iova_offset: global byte offset into IOVA range (IOVA path only) + * @total_len: total payload length + * @frag_idx: current region (-1 =3D linear, 0..nr_frags-1 =3D frag) + * @offset: byte offset within current region + * @linear_dma: DMA address of the linear payload + * @linear_len: length of the linear payload + * @nr_frags: number of frags successfully DMA-mapped + * @frags: per-frag DMA address and length + * + * DMA-maps the payload regions of a GSO skb (linear data + frags). + * Prefers the DMA IOVA API for a single contiguous mapping with one + * IOTLB sync; falls back to per-region dma_map_phys() otherwise. + */ +struct tso_dma_map { + struct device *dev; + const struct sk_buff *skb; + unsigned int hdr_len; + /* IOVA path */ + struct dma_iova_state iova_state; + size_t iova_offset; + size_t total_len; + /* Fallback path if IOVA path fails */ + int frag_idx; + unsigned int offset; + dma_addr_t linear_dma; + unsigned int linear_len; + unsigned int nr_frags; + struct { + dma_addr_t dma; + unsigned int len; + } frags[MAX_SKB_FRAGS]; +}; + +/** + * struct tso_dma_map_completion_state - Completion-time cleanup state + * @iova_state: DMA IOVA state (when IOMMU available) + * @total_len: total payload length of the IOVA mapping + * + * Drivers store this on their SW ring at xmit time via + * tso_dma_map_completion_save(), then call tso_dma_map_complete() at + * completion time. + */ +struct tso_dma_map_completion_state { + struct dma_iova_state iova_state; + size_t total_len; +}; + +int tso_dma_map_init(struct tso_dma_map *map, struct device *dev, + const struct sk_buff *skb, unsigned int hdr_len); +void tso_dma_map_cleanup(struct tso_dma_map *map); +unsigned int tso_dma_map_count(struct tso_dma_map *map, unsigned int len); +bool tso_dma_map_next(struct tso_dma_map *map, dma_addr_t *addr, + unsigned int *chunk_len, unsigned int *mapping_len, + unsigned int seg_remaining); + +/** + * tso_dma_map_completion_save - save state needed for completion-time cle= anup + * @map: the xmit-time DMA map + * @cstate: driver-owned storage that persists until completion + * + * Should be called at xmit time to update the completion state and later = passed + * to tso_dma_map_complete(). + */ +static inline void +tso_dma_map_completion_save(const struct tso_dma_map *map, + struct tso_dma_map_completion_state *cstate) +{ + cstate->iova_state =3D map->iova_state; + cstate->total_len =3D map->total_len; +} + +/** + * tso_dma_map_complete - tear down mapping at completion time + * @dev: the device that owns the mapping + * @cstate: state saved by tso_dma_map_completion_save() + * + * Returns true if the IOVA path was used and the mapping has been + * destroyed. Returns false if the fallback per-region path was used + * and the driver must unmap via its normal completion path. + */ +static inline bool +tso_dma_map_complete(struct device *dev, + struct tso_dma_map_completion_state *cstate) +{ + if (dma_use_iova(&cstate->iova_state)) { + dma_iova_destroy(dev, &cstate->iova_state, cstate->total_len, + DMA_TO_DEVICE, 0); + return true; + } + + return false; +} + #endif /* _TSO_H */ diff --git a/net/core/tso.c b/net/core/tso.c index 6df997b9076e..e39b6f30345e 100644 --- a/net/core/tso.c +++ b/net/core/tso.c @@ -3,6 +3,7 @@ #include #include #include +#include #include =20 void tso_build_hdr(const struct sk_buff *skb, char *hdr, struct tso_t *tso, @@ -87,3 +88,271 @@ int tso_start(struct sk_buff *skb, struct tso_t *tso) return hdr_len; } EXPORT_SYMBOL(tso_start); + +static int tso_dma_iova_try(struct device *dev, struct tso_dma_map *map, + phys_addr_t phys, size_t linear_len, size_t total_len, + size_t *offset) +{ + const struct sk_buff *skb; + unsigned int nr_frags; + int i; + + if (!dma_iova_try_alloc(dev, &map->iova_state, phys, total_len)) + return 1; + + skb =3D map->skb; + nr_frags =3D skb_shinfo(skb)->nr_frags; + + if (linear_len) { + if (dma_iova_link(dev, &map->iova_state, + phys, *offset, linear_len, + DMA_TO_DEVICE, 0)) + goto iova_fail; + map->linear_len =3D linear_len; + *offset +=3D linear_len; + } + + for (i =3D 0; i < nr_frags; i++) { + skb_frag_t *frag =3D &skb_shinfo(skb)->frags[i]; + unsigned int frag_len =3D skb_frag_size(frag); + + if (dma_iova_link(dev, &map->iova_state, + skb_frag_phys(frag), *offset, + frag_len, DMA_TO_DEVICE, 0)) { + map->nr_frags =3D i; + goto iova_fail; + } + map->frags[i].len =3D frag_len; + *offset +=3D frag_len; + map->nr_frags =3D i + 1; + } + + if (dma_iova_sync(dev, &map->iova_state, 0, total_len)) + goto iova_fail; + + return 0; + +iova_fail: + dma_iova_destroy(dev, &map->iova_state, *offset, + DMA_TO_DEVICE, 0); + memset(&map->iova_state, 0, sizeof(map->iova_state)); + + /* reset map state */ + map->frag_idx =3D -1; + map->offset =3D 0; + map->linear_len =3D 0; + map->nr_frags =3D 0; + + return 1; +} + +/** + * tso_dma_map_init - DMA-map GSO payload regions + * @map: map struct to initialize + * @dev: device for DMA mapping + * @skb: the GSO skb + * @hdr_len: per-segment header length in bytes + * + * DMA-maps the linear payload (after headers) and all frags. + * Prefers the DMA IOVA API (one contiguous mapping, one IOTLB sync); + * falls back to per-region dma_map_phys() when IOVA is not available. + * Positions the iterator at byte 0 of the payload. + * + * Return: 0 on success, -ENOMEM on DMA mapping failure (partial mappings + * are cleaned up internally). + */ +int tso_dma_map_init(struct tso_dma_map *map, struct device *dev, + const struct sk_buff *skb, unsigned int hdr_len) +{ + unsigned int linear_len =3D skb_headlen(skb) - hdr_len; + unsigned int nr_frags =3D skb_shinfo(skb)->nr_frags; + size_t total_len =3D skb->len - hdr_len; + size_t offset =3D 0; + phys_addr_t phys; + int i; + + if (!total_len) + return 0; + + map->dev =3D dev; + map->skb =3D skb; + map->hdr_len =3D hdr_len; + map->frag_idx =3D -1; + map->offset =3D 0; + map->iova_offset =3D 0; + map->total_len =3D total_len; + map->linear_len =3D 0; + map->nr_frags =3D 0; + memset(&map->iova_state, 0, sizeof(map->iova_state)); + + if (linear_len) + phys =3D virt_to_phys(skb->data + hdr_len); + else + phys =3D skb_frag_phys(&skb_shinfo(skb)->frags[0]); + + if (tso_dma_iova_try(dev, map, phys, linear_len, total_len, &offset)) { + /* IOVA path failed, map state was reset. Fallback to + * per-region dma_map_phys() + */ + if (linear_len) { + map->linear_dma =3D dma_map_phys(dev, phys, linear_len, + DMA_TO_DEVICE, 0); + if (dma_mapping_error(dev, map->linear_dma)) + return -ENOMEM; + map->linear_len =3D linear_len; + } + + for (i =3D 0; i < nr_frags; i++) { + skb_frag_t *frag =3D &skb_shinfo(skb)->frags[i]; + unsigned int frag_len =3D skb_frag_size(frag); + + map->frags[i].len =3D frag_len; + map->frags[i].dma =3D dma_map_phys(dev, skb_frag_phys(frag), + frag_len, DMA_TO_DEVICE, 0); + if (dma_mapping_error(dev, map->frags[i].dma)) { + tso_dma_map_cleanup(map); + return -ENOMEM; + } + map->nr_frags =3D i + 1; + } + } + + if (linear_len =3D=3D 0 && nr_frags > 0) + map->frag_idx =3D 0; + + return 0; +} +EXPORT_SYMBOL(tso_dma_map_init); + +/** + * tso_dma_map_cleanup - unmap all DMA regions in a tso_dma_map + * @map: the map to clean up + * + * Handles both IOVA and fallback paths. For IOVA, calls + * dma_iova_destroy(). For fallback, unmaps each region individually. + */ +void tso_dma_map_cleanup(struct tso_dma_map *map) +{ + int i; + + if (dma_use_iova(&map->iova_state)) { + dma_iova_destroy(map->dev, &map->iova_state, map->total_len, + DMA_TO_DEVICE, 0); + memset(&map->iova_state, 0, sizeof(map->iova_state)); + } else { + if (map->linear_len) + dma_unmap_phys(map->dev, map->linear_dma, map->linear_len, + DMA_TO_DEVICE, 0); + + for (i =3D 0; i < map->nr_frags; i++) + dma_unmap_phys(map->dev, map->frags[i].dma, map->frags[i].len, + DMA_TO_DEVICE, 0); + } + + map->linear_len =3D 0; + map->nr_frags =3D 0; +} +EXPORT_SYMBOL(tso_dma_map_cleanup); + +/** + * tso_dma_map_count - count descriptors for a payload range + * @map: the payload map + * @len: number of payload bytes in this segment + * + * Counts how many contiguous DMA region chunks the next @len bytes + * will span, without advancing the iterator. On the IOVA path this + * is always 1 (contiguous). On the fallback path, uses region sizes + * from the current position. + * + * Return: the number of descriptors needed for @len bytes of payload. + */ +unsigned int tso_dma_map_count(struct tso_dma_map *map, unsigned int len) +{ + unsigned int offset =3D map->offset; + int idx =3D map->frag_idx; + unsigned int count =3D 0; + + if (!len) + return 0; + + if (dma_use_iova(&map->iova_state)) + return 1; + + while (len > 0) { + unsigned int region_len, chunk; + + if (idx =3D=3D -1) + region_len =3D map->linear_len; + else + region_len =3D map->frags[idx].len; + + chunk =3D min(len, region_len - offset); + len -=3D chunk; + count++; + offset =3D 0; + idx++; + } + + return count; +} +EXPORT_SYMBOL(tso_dma_map_count); + +/** + * tso_dma_map_next - yield the next DMA address range + * @map: the payload map + * @addr: output DMA address + * @chunk_len: output chunk length + * @mapping_len: full DMA mapping length when this chunk starts a new + * mapping region, or 0 when continuing a previous one. + * On the IOVA path this is always 0 (driver must not + * do per-region unmaps; use tso_dma_map_cleanup instead). + * @seg_remaining: bytes left in current segment + * + * Yields the next (dma_addr, chunk_len) pair and advances the iterator. + * On the IOVA path, the entire payload is contiguous so each segment + * is always a single chunk. + * + * Return: true if a chunk was yielded, false when @seg_remaining is 0. + */ +bool tso_dma_map_next(struct tso_dma_map *map, dma_addr_t *addr, + unsigned int *chunk_len, unsigned int *mapping_len, + unsigned int seg_remaining) +{ + unsigned int region_len, chunk; + + if (!seg_remaining) + return false; + + /* IOVA path: contiguous DMA range, no region boundaries */ + if (dma_use_iova(&map->iova_state)) { + *addr =3D map->iova_state.addr + map->iova_offset; + *chunk_len =3D seg_remaining; + *mapping_len =3D 0; + map->iova_offset +=3D seg_remaining; + return true; + } + + /* Fallback path: per-region iteration */ + + if (map->frag_idx =3D=3D -1) { + region_len =3D map->linear_len; + chunk =3D min(seg_remaining, region_len - map->offset); + *addr =3D map->linear_dma + map->offset; + } else { + region_len =3D map->frags[map->frag_idx].len; + chunk =3D min(seg_remaining, region_len - map->offset); + *addr =3D map->frags[map->frag_idx].dma + map->offset; + } + + *mapping_len =3D (map->offset =3D=3D 0) ? region_len : 0; + *chunk_len =3D chunk; + map->offset +=3D chunk; + + if (map->offset >=3D region_len) { + map->frag_idx++; + map->offset =3D 0; + } + + return true; +} +EXPORT_SYMBOL(tso_dma_map_next); --=20 2.52.0 From nobody Sun Apr 5 16:26:20 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 8540023EAAD for ; Fri, 3 Apr 2026 00:35:51 +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=1775176552; cv=none; b=s/PWGEk1aLoFkpwqCHPA/BQl13hhoXcd3CIiPamUzHP+s6MkLm/IDTmbJuBKwD4HDow/1DxZIQmwVdpEE0BiOHVhWq013x39NdfEjT4A9jNSI+mRdDBnB0raG3iHC/PKMZ6FpjqvIHdWl0CgWLbb8vUjlzNI0gl1OzgJE9Vw/9E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176552; c=relaxed/simple; bh=iQ727465s3Aho370Tuxfm2rIvW+aDujPQFCVr+k8Ilk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A1Th5kMC3RKfX9ONbEcRmsZ34wCVqUBp+IDSq0mafhH1O0SN5SXJZyrKuqZjtSc7ZdiCblnmVgvrsb3O+s523ngOR/Q7rjwqR21Vk+nEjEf/XMQOoLGhbE0MMN2CPunV6O8NpFqmu21ap9Dq7jiJ/6r0+8Id9z9b1Xu/bVQQZiM= 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=sOx9mtqm; 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.20251104.gappssmtp.com header.i=@dama-to.20251104.gappssmtp.com header.b="sOx9mtqm" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-35d971fbcddso830150a91.1 for ; Thu, 02 Apr 2026 17:35:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176551; x=1775781351; 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=GgEhIXxIJA8MtEOelbwwhwA4rZuHaEy+H8Ivt4MY40w=; b=sOx9mtqmUZ1YyzmzODrUx616tcpW7MqThgqv9tGCw4PBx8molycIalspUTCY/W86NR U15K9rV9/AwEVBIpg2MPZoIqiQNWXneO/Bbbpj8v822Ze2hndpAEg/UljqI6HXIgxlnh nZcx93oLF0fKDkEyZ0b9sgRvrtysOWgDuXdM3mwU5hTHvwlsh0nal5N93QIReUwM24Mc FWBZFj8Pb5q8yAvcld7wZluZGTnFg0cOSMA5CQKohUUAC0iKu0upVxyDqVvC+FudUdQv 5PwHfEb3G4Hfxn6qERPs0SFD/87GSV6pmkPcooOIRypcF/BduevW/xq8SA9FGzy012NC dCaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176551; x=1775781351; 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=GgEhIXxIJA8MtEOelbwwhwA4rZuHaEy+H8Ivt4MY40w=; b=YMC8vCRwV2geR5G1WujDK+cd1GjqM7d0hgPYIPFwkpSRfjY3DfzEcge792ZV0c7ZgZ LRWxWJyMouYzlYCdZfnycU6jlIvRuyNh25iu9jkWuyuMbw4l4fMGHu/57GZ4pJzxIF3i rcZ73qArNejaB1PLuP+voI6gYGD223W1oE/Jq0Qgt3LLqIPkn4UYtTgXmJIk533Vmdf5 FQXQJoQpzU1pe661whxaS1Qc9HOR24iIx0U0n7n4jSeGZUgcyZSg/6VCLETCFIWdAiRB amlYLpC+Y8djfr7Wy4+pEXQEWbTQghLvDNhAkjPqKRkdDw0IeYSoTTYi3rBnq8wdpcCs MpRg== X-Forwarded-Encrypted: i=1; AJvYcCXE5OrKFqCFLbnyGUEdSYJnvsnUU9h86YyQFHiWlyIxHGVE20WidqsBbTZiC5W6nEhST0TuY7LdRK3i/Pc=@vger.kernel.org X-Gm-Message-State: AOJu0YzWw4COaBxpy5xC3XUIEBFTTMeqJ0YT2s2VGrXPMg5i0ov5Ayr8 AgX3KyNt+fMT9jucAqrp7XRg+3GB22i/ZwwTv1K9Sx2UfPHSJT+qCmrP3hsd5ZjWL+E= X-Gm-Gg: AeBDietJo0RWJJw/aflR0uD6vn7nlqemlqQ6HtdsSS878sJocKvnlviOBa42jSYiB/T LbjD7rErV+y/aNvBOt5Rwpxg6wWGgBidY2k/7dV/X53K6fobt9HfYuTeTlYx/8bvNwT0CrVzcgD Ug4vKS1ccUk1Cva5FxD35Z8x59f11FwoIQke0DPqb3ynbeqRBKpPiqHOCUT7ry5rVvnlHPbWmz4 i20YFbB8bYwNdU901AJYQl6EbW07UziNbhhjttKy5T+JoMpIG9E0l02pFg0KtD+/LIy6MwIAdAd fTqF3q5y+tPLB4Kx+jazwGgJvkRnSkG4xMtX7YcFape9SA9fAX6jl0jc80YChxAVZu7WQzEKvtf ZA3pyw/2+3IXnXoOw/Go5ht6PfVPMEGIATJPvO6MIxM/oaAkbg6FpjG0b/nKF6bjpD6Kf9YsogK f8FQPo0yf2bA/z0Q== X-Received: by 2002:a17:90b:1802:b0:35d:a559:5c0a with SMTP id 98e67ed59e1d1-35de597275emr783107a91.6.1775176550940; Thu, 02 Apr 2026 17:35:50 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:6::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35dd367bfb1sm4094226a91.10.2026.04.02.17.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:35:50 -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 v8 02/10] net: bnxt: Export bnxt_xmit_get_cfa_action Date: Thu, 2 Apr 2026 17:35:09 -0700 Message-ID: <20260403003524.2564973-3-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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" Export bnxt_xmit_get_cfa_action so that it can be used in future commits which add software USO support to bnxt. Suggested-by: Jakub Kicinski Reviewed-by: Pavan Chebbi Signed-off-by: Joe Damato --- v4: - Added Pavan's Reviewed-by tag. No functional changes. drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index fe8b886ff82e..d4288c458576 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -447,7 +447,7 @@ const u16 bnxt_lhint_arr[] =3D { TX_BD_FLAGS_LHINT_2048_AND_LARGER, }; =20 -static u16 bnxt_xmit_get_cfa_action(struct sk_buff *skb) +u16 bnxt_xmit_get_cfa_action(struct sk_buff *skb) { struct metadata_dst *md_dst =3D skb_metadata_dst(skb); =20 diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethern= et/broadcom/bnxt/bnxt.h index 3558a36ece12..2b40a5bd57af 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -2969,6 +2969,7 @@ unsigned int bnxt_get_avail_cp_rings_for_en(struct bn= xt *bp); int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init); void bnxt_tx_disable(struct bnxt *bp); void bnxt_tx_enable(struct bnxt *bp); +u16 bnxt_xmit_get_cfa_action(struct sk_buff *skb); void bnxt_sched_reset_txr(struct bnxt *bp, struct bnxt_tx_ring_info *txr, u16 curr); void bnxt_report_link(struct bnxt *bp); --=20 2.52.0 From nobody Sun Apr 5 16:26:20 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 D8677257435 for ; Fri, 3 Apr 2026 00:35:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176555; cv=none; b=JXhsdwHGi5UaWmrTyiH6t0z+pfPSRU7IWT4i5hg9VyA019JmWKHp3eQk7rS6naAa7+mv+GY1kMb6rksAY2cEr6ZYODXFAy/x0b+pxqwFHX5NUxdlkIYnr6MKOzKSVAgyLANFyzWQPXLOQeac8FQEFMTM8LjRtS8mfwp91Jui400= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176555; c=relaxed/simple; bh=QNzOKPdiy8cSJfr1mCdxlpDpX0PCIjFpk/12ymL9Mjs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lN0r0TQcU9jugMgFjMB86FMKNumP6PSgvDkaXAB0oN3lMyz/eye1/DyyQ0IpNqG977aD8tj3rkFHjvtcn18pgOsqc/ueV3llnhqJ7x0AzWBU0Vr83ceyop8Sr8lQokPX/9EdYzRM8CZVpAfb/lAEuzsOKlBXs7KzgyW78vsTly4= 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=UhtktxIc; arc=none smtp.client-ip=209.85.216.48 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="UhtktxIc" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-35d94f4ee36so853694a91.3 for ; Thu, 02 Apr 2026 17:35:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176553; x=1775781353; 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=zg+/QcI8r5Qwsw6nUEc3qwhDPUQV4lyYXGZbebKcjco=; b=UhtktxIcidHzUonYIpKH7SGelZG1COlIHe35zZ+XB9INrYXj+iKMaaQ+p20k1qCA27 7qTGCJT4UgSqiPGQgSjqy7btQUct2+EfqiqQ7KxvebJfHUvxt2IonWHiyXJkgKyRlAqj ynOQc37Z1DBnN9W5bC5HQSBk2icEQ0EXx5uCP2WFi483niEq3jtQwhhfLA196qWWhV23 V6V6gr27HBJk5kN5HkbK7Zg+7gz7Th0QgKzwgxITNJdNjqMiP6UacQ/b55E2kKwBdcyv 4Ypo7gODS4QQuAPJ4K+8ZmO82FxkIFoudJMUEpY4Hi/gmpFM6JgQ7K1bQqENr919N9kp W9lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176553; x=1775781353; 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=zg+/QcI8r5Qwsw6nUEc3qwhDPUQV4lyYXGZbebKcjco=; b=mAhQnab+G+fNwnYfGjrJwi4n7PANAACxSen3nfOBtNO69g9Yt2JyuKnqFxUZvZDt1C 2y5is8spdlf8TD4NDBJCvLZausOHhdpzh2mHWrJTRYqoa17Dkir7bLkEhhkVQGBSmRpc Cn3uzr46x4AED77EwJb+4Bt3B0etGXoS7+mX4B34G8BPcGMf0EZK2PUeT0+A2z+aYwnc D905EY4uW2z5eZFrW1VGIAk0KhMMIrV8WKCv400ZuQa4+WUWCEPqsnFNW1w3X878puT2 hJ2QhZ1T1Z9eyWbYvN4VHOgN9jIN+BIm2Lp3knmsvRee3sdN6wxvkTTDyz5Q7hdiVkKb ZyfQ== X-Forwarded-Encrypted: i=1; AJvYcCXsRgJfMg/NyzIL+uPOc7YhVQvcaxiuOS8eoIfSK4hcfI2KuRTt43NIe7xbN2OUpR0P8I95t5/KixKU7DM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw78Q7ynk3IO9511L2gA1rEyhADTwkQGCsJqoRAzc3d/aik+lHf qkhMk1wmDkptWbGPacDFOi2w/JbghPSnJcUX0FDoryvEY1PIV/HgN1ShoUX3kZaoM9Q= X-Gm-Gg: AeBDievUa+GZEEM/1hX8XgssHn/TDDSw0jxnFXQTJjsryyxl23PE4hnrxWfd/UgYVWo 3J9iFpnjFxNhHzzcdu5/M7X6dkvZ/lpYTAIikh050DCnB1WIE/oGWwY5u8YAUvp6+0cmtmMCSSK ACsZdA8nYXtbPdqWHR5qq48iS2v9tPHBxZE0zVMdXdj9IfPLZ6a5MdzhzFLAI/DMRb+XNZm0rr8 FKaspCMkZeK68Kee/QC0tw98CMPpYCVthuKkd928F9BFWVVg2JZxj3vD+KKKlPk9YMkUfXpuR0r oiqckdCcJmymm102BH9pvxFTV792g53LNJckLkqhDsolNtk3elrAMhosgvyPaXs2CxWmdqMq1dt FBsqW1CkJN1wLtWDtgCQJwvu8VoYCeeVIA7tdXB0IW0G12LJoy4f0RCpInDNJGjCubd2ccC0Mzj ISfMRb X-Received: by 2002:a17:90b:582b:b0:35c:1695:24a3 with SMTP id 98e67ed59e1d1-35de691b308mr725959a91.23.1775176552800; Thu, 02 Apr 2026 17:35:52 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:5e::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35dbe41b11fsm8949063a91.0.2026.04.02.17.35.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:35:52 -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 v8 03/10] net: bnxt: Add a helper for tx_bd_ext Date: Thu, 2 Apr 2026 17:35:10 -0700 Message-ID: <20260403003524.2564973-4-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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" Factor out some code to setup tx_bd_exts into a helper function. This helper will be used by SW USO implementation in the following commits. Suggested-by: Jakub Kicinski Reviewed-by: Pavan Chebbi Signed-off-by: Joe Damato --- v4: - Added Pavan's Reviewed-by tag. No functional changes. drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 ++------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index d4288c458576..d1f0969b781c 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -663,10 +663,9 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb= , struct net_device *dev) txbd->tx_bd_opaque =3D SET_TX_OPAQUE(bp, txr, prod, 2 + last_frag); =20 prod =3D NEXT_TX(prod); - txbd1 =3D (struct tx_bd_ext *) - &txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; + txbd1 =3D bnxt_init_ext_bd(bp, txr, prod, lflags, vlan_tag_flags, + cfa_action); =20 - txbd1->tx_bd_hsize_lflags =3D lflags; if (skb_is_gso(skb)) { bool udp_gso =3D !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4); u32 hdr_len; @@ -693,7 +692,6 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb,= struct net_device *dev) } else if (skb->ip_summed =3D=3D CHECKSUM_PARTIAL) { txbd1->tx_bd_hsize_lflags |=3D cpu_to_le32(TX_BD_FLAGS_TCP_UDP_CHKSUM); - txbd1->tx_bd_mss =3D 0; } =20 length >>=3D 9; @@ -706,9 +704,6 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb,= struct net_device *dev) flags |=3D bnxt_lhint_arr[length]; txbd->tx_bd_len_flags_type =3D cpu_to_le32(flags); =20 - txbd1->tx_bd_cfa_meta =3D cpu_to_le32(vlan_tag_flags); - txbd1->tx_bd_cfa_action =3D - cpu_to_le32(cfa_action << TX_BD_CFA_ACTION_SHIFT); txbd0 =3D txbd; for (i =3D 0; i < last_frag; i++) { frag =3D &skb_shinfo(skb)->frags[i]; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethern= et/broadcom/bnxt/bnxt.h index 2b40a5bd57af..83b4136ccd31 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -2836,6 +2836,24 @@ static inline u32 bnxt_tx_avail(struct bnxt *bp, return bp->tx_ring_size - (used & bp->tx_ring_mask); } =20 +static inline struct tx_bd_ext * +bnxt_init_ext_bd(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + u16 prod, __le32 lflags, u32 vlan_tag_flags, + u32 cfa_action) +{ + struct tx_bd_ext *txbd1; + + txbd1 =3D (struct tx_bd_ext *) + &txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; + txbd1->tx_bd_hsize_lflags =3D lflags; + txbd1->tx_bd_mss =3D 0; + txbd1->tx_bd_cfa_meta =3D cpu_to_le32(vlan_tag_flags); + txbd1->tx_bd_cfa_action =3D + cpu_to_le32(cfa_action << TX_BD_CFA_ACTION_SHIFT); + + return txbd1; +} + static inline void bnxt_writeq(struct bnxt *bp, u64 val, volatile void __iomem *addr) { --=20 2.52.0 From nobody Sun Apr 5 16:26:20 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 6ABFC263C8F for ; Fri, 3 Apr 2026 00:35:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176556; cv=none; b=oGq7FGIEODX7p092zYIz/2E3R7oW2Fmvg5bfGh9sAJfXWDCY/RaNgCCiKDUwiQ0LOXleeWMnerN3KfHcpqH+83M82hEIcBicjhQ0El+G3pKUI0n1sjpiFu6DhKW61bO8cMEaWh//V2BEBvln8R1L03LgvqIHdIdtaiolmvZP5Iw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176556; c=relaxed/simple; bh=OUk9q5Arkhanj5HtzwfH5k7t5KwEKJDygKJt0djc3kM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BGaUWIqAChEZFK9RpkD+3WwsgbMOLSQAYktsbk6Nd3Xx4Tk3LLji3TKJPRV5MEBDXHOc7cmPF1PD2zthmo2XTkGPb/w7qLtiPM7T3gpLstepGRvUPwSFNen1WMWwSCmNazebXgiQmTmG7r5KkzHIld3/JapkH6dFpblBF7rkr4s= 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=UDZK5rbU; arc=none smtp.client-ip=209.85.214.170 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="UDZK5rbU" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2b258d93ffeso8416705ad.3 for ; Thu, 02 Apr 2026 17:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176555; x=1775781355; 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=UDZK5rbUGHpRfDsIgWCQEp5bvnaMwrZb+jSrzUfiJBaw3aqk2Xmc8r7BW6Ti2dg0vb au8TMpGaSBLuOcdd/19IoFs9slDRNiisedsfK3aXb7aMlcId9LiFkG+knaiJ99M/QwK/ +s2mvyFvwfs1m79vDZ4WbU0j5TFTm538xG1OopUfI7/kXN2spuvQKsPlK2LJCW0Zbhp4 LhQDom7F6f75GEeytvz2QR/kLz5osTsRMDAZJlckVLaVYktLJVXsHjiEabfl6c6pJgVf UZVO2kOCvgcDuA5g3tprZE6wgyZRbxYM22b2DAgCeU9HpRcZXV2nMWi+0Nkzqwpp/VkN 4/sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176555; x=1775781355; 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=hXatoGcyUIVjCnYtejOftyTFa+xmHiz11XHjcgyN43G/PXT/REfN+zhYBUZ+lBvzeg FNAJbaAt6mrFNRaZbvYnsM+MOpxEysJURK6hpaDW9eqVE241uvi6P5LYUffMC7YVH9QL sCg+fHKeWAA6q7Queu5yLM11+TtiBYdCLUt4GxKq4lEO0Ve747bBiNwV2jOLTQ7VHpjC T9SC9pzIqCkP6GJLUYn+WgiOP01pTftuDyLucIzY4lPZKiHxvGyUULdyaSoVJ+fX0NRE uiu3h/WYpWiihFtGoQBshfiROqGgWDLJ3iF7ISqAlFxNv10+F1/Vz4E6/v71NnyUXTBp jZHg== X-Forwarded-Encrypted: i=1; AJvYcCUV711xK8SJaOtj6CJGn5N/vd6Jr92ElT0ON9D5smzCj0KLvRPAj5x8P3mJXcqsX6qPaXuxplUa16JaBnk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8YZpZHR5COJPs4x6Ul/m1OXt3jUTnvCug/UJDJDc/KXnhPGHR 8Efb18AMM6aBq61T7viWhLSc1MxAVZMuNtimPjuKZv3LEImQ8SarUv4gzRhozqGSJqM= X-Gm-Gg: AeBDietSsTQKoOtXJCrICHMjcNTomNeZD/Wh5mgCFlCzbcepf3hj95xC7sDaDLF2Uup B50IoXn9LYfyzOCj41bNUSgTvfz3LprU3v5tMxyvonHotCo8NLrkzhYqdzZATuC6dCaUaKrdrZu ARKDpltfWMLNCCSci/Ds5fugGxdY6/wP1p13kFOIt2uXoTrzgPHqQuaE3uIXAgSp7p8grGUFdIp oYpljRLWVzhw3KybyhdI4sokK5W01ld/v13kAZvtFEsUAH5wuj+ESMNHFRR2Ck2ftOMTJnAf6MM 0e1hCenpbN7CxfjGh5AE9T+c+1lRX8WEjVlP1NJEsVc8IICVdav8g6sFRHL4YMF6kgd1NSxOZgk WocJ+acWowaYUeDjWB7RJ4Yo1fkhWWbI8mXElBzrucAswHN2rHg3k/2mEZMMUFHUlUaLADN7M3l nnFpE= X-Received: by 2002:a17:903:b8d:b0:2ae:fc60:2650 with SMTP id d9443c01a7336-2b2817b24c3mr11828475ad.39.1775176554885; Thu, 02 Apr 2026 17:35:54 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b27472d688sm41830405ad.8.2026.04.02.17.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:35:54 -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 v8 04/10] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Thu, 2 Apr 2026 17:35:11 -0700 Message-ID: <20260403003524.2564973-5-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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 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; =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)) { @@ -3394,6 +3405,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 @@ -3404,10 +3417,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; @@ -3429,23 +3442,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 From nobody Sun Apr 5 16:26:20 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 4377226E142 for ; Fri, 3 Apr 2026 00:35:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176558; cv=none; b=Rg7U3JcK763OzmB+9PQzo6PiOrmTWiN9voBwLhNysRXbEwcOOMNm/C2rcjGrJceiqsJtT8CuBDbWNYfJc3A9jy9h4QFJfwf24gF7wyfSANH+2z/0SAgB3PtDNgDEoCFo24TAmfPuk75mYtCxhQB28O5BNRUGUL3p+hcssqo7fsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176558; c=relaxed/simple; bh=cC+5Wx7mvSuD5TmmI90JQNyOVlCxmvA8yGpUrQItxjA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UBRGTaZLtqqJ13cmHrTgavbAMBlOY1ueK7CyVBgfrWsm/+TCvbJeyoZR2/jiR6JHgEXEmEO4Pxn2Z79/rBOfskq6FfW77rZW11StboeCmBNvvO00Lw9sirO0GU0MCcvxeQbwetCzcF9fBeuKJcF0aXodHur1arV/BQBYM5XRcAQ= 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=OS9jAOoD; arc=none smtp.client-ip=209.85.210.182 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="OS9jAOoD" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-82cef263bedso727057b3a.0 for ; Thu, 02 Apr 2026 17:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176557; x=1775781357; 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=NgieY5sH43uwA7fRoCGN+5l2gJuDhD3AI8cPry4udUQ=; b=OS9jAOoDGmV1gPmVEd7exH2xRosbjvcDCZmyjQcVP23gksU9TFfX2OsZ3SiTboVQpV fz2Wg5DpK3J0cb/RcodOJlib0oe1wWoz+4bQOGB8SiQoI7aRFvxFEn+LP/uX00mQQruZ NleB0fELFuVnRxVZc/49ZWfXQe4R4W23RYWCEHmRLic9AryMZSBTU3QE4opfRW7iG6Fr 5SQm2DOR9eqLa3XFV1WsMuNb2rX1ey1H9vqQgbSCSjkH4Km757iDYwGaAubTJC3i8O5k AxBWwRjKoFkDo71+/UEPAPHcOOboHqlq+l4XmMjQLoMKkykBuR3yHxnbfMaKRoFw8FI1 zw6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176557; x=1775781357; 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=NgieY5sH43uwA7fRoCGN+5l2gJuDhD3AI8cPry4udUQ=; b=JWWrx+rvv2gQlZQQRLne6SgNq4AI6ffb638RkVFpYVr3Jg77CBORXFp1x4frevqRvE JAJIDDPollQmD3eulnf/Qi1rmRrU1bQTxKVWlEac0IAdNCQ5UVC2wTmtBrxCI66qUDfg Vb7qwIs9OGG20u3zfe7gL/C+1UaBuzKrCCmRjTw+CaBeoox72rj5rxYTVqGRCN0J9CKQ ow4xnwXWkhOp0SFehbm05PGq4MRlcBA57GNl8hiCi5CCMr6w4NuDqyt6sn5L1LkR85FY 8TOAJ1meGa81hJkAsQwRq3uKboE+rPbG6fPqlsD5yjHK4LMY3muEy/G25AfABUET6xXz XBHw== X-Forwarded-Encrypted: i=1; AJvYcCWt7lI18Gflejqvi9MEh44iFdu+nfZY5lPt8WBA9YwYTzjZ87LKcQ+a/gxncRs62hMpf/hZEwf395jSly4=@vger.kernel.org X-Gm-Message-State: AOJu0YxKQNucVYCXYXb94Y5fnmc5r5xQE/cnasA6ZffDI6mFH/S9r1uz GGJQFwBkjnq/ByvLTJFT+n/tIZpq4jpNzanE8MA+QhIUk9Tdx7dYc1/2GX8yOsl4GZM= X-Gm-Gg: ATEYQzw5w+Sp0YmW3UbpNmeBF73BSxGT8mN6TNu+OnL1Q0YFzQ2hXCJhQftLF2WeKeQ LT3qLmGYd8sGsj8Kpt+DegbiNUzSCmNbE/F5Im+QkFpY2haDwJ5fMmwPXzeda/gctMTvk7IBEz+ 4U5YisUbwAHCqLezB1sp7THbjGGBwH0nIDKOPedNLv+5EUMYw4hgUmE0paetjikrDBx/ZJcvlpa e1ielSRzrtTymgG+Na1FuG0vO6od29PFUgdNqhmivp0I4aA4RnbgCsUpCaqf+jhy5ZZjI/iVzuh gjwT9F4CT/Plz46VZVRPb+yVIFa31Y4smcEaNYaP1980ts+5n62aCJOTarYTaDezf4THbYaXQ5A boDLbM3cKGnxUXvmVizoON4C6ASe93WlN5A9fZKb3zb3IKvT07ZGj4dzFNkokKy9I7K2NoP1mMY c5irA= X-Received: by 2002:a05:6a00:c8c:b0:829:8942:2ca4 with SMTP id d2e1a72fcca58-82d0da4e25dmr1067540b3a.19.1775176556667; Thu, 02 Apr 2026 17:35:56 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:6::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9c6f0c3sm4225634b3a.43.2026.04.02.17.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:35:56 -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 v8 05/10] net: bnxt: Add TX inline buffer infrastructure Date: Thu, 2 Apr 2026 17:35:12 -0700 Message-ID: <20260403003524.2564973-6-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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" Add per-ring pre-allocated inline buffer fields (tx_inline_buf, tx_inline_dma, tx_inline_size) to bnxt_tx_ring_info and helpers to allocate and free them. A producer and consumer (tx_inline_prod, tx_inline_cons) are added to track which slot(s) of the inline buffer are in-use. The inline buffer will be used by the SW USO path for pre-allocated, pre-DMA-mapped per-segment header copies. In the future, this could be extended to support TX copybreak. Allocation helper is marked __maybe_unused in this commit because it will be wired in later. Suggested-by: Jakub Kicinski Reviewed-by: Pavan Chebbi Signed-off-by: Joe Damato --- v5: - Added Pavan's Reviewed-by. No functional changes. rfcv2: - Added a producer and consumer to correctly track the in use header slo= ts. drivers/net/ethernet/broadcom/bnxt/bnxt.c | 35 +++++++++++++++++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 6 ++++ 2 files changed, 41 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index 32a0e71e9fb7..74968ca1f4e2 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -3977,6 +3977,39 @@ static int bnxt_alloc_rx_rings(struct bnxt *bp) return rc; } =20 +static void bnxt_free_tx_inline_buf(struct bnxt_tx_ring_info *txr, + struct pci_dev *pdev) +{ + if (!txr->tx_inline_buf) + return; + + dma_unmap_single(&pdev->dev, txr->tx_inline_dma, + txr->tx_inline_size, DMA_TO_DEVICE); + kfree(txr->tx_inline_buf); + txr->tx_inline_buf =3D NULL; + txr->tx_inline_size =3D 0; +} + +static int __maybe_unused bnxt_alloc_tx_inline_buf(struct bnxt_tx_ring_inf= o *txr, + struct pci_dev *pdev, + unsigned int size) +{ + txr->tx_inline_buf =3D kmalloc(size, GFP_KERNEL); + if (!txr->tx_inline_buf) + return -ENOMEM; + + txr->tx_inline_dma =3D dma_map_single(&pdev->dev, txr->tx_inline_buf, + size, DMA_TO_DEVICE); + if (dma_mapping_error(&pdev->dev, txr->tx_inline_dma)) { + kfree(txr->tx_inline_buf); + txr->tx_inline_buf =3D NULL; + return -ENOMEM; + } + txr->tx_inline_size =3D size; + + return 0; +} + static void bnxt_free_tx_rings(struct bnxt *bp) { int i; @@ -3995,6 +4028,8 @@ static void bnxt_free_tx_rings(struct bnxt *bp) txr->tx_push =3D NULL; } =20 + bnxt_free_tx_inline_buf(txr, pdev); + ring =3D &txr->tx_ring_struct; =20 bnxt_free_ring(bp, &ring->ring_mem); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethern= et/broadcom/bnxt/bnxt.h index 83b4136ccd31..d98a58aa30f6 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -996,6 +996,12 @@ struct bnxt_tx_ring_info { dma_addr_t tx_push_mapping; __le64 data_mapping; =20 + void *tx_inline_buf; + dma_addr_t tx_inline_dma; + unsigned int tx_inline_size; + u16 tx_inline_prod; + u16 tx_inline_cons; + #define BNXT_DEV_STATE_CLOSING 0x1 u32 dev_state; =20 --=20 2.52.0 From nobody Sun Apr 5 16:26:20 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 7803A2405E7 for ; Fri, 3 Apr 2026 00:35:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176560; cv=none; b=t066pMkBv7lPlfQtIjE0LmdYtMd1PLfnwDDOurY3wiz3JZDfnBef9gMD+nM7cPLl4EQFDi4PuqzB7FLEga+dEtnz4p8u686xgZPhoPVKkk07h9r/3O/XMA1ciquk46SiPV18aF/L+aJN5vuCbMoWmNgfQbFOrraY9gfsUkISx1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176560; c=relaxed/simple; bh=imhnP3c90RnqduwmC0Bs7sD+WwiHek5Y56xEli2D4zw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LXzgWolG8ib9EccDSCdL+VP7Gjo0RirA3E+FfEeqtTOM9/qXcf+1UDZOuhJ0QPxqbg6RqAXau9EN+/QG8xvhzsPXUTr9DrZsbEQ4x5dEcTP2aTuqf4Uq/gUSml+XaHNtENGEQDbakswOM6Xuo0BQLA+cCWqdR3/0MP8MjqUv97E= 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=QHMMUcqv; arc=none smtp.client-ip=209.85.216.48 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="QHMMUcqv" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-35d9923eec5so921217a91.2 for ; Thu, 02 Apr 2026 17:35:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176559; x=1775781359; 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=gILlFOgGbo5p4rommdyZj12/KVIzsVhqUzxLDwWsXoM=; b=QHMMUcqvwoWK0MV+nlSsntKhuvS60F74AnRr3iQUJNSS9J8VX1SCB9JLLJjSF4Y2Dh us6iPEYIfSapwJYmjo6LrXnOe9ZB8E9yNQ7qGNdlsLtC/yG/TqD2eAxBEsL3lEhCVIRU p5bHypMGtzhcnuaiWcAfcBRpXf4h47KPbqoUZ8XEFXOYm7jcWCOLM4bV0ymN5obSKiiQ WXZmrQwnFHMhyzM66chYGUKyIJh/Fm/ME/RFRjKrTKtR4PdQ4lIiWIBl8lisUvp6vZj5 AUh2Xv+Rxv/MD4SAj0e2FqQodN2vfzbkNfvLCgnPqYNQNliFOlkladGo5rslW0RNvRWB 0zTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176559; x=1775781359; 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=gILlFOgGbo5p4rommdyZj12/KVIzsVhqUzxLDwWsXoM=; b=L31yO3hqCWEbIFfiBcRfRZwtgyemtWaiVqOJzwB0uQNOb1RS7WpvFuR7lz6IrpM18+ bKoLr4D0DgxkjmendJFDdKLpfpkNOYSFykCVdRODwKXFxr6fs+gZIWNmSCkZ7tGo7753 ac4U3evGO14HQv6Ty0cv69XsM1aNtNiB9VUoODlIDf2O84AQ8fzrzBob6yIFmv4DhS7B meS+Coes9+UmqKnohtDdzpxZx0sdJuPb+7nJzI0TgP2r5ESR+jKqmWUJAaDYURDAtK9n JG32Unydzrv7b8HTkDL73Jx/IC8d74/ze6CkfOSQmXPE1DiBQkKr4fKuNXmLptYCTmVK PItg== X-Forwarded-Encrypted: i=1; AJvYcCVsWHaaqxkzOHQFi+Oib7yCfJncC9dMx7vxo6SdVeduJ2uPM0jSADpq8cc3naW/aVtyUQ1Pxb/5a2dnQQU=@vger.kernel.org X-Gm-Message-State: AOJu0YwdSolKJtJqN1CdaAo0tdUuXb7U8pr7j12ziwYPZI84DRUCUOf7 h7Srbnq4mfmg7ONYa7w2AavUyhHKWueirRf9973SeHZCtnj6mhAWtXzkcl5b+l7Vv38= X-Gm-Gg: AeBDievcfKspftT6q5c3+zbEKDuVU1bdtpJbqzSg0Sy4xCAwM96thvHm0BM51IEcJZg /oE382CgxVNJVZ4NCaQHnfqXjocbBtJTVnp1eP2zsbyA93iIRsRbwoZJoyyL24ervKy3q5YoD5m Li89ZMFjUkofRGFaOvnHobGBnEB4ENYKv/Nylh4pHhMl7Skb8zTE0BUNJqBQuLugSthhtuMcdKQ 64rSl1wxqsrlK9W4FxWz7J7UjNfsJdFhyDnJV/i0GQt3vK2BGuB9BlrOUUBpQeQ0g4+zKDY2Haj +Ze3jeTulh7WzvMNibBAKoN907O0L0FD6Xv9hlAJAZW6OcFmczn5PnnrOQtE3PQGWnEJKYYjU7v SsdWeBM93Vq4ofBHwCgmrdQHba6HajK2VOBpCYrJs06YJKkud1IVxV0vtFQycM+dSSjIFjmRQU4 MquVn9 X-Received: by 2002:a17:90b:4fc9:b0:35d:ac4d:3cb7 with SMTP id 98e67ed59e1d1-35de68417f5mr782080a91.6.1775176558886; Thu, 02 Apr 2026 17:35:58 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35dbe62f5dbsm9310718a91.8.2026.04.02.17.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:35:58 -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 , Richard Cochran , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev Cc: horms@kernel.org, linux-kernel@vger.kernel.org, leon@kernel.org, Joe Damato , bpf@vger.kernel.org Subject: [net-next v8 06/10] net: bnxt: Add boilerplate GSO code Date: Thu, 2 Apr 2026 17:35:13 -0700 Message-ID: <20260403003524.2564973-7-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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" Add bnxt_gso.c and bnxt_gso.h with a stub bnxt_sw_udp_gso_xmit() function, SW USO constants (BNXT_SW_USO_MAX_SEGS, BNXT_SW_USO_MAX_DESCS), and the is_sw_gso field in bnxt_sw_tx_bd with BNXT_SW_GSO_MID/LAST markers. The full SW USO implementation will be added in a future commit. Suggested-by: Jakub Kicinski Reviewed-by: Pavan Chebbi Signed-off-by: Joe Damato --- v7: - Changed the placement of is_sw_gso in struct bnxt_sw_tx_bd to be near other is_* fields. - No functional changes. v5: - Added Pavan's Reviewed-by. No functional changes. drivers/net/ethernet/broadcom/bnxt/Makefile | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 +++ drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c | 30 ++++++++++++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt_gso.h | 31 +++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_gso.h diff --git a/drivers/net/ethernet/broadcom/bnxt/Makefile b/drivers/net/ethe= rnet/broadcom/bnxt/Makefile index ba6c239d52fa..debef78c8b6d 100644 --- a/drivers/net/ethernet/broadcom/bnxt/Makefile +++ b/drivers/net/ethernet/broadcom/bnxt/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_BNXT) +=3D bnxt_en.o =20 -bnxt_en-y :=3D bnxt.o bnxt_hwrm.o bnxt_sriov.o bnxt_ethtool.o bnxt_dcb.o b= nxt_ulp.o bnxt_xdp.o bnxt_ptp.o bnxt_vfr.o bnxt_devlink.o bnxt_dim.o bnxt_c= oredump.o +bnxt_en-y :=3D bnxt.o bnxt_hwrm.o bnxt_sriov.o bnxt_ethtool.o bnxt_dcb.o b= nxt_ulp.o bnxt_xdp.o bnxt_ptp.o bnxt_vfr.o bnxt_devlink.o bnxt_dim.o bnxt_c= oredump.o bnxt_gso.o bnxt_en-$(CONFIG_BNXT_FLOWER_OFFLOAD) +=3D bnxt_tc.o bnxt_en-$(CONFIG_DEBUG_FS) +=3D bnxt_debugfs.o bnxt_en-$(CONFIG_BNXT_HWMON) +=3D bnxt_hwmon.o diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethern= et/broadcom/bnxt/bnxt.h index d98a58aa30f6..6b38b84924e0 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -892,6 +892,7 @@ struct bnxt_sw_tx_bd { struct page *page; u8 is_ts_pkt; u8 is_push; + u8 is_sw_gso; u8 action; unsigned short nr_frags; union { @@ -900,6 +901,9 @@ struct bnxt_sw_tx_bd { }; }; =20 +#define BNXT_SW_GSO_MID 1 +#define BNXT_SW_GSO_LAST 2 + struct bnxt_sw_rx_bd { void *data; u8 *data_ptr; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c b/drivers/net/et= hernet/broadcom/bnxt/bnxt_gso.c new file mode 100644 index 000000000000..b296769ee4fe --- /dev/null +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Broadcom NetXtreme-C/E network driver. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bnxt.h" +#include "bnxt_gso.h" + +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) +{ + dev_kfree_skb_any(skb); + dev_core_stats_tx_dropped_inc(bp->dev); + return NETDEV_TX_OK; +} diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.h b/drivers/net/et= hernet/broadcom/bnxt/bnxt_gso.h new file mode 100644 index 000000000000..f01e8102dcd7 --- /dev/null +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Broadcom NetXtreme-C/E network driver. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + */ + +#ifndef BNXT_GSO_H +#define BNXT_GSO_H + +/* Maximum segments the stack may send in a single SW USO skb. + * This caps gso_max_segs for NICs without HW USO support. + */ +#define BNXT_SW_USO_MAX_SEGS 64 + +/* Worst-case TX descriptors consumed by one SW USO packet: + * Each segment: 1 long BD + 1 ext BD + payload BDs. + * Total payload BDs across all segs <=3D num_segs + nr_frags (each frag + * boundary crossing adds at most 1 extra BD). + * So: 3 * max_segs + MAX_SKB_FRAGS + 1 =3D 3 * 64 + 17 + 1 =3D 210. + */ +#define BNXT_SW_USO_MAX_DESCS (3 * BNXT_SW_USO_MAX_SEGS + MAX_SKB_FRAGS + = 1) + +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); + +#endif --=20 2.52.0 From nobody Sun Apr 5 16:26:20 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 7EE3A27F18B for ; Fri, 3 Apr 2026 00:36:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176563; cv=none; b=oeEh6Lu0EcTearmfSbjizMittOuck1s2+idZqObjikXRkKEkVMXNAm1jy7KrydmPL6mo8keV0+eCCRiEx/SUSu3b76JbAZhngJL5l0EAyPrwhv/5el1NBMDObhFwYFtL00fXip5Mn04zmbJdr+ZZjdAUhz40MFxEyFwkNWv4fJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176563; c=relaxed/simple; bh=kZRHtIKxn+u0/uLZUh7cjhfYIVnWmzKAZbXjoBV0kpc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SthyDCEEXPjbfxrPeraFlGQjpmdPL7n0y3ifcbmswydzK+JbFZyASJpXQIuzhb4TZ8gvWKZMNxmWN/8T22hfdYYm09DIo6QdpVKC1GtxhME6PbioYosMfI22eWZAetTY1tHcH79dVses2csZzAuN7g1cAiL92OJ29RDnC+I4d3o= 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=Cohz7b9A; arc=none smtp.client-ip=209.85.216.52 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="Cohz7b9A" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-35d94f4ee36so853739a91.3 for ; Thu, 02 Apr 2026 17:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176561; x=1775781361; 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=PsQ3WCmsmM6SQuzrllGk6EfoXK5HciHhGyhpPbk0hLM=; b=Cohz7b9As7XEQAu6PLWmBunZqhyO/nLKThfpVMR6dBdnk/cFcKqOTjBuHs9YjnwEi7 eCVuO9RdUHZ8yIQrvYeyfJHnu4JR34OEpFLlyii/BaW1qA+MYwNkdnh2gDjOLvjDi30o bjghjo4XGbkyaumlipnBlLy2BlcpFKH2K8J6UHL2vZLv92glIUoc64ING42EJ3epL4bE XfthUkJBFcZ8SkmXYzMAB6UDSy75NXeUjN5PCUXvJ70NE3IgmxO/NUiSHbwjslEp/Dc/ NSqZ/XFGOEyXm5eGQl9lOU3OkKQDc2bh7bj9jpgtSPqV0zLNrbDkaU3QgQrhHGl6J4YU Wkqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176561; x=1775781361; 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=PsQ3WCmsmM6SQuzrllGk6EfoXK5HciHhGyhpPbk0hLM=; b=fMR+K3MfKHffdoJcMhVoSSUYXoVQcy243v+UGXgO8ayQPTzKJLQv749rRTk5Itv2tL JCNKoa/rZUizePK4PRQbrT/oJ9Y9c++fHo1FhYORtZy4MIyYcESKQGsPl4Esz/0D51J8 tYaXQ/sjR+JIk5vaFZ/1xRcCAsrN5kYvd/7fxQRkcLh+q+HJItCYzLQXfbiZE/1Z9/Bb +R0UGVsrX0k2CelgCsTgtU+l5j93sKtz5/5/20Kfv3XImNgp6354oyGxjb2beKEQDgCR 6A3McvfRWkeEiOM9kshKqMbHIQ8qnZrzOL1xCY5+j5xS8ie+MkA4iMNEAFE91kSLsVGp KsVA== X-Forwarded-Encrypted: i=1; AJvYcCVJwjpQcJ6U+FUXIZZJXi5d7ihy65sA83KqngZxuKt5pjsliSlbTullvG7X/EELAa4vUDVuMST33fZ9KN0=@vger.kernel.org X-Gm-Message-State: AOJu0YxWgQydyF1HpQVfPyAYa27BbuCzTZ5Cd80ytf7RCqqM3aJb2uJg hx4xQGRxEA/h2q3ZdPNzgPnzmOpo4bIDGuqWVLp0pImGhFv2hznCQNaGOWKDuJb9hAc= X-Gm-Gg: AeBDieu4o96SePP/Yd9W63xuLGUsq9svdFbMZKxSUTEvnY3EaP3oU5cvp6BmfGY0J7R 8MaUTXi5KE8hMgKxRc2v0G2BT0bQL1Dxs4hy8svhINWxKygAsL2y4/eBP/FteeGo6rIb/TWgJRs hTjfSTyx9Z4JZ0hpyRvNr1LhbHS+0s3E8B8U+otujntQOOm+q2OFQXwfufp5mkidTI/3e4F/YMn GxY84t7wvjHmKQnqRvAJiOi4SXLvWVNolPin6NsWeejDOPfuyXrPS4tYMcX4pMpoQGCw2kiLVF9 /cX/5B9rrj4X30hsSyjE6WL5cLBY2GqH3VcQU+Ln2/TyWbETHvejqGL6zneXZFXJC4XX9D+zK45 I5DVyh+hyslrxI6T6acg5BMF8I/bv88ziRO9uY96/XmkZ4oYzfnG3bGrmcocBdGnhzX6eRoTFCm EQQLZp X-Received: by 2002:a17:90b:3ecb:b0:35d:a8d9:3a8 with SMTP id 98e67ed59e1d1-35de68cf48amr728073a91.16.1775176560933; Thu, 02 Apr 2026 17:36:00 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:5d::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35de51a87f4sm277726a91.2.2026.04.02.17.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:36:00 -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 v8 07/10] net: bnxt: Implement software USO Date: Thu, 2 Apr 2026 17:35:14 -0700 Message-ID: <20260403003524.2564973-8-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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" 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=3D0 since the inline buffer is pre-allocated and unmapped only at ring teardown. Completion state is updated by calling tso_dma_map_completion_save() for the last segment. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- v8: - Zero csum fields on per-segment header copy after tso_build_hdr() instead of on the original skb, avoiding the need for skb_cow_head, as suggested by Eric Dumazet. v7: - Dropped Pavan's Reviewed-by as some changes were made. - Updated struct bnxt_sw_tx_bd to embed a tso_dma_map_completion_state struct for tracking completion state. - Dropped an unnecessary slot check. - Eliminated an ugly looking ternary to simplify the code. - Call tso_dma_map_completion_save to update completion state. v6: - Addressed Paolo's feedback where the IOVA API could fail transiently, leaving stale state in iova_state. Fix this by always copying the stat= e, noting that dma_iova_try_alloc is called unconditionally in the tso_dma_map_init function (via tso_dma_iova_try), which zeroes the sta= te even if the API can't be used. - Since this was a very minor change, I retained Pavan's Reviewed-by. v5: - Added __maybe_unused to last_unmap_len and last_unmap_addr to silence a build warning when CONFIG_NEED_DMA_MAP_STATE is disabled. No functional changes. - Added Pavan's Reviewed-by. v4: - Fixed the early return issue Pavan pointed out when num_segs <=3D 1; u= se 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 | 3 + drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c | 202 ++++++++++++++++++ 2 files changed, 205 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethern= et/broadcom/bnxt/bnxt.h index 6b38b84924e0..fe50576ae525 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 =20 +#include + #define DRV_MODULE_NAME "bnxt_en" =20 /* DO NOT CHANGE DRV_VER_* defines @@ -899,6 +901,7 @@ struct bnxt_sw_tx_bd { u16 rx_prod; u16 txts_prod; }; + struct tso_dma_map_completion_state sw_gso_cstate; }; =20 #define BNXT_SW_GSO_MID 1 diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c b/drivers/net/et= hernet/broadcom/bnxt/bnxt_gso.c index b296769ee4fe..7a7d40e36cea 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c @@ -19,11 +19,213 @@ #include "bnxt.h" #include "bnxt_gso.h" =20 +static u32 bnxt_sw_gso_lhint(unsigned int len) +{ + if (len <=3D 512) + return TX_BD_FLAGS_LHINT_512_AND_SMALLER; + else if (len <=3D 1023) + return TX_BD_FLAGS_LHINT_512_TO_1023; + else if (len <=3D 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) { + unsigned int last_unmap_len __maybe_unused =3D 0; + dma_addr_t last_unmap_addr __maybe_unused =3D 0; + struct bnxt_sw_tx_bd *last_unmap_buf =3D NULL; + unsigned int hdr_len, mss, num_segs; + struct pci_dev *pdev =3D bp->pdev; + unsigned int total_payload; + struct tso_dma_map map; + u32 vlan_tag_flags =3D 0; + int i, bds_needed; + struct tso_t tso; + u16 cfa_action; + u16 prod; + + hdr_len =3D tso_start(skb, &tso); + mss =3D skb_shinfo(skb)->gso_size; + total_payload =3D skb->len - hdr_len; + num_segs =3D DIV_ROUND_UP(total_payload, mss); + + if (unlikely(num_segs <=3D 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 =3D 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; + } + + if (unlikely(tso_dma_map_init(&map, &pdev->dev, skb, hdr_len))) + goto drop; + + cfa_action =3D bnxt_xmit_get_cfa_action(skb); + if (skb_vlan_tag_present(skb)) { + vlan_tag_flags =3D TX_BD_CFA_META_KEY_VLAN | + skb_vlan_tag_get(skb); + if (skb->vlan_proto =3D=3D htons(ETH_P_8021Q)) + vlan_tag_flags |=3D 1 << TX_BD_CFA_META_TPID_SHIFT; + } + + prod =3D txr->tx_prod; + + for (i =3D 0; i < num_segs; i++) { + unsigned int seg_payload =3D min_t(unsigned int, mss, + total_payload - i * mss); + u16 slot =3D (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; + struct udphdr *uh; + void *this_hdr; + int bd_count; + __le32 csum; + bool last; + u32 flags; + + last =3D (i =3D=3D num_segs - 1); + offset =3D slot * TSO_HEADER_SIZE; + this_hdr =3D txr->tx_inline_buf + offset; + this_hdr_dma =3D txr->tx_inline_dma + offset; + + tso_build_hdr(skb, this_hdr, &tso, seg_payload, last); + + /* Zero stale csum fields copied from the original skb; + * HW offload recomputes from scratch. + */ + uh =3D this_hdr + skb_transport_offset(skb); + uh->check =3D 0; + if (!tso.ipv6) { + struct iphdr *iph =3D this_hdr + skb_network_offset(skb); + + iph->check =3D 0; + } + + dma_sync_single_for_device(&pdev->dev, this_hdr_dma, + hdr_len, DMA_TO_DEVICE); + + bd_count =3D tso_dma_map_count(&map, seg_payload); + + tx_buf =3D &txr->tx_buf_ring[RING_TX(bp, prod)]; + txbd =3D &txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; + + tx_buf->skb =3D skb; + tx_buf->nr_frags =3D bd_count; + tx_buf->is_push =3D 0; + tx_buf->is_ts_pkt =3D 0; + + dma_unmap_addr_set(tx_buf, mapping, this_hdr_dma); + dma_unmap_len_set(tx_buf, len, 0); + + if (last) { + tx_buf->is_sw_gso =3D BNXT_SW_GSO_LAST; + tso_dma_map_completion_save(&map, &tx_buf->sw_gso_cstate); + } else { + tx_buf->is_sw_gso =3D BNXT_SW_GSO_MID; + } + + flags =3D (hdr_len << TX_BD_LEN_SHIFT) | + TX_BD_TYPE_LONG_TX_BD | + TX_BD_CNT(2 + bd_count); + + flags |=3D bnxt_sw_gso_lhint(hdr_len + seg_payload); + + txbd->tx_bd_len_flags_type =3D cpu_to_le32(flags); + txbd->tx_bd_haddr =3D cpu_to_le64(this_hdr_dma); + txbd->tx_bd_opaque =3D SET_TX_OPAQUE(bp, txr, prod, + 2 + bd_count); + + csum =3D cpu_to_le32(TX_BD_FLAGS_TCP_UDP_CHKSUM | + TX_BD_FLAGS_IP_CKSUM); + + prod =3D 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 =3D NEXT_TX(prod); + txbd =3D &txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; + tx_buf =3D &txr->tx_buf_ring[RING_TX(bp, prod)]; + + txbd->tx_bd_haddr =3D 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 =3D NULL; + tx_buf->is_sw_gso =3D 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 =3D dma_addr; + last_unmap_len =3D mapping_len; + } + last_unmap_buf =3D tx_buf; + + flags =3D chunk_len << TX_BD_LEN_SHIFT; + txbd->tx_bd_len_flags_type =3D cpu_to_le32(flags); + txbd->tx_bd_opaque =3D 0; + + seg_payload -=3D chunk_len; + } + + txbd->tx_bd_len_flags_type |=3D + cpu_to_le32(TX_BD_FLAGS_PACKET_END); + + prod =3D 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 +=3D 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) <=3D 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; --=20 2.52.0 From nobody Sun Apr 5 16:26:20 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 A5807282F2A for ; Fri, 3 Apr 2026 00:36:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176565; cv=none; b=VqoxKb4Oais1TQXt0S71TCM5ZCUlg8IR8ZvB0L/FVKkSOwQnGPi9+Ad7jl71SrKHQfbxKprjwEwEolG4mnt4r2PobgfeTvE/G8b8Ohn3yV7WAcmxL2glvqacYpxIH7dsUwe9VjqJCQBLV/atVrYN2KIQaBwrRr0/nL9B21b65Xg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176565; c=relaxed/simple; bh=eLG/HnziP/nIYhK7l47nx7jB8xSDy/qUED3L8LYWUXE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r+/v+voYx4zhD4lGbWPoYqsT3PmXONNGgW1ya3zUmHGG+TBimN+hBvxhYWGOB0hVn2hdZglss7mwtnDrIPYwhpdHs50uAlMqn5Z16iHgyLruOo6OQyoGz4qwt1xi5S98FBA0xAW/geaHT8I36ByyGOb3UP6q6qACiuf1Qqa3fK4= 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=pR1PFXt5; arc=none smtp.client-ip=209.85.214.182 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="pR1PFXt5" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2aaf59c4f7cso6570045ad.1 for ; Thu, 02 Apr 2026 17:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176563; x=1775781363; 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=mXVjzDT8iR6y1+KUsOV8fPMoeIEBaskcv9TKsm/aba4=; b=pR1PFXt52h/4CK6dR515+kJjGD4iOn2w/vwVjpk5YUUKwhzszAgvh4FUrIfGVNhUec ujwDaxrWLMviCP65ZJ/sxuTNqUt/dL9FaXaW8g5kFIyhDGeKF0eTM7NRzD9dLs94D4mJ TdapIYuYJIu4eiqSXbm6O2SNBpAyN6UkByT9vpasIOdAFpN/GYyjAam6mgKw0ztVxGRZ E1QSt+lICjR8hQddvrbEVNAhWZ5HQgB/NHRBLhvL3tOox2H92XLVsyml5jbZVZm7+PF9 aoDRokuqYt+Wke8YxLaUfky/T4nBA1HxFWWmXvfENIW6mrISXq3ekRd369MZhxcVQWvB AlDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176563; x=1775781363; 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=mXVjzDT8iR6y1+KUsOV8fPMoeIEBaskcv9TKsm/aba4=; b=G7v+QGbU3wI6hpqebVu8As2i/mip+f49z2HPpLDNhZY3zirOpfVuGmgtKIToDUprs4 HOF8bjvyzN1zvOGUktJdDj08uGjm8ErJqKh3oBuqVQ3gk8kzi7V2XtOjn79lGkZjP3G+ ynQc62JZzpv7T1bz3HybB+PcjVsJdpwVFGXNf0QWTRf9ISHT6FZzHaOCdg3Gv2rbWvVE UMyWc06jkR2rPYsZpsnTG23dT4k7HAm80qoYC0o1C0GhQjOapYR5SvkLk3NlRb+cuJWZ 4cBVEUxgvo9130b2aT4FBVSN53WY3ZXWNGZh2jKwJtDCDvx63MhflnNbCwp9LApW8vPU +LzA== X-Forwarded-Encrypted: i=1; AJvYcCWKWH5d8BDLVIAUXLD3HBthJJV8mkLLwSHAH5C7dHj2hVjTWja5kdud5FMS8SX1nXK+0tlIpacs2JfrbRs=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4BWiAlSdwlyztMfsttXVxZfB41EOivvSaYkaUWjBo/AW9Nlk5 WAAq5I0Zbp3tzz7BbCA0I9DTmPl6Nqne8IU3lZyf4/FEdqAHwDAWZGH/wfJPqL2szS0= X-Gm-Gg: AeBDievxgsL5vuA0H2CERYc1/+DVY/UhjnqBlUzxE3xURZf1xHM38q6wN6RmrHR1Oyq lR7UH01fzOXE51kFGdFV4bX8siKPCuBW0H1LW0wc5mmcc449qEOPUTzy8GdJ1NWCAZq52I8kHuE zJbTZfbWpUZjxkzEr4EOUKxcxKc5klV7Ar9WRr4CpqI6wRFBkmXZVkiICRHrACWntisTLLz8RVR oSqNySQGr+gXwzL8n0NLHqM7k/cmTeuZ2g/jK7+yINkxH5muIPhf7UL6+jT5oaJ6EFR5wODrVn0 tQ4ziw9+EW4hkz8uNGkRsXleyVsOpb02a439Ub5kwfVr/Em3CeqUi/bA/OcJ5W1cLjo+BWaUVpp 5WKfZdsf3N+yASSpWaNQWpHdowmfsMjPphSVd+FkZJBW4L5yXpSIE/KBIbWjDir3Q/DbAbOpPx4 Zsz4Q= X-Received: by 2002:a17:902:cf05:b0:2b0:beb4:3bb with SMTP id d9443c01a7336-2b28164cce1mr12116825ad.10.1775176562992; Thu, 02 Apr 2026 17:36:02 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2749a34a6sm41400775ad.60.2026.04.02.17.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:36:02 -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 v8 08/10] net: bnxt: Add SW GSO completion and teardown support Date: Thu, 2 Apr 2026 17:35:15 -0700 Message-ID: <20260403003524.2564973-9-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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" Update __bnxt_tx_int and bnxt_free_one_tx_ring_skbs to handle SW GSO segments: - MID segments: adjust tx_pkts/tx_bytes accounting and skip skb free (the skb is shared across all segments and freed only once) - LAST segments: call tso_dma_map_complete() to tear down the IOVA mapping if one was used. On the fallback path, payload DMA unmapping is handled by the existing per-BD dma_unmap_len walk. Both MID and LAST completions advance tx_inline_cons to release the segment's inline header slot back to the ring. is_sw_gso is initialized to zero, so the new code paths are not run. Add logic for feature advertisement and guardrails for ring sizing. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- v7: - Dropped Pavan's Reviewed-by because some changes were made. - Added helper bnxt_min_tx_desc_cnt to avoid repeated code computing descriptor counts. - Updated to use tso_dma_map_complete helper instead of calling the DMA IOVA API directly. v5: - Added Pavan's Reviewed-by. No functional changes. v3: - completion paths updated to use DMA IOVA APIs to teardown mappings. rfcv2: - Update the shared header buffer consumer on TX completion. drivers/net/ethernet/broadcom/bnxt/bnxt.c | 68 ++++++++++++++++--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 19 +++++- drivers/net/ethernet/broadcom/bnxt/bnxt_gso.h | 8 +++ 3 files changed, 84 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index 74968ca1f4e2..82bab63b5821 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -74,6 +74,8 @@ #include "bnxt_debugfs.h" #include "bnxt_coredump.h" #include "bnxt_hwmon.h" +#include "bnxt_gso.h" +#include =20 #define BNXT_TX_TIMEOUT (5 * HZ) #define BNXT_DEF_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_HW | \ @@ -817,12 +819,13 @@ static bool __bnxt_tx_int(struct bnxt *bp, struct bnx= t_tx_ring_info *txr, bool rc =3D false; =20 while (RING_TX(bp, cons) !=3D hw_cons) { - struct bnxt_sw_tx_bd *tx_buf; + struct bnxt_sw_tx_bd *tx_buf, *head_buf; struct sk_buff *skb; bool is_ts_pkt; int j, last; =20 tx_buf =3D &txr->tx_buf_ring[RING_TX(bp, cons)]; + head_buf =3D tx_buf; skb =3D tx_buf->skb; =20 if (unlikely(!skb)) { @@ -869,6 +872,20 @@ static bool __bnxt_tx_int(struct bnxt *bp, struct bnxt= _tx_ring_info *txr, DMA_TO_DEVICE, 0); } } + + if (unlikely(head_buf->is_sw_gso)) { + txr->tx_inline_cons++; + if (head_buf->is_sw_gso =3D=3D BNXT_SW_GSO_LAST) { + tso_dma_map_complete(&pdev->dev, + &head_buf->sw_gso_cstate); + } else { + tx_pkts--; + tx_bytes -=3D skb->len; + skb =3D NULL; + } + head_buf->is_sw_gso =3D 0; + } + if (unlikely(is_ts_pkt)) { if (BNXT_CHIP_P5(bp)) { /* PTP worker takes ownership of the skb */ @@ -3412,6 +3429,7 @@ static void bnxt_free_one_tx_ring_skbs(struct bnxt *b= p, =20 for (i =3D 0; i < max_idx;) { struct bnxt_sw_tx_bd *tx_buf =3D &txr->tx_buf_ring[i]; + struct bnxt_sw_tx_bd *head_buf =3D tx_buf; struct sk_buff *skb; int j, last; =20 @@ -3464,7 +3482,17 @@ static void bnxt_free_one_tx_ring_skbs(struct bnxt *= bp, DMA_TO_DEVICE, 0); } } - dev_kfree_skb(skb); + if (head_buf->is_sw_gso) { + txr->tx_inline_cons++; + if (head_buf->is_sw_gso =3D=3D BNXT_SW_GSO_LAST) { + tso_dma_map_complete(&pdev->dev, + &head_buf->sw_gso_cstate); + } else { + skb =3D NULL; + } + } + if (skb) + dev_kfree_skb(skb); } netdev_tx_reset_queue(netdev_get_tx_queue(bp->dev, idx)); } @@ -3990,9 +4018,9 @@ static void bnxt_free_tx_inline_buf(struct bnxt_tx_ri= ng_info *txr, txr->tx_inline_size =3D 0; } =20 -static int __maybe_unused bnxt_alloc_tx_inline_buf(struct bnxt_tx_ring_inf= o *txr, - struct pci_dev *pdev, - unsigned int size) +static int bnxt_alloc_tx_inline_buf(struct bnxt_tx_ring_info *txr, + struct pci_dev *pdev, + unsigned int size) { txr->tx_inline_buf =3D kmalloc(size, GFP_KERNEL); if (!txr->tx_inline_buf) @@ -4095,6 +4123,14 @@ static int bnxt_alloc_tx_rings(struct bnxt *bp) sizeof(struct tx_push_bd); txr->data_mapping =3D cpu_to_le64(mapping); } + if (!(bp->flags & BNXT_FLAG_UDP_GSO_CAP) && + (bp->dev->features & NETIF_F_GSO_UDP_L4)) { + rc =3D bnxt_alloc_tx_inline_buf(txr, pdev, + BNXT_SW_USO_MAX_SEGS * + TSO_HEADER_SIZE); + if (rc) + return rc; + } qidx =3D bp->tc_to_qidx[j]; ring->queue_id =3D bp->q_info[qidx].queue_id; spin_lock_init(&txr->xdp_tx_lock); @@ -4636,7 +4672,7 @@ static int bnxt_init_tx_rings(struct bnxt *bp) u16 i; =20 bp->tx_wake_thresh =3D max_t(int, bp->tx_ring_size / 2, - BNXT_MIN_TX_DESC_CNT); + bnxt_min_tx_desc_cnt(bp)); =20 for (i =3D 0; i < bp->tx_nr_rings; i++) { struct bnxt_tx_ring_info *txr =3D &bp->tx_ring[i]; @@ -13835,6 +13871,11 @@ static netdev_features_t bnxt_fix_features(struct = net_device *dev, if ((features & NETIF_F_NTUPLE) && !bnxt_rfs_capable(bp, false)) features &=3D ~NETIF_F_NTUPLE; =20 + if ((features & NETIF_F_GSO_UDP_L4) && + !(bp->flags & BNXT_FLAG_UDP_GSO_CAP) && + bp->tx_ring_size < 2 * BNXT_SW_USO_MAX_DESCS) + features &=3D ~NETIF_F_GSO_UDP_L4; + if ((bp->flags & BNXT_FLAG_NO_AGG_RINGS) || bp->xdp_prog) features &=3D ~(NETIF_F_LRO | NETIF_F_GRO_HW); =20 @@ -13880,6 +13921,9 @@ static int bnxt_set_features(struct net_device *dev= , netdev_features_t features) int rc =3D 0; bool re_init =3D false; =20 + bp->tx_wake_thresh =3D max_t(int, bp->tx_ring_size / 2, + bnxt_min_tx_desc_cnt(bp)); + flags &=3D ~BNXT_FLAG_ALL_CONFIG_FEATS; if (features & NETIF_F_GRO_HW) flags |=3D BNXT_FLAG_GRO; @@ -16905,8 +16949,7 @@ static int bnxt_init_one(struct pci_dev *pdev, cons= t struct pci_device_id *ent) NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_PARTIAL | NETIF_F_RXHASH | NETIF_F_RXCSUM | NETIF_F_GRO; - if (bp->flags & BNXT_FLAG_UDP_GSO_CAP) - dev->hw_features |=3D NETIF_F_GSO_UDP_L4; + dev->hw_features |=3D NETIF_F_GSO_UDP_L4; =20 if (BNXT_SUPPORTS_TPA(bp)) dev->hw_features |=3D NETIF_F_LRO; @@ -16939,8 +16982,15 @@ static int bnxt_init_one(struct pci_dev *pdev, con= st struct pci_device_id *ent) dev->priv_flags |=3D IFF_UNICAST_FLT; =20 netif_set_tso_max_size(dev, GSO_MAX_SIZE); - if (bp->tso_max_segs) + if (!(bp->flags & BNXT_FLAG_UDP_GSO_CAP)) { + u16 max_segs =3D BNXT_SW_USO_MAX_SEGS; + + if (bp->tso_max_segs) + max_segs =3D min_t(u16, max_segs, bp->tso_max_segs); + netif_set_tso_max_segs(dev, max_segs); + } else if (bp->tso_max_segs) { netif_set_tso_max_segs(dev, bp->tso_max_segs); + } =20 dev->xdp_features =3D NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | NETDEV_XDP_ACT_RX_SG; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/ne= t/ethernet/broadcom/bnxt/bnxt_ethtool.c index 6826bf762d26..9ded88196bb4 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -33,6 +33,7 @@ #include "bnxt_xdp.h" #include "bnxt_ptp.h" #include "bnxt_ethtool.h" +#include "bnxt_gso.h" #include "bnxt_nvm_defs.h" /* NVRAM content constant and structure defs */ #include "bnxt_fw_hdr.h" /* Firmware hdr constant and structure defs */ #include "bnxt_coredump.h" @@ -852,12 +853,18 @@ static int bnxt_set_ringparam(struct net_device *dev, u8 tcp_data_split =3D kernel_ering->tcp_data_split; struct bnxt *bp =3D netdev_priv(dev); u8 hds_config_mod; + int rc; =20 if ((ering->rx_pending > BNXT_MAX_RX_DESC_CNT) || (ering->tx_pending > BNXT_MAX_TX_DESC_CNT) || (ering->tx_pending < BNXT_MIN_TX_DESC_CNT)) return -EINVAL; =20 + if ((dev->features & NETIF_F_GSO_UDP_L4) && + !(bp->flags & BNXT_FLAG_UDP_GSO_CAP) && + ering->tx_pending < 2 * BNXT_SW_USO_MAX_DESCS) + return -EINVAL; + hds_config_mod =3D tcp_data_split !=3D dev->cfg->hds_config; if (tcp_data_split =3D=3D ETHTOOL_TCP_DATA_SPLIT_DISABLED && hds_config_m= od) return -EINVAL; @@ -882,9 +889,17 @@ static int bnxt_set_ringparam(struct net_device *dev, bp->tx_ring_size =3D ering->tx_pending; bnxt_set_ring_params(bp); =20 - if (netif_running(dev)) - return bnxt_open_nic(bp, false, false); + if (netif_running(dev)) { + rc =3D bnxt_open_nic(bp, false, false); + if (rc) + return rc; + } =20 + /* ring size changes may affect features (SW USO requires a minimum + * ring size), so recalculate features to ensure the correct features + * are blocked/available. + */ + netdev_update_features(dev); return 0; } =20 diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.h b/drivers/net/et= hernet/broadcom/bnxt/bnxt_gso.h index f01e8102dcd7..370b9f4f1db8 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.h @@ -23,6 +23,14 @@ */ #define BNXT_SW_USO_MAX_DESCS (3 * BNXT_SW_USO_MAX_SEGS + MAX_SKB_FRAGS + = 1) =20 +static inline int bnxt_min_tx_desc_cnt(struct bnxt *bp) +{ + if (!(bp->flags & BNXT_FLAG_UDP_GSO_CAP) && + (bp->dev->features & NETIF_F_GSO_UDP_L4)) + return BNXT_SW_USO_MAX_DESCS; + return BNXT_MIN_TX_DESC_CNT; +} + netdev_tx_t bnxt_sw_udp_gso_xmit(struct bnxt *bp, struct bnxt_tx_ring_info *txr, struct netdev_queue *txq, --=20 2.52.0 From nobody Sun Apr 5 16:26:20 2026 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 1F57B27FD4B for ; Fri, 3 Apr 2026 00:36:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176566; cv=none; b=qxFSXTrrqNg1QxstQw02sL5ORS5TTJNjQkAUQDrrlEYPnakato43hA4IDGORO/u6R7lr/bCHnfmwYhdEIbZ7YNgR4ETI+MinrFWE5JSH/D+gTpLECIsiXQSzUplnDz60vrX+GOKszryEdyqIW1hAw151XPC4DkY1ayUTqMvHmm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176566; c=relaxed/simple; bh=i7LlFWSxtXSqs68JNjJJCKZTHI6dOrsEB4tMckHBawI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MEZl2yv9K9IEX+dMHqi6e7RrLTNrRIQrrq/6mFyLbSC4gtAGpVSRcFhK4XJ3+a1Q8uTMfWty0ZCho06R5RoYdaiAXX4UpT0lknAfoZQK38xz8TZRYOgS92cTjSEOC7IHYjx5b9yYNBg8NGzuobPub5ikCc0HtuJ7oTO0HEa/JSc= 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=MmAe2Oze; arc=none smtp.client-ip=209.85.210.169 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="MmAe2Oze" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-82c68339cf0so1553555b3a.0 for ; Thu, 02 Apr 2026 17:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176564; x=1775781364; 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=DhSdyxItZF7Zo/U3S2uuQtdffY9aqIoTVtx9G17MmZM=; b=MmAe2OzeTwiq35q7vkF9ovVPa2opHPxGRfP3ECPEGhizcdzSqreUwbBgVmLwz1CP8E qui2QZubVpcZfZ13kCkXoAZscyS/TMW8GFJnXppjSgyN4ruILDcF9Gg4d2+aKr4dxety Ms5fj+dkcqT+Dx3f5zCzWTLxMlJ0QNMB688/0CvfUR/NFO+fVq7sVxwtRyoPR2r4LE+E FLjK5efaYcUtu7v6TdHs24LydcpPFA40rpLhhCScD7rFGt2DPXrLUDYI9B4IH/Q+HFby 9mFC5WVH4SmvCyKd32TufXpJbuFUlsTv6qM9HzCDSr2QiIF5Q6nDDqu3cr1ERrL3M8QZ UP8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176564; x=1775781364; 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=DhSdyxItZF7Zo/U3S2uuQtdffY9aqIoTVtx9G17MmZM=; b=ktuYGiWY3sXGwyapMQwe6Y9+CvAZ+pZuVJTzOEs4+g3W5hwwHDZIGp55rsxLutkpIJ BrFjXcXPdiL3KwpXVaezhXKN/qgx8+qbjn+AhU2Oq6M7qdexmp71fT4hGwzSWwXv7aAd QmX3VZHyNXyp20hS7i12R13ThF1tf1WNcLhlBR8fUFSdvJNbJenCwDzE/JCOED9/BuRs poXnIlplhnmbfNZBetgL4Sw2ixZC+/C446Vz8uVaT3vLttMz8+7Tlqi6HEHiMso8tWlD Pf3F2JmmA6kHJ858TuL29E3yLMIcuO/ux63lIhyb4TA0NRMpNlSOG8oqrfjYj3u6Mg9n F5TQ== X-Forwarded-Encrypted: i=1; AJvYcCXPbgNRJd8OrZFEKl+7oNb0ozMV3ff8V15pkVkctaVqD9gRnMAvGPGppYxq028M917W8O/GUqZVjW0+g38=@vger.kernel.org X-Gm-Message-State: AOJu0YxZbQDSC/vbXgUnACau9O/AdyhRx7TVspsgP6JQmxFT0+6njcuT rzFtR+HpJTTZsBFEU0QYt68nn1w3tl6AmCiPZudB7OIddo4CblAqx6zjsuMDtByMN/M= X-Gm-Gg: ATEYQzxIQbsATpa8STZVjn8DauEFUyRkgCOn9sUNO2+cLc6iXMCIfMLhC8PWbydAZV8 vaY3NGsS/wSXCsn5+zZ/Xv3Odp7iTLhxKyCi8FYiWesjnnRwR2tjPqz/C9fDgsslSYtgUFINAdi XL24ogvEvr02qlOZBT2NbFOWhbCVqmL9PihJtCLtxj8Dv/HSwjsbb3y1YoAp3qAAoA91Pgbi1nt iKsnwNZDW3ZSKknug5PmWy29N0tm1wPmM0V1QJjMaXy85CHHocbW67VRQN8u+FDjdb9MrXFYgML hy7AOF9tjixg34f/T5uASIRxTv6D6B+GHZWRmx8XXnEfysap5ZhkaEJeqhes5Wp+G49YwQ/6uVQ BrJomqYD9O8U3lddgfA4HvxmNbtAn2LJkZFj69SothYVcvqLT/2QWn2rSu9GXdvM1SvaT2/j8sa EimcqC X-Received: by 2002:a05:6a00:421a:b0:81f:32cc:b1fc with SMTP id d2e1a72fcca58-82d001e9b4dmr4081991b3a.3.1775176564568; Thu, 02 Apr 2026 17:36:04 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:5d::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9c41bc6sm4252084b3a.29.2026.04.02.17.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:36:04 -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 v8 09/10] net: bnxt: Dispatch to SW USO Date: Thu, 2 Apr 2026 17:35:16 -0700 Message-ID: <20260403003524.2564973-10-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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" Wire in the SW USO path added in preceding commits when hardware USO is not possible. When a GSO skb with SKB_GSO_UDP_L4 arrives and the NIC lacks HW USO capability, redirect to bnxt_sw_udp_gso_xmit() which handles software segmentation into individual UDP frames submitted directly to the TX ring. Suggested-by: Jakub Kicinski Reviewed-by: Pavan Chebbi Signed-off-by: Joe Damato --- v5: - Added Pavan's Reviewed-by. No functional changes. drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index 82bab63b5821..a89b0927118c 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -508,6 +508,11 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb= , struct net_device *dev) } } #endif + if (skb_is_gso(skb) && + (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) && + !(bp->flags & BNXT_FLAG_UDP_GSO_CAP)) + return bnxt_sw_udp_gso_xmit(bp, txr, txq, skb); + free_size =3D bnxt_tx_avail(bp, txr); if (unlikely(free_size < skb_shinfo(skb)->nr_frags + 2)) { /* We must have raced with NAPI cleanup */ --=20 2.52.0 From nobody Sun Apr 5 16:26:20 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.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 F2BC42877E5 for ; Fri, 3 Apr 2026 00:36:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176569; cv=none; b=W5Xal0udD7k8Tnb14o9zcozcBcrqUiC84JvoKvjjF3qqvX8WxzaKis3wxnWaQ2Y1aYfFl1IWhZ2UBFJPvavuhIi1/KeFeY78+MDkZzwdw6mFH4ABuRJxrQjwkoycuaD5IaYwkrhUnMUeLx7fJLAe1X1IzXvCEd2t9I4lw8201fU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775176569; c=relaxed/simple; bh=8wDnYGmsZvC7abjvNEJ3Tk+IvO8q3U34sLBOd8TOXA8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nY3EL5eG8CaDXiKMywiFvna/dZjbbm2aFnSOrz7NXgCVH6Zp8CEgllxYPRaVzHzsa6OUxI8qEwrMZKsyt5REcPH+cFIkj431hi/tw4EBFHadC5HovlaFppekD2OBeDBjZV37BAj5EmIY6NJkG4QvgEFijZ7FgDMC4SwsB4KEJFA= 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=VfvzpoH6; arc=none smtp.client-ip=209.85.214.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.20251104.gappssmtp.com header.i=@dama-to.20251104.gappssmtp.com header.b="VfvzpoH6" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2a871daa98fso10798155ad.1 for ; Thu, 02 Apr 2026 17:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20251104.gappssmtp.com; s=20251104; t=1775176566; x=1775781366; 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=NLMUaKCgV8ol4xEA39jbeNRFpzXzgz54RkpOpnmPJPI=; b=VfvzpoH6pNmkO3AKv5bsD/XwKnYjQs5Qycpuz7hrofgEvL2WyvJ8QYYqX/Ef/RTJ5w HwiwG/NP55ALItUKag1Asr9FCxVH1dRYNuBIYE+AEgIiuvgNpGl6aLvJEPqrqStB/RKc uxD8z8buOdOwDugaBZ4Ld+P+w5w1uvtXNq6YlNUGjRNUSGXW2XQrPRX9wDG2nZOhdYjT R/76NBd1w0sMJSVx24jt1zRkeW1TCJFNjXs1o13DK2Wlljlfg+N0K9/iD2nSePyReFyk bSFAEJmp3hvB4x0H5VyRl1BOf9Rx9rG50kD7eRtZotynIDeCq7PgcpDdukprsW21VrZe /ShQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775176566; x=1775781366; 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=NLMUaKCgV8ol4xEA39jbeNRFpzXzgz54RkpOpnmPJPI=; b=D/V3jOUMFRb5+UEyd3O+vRKpRZh5RetyPNQEaUjSDE6qqe3IJ+XDtVfnRQDdHQMGIB aTo/IYN4Og5ZO0ZdVrLXpq3Mq1AUU3jYEmdLjgIG5kXlrm9aNvuYldXZHA8YNY7NkdnC AMgTm33VeeEEtJOrvH/nVhnqSKbMtDJFoFqKHPpziwy65uKhPYMuiQxzjW5lJcpBmbzD CS/6JXk+HwHwfU5jPJhvhQuE0D8jU8mm/qHbF6DVFBA18J4AnmGgCBXusZ9Pmhb/8T+G /YASIWUNKiSLxQCGJw3dIbomrncElmHwUTTpjrfQEhpWHlVL4kDUhCbUi8tN1LyNdTlU UqoA== X-Forwarded-Encrypted: i=1; AJvYcCUBCQb5cjyxGObrxfgOg9ZP0aooQfVtBQYBK1gJCm6HBTseOSxM64Z8BSdd6hgcrO7ztxhreFJlqh44Em4=@vger.kernel.org X-Gm-Message-State: AOJu0YxTTUtN8+PhnwOAneJNJC2LUYD1d4VHXPt2vQat4oFeC7wmAyZp i5c/HqGz+BpQ+hQffcgvVQmZzcBaPry9iEonnvSTt3wh1SIZebF+Lirc8j7vPQ20yb8= X-Gm-Gg: AeBDieurkoi/hN5ghUekVvnTFnnL8tx2uNtq8cqEMx7iBviKy06eMAb8k37uQOyESjb G1gq2xRCmMkZjgqx19/LwxYEA31G8zJpGUvW4SxNwTogLu0IXWl/jEPoe3Ytvi+teJNmBbQOjWK nSNBFJ70zayG+hh/ypXjx6NdD66Eak7PyxQZpwTgCSgm9oHuITILnnz5W59nut6WttHFtY2QcFX vLntaWRCRquMQOPGaK3FFtIVtFhsU4JClg4IdcfURESqxtiOJZxeQk2mn68E5sJUao7rjz+2jS/ LKbjUXSlSpwlO9vXZ0QVKR6yb4ASh1IoGgRL9E/apJrHVDsOtyCzD+SpqzQd3RwmteIhl8qg7He 9YimoQDM+PSFIU+/KxwR4MDox4pSqq/MCHIWQGZKfZfbF+YrUWAPrs3VgNYS3TuOzmMFCP5dJfc Oi+us= X-Received: by 2002:a17:903:2a86:b0:2ae:ce35:2686 with SMTP id d9443c01a7336-2b281706f07mr13520335ad.5.1775176566421; Thu, 02 Apr 2026 17:36:06 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2749cbd85sm38769725ad.74.2026.04.02.17.36.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 17:36:06 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: horms@kernel.org, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, linux-kernel@vger.kernel.org, leon@kernel.org, Joe Damato , linux-kselftest@vger.kernel.org Subject: [net-next v8 10/10] selftests: drv-net: Add USO test Date: Thu, 2 Apr 2026 17:35:17 -0700 Message-ID: <20260403003524.2564973-11-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260403003524.2564973-1-joe@dama.to> References: <20260403003524.2564973-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" Add a simple test for USO. Tests both ipv4 and ipv6 with several full segments and a partial segment. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- v7: - Dropped Pavan's Reviewed-by as there were changes. - Update to use ksft_variants with a generator and a parameterized test_= uso function. - Save original USO state and restore it at the end of the test. - Replace sleep with cfg.wait_hw_stats_settle - Use a socat receiver and check tx stats locally instead of rx on the remote. v5: - Added Pavan's Reviewed-by. No functional changes. v4: - Fix python linter issues (unused imports, docstring, etc). rfcv2: - new in rfcv2 tools/testing/selftests/drivers/net/Makefile | 1 + tools/testing/selftests/drivers/net/uso.py | 103 +++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100755 tools/testing/selftests/drivers/net/uso.py diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/s= elftests/drivers/net/Makefile index 7c7fa75b80c2..335c2ce4b9ab 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -21,6 +21,7 @@ TEST_PROGS :=3D \ ring_reconfig.py \ shaper.py \ stats.py \ + uso.py \ xdp.py \ # end of TEST_PROGS =20 diff --git a/tools/testing/selftests/drivers/net/uso.py b/tools/testing/sel= ftests/drivers/net/uso.py new file mode 100755 index 000000000000..75bf02849075 --- /dev/null +++ b/tools/testing/selftests/drivers/net/uso.py @@ -0,0 +1,103 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +"""Test USO + +Sends large UDP datagrams with UDP_SEGMENT and verifies that the peer +receives the correct number of individual segments with correct sizes. +""" +import random +import socket +import string + +from lib.py import ksft_run, ksft_exit, KsftSkipEx +from lib.py import ksft_eq, ksft_ge, ksft_variants, KsftNamedVariant +from lib.py import NetDrvEpEnv +from lib.py import bkg, defer, ethtool, ip, rand_port, wait_port_listen + +# python doesn't expose this constant, so we need to hardcode it to enable= UDP +# segmentation for large payloads +UDP_SEGMENT =3D 103 + + +def _send_uso(cfg, ipver, mss, total_payload, port): + if ipver =3D=3D "4": + sock =3D socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + dst =3D (cfg.remote_addr_v["4"], port) + else: + sock =3D socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) + dst =3D (cfg.remote_addr_v["6"], port) + + sock.setsockopt(socket.IPPROTO_UDP, UDP_SEGMENT, mss) + payload =3D ''.join(random.choice(string.ascii_lowercase) + for _ in range(total_payload)) + sock.sendto(payload.encode(), dst) + sock.close() + return payload + + +def _get_tx_packets(cfg): + stats =3D ip(f"-s link show dev {cfg.ifname}", json=3DTrue)[0] + return stats['stats64']['tx']['packets'] + + +def _test_uso(cfg, ipver, mss, total_payload): + cfg.require_ipver(ipver) + cfg.require_cmd("socat", remote=3DTrue) + + features =3D ethtool(f"-k {cfg.ifname}", json=3DTrue) + uso_was_on =3D features[0]["tx-udp-segmentation"]["active"] + + try: + ethtool(f"-K {cfg.ifname} tx-udp-segmentation on") + except Exception as exc: + raise KsftSkipEx( + "Device does not support tx-udp-segmentation") from exc + if not uso_was_on: + defer(ethtool, f"-K {cfg.ifname} tx-udp-segmentation off") + + expected_segs =3D (total_payload + mss - 1) // mss + + port =3D rand_port(stype=3Dsocket.SOCK_DGRAM) + rx_cmd =3D f"socat -{ipver} -T 2 -u UDP-RECV:{port},reuseport STDOUT" + + tx_before =3D _get_tx_packets(cfg) + + with bkg(rx_cmd, host=3Dcfg.remote, exit_wait=3DTrue) as rx: + wait_port_listen(port, proto=3D"udp", host=3Dcfg.remote) + _send_uso(cfg, ipver, mss, total_payload, port) + + ksft_eq(len(rx.stdout), total_payload, + comment=3Df"Received {len(rx.stdout)}B, expected {total_payloa= d}B") + + cfg.wait_hw_stats_settle() + + tx_after =3D _get_tx_packets(cfg) + tx_delta =3D tx_after - tx_before + + ksft_ge(tx_delta, expected_segs, + comment=3Df"Expected >=3D {expected_segs} tx packets, got {tx_= delta}") + + +def _uso_variants(): + for ipver in ["4", "6"]: + yield KsftNamedVariant(f"v{ipver}_partial", ipver, 1400, 1400 * 10= + 500) + yield KsftNamedVariant(f"v{ipver}_exact", ipver, 1400, 1400 * 5) + + +@ksft_variants(_uso_variants()) +def test_uso(cfg, ipver, mss, total_payload): + """Send a USO datagram and verify the peer receives the expected segme= nts.""" + _test_uso(cfg, ipver, mss, total_payload) + + +def main() -> None: + """Run USO tests.""" + with NetDrvEpEnv(__file__) as cfg: + ksft_run([test_uso], + args=3D(cfg, )) + ksft_exit() + + +if __name__ =3D=3D "__main__": + main() --=20 2.52.0