From nobody Thu Apr 2 18:47:46 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 B6B6A3CE48D for ; Wed, 1 Apr 2026 23:37:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086678; cv=none; b=SQuHuaS9HS78Ym7UdMNZudZlB5ezwJtTTTphv5cPHK7QDJq/AULX93Qs3SQyBKhnyCMxkRyRwSMOBoFmTl+RJUsklj4f2RC0iYXm6/1sArWy6v24WS3Un5tIsehI3y1yI/bQGE2v2XXiy2ifJd9t5nxf2e5P0DvHKly8/eDUoRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086678; c=relaxed/simple; bh=h+Nwi019zg+GNcSNKItz1L6Nk+mYmZVR7Du6cw1htdQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oRsQM/pc61zY0pVHaZvUSsbktRivZIC1aVW8xAGR/fbVDwvfYgxThe2cidhw42diDNwjMysHGuMqQF4v9dEg+wFNPFafhW5whcKnib8VwwDp1G3uylLlbmAvj5Eebmlbdih+QaOOoELWXydK1wEiEvfxuDoMFqsYRqT/1y7io1k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=KkU4K8op; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="KkU4K8op" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2b25cf1b5f0so1414075ad.3 for ; Wed, 01 Apr 2026 16:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086676; x=1775691476; 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=jzCXTpCa7ZOEvxRJnzVCfpMgnNv26mbZPoa53MNxeDE=; b=KkU4K8opi6TZSWvsRtqhbsVXYXY7r1xI2gMhEpue6ntuIDhaiKUR0SeMW/+IZVPTJw GK2BvbWlseXV3L5WfQdj974LnE7GDx05wNPX135hAD4SexsihcNz1ly+9PP6Vpu8r3rH vAVqJiErUpy44Q83ljEdHK9amxahR5Htd9RQDi5v0/ot3cIPH2qWvzxxylY6z3C+z1hP 1BAPx7AAvAAVP1JvZ9/t7yPGF5GPvB87aASs5SrhM7akognJ8BP1mYwByk64kIme0syp Ix6B9sOMZSKClpvF6t6WAuN3M558r7UJEXC/1rfIhvgnQb4gecrH2QzX/M9th4ytS9ml uXUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086676; x=1775691476; 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=jzCXTpCa7ZOEvxRJnzVCfpMgnNv26mbZPoa53MNxeDE=; b=D6md/+ar2wtzFbtFyFfClFmyqgtXUJCBwzHtnXuAyau3FgkIsjDJx5PqFruaxv9pyT eQ0ePfAIaQIicQF/DoyAoYj7IeVdmDriHla+UhCEvBYMAkhWTdR89SsmP9KHzQ0wwlXe cmEcxz5lzy3MDJ1tSj7qcRyd+fQ5wx4j6sw6tgEvs0MNWg4ApLBCtY1o3z7vSRnAxjSj LbgRYxUKptvGN4hfxqrWur0JThNs25OE8jpjEj8ZgwJ1CqH9ADcfNeXwqQv7oCtgN/r4 YVmlVH4yLYKkOTlUsMK9VWmqG1gNnhVML+YDEv+72YYDFOaLt9TlCcWq3x+FP3rDZOMa xlnQ== X-Forwarded-Encrypted: i=1; AJvYcCUVpiBJGs+CjRiE74TlZvCqRrvXQyB4+Q1M8nTHDR+s5f8/Cn6cII7+hMKVJaUbWCmrmzPBGYsefws6agY=@vger.kernel.org X-Gm-Message-State: AOJu0YwOGpU7S+Fy7bCYmt14gQ1ET5HfP/L/glIs/F2Pq9CyTYyP40f5 PrQ+EttChHJ9+suc8GudOjZElheXSQnGvs64RUpQJYpjElLIOBLPPkizC3j9Hz83Mc9/U/PUKfe Lz0OaFW8= X-Gm-Gg: ATEYQzzp7x8Js6ECBjH79DC1Jzh3rfb41pJpcLniLlnzZLV6BhsouUMHE1STqT/f3Gm lxk46KcDD1tOUchQvGD4RgeNqxms7QIsHBoQau9leYwrAxa/Emby5KyBCx8+CJ4LISicGis0ult 96XUmroKol2zF3UkcpHMZIcveSd+z4QpruUz0nCJFxwcbVOGaOFo3gj8ukGQnCnPrE6ko8bcNu6 A7xbJAUspvwUUmOUcSAKe9ZbmLMX2lLmV7PSfjAqmEXZPhE2kvqF8kzcE3df+HyOkdA7ECZsJHw l2uI6D+a31PpX0+o8yjSb97t7lwiBDoBHgKYPy0ZyYETg1MbiKN0unsI5VPS+MfSivWX5qTr9zi rcUdxCbKWlCg4qQQQRwtcJonY/EygKLft+PIbSxBeJaRnh2Yo88g1mxGsnMNnz9X9eTiYahM6cK RW3031UvBt13fHHOs= X-Received: by 2002:a17:903:17cf:b0:2b2:4d08:9e04 with SMTP id d9443c01a7336-2b269ab308bmr50164325ad.15.1775086676054; Wed, 01 Apr 2026 16:37:56 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:5e::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b274979500sm10479885ad.44.2026.04.01.16.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:37:55 -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 v7 01/10] net: tso: Introduce tso_dma_map and helpers Date: Wed, 1 Apr 2026 16:37:29 -0700 Message-ID: <20260401233745.2333858-2-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 9cc98f850f1d..d8630eb366c5 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 Thu Apr 2 18:47:46 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 771B83EFD38 for ; Wed, 1 Apr 2026 23:37:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086679; cv=none; b=iRY9Ma7M6cebc+MlBcJpTaL+CfDF8YPXWbWcdp+Jwashw4TTEBn1KnjcV9sAxHYxAfIOdv06smCO8Jwx4E92/GqgHP/xFxRvD96x0mfFFnBUPXb2hGylSxekBeAniME3Gy4F69y18M5A9Y93p5a564oBcsWdsQsNhzpjExYXo+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086679; c=relaxed/simple; bh=d2rya2g227s0mOgCHZLhT/Jc5T9CEEjdfICOP2Htdp0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jX+H5AU15Rj6POKb642pvrYULk/Zzcfp3Gxy2aMJeWrkKZqPk6r4NjD5/McaPWOU5u3fgHgFDKpAod2xr2EeGJRZfy9beJ+FQT3IrIfPKEurMG5KhPwwv5WhPzo/vaAL1ocD/Bs+UI8pOOY1X5feSsFmCxgDz9Qaozx74z6Te6c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=pZGUjFtO; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="pZGUjFtO" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-82cd5c07f93so130615b3a.1 for ; Wed, 01 Apr 2026 16:37:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086678; x=1775691478; 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=vQV6psvUVgK5CgQiXG3VYh+xP/mkvkQLPuwwhI8Z6M4=; b=pZGUjFtOw+6Y/R+lXOLMd65oMyAl2Pqv92KelEU9iJH4JnGMznJ11iAlYPFoOcUiR1 Li3eACkoeFdU1PdNCzp8kJW0tCMbSw1/1yA/LhH0vYN1FQTQ4lmJguQ5M+Kq6lw3XujV KLS0oM9BgTF1VDDBpsyF8Nwr0mXRmgwgyOE6aS/coWVFvPD4PSoQDBB+aJpot5t+66Ty iSLZvCPNLNrFzFbAFv0L8vPTkBfTwMU8I62Cdoe1Joa3ezeuqc78ELwn/7RC+CeSoLj3 mALuZRXcIXT2lNUR+FOt5mTDP+Q+CGP2LgYvgm4fJft0RCLUMgEDgU7yJGqgzj/4wYve y/ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086678; x=1775691478; 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=vQV6psvUVgK5CgQiXG3VYh+xP/mkvkQLPuwwhI8Z6M4=; b=Ck88kaXMdQ/y5/S0eeJQ27vaUXrwXTwyChILkuq8HayFs4KNt9Dnocz2a7aXg/UwLg QDa9ZirKc9wulow7VQQ4oAuQplBykOMBPl3NRiwcLyLm0LmNLRAKtKXTp44UKGMNohOu CVcGAnHO/NkDFvndLKsWkdZ6O+CDjrHOixidok6Xr4iqAIHDK5tRbDf9rMZ/2MGOi3R2 Hq/bzVUM23BqGP2DiRtap9IIo9oeeP9dNTZlhYEBf7BoIwpb/EK5IZ42GdUa5FVvcZ57 YfnrxKwIxtR4GlDkv48PgJfipzeEUJnawMcvKjC07JROW4Q2tlPWCYxtPzt/6v1XiifH kWYQ== X-Forwarded-Encrypted: i=1; AJvYcCV+rDsZxTnhdOUkxV8142Z166ItQr1Rawf5DTTxBAnsp3DJzsgNH9OCF522r69M/6AKl8yGSRW7piluheQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3aTuhgd+iKFMI2FfAHV+mKhUBVzIE+Y2pFWwx00AR66MblPHA HpZo9JR6KRp2DzgvnHUMDWSTzRM7oWowwzxVa/ERypGD+hIcgeG5VO9A+7VYTrYzbG8= X-Gm-Gg: ATEYQzx4NnPWKZtULSglaIBVvtHN8sQxTcJZJDJAEQKA4C/LhUjukXbyv9uZG0iLdPO ojEcPDVfHG/smXwKOzK+qVUqtMTyt1vvSxINLLRmuCfB9HoE36/G8LyIWbWv69b8Yo49MG4MZdt e4T5VyPAsKFWEfiqsnGYXLI3vjCTbSmHl0XtR4JdzyISjkAt0foVp7L3on6moZhnSOSa6aeqx4D gNZou731u3I6amUNtRWjhPccArf88IN+n1euWi2O0NSl4PYpwrMFJV39VVaSd7A9MEwqGKrocsU tt3WJQc4oYwYNbyVyRdTohZ4KZ0VAyduqyP++zIhapSrnjc76loUHHSy35c8F9EebTv7chYTNmk VRKJodoIx6h11FBo/0vkyvZisfWgQxB+43xU1PhXviV5aoBfW1WyGzyq5zqOaXP7H4bYdHUG4N5 v5A4g= X-Received: by 2002:a05:6a00:1405:b0:829:780d:99c9 with SMTP id d2e1a72fcca58-82ce8ae50e8mr4989900b3a.26.1775086677829; Wed, 01 Apr 2026 16:37:57 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:7::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9c71e62sm939551b3a.44.2026.04.01.16.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:37:57 -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 v7 02/10] net: bnxt: Export bnxt_xmit_get_cfa_action Date: Wed, 1 Apr 2026 16:37:30 -0700 Message-ID: <20260401233745.2333858-3-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 8ec611bc01ee..a6ff234c2864 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 30efcfbb4791..ce7291c68370 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 Thu Apr 2 18:47:46 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 592113F0752 for ; Wed, 1 Apr 2026 23:38:00 +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=1775086681; cv=none; b=HQl1AogeWmCpwCVEASAx9/6qVHKKX1kjeozaYS1pjPZulx2kBb8I+DBoJO9FyApZ8IGDsrj24qFDTMv/PxzRRPFdvlVV2CpnNu2fla9Gm3LwTg5KA3LW6K52ffXb5ZVnsV/S5zQNH7Izbj8nm0rQn24QljI61lZLhVyZq9IbUWg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086681; c=relaxed/simple; bh=qqTo0OGVy97q53yKZcD7KVbNbUy3LwcG0BT5l19gi00=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mUfk7Bz3XlN30zHVNciNXwfAa0a1f/yQmVaNeR1su3+EmOKEaX+ughFHAZvZDUy0qwXgJmraEY+4aQZhgkQuTR0eG2ZxyFbdxzSBxNt7LIEOU5JmYBggKtGMuAO5illKAR2ra01kFlb0gKmPrFIu2ec1K1UPgal43kxw/eGHybw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=IFu2GVE5; 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.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="IFu2GVE5" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2ad617d5b80so1407115ad.1 for ; Wed, 01 Apr 2026 16:38:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086680; x=1775691480; 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=ifpHKJdUDsXQbmh4bEHFURA21vSlk2ladF+OAXDwL3I=; b=IFu2GVE5SzXHx6Q/M8eG0wdhUJXqQtc5HC/u2g+ziy2CbJAmG5qqle5NUcTnq7pX+6 qbJGDynZdlGas+VtjIdM7pHkEkcOKdjlHGmW7uyK4uXpJXRJ50GPfzNvq7eAPjCr88Fs nF33XryfNn8iSG7bJNwcjCEFdEb686zZVWZrygpB3EngrHMsWZn5OE7b397VST8J37Te xelWgttHR7+UaariXI9duRDSmwg4ATmq99JsSGhP3ZzngGg3im9mSHi39ol3bE2sK3M8 cGQCLpev7cYwkPzD+wJNxxygrzzxamoLPdUtjasGyK4ZzdW0+ERdeTElAAvdaAKrN1k/ M6lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086680; x=1775691480; 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=ifpHKJdUDsXQbmh4bEHFURA21vSlk2ladF+OAXDwL3I=; b=gYRrN8F5nZ+FgxBINsSlBgAG5VWoPMkNoGbzv94NoDegGOfhYcWt3xT4XGUU/pZoCt yx1Z1/5/dtKZGU3jl7caAR30kA8HX2bOnX+YNWIadOZ0wfK5kygdbcIEAF9ra0ytKvRj S2pF2GU7WgBt9r0FU7rr92DO93uJJUvgm7sXZIQqdhO5dBQYoOnF3QhbfeZ0sw4A5L+m MEDUHvW2suhL5LzXDmM0kkVjx8zmrQ1Ss+NQxTRYFCZs+qO9RgGXMHRiIm/7W7hCpeZo UYrBTpCYRp8OtGvsCXZZsUBqp2gIYD6n7fUSzBhzOzcsHls8XefuO5hLvfc0OTivS4VJ ZPMg== X-Forwarded-Encrypted: i=1; AJvYcCW8CPsy/tzXYu/9ICTUfuyKIvMFM/Z08Dmfio7iXZffChTfVFGw66oyLWOal6n3bSrZipydgLp8ZfgGiL8=@vger.kernel.org X-Gm-Message-State: AOJu0YxE8drje61/FMF2sQVfMJZyiTXbpzWVFbEzFAtyWfEXODi0ZyTt i2Q5H7/TvO2t+B3biuHrYA1JAor814LLfxJ9yWemGSHeKnrTqtv4PickHJHNXej2MAI= X-Gm-Gg: ATEYQzxAWQ0f5vTilo12X0cKbh9/j13gqkBNAw6jiI0LrjeLqfFp6sHDmCRi6x8+UZn QUToMi4Du/Mk1wku9sH7Cu76vn7YYiUTrGzmlb51FaHl7d3UUKMGAknYjxAkCSBmeKBLdw57/c7 mXKsAAXC9f93zVVxMrYy/hjIPhXP705SfUL3Qij9L1CAC70hGGUlGjzEVCiakSTzz+FvF9VlQKe 7v0ZMcqJYjkKLGbymtx6rJl+YcOnKqRjKUGBR+XnvA9abZR2vzWQ/qakrMsd9M3Ulc0/6qtJkC9 q7iQPPox/TlIHQVp/vZI6nvMXMkVjhy91DJXfK0ofw4wOTN3xTeQyZrcAjc9XHyJFr97GXRJ+0e lWrI2zyxvzV1XW+c00XPkHUvrslvfABCpg5vUS8pTfRO9H2auSJqKF5sssPMnkfd3AMTf3DD5tu 8qFa64 X-Received: by 2002:a17:903:90f:b0:2b0:5ec1:97c1 with SMTP id d9443c01a7336-2b269a950c8mr50391395ad.7.1775086679678; Wed, 01 Apr 2026 16:37:59 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:44::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b27478cb4fsm9202845ad.29.2026.04.01.16.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:37:59 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, Michael Chan , Pavan Chebbi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: horms@kernel.org, linux-kernel@vger.kernel.org, leon@kernel.org, Joe Damato Subject: [net-next v7 03/10] net: bnxt: Add a helper for tx_bd_ext Date: Wed, 1 Apr 2026 16:37:31 -0700 Message-ID: <20260401233745.2333858-4-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 a6ff234c2864..6abe4bef8afd 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 ce7291c68370..24a32ba7157a 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 Thu Apr 2 18:47:46 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 F11912D949C for ; Wed, 1 Apr 2026 23:38:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086684; cv=none; b=M6tuftkIU+H3Bi9QpBReTIoKGNOtxnBbF7a9TRO0mDk0AFF9o8udBTgBs3ItSYogCnQ97FV8xf1gBd/Evh0OfNlhTiIK7LZQd7KDxZdg2cWT3DzdFuwPoVbiMaTNDCO8+wAKpfAar1gl6+1QhB8coF+Bmkg4g6iDvpUH9J6t8HM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086684; c=relaxed/simple; bh=/QG4rq6stvRVzMtzKT515AeU34mX0x35NxKPcHuNDVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e+y31t59kLa9x+N0HzIqlUdj93aALog9WnDzsS8x0gurrL2Ict3OA/uCA5aSFPNm8jVkAOF1xDVXRg1qMZ/66V3ih6HGENJT7KBJGX7hgF9RnOScv4cCpyZn95XfkmuAWD625eP3jyEfqx3+sIDwkCz1YXzU7mo14tFp4Jupdb4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=pzadqI+x; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="pzadqI+x" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2a871daa98fso1823765ad.1 for ; Wed, 01 Apr 2026 16:38:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086681; x=1775691481; 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=EvCUZz78UoCDWGO4l29n8jMLaU+MzNVlLAG9l7O/Ufo=; b=pzadqI+x+pxNtLLILzI2seV+tNyFyg3rbUvpuaFSGrp1CfWKlANLc6KNz0KNDfbPns 004lNWl+YdwV5EVWt0kBkKqNGKF3nvXMui/MyQ/yTSajNxIflGSnVx9EGcuy+gWvfDRV UeNO1uGZUka4SxE1OuDR+W7JoYviQf0rAtT1EgX24tTeEV7Fv+LF2L+PEVnHjEO92CcY H/hZE1b+uOlzIgWia+BSiIzcdJF9+UF45SCt+oEVLCCEwKsnJREt6OZrImwlh70Mz/ME nKzK6iM9+8vDy6zT6RSxCDOXqJVUqO3iH7X27w7hcgn+kY5m4GPwTDH4oOnjKUwj8FAE SiFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086681; x=1775691481; 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=EvCUZz78UoCDWGO4l29n8jMLaU+MzNVlLAG9l7O/Ufo=; b=QFkkcgk0Kw4RIqCUVwzQDlAoKbmp1akoBeD/DCKxr3/i9kMz0kuh7E5ZbiQRNHM2d1 wG+LJA26dpckZbzZhcBP2HiQOmu8Imz77iBu5y5Jt4MRdqaA0QMCmk3gQGyqxRnN+W8c 9auLSOnpU4iA7JLfLGLzZ7BVFv4TF5B7MNB73xyqsYSY4d8pgPPk6MzAdLgvTvoI42bY dt7RLcqI3LTlHcKS1gjcdUyFYdosl/KEk2Ml9i+ruolN3Z8o/5oITUk8RV2fmj4Ha7eE 4o5HQUn9pGX8dRGpMCy3xO9oUwjo6TxB7PN3EoZlFnL2nrSWhSDZ7lKR5GSpav/04QJY KUnw== X-Forwarded-Encrypted: i=1; AJvYcCUNULHPFW3rRSK859hcZrc1qKPJ0ngV0DRSzAgRkwxDvqkEyxQOvdm18fdB1ZAQmeZzJkntthTkqNwveys=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4oRvXnYXu5dQLfBeQV0zUjNruYWuudRU2OQuA62/oTWJl8Gg2 OO7Fk0IoO07EXnXhF7jop66JibJzEfuOpaRSbP7vHDdDOYu0iN1yKI3uEzCJOCKbCwI= X-Gm-Gg: ATEYQzzzKK6ra0OfEKVSrlsGEWF+D1TUDhA2RwoFVZL6k67k0sfPh5cinYJRNb40e27 CJJzu/SolGoemmh9EzxbC1ioCFt22Zrb2YwqOYuvJaNS0EkKEg0YQ+foQ1NUKlOLjT+otjdivSo wu1XddqNaFplVgA8hSgmf1WeYLm37izrMMXwRauzUHQFrkzzDbaHCBYN3iXuf3ld/lhg7mOsQbt HuNujo5ZNNcp39mJwr5kFmzwmt0j6CAeUiASylJU8HuTGgyNWurBTVc3j4K9B4b9xBzGPkhRmU9 pZqzYlR4oseZ1lcHaplDbe28NUFex6Xh5IWf2RDC6nQjei23g4RM9Br6gDRbnbgaBSbAjAp9qlG Iut+2+O6Xo5paS8EVU9sqm2KdCxLhnaW+nmcAzLEvyItdH8kB5fJ2+tCiHE86N+ocTM4KemtR8i chFwyOypSn5Ooqw0E= X-Received: by 2002:a17:902:c945:b0:2b2:5503:1b8d with SMTP id d9443c01a7336-2b269a8c563mr58851845ad.6.1775086681354; Wed, 01 Apr 2026 16:38:01 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:44::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2749b2423sm9869335ad.67.2026.04.01.16.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:38: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 v7 04/10] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Wed, 1 Apr 2026 16:37:32 -0700 Message-ID: <20260401233745.2333858-5-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 6abe4bef8afd..acd76d9bf403 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 Thu Apr 2 18:47:46 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 8D2013F075C for ; Wed, 1 Apr 2026 23:38:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086688; cv=none; b=ueh2RDy8GqcuoDmyaYtR7GFPCMaWPV/UKzdggq+PNWMsTQgQ6IkJN0xjaLlb0P8Bb01241Fn7+YgthbelSOCYP4d3Cy3B3+D09YB1ybTOHehQGTb6vgrhJXMqQOy554Jy/b20CugOoX1d9f5nF3HdlAsovICFvfhZmRdfnglmS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086688; c=relaxed/simple; bh=8yrRK6KOpkG48wfofnXf88ckxyX6LR4sGxYt1H48M+M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rbBPEVnovO/KZPB+LMkh7sjwEyR/BTBvGzenVEdAJnZOqUm/0bVddUt9hYrVw1NDiobrxW0PE1xmUiCQUiuE35MSLdKq6FAhZbIpoqO8Et/v0Ejlh9PjOmnK69kkGmMJx1myOS4x0qMy4qW4e3kKhVaPomj+LmUH9AEQ7K/Zqtw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=u+tcLmxn; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="u+tcLmxn" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-35d932cc948so130497a91.2 for ; Wed, 01 Apr 2026 16:38:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086683; x=1775691483; 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=/Y1kCqtr6G4/Db8CIqyy23JCMHMGVwKALhaotwfTTB0=; b=u+tcLmxn2xlniD4vnLtuREB0Up/0/Jyac57HbFlVzt2MNeyBQMXZ2a7HIyL2yAPBOv kWvoJnxjzNdVXoTmVPe0JzNgpQ1ZUeaQYKW3nY9ilGTVWUmOP+lNknRhRvm5GiDX//g+ 30GLjZ1hjxvfWuPHO4vMP1Z3vD+VxeElHFHkVNL5apJf2uvRX8EYNdVFpXdcDDaT9TLl +z5QR9rHUJd+fpzggiMJ+wSCIUhjgcJwUourMUezy0q9IVvWH2gNchkoBmAZUrmqR+lV D9Ow2OZUL4mZpl9GDJSDp2MWwG0IRq1PDpd+w7BhddU4RObS1L9VfzmFnpbczYY2+F81 y3RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086683; x=1775691483; 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=/Y1kCqtr6G4/Db8CIqyy23JCMHMGVwKALhaotwfTTB0=; b=F4R+CxX1EbvA36Few1txB+FuNETwsR8dQRXeqmCwSElr6fbvGQACYBsN8f+HuMfJS1 XczcdJUd33eQPkPEy8/sI9aUVjuyKvBipZPnLZ2DhEowm1NYGJc8b3nWdwIe3Ri5/+hu 65rmG/KgCHsPJICSJc9+sdeO1ywxigF6HweY7Jnb+BJZJ0dAUW7p4l0kHMjcWq/MxwO7 FxN7JUSkVFxY+mauSGkvJ0B8bowTDFMPCFKi5Xg/V/vIn92aKYPOo+xlDZpib/ETe7Yu 6tvkbcRMzRWfD97e1TmOxip6N3OFNB12iX7aTmytcVu0qvZXYXZMPJswugRsPfzTBds6 tjgg== X-Forwarded-Encrypted: i=1; AJvYcCVNssL9kJgc2gWWxkjB+rbOVA9Bv7rJVW1Wo1UQsomPGI574gtjM0FnSvesmh1ad8w5G9NGGbsWRXp5MB4=@vger.kernel.org X-Gm-Message-State: AOJu0Yyk1fMmC5tLiW5mbY5iB8LNP1x0a8jiZ8mae9H0jdRVPf5T3bYK IU0x0xMDMEFn0C6jLn0+ic5AoDJfsGcgJO2i3QiEVAhoXIPaVF7E8Fx2r7MKVzlZIXE= X-Gm-Gg: ATEYQzyqZ1LXpEOVdp+Dz+eCees2FR26dMuDZ68HUitM0p8avtJFwIGPnXV0MPGBPSe ZljdMDAE4+PY/Hdqo4bJNdSBUAByn2+E7F/OCuHIHwnTKhncgYARvdu2+Eul8imbAGCCA7vNnHc lBMMdepsrizCgSWgM6rhfdT7w9z7kaBJXqUzziSh53vHzQgTfGDKl+SM0TpJlKoUQzgQSIvzmMR Yc/rcnF1wz7NbZDlG4qMkN+bzcj9NV04hPVCkBtYlYzLZjkaqF3X4kDkb3VZGfc52C+ZeVPeAyd Mx9NxNSoiNPJKtvpoQ4CHHajM1nf8UP7CCvdg1e7aVThfrChtd7C3H8675evLJqo8d4IGla0t7d NVeTmKm6SG/qkXGTsaZ38sN+g1ZY5euTbBqdSQcRh7gKj+NnbmbNGfuNdXM/m+pHdz+auytlEZr Kt8ac= X-Received: by 2002:a17:90b:51c4:b0:35a:cf:64a6 with SMTP id 98e67ed59e1d1-35dc7013459mr5144107a91.23.1775086683078; Wed, 01 Apr 2026 16:38:03 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:7::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c76c6563597sm1083101a12.16.2026.04.01.16.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:38: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 v7 05/10] net: bnxt: Add TX inline buffer infrastructure Date: Wed, 1 Apr 2026 16:37:33 -0700 Message-ID: <20260401233745.2333858-6-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 acd76d9bf403..815c01d75ecc 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 24a32ba7157a..9ee8ab266e28 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 Thu Apr 2 18:47:46 2026 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 058FF3F0744 for ; Wed, 1 Apr 2026 23:38:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086695; cv=none; b=hrQwMwl09/Cv+u+vT0JcSbFQkC+lnElG1y8IvjY5chOp+MMOB5qheWXcG0OqMsrBwxm+W3O1+ysIqWQ2MsBLSolbIxB/0wGguRdQ3HobRDxRzupXEK3EzickB48A0SWSH09h/2c9LJDW44aCTFwx2YheYLwYoZdp2AGq3/EXP9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086695; c=relaxed/simple; bh=mS3rInY2SVNFpz3uz15qX0NhZQ6N3b9eDjXMhQlsb/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=egAikWGj/lRztlBVryOvNc/9IkHc6OcAYg6cpQqu0kpMIHmOfWaq6Zc3i/i9GBaS3X/dxm3maRkjXNvMT5wmWZ8/vhL/UUzL5RRQUdtGdDaKcqG8z/0lBRjp8dr9a/cFSsa1/d0bLZpLbqqlI7MAibYsYrJC8tpyly4RLPQa5Vw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=WJPpMJo0; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="WJPpMJo0" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-824c9da9928so114475b3a.3 for ; Wed, 01 Apr 2026 16:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086685; x=1775691485; 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+e1/eRojUC2JOY0L/aPKRCwKpUmEMMz0IiSi2yaPs=; b=WJPpMJo0sBht3zemiAlwFpqNfkwO4CT3vTXtitlp+jEHM6hi5aKW4Ti9/Vdnb6G3S5 LPUkLcfc2p4I6ubf9G113j2anogjqOr1IWLIf1uY77diwB1+h/ZorOjyG3/2MZfZG26z Ay3h8Q+ZKsiyl3vBnTz4y2c7BKkhKZ9nKe92SLFcleZKNodpCl4F4B8qd7/aarPp1wvg hufUztLDIrSAFknChOndf+nHQ+RhaYxUsogR68U/P3Fw9NiV732FEBNGXSFRnBRLUUPB vCooqP8gsMFZZksKLKjmG0jxJZXBr7Gq9pKZa9zDeufxtCUKfcCGSPbT35UyC2Sa0w0r jbmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086685; x=1775691485; 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+e1/eRojUC2JOY0L/aPKRCwKpUmEMMz0IiSi2yaPs=; b=PdSSQKhjtD4zk+t2qp8l/w+ZoN58mHLiDSyYPW5xTsDWmpPe7Cb3trOLEkUS+owcZ7 Zmc5psZLQF3v0B2UNui/fWmft6hJsltxHRVaBjD5FCWoS90Y0KajWVFtAME3xSBfAcPF R9K/Djt21sKFrRYKBLal3Y0zVIYCKIJ0ItTstrhFFU4hZIu21u8x3mv9y+YK2zudhOLE 39lgwOPodMmZAI8I7CXAzC8jMFm1uboWILCy5pYcHSwcZXpmq+vMRt3ElPk8tyMhcGmV 204kGk+CAgAljHPvo1MA+XUAqpZ+k2MWObGSrN+06B7guw8UBiwRYUC6EzCRf4zL98A6 A1Sg== X-Forwarded-Encrypted: i=1; AJvYcCXGe2Ack11NIcF2m2GZc2UJezL69kqyUro27ca3l1rZ3nLLKijXLKXs2Ttj3lyDWySt/j10Omdkrr+gm2U=@vger.kernel.org X-Gm-Message-State: AOJu0Yyqs1tILY4al/ofil+vuFwtsoy4XiPZkNYP0eFWEwZkcgvCpG6p 3eYkHzZSrS5uNaQbvLPZeW7dPjE2ri8DNPY3RyufVVLdTZ7RXGJzEEhlT0czjeIagNg= X-Gm-Gg: ATEYQzwlpsmrxsv3xuCy+foJtGhjXNGp+tsT1WXRFgI3Ux416u6BJOb8K1KDIEUsOu2 FxmbkZNpNHVsnGpSROcXvRhC+iLGVFOKEH/87oxUETATZuqXfVPHxcGmBpRFz+o3bCB7Qgu8nMV 9ehkDxzLboQMHkkgeTldsr53DhFzPyV2t2f+9BliYW9KwokZYeGn+Gt8Jv/XjVsVUv5pJhOwI1y b8zlVLUAZBOwfMGu80sDQncYwlbkNoWsRUm+yTI8Q3xTJCsZPS2IDIe6QisSwnMcCRBYJLic5Xh dItc+5vkWl8zMb6splp7T/x1jytDunDlqWuoh3NRqyhmNLpVeG4I4/9WJl4D7T0jJIfDMIwhw4D WnPfDpWSlV5d/E/1RWSSkHvnOh/0/3U+dCHzwQ91rHA7qkHrc3SlPUmxmVOC5B08h7sAbmioQPe ECqLE= X-Received: by 2002:a05:6a00:194e:b0:829:9fa3:5c8b with SMTP id d2e1a72fcca58-82ce8b66850mr5376607b3a.55.1775086685285; Wed, 01 Apr 2026 16:38:05 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:7::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9c3e5d7sm963695b3a.39.2026.04.01.16.38.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:38: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 , 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 v7 06/10] net: bnxt: Add boilerplate GSO code Date: Wed, 1 Apr 2026 16:37:34 -0700 Message-ID: <20260401233745.2333858-7-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 9ee8ab266e28..b5b84d1e5217 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 Thu Apr 2 18:47:46 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 0195B3F0A90 for ; Wed, 1 Apr 2026 23:38:07 +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=1775086692; cv=none; b=qFYmL7YiHVhI3OmTdxZszTlbW72YuXyzfeKdNi29QLtxj1DQei9xktDcd/RTE+qvb0ZiZmX84P4MLikLcMJKs5ZKptMap82+CIlCQEJUpymp/5bOdyvQYrCrhQJDlEBS9UyY9aFWA4HNZXrSvjb3LkY7D44HZuYiPGBTq9Rdhrk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086692; c=relaxed/simple; bh=X0PLS7uQfcwIkU18Q9dsVS3BA1yIi9STRGqKUCLjVRs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DJy/AAZ6ZcqtIuB/2aphYw3G/9mungQmLGBJF5DxU2db2lAlnCkJxxE2+BcMGDyVtImFlDVmMv9FyMJG+cYy4KmoCKFREdMpTirHIVVjtqBIBXEhbJrGGHiIshP5MYuGwLxVTPKZD/PUfQnA/juk5bXwELT1e99E6EmVC1WRV5s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=w7xSo7vK; 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.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="w7xSo7vK" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2b24fede2acso956325ad.3 for ; Wed, 01 Apr 2026 16:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086687; x=1775691487; 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=0tyz+7f1gBQoZhc30wkwK7dwm2kbTLb5z/TDmDdtlHI=; b=w7xSo7vKifC2I+L6OEaBFAXSsxeTYOiDtUmTiJLVKrUSGXYNkoM2hiGVIXgHVbiJQ/ VZ3gZjLb6n1Oh+IgL7pwIOrNEMNwIgB6b6lAcAwbX5vo2v2e+THopW8XeG12CeTtzhSa QzG2G74woEaZ2Z8RS4QIWHaHEcehSf6Rehbn4fM5Ms1V+ddW3wK+ii3a7kJhk6TdARei U4pD0K9FX5fje6cNiJ3DqLfx9zCpPzvgyhNRRFs/HDTI9vEXxhQ/8dgZ6aQ0hlaNQOIb H3dqw67y6Th2BVKBfbctovFdjisVOFkKMIbdhkJ23Znuo2xYCLaQw6mCoQYVKejDvJGk hJ3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086687; x=1775691487; 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=0tyz+7f1gBQoZhc30wkwK7dwm2kbTLb5z/TDmDdtlHI=; b=jhMDSx2n7VNGVaXnV0jzVwH+tzsIanoYfNuQtV4K0ZX1Og40GqtMi0xhUAbUawoTNq eDy889+kXxfcdDu5j540dnHrPsQmi+pqKIMJn59T1cs1ck7oSjqcLjSrG//DbrEARASx eid6h08wUIiLm7+8hBDl3/h+T+tR8A1jD87TIciUTfm75jGDDqrb/lx4l+nYdtWS87+d X2XWYIlCvQJO9lWIwEMEDw1leRe/dZKhPP8MDjQ1mt1iFUtkBptdr3b4e7mD+NiNB6Xx jt2tcFU1yO0WB+hRwOg8ZpaqeDhx2Bnf+i/r9ZNOD0CVBZ4y8yCm500qq9Tq6uBUtRr6 3y2g== X-Forwarded-Encrypted: i=1; AJvYcCWvPMMkKz2n2ApuPB/ofCBwonW91b3ZvRy1fcKe4yZu2YZ+JBjlTLaZL7mKckb8zYj5Mwvmi4K2lCYa3FQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywbq90EqfaZ0c5fu08JXa05k3MVlt+kQT8H1m+XFoNkAmrv4MoS 9IMQYBG0XW25T/9ar/iQ1Y6ZW8cybcQ9zUFcu17dQhVqANQ+3BkzDsu64JoN3cAqMTs= X-Gm-Gg: ATEYQzwJOsfuEU+JrfHLkmEjXzpM3Blwd/QsWoMSKKXhJ5JivPtFBKB4wbNtGDghItB 8e/x0UT9gPFzFTatWcZZ68U5i2vIboUld8rJm1D2auU1bRJGXXg+fafJZ3p/82NVoWj9jD73AYF zHOsGevBLxbl6tnTz553624msE4ODsyJnT0Hied1IZeLz3QgoCYdqGKvUTF4dApYunKWzlLYX+G vnGTm43UCgMsTyf1vpR8FPP8zLogQ6XQHx7/YYVTN04RcsdabeoO5q5LHxLKGsKAnYp/Svn6IJX OAvLI4e6nrrpjmtbrn3oG7dX+4+A6ia5P3BXW2S9Ts1m9hy0FtxSL993MoPDBG8ocJw/OiTAer6 NC3aNJFVnn/2Jx264Dq4Zdu8SillWTARza+IHjFpTXVksViq7tthylfyRtNH24i8gC1hCrLTPLD wUH8Lc X-Received: by 2002:a17:903:4b48:b0:2b2:4eec:980b with SMTP id d9443c01a7336-2b269a9cb00mr60909425ad.7.1775086687229; Wed, 01 Apr 2026 16:38:07 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:41::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2749ce29esm8530085ad.81.2026.04.01.16.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:38:06 -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 v7 07/10] net: bnxt: Implement software USO Date: Wed, 1 Apr 2026 16:37:35 -0700 Message-ID: <20260401233745.2333858-8-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 --- 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 | 197 ++++++++++++++++++ 2 files changed, 200 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethern= et/broadcom/bnxt/bnxt.h index b5b84d1e5217..993b215413c7 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..b0f8126b6903 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c @@ -19,11 +19,208 @@ #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); + + /* Zero the csum fields so tso_build_hdr will propagate zeroes into + * every segment header. HW csum offload will recompute from scratch. + */ + udp_hdr(skb)->check =3D 0; + if (!tso.ipv6) + ip_hdr(skb)->check =3D 0; + + 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; + 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); + + 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 Thu Apr 2 18:47:46 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 E6A6D3F0761 for ; Wed, 1 Apr 2026 23:38:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086691; cv=none; b=arWlcfzAEqc/O6xVnDubVP4rHKXwjEs6P8JsKDfN5wCEc9XNDpJwRU/lYh0B1IinznxwgC3UOw/7UjDT6Ql3Yz41Em+MAFKpEIjWziNQiC7BwRsPHl3wXgJxzyiymuT98wD6WVZki/eCC5AhDV6jd3RXVYwc763qbJL2LtRMzVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086691; c=relaxed/simple; bh=T+3sW2tSFmqzY9x10JWwuzvpwXTF7YlhM3nH61MWTHU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tfOE5WPNIblFdr5slSLOpBkltNj1Skx8gIxlMteSesiNQ3pKcSesEvCxjDBTJOMMx8dHPFKDLniqwthEW1kEnMSSupng9vuO+zPIxzYO/jNEPuES/QXz/kVT4U4s8TAhhheJP+kurZxLzpafATlJ5Tn5EKBRar7adOv+22fKHDs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=rkXnBe9W; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="rkXnBe9W" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2b24fdac394so2387285ad.3 for ; Wed, 01 Apr 2026 16:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086689; x=1775691489; 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=tilJCjiCIv7TTqfGMSjq79lLDNcMp8yDeSbDDHIsBLs=; b=rkXnBe9WhcOtEVwYxUH9UAIlnROkWvA43/uOsiJW+gsc7v8mq4pU7b7oyz667xuRZH UIONCArWMmARNnjKKSLViRLmoZvOGq0J/L+Lk1Sbp7RRzhczqHNH2wa2wl/bSzmWtTjZ zPHtDzgbFJL6NTFjt2SJbYSZAn1sAzrgpf7stZfKD013HrlGumRkJhpSvScdWl44hDtb tEivmxGbrd0fyW7Iu84jwOc4RAhIhlaepUByFUa0gChPJpPnCatcZ+sq6trpJXQ+w+18 bL+ipM1YL05EhYOODMLhXite60lpEa65b802YOlD8iwVJ+pO2N2Pn8HWfkp7OP1QjDld Tskw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086689; x=1775691489; 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=tilJCjiCIv7TTqfGMSjq79lLDNcMp8yDeSbDDHIsBLs=; b=k7cFm6POIkaLQbQv7O537Qo5IZRAhVvXWd33CB7C6zKf0Q6wBoHaXl9V0X+eq156s3 g+xeO+mBgiPqdbtSPhC6GGE/tzAKk1ROP+mtaQXl434RyhN6NwSkIGfCK0+mMhEMBwz8 quTw4WxObBB2HfoRO1TrU4Iv4+ERwSiK3Sn04gXflYoOg9rhOeW8Qy8qdXkBbgtUpkBU w+p+AMZ8CfowmXhIOiGTCRg87QprmPuWeSQmr87X9CHnm+q9j2XncH7uk3k+o8mq2KJZ XQ1ALicYDXBdCIQI+Bl+gPxNQesMbBPQdqr4il74VyvPIw4MDc/vCeB8Uj0Baer7/mpn kS4A== X-Forwarded-Encrypted: i=1; AJvYcCU4QEMCvS+UcfPjFmSk/9ps1hL7HDIKoOd+k8lBo6tTRe7bI+PNaFbrtA17CD1xKRxkdC+oTfAU2qFVGm8=@vger.kernel.org X-Gm-Message-State: AOJu0Yyui9Ahn+o/L0jub6i5J4a7FRd+meiXNkoRRKeqMxrZXMX5+YLz +XPK6EwTr6uUA0+ONC9ttKOCJsUAQdCxiFlDk3eDbP3pNx+xJqRoBS1WCvUmNAJyYMU= X-Gm-Gg: ATEYQzwYgZYoYpwVz1z5eGbFtJQQo1RJjDDEe+5KY7t6/2wRsFKKF5CQp7eSbT02Tn/ WJ3LQ9Fj0lhEy/vrGqiBPsuTOtu5tgJ79orbKkmypSO5bgescW0tP8hGFQNY3Oz8Sm+pZ0i+NIp ffByHIcoKIBw+n2oZ5XXc15kdL8SUTkn6BItbE4TsHgU0omPVKbkCoILiKne63qmtoZRlfOCPZE 5dfDgTAmjpl0XFGSD0psLOy3HY8/nTmzejRJs4r1W7XGk5QtQ2ZWKaetzp+q+3DeOMB3oel3R/j 1fSiuGBqyBodc4okkZVqL6IiOk//+vfC/quIDOD6imtbV3fHVmv61s3TiKERYBaZxfKG4zWPegK oCoXYD9nIske0dMimP6OARAg6ZWUbkwJbgZBAvuonwWum368dUZSWL8cn48ubCWyAfxqedgJn1B 2GGPvvwZr50J4qzYA= X-Received: by 2002:a17:903:1b0f:b0:2b2:54e5:b3af with SMTP id d9443c01a7336-2b269d8431amr55925345ad.45.1775086689316; Wed, 01 Apr 2026 16:38:09 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b27478cb4fsm9204835ad.29.2026.04.01.16.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:38:08 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, Michael Chan , Pavan Chebbi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: horms@kernel.org, linux-kernel@vger.kernel.org, leon@kernel.org, Joe Damato Subject: [net-next v7 08/10] net: bnxt: Add SW GSO completion and teardown support Date: Wed, 1 Apr 2026 16:37:36 -0700 Message-ID: <20260401233745.2333858-9-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 815c01d75ecc..92a4c270d2f5 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]; @@ -13824,6 +13860,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 @@ -13869,6 +13910,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; @@ -16877,8 +16921,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; @@ -16911,8 +16954,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 b87ac2bb43dd..a3d17f436b22 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 Thu Apr 2 18:47:46 2026 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.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 E28FE3F0740 for ; Wed, 1 Apr 2026 23:38:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086700; cv=none; b=fs6LR/1U4xuvq7IO2pT2j6P7guZWHGADdYBuZk7sUCOui3+JQ/YvAv3rjVD1+ePmfyK779fVlCO6jmz6+OLFAtq7SH/DHK9YMSgGENS98ueSmxWiuowyGpG8KJQA9LMh8IXoiNxRFD3aQLeQtPZRldBjv0Q4iWCfq0QzIIWdnrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086700; c=relaxed/simple; bh=Lu2Nj/UoAaaciq2gpBkUn86nXLEy3o1XfRVQu4gPPcs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rMrNJ1LOrIzzbkQ7rpA8QXdyUntNeIDHCrhlvP4xWXMDRAerQMPyRm/wf5aODcsbVhziBD+ZfDJX3TzTdiSl1zbnfGWps0ZRv+kBb8TepQkK7FqJGHxZdR0u+eLikpIMqFTg+r2kJHuXv7xMad0f6V7vh8I8rUE++ygZyiTtazY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=h8OgMh5Z; arc=none smtp.client-ip=209.85.215.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.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="h8OgMh5Z" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c76bde70ec9so85863a12.2 for ; Wed, 01 Apr 2026 16:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086691; x=1775691491; 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=3U5nQ07hN5UPJ21y01kKu+oNHzfnV8MRDnHGP25Esxw=; b=h8OgMh5ZpzUp4ZKkz9pyVNE+LhnQWeBnIl5ObE9j1rTWQZuL/YXUlrimdjPWjwVGC3 5zuqk8YiBNk4H5J91DAtJJIFL9GGANYV94hX8N2Rb/lSswXipc9VZOmI4DuG5G0nKvpz NAN+mjTayevi9uYZHE4iNWoFvT9po1Vo5AB4jn20n15FgBTysal8ctOLZXnn+SxyNSJW p0jER2AeoqmNYU4ijHnsXpXB/M9zeCIJaP7ZAXePZhHEoO7RXMBo1toYymiDzzx6EFZU Wnjnd3X3ahYDZIDTpfLx88m0AsqAlciFff0O7HqBNlUW5/9ullJwhY9nBN8gJONZH1Lx 4V5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086691; x=1775691491; 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=3U5nQ07hN5UPJ21y01kKu+oNHzfnV8MRDnHGP25Esxw=; b=cn5Vo5HpEhG44RZqpefbgRShltA+jiyPI7ZCqXPHNlA6BX46z4zo8PsmReVKQMkVJq a9VqZZeCNnazWoFbi9y3zXHfTJmxvBwHST67Lrp1RqUwXfrJq9Ka0ZVj5DyFLTOd/PKE UeiLeCmnJk3LSjUq60LMliMm8sZ3mHaEDPeAH8OXZSfs5fg+c1Cy3rgfindNc+VTTAka iz4adY6P5jvbAllSFqAlonpVRcyIhRa5bSxRyllYkJ0am2aZjR2bsFwXSSbSVsjuDxdn f2V941E5rc+F4OD7QdR5KNqwy5YogoVJdEeBbGt+V/uSRGa1BxZOyX52pr/4Th7Q7NNc C5rw== X-Forwarded-Encrypted: i=1; AJvYcCVzZ/FM2AAC54W/9ocy5lszJdCoHNQw4mRHjKf9lkPdHzjM16KuHUxcEpfOdwCPUwhdqxGK2Crd5+aFUd8=@vger.kernel.org X-Gm-Message-State: AOJu0YyWEeaiJMzebcZ7nSVS9xbj/RIlZwFfxDGzhPsTK6C50y84HteD 0LgOGr2kjifblcJ0Dk/t2GDbRXOxaSTqQkoMP3E1A4P+XnUlbsUXktnUxRgK91Vdv2o= X-Gm-Gg: ATEYQzywP0i3wyvpcV2nV68AXlqeaeZ9W3tX0huluHyCQORTctqWqZBYbPuA1dXY6mx m1iIrLtQ3lV3VNAa32XisuhJVzX19sTH3NFrIvhfrWcC+bqbhwZ52fH/WTsysn875psj17jFlqO YtpDKi4O1KY5W1JcK3ZamYJ3uvKVHt/G8LfhggdYs60gFuAPqfJ3FFOKAeaM1YO87dMLwXSeatE /lKDnV9vm7281VepKsgMB+0tTOvLv7tYIW/oNb9IXvGg0zeMJjaI/JBnUnP58+HBvGQC7/58suO BBv2aQNzvoI8Dol6tekZCwSjVazzrYEoynPt7enptdCzxWRbgUaogm6JiUnqGt9An/BWkwkkn5q KA7bqKzhHY0yr4G/OUU67ssqy4GgNeP//ks5VnZVYrbDmZ1HkrSef5GZOqNXOO07o11OxBDdL/v eXZ5qR X-Received: by 2002:a05:6a20:734b:b0:398:6461:688c with SMTP id adf61e73a8af0-39ef7223b3amr5684829637.2.1775086691183; Wed, 01 Apr 2026 16:38:11 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c76c6476a81sm900824a12.7.2026.04.01.16.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:38:10 -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 v7 09/10] net: bnxt: Dispatch to SW USO Date: Wed, 1 Apr 2026 16:37:37 -0700 Message-ID: <20260401233745.2333858-10-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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 92a4c270d2f5..90bd1b806db8 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 Thu Apr 2 18:47:46 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 20ADA3F0AB0 for ; Wed, 1 Apr 2026 23:38:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086707; cv=none; b=iyc3VkjCYOok/LjxpT+D3kig25wViEgBppFr81cMrSrLOTCzYdjcX6MfbfZ1AROJLJZDprnA36zMVXYLHDMRvEPd4hDdYclXgQX0SIsOiRWmEdUtaQG2i1StqXSJyyOhRsD5sTCZHfyd+/yiLLr+oEDPIv9wcOhY7olW8/xcUwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775086707; c=relaxed/simple; bh=8wDnYGmsZvC7abjvNEJ3Tk+IvO8q3U34sLBOd8TOXA8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NTT5rT3z3Hb8m/4BGKuuSsFkK2+wd/ovaXsrvbwCQ9iMX8edp8wV8z5bttHhj+OGOc9FY82HD0hqMVCci7P2ltomwYpW4FswHTyRqw+sqAYuUlvO9XPZ2cwRwM6P7fSPlOzsc4LIJKf17OywvQRCePVxK/9s4OY3Gs5/Y1L/MG0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b=KTZuEb4n; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="KTZuEb4n" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-82cf83bf375so132955b3a.0 for ; Wed, 01 Apr 2026 16:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1775086695; x=1775691495; 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=KTZuEb4nG6XfzTehZDj6Bg39VCQrS3nGZYzOrOI3z/REbHD+sx9jMkRR6UJxXa54b7 pzAE3YDsZg7D8PuljbxYRnxVnyrboT2NRYTRTQcd8n3Quihg2QDxbwH1z5UcAOCltjJc ovGxGqjM0jagq/bmxER106PlgneTWvqvP6uSZqkVNqvx7VZfTsOb5KSQvnKt7p3OMKRl iY54OeyMEdYXKBofkgSN8d2hLAibeD3arxn1LU1CcvxCIGx0639vDh2Mqssr82wySKA9 Tt2fZwyVuYWE6g40EInZ1jqTVt0fKdgdVW36u9TZsPnpVkyM1+UKFFuUYf/xAbOoC+c0 gUzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775086695; x=1775691495; 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=A3HB4byAD0xwG/tlEB6EzkccFR6M5pFw5wfDk05ZJq2XNm71do2Ptm6pqGV2LpadXv OoGuLXXvVf3WSUfKh2kHW9VDVjeOjkMjx1Sb0QXXQA8K665sysfcGz8HG8kPfcOQF6aQ ZoYlQNvlrUIMBgGLlXRU/bHYg62SLU4pIBzUxe7meQI0hV4wN7Bm6nMxxQKfnxaoCd+I uFa8p3cEP5Q/KI+23y15agVHRtID/sphnlX8ZIQaMR3EVZD5/mWdAnFvF5bcOAujD5Wg /zjxGOD7c4VVLusvNqgszx96xfLGEM5DM6HYr+vLwaW39PDGHRCTcXp8dkYyoUUCVONl DNww== X-Forwarded-Encrypted: i=1; AJvYcCWbVF8VDu4Di60vei/T4c6FLbNLGxPEfg68GADn+j3Q+scZqPpYZC2eGvKRcG5rEQzIMDQENajOllqu5sk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0c+YL7oKxD0jwprjwx1j/sTYF0xcc5XSfUfiK/v5rVxb5/Cwa ltgnzS3pyREqAvnPSQ+5tqrO80Js4sINJdZvl4QzCjs3KJEzaE3wfGTDEpqw8vz/0sI= X-Gm-Gg: ATEYQzyWwYiCMj9p4L7xpKOqG7reAQm1oeHdx/J5ljNyvXpDIonGAvepWEtDxRxuSZp Fan1dpn67TFO/bpsr8yTfjbUtPySyK1fj07gw/Ex3Yjdj3bD9KPbcnZQv4IrwmLaetzZGgs0f64 eRrW5DExamIgJEDUsdMW+7+Z7k/rC9MQpsiu/RVPQBGoFhJk5SNQnH5ZHRm2xs3EyhQ5RKDi6gy CgZKbDf6QWPiM9K2+uJqKPmeK7Pn9smaXs8isMGhbct6hGcaIzVdAaUhbA6ZJi7WTp6l3NMcT7T RaoQjXTFLy3modvsMzC6wBooP2qQxwWnznDTAjP0/llR1Ei8JrIKH/Y8O/fPkLt0ePwo9o7adT8 AVDrAKcVyT8dwLPI8F2nQRCotf/7F2461Mz2f591nYTbeVU4icqQ7yNKIXHguVQJPmOkIymNuBG fo/V3K X-Received: by 2002:a05:6a21:9983:b0:39c:787:f17a with SMTP id adf61e73a8af0-39ef76a85e2mr5757489637.41.1775086693216; Wed, 01 Apr 2026 16:38:13 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9b3dcbesm1012860b3a.22.2026.04.01.16.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:38:12 -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 v7 10/10] selftests: drv-net: Add USO test Date: Wed, 1 Apr 2026 16:37:38 -0700 Message-ID: <20260401233745.2333858-11-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260401233745.2333858-1-joe@dama.to> References: <20260401233745.2333858-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