From nobody Mon Apr 6 16:47:56 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 E3A693F0756 for ; Wed, 18 Mar 2026 19:13:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861219; cv=none; b=sPfwApTk17al7e53BB0qJMg8OlK7KdqMRSwxfiIH7sBANDKTqXBJcDhbxC+u0fy2uQu+5Gr0Fev5TiCl9VdAeQyVG9Lbso6Tzr3hBPasce0f92avI91ZifNufdquXhkJnwQUlFliCf7Td/WHblLmrN20hppYOjwC2tYs1mFvNk4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861219; c=relaxed/simple; bh=zew8Hi0Jlynv3BzSnDjtLPWvg3zE+oMVtctTTm4Asiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WcEUUrn8IZY/jGy1Qu0bPz64Yk+jbWmbqduIyr13F9DN1ueIq66F5H0bDwtQJllqQQKTZBgkMzZ/pPNfr9hP8L+kaGxXgx5ZwziduPGNTUJKqoGDei4hj1lF3nmSc3uPATjUfWVQzHglQMam2ptBIMkjc5jwQOAktx+Zvp1xezI= 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=Fsyh5iLp; arc=none smtp.client-ip=209.85.210.171 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="Fsyh5iLp" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-8298fad2063so169647b3a.3 for ; Wed, 18 Mar 2026 12:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861216; x=1774466016; 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=hzwsL2AaeOyolPivj0sSP8+HZDWRlIMJad3TwBTVVkk=; b=Fsyh5iLpb9DWsrl+shceFbdZ0MY5C9Ad9moIH7MAyLWlwKTOtaoqPjrNNEDeZXRVJf TEsspaHdwfeY/Y5C8jctRUvr0oHNLEY/XcqkFmSmgVD9GzTJMjAWhPIx5EzVxWYvYLSJ T2bZVdQzKa+SfgW8wWLyMK13fWsFWtvsJ9HkSi7GqbvjA/w0ktXwh6LRO0RBRQbDeIPn eUS6GOk28aQ5wtHsejMT+EiSDGC/yaKYymYgZWCMQgds69aJ2lWiEdEAbc+Lo+l+jyV5 v8MGnQ3xoT9Ig0X6Tyyx/r7U9X0DNmq3Eqebunlk2HBNpjEPKweIJVbJ9Nsy8oVr9ibq iENQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861216; x=1774466016; 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=hzwsL2AaeOyolPivj0sSP8+HZDWRlIMJad3TwBTVVkk=; b=ZrKMntDQ8Fh5UlimV4/97hu4zZZZohUa46Uh4zMvBSX6CLpj8jerNnfApfPIXb/PXR 0i/qYX62ockss/rM0+I6aMANwvxh9z4E/V5Ct0xzD3zAtz4yVkjINIRDTD4S5E5c915o xnP2zmbh8myVZYSOreE36kRoOLZoCz+Zx4OpcPOjN8NFWx+GGJ0BhnetoNvFyJTDbOqe /DKHU99Le3q7fDAZEkMOWbSjzOs62DbQ3HXHlI6eRltr3ahE4R3JD0GiCwOdQkZVONSt LA5mbTU65uhiVc4Ozk4GO4QlkRojyqklX/13VBFwxZuDJd4aartGOI7kgDbHcUhTUAlf xsXw== X-Forwarded-Encrypted: i=1; AJvYcCVsk4O7OWjv2N/MDsus61kmOThyiemepdZZU5BTrvskIsiythWv5ByAcw2t1vipM+bZ01lmXgU/O3UCsT8=@vger.kernel.org X-Gm-Message-State: AOJu0YwKiJdYd4m4Rw/YcsZE7LWJXQDtLSJ6snb8JQUqQaIQvyAM6IqM qxOdTD422pP6baovryn4UOmdIknGI4rj9vIlOJIAZgRqdzY5nwx5sd49vmthFmx+zIeA73/kjiK 8W6LUIwg= X-Gm-Gg: ATEYQzwjcYQeEZOfGZe8NovLK05KGgP9MBOzw1MLDPkhADLP5r4Bt/xQnTpwKcG/2fk eDcA4idGePI1VJFljshSc/+BcHrchSb6SXWFZ5TG2pgZMLCmw4pQyAwNWpvo7KMNpuR5AGrqWUe Tu25WRd8SDubkCZVurPpmZNydwxQPUYqu6TeeA51FFJZCg6NiYNg+gPBsuIkJxWnjSbQGAu9Xvs qXvF9oGfFFZMUPw3VDcxxwF7s7nfA697Nm5WCl5vi6ATvP6GO72RHPIbTn7qNG3VCyUMRpketM4 q/rdgPr8cAQxmNAEqtsjf2S2Y1crh0wdHZgrtgVICvAsaihQquOr1ksxrJUF7d4IE7pp7KgHXSZ 2y6+JMpzEdq0lyi8GaMwF716TJnc7g/52+UPHE2O6+KpaA3hOVOpBzWGLy1U1Q3NWxxJ8mvIPju OwmWg= X-Received: by 2002:a05:6a00:a1d:b0:81e:7496:f826 with SMTP id d2e1a72fcca58-82a6aedf286mr4281697b3a.31.1773861216102; Wed, 18 Mar 2026 12:13:36 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:5::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6bbb390csm3766911b3a.29.2026.03.18.12.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:35 -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 v3 01/12] net: tso: Introduce tso_dma_map Date: Wed, 18 Mar 2026 12:13:06 -0700 Message-ID: <20260318191325.1819881-2-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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. The struct 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). Helpers to initialize and operate on this struct will be added in the next commit. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- v3: - struct tso_dma_map extended to track IOVA state and=20 a fallback per-region path. include/net/tso.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/net/tso.h b/include/net/tso.h index e7e157ae0526..8f8d9d74e873 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,43 @@ 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]; +}; + #endif /* _TSO_H */ --=20 2.52.0 From nobody Mon Apr 6 16:47:56 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 39F9A37B3FE for ; Wed, 18 Mar 2026 19:13:39 +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=1773861221; cv=none; b=I+trGUW+fTzianiQ009FC+k33FrT2n/P81tPCU+TPaLyuQIGLJKDgwZXBrlMNYpQ0UAduBnDhvlqfgkUphkEfFUmTR/VBB0qkpyHVw37SUZQmQgsbuSlOOYXeYg/xC/VIiN7PcMDm/xjH6BDiFC/JDcYQ0Po9Qf8rBnv2Ix+JoI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861221; c=relaxed/simple; bh=xq/+xvoT0Hu+ErcCDpnpPBW6PY0iRF0ZVwGcVOToUDw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o4kKl5frf2ha0pljnqF2isgn7y3COoJJKEHdlzK95lk3W6611ZpjKB4FNhRjdqnG6Dqrnxv6+M0szMBbKU7vWCo/Dqu5QW8udK+J7J1+Q+Zxa95AUWbXmhxluuqo3ZroGkpIjalBWnwvvBW0y8yncA+/XL9Yxez6WVKxgrRuizc= 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=dJmZrrWg; 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="dJmZrrWg" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2a9296b3926so1539975ad.1 for ; Wed, 18 Mar 2026 12:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861218; x=1774466018; 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=/TUMkjbkfsbcNIiidb7T5QT1qP0bw5g2hAra5IFGolA=; b=dJmZrrWghetNryNYML+a5wEQdEt85plG/q/BDGO97ngbI95I+JdwsiwgfCyOz+NbTG PiKZUepblN6VNtyiZ3BogwIV7Se+KcH3LjD9bWtg+9+NXBd+k6hzIUE4SsgSEIdEJ0L2 dTZOIMET7OCtj7/1y3fdU3MieVLZB506uj07yDAsVYqN4YTeLTU1psV+qJyKKToDRDRI kiLXvgevre/zbA08h+3J2DCT6HO1iaO5+IEdUK2gP2hSTGi7hPHq7sszo7iU6XqQEUcU 4W2B0SaB0Inzohd7632cwOipJDA9IRlPyfuaAy+7Xl8HImFQ9t+6Qv1hc4ilmcUkx3n5 wsNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861218; x=1774466018; 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=/TUMkjbkfsbcNIiidb7T5QT1qP0bw5g2hAra5IFGolA=; b=KQwGw50MA4Ju3PA5GiNxALX+4kVNl6H/ZT3t9qH7f4Ljpp+2SriJ2hYadwWjuvohEV 6JWYZ8y7LsP6Kjax5orCOdDko5xN+sPze4evchq/9x5y76QbFhYQaU3zcmaonAdyYm0c ihNBhfazjK9azpA5i+wqbdgOeTXOjaXm3piBizhWHollrYDcpfDwiHLdDiz2yNj83rBf JJN8euYlBPhzNf/126sBBlENEuMPAoRuXkADPdxlcR2Z8faodXarFo4h4XsqWXA2NimQ +3PjMEIM0nNXIPwOGsVnW0KrHxu+VN5GlsL4g4/I3rR51OHsN6CUJnzOrNCSK8UzVr5i zduA== X-Forwarded-Encrypted: i=1; AJvYcCUT4zg35TfLvk5yhTg0Uasw9bJIOAKFuBtFA1im6CzxWp8ET9Z7aZ3qaSVWFaD0qW/IfWfP7tguyGnytS4=@vger.kernel.org X-Gm-Message-State: AOJu0YyV9jTkXRN0DleGLzzp9gU6oo2q1eDheLnkhtf0SiWpl/t623BU Q2VnxgAtHnismT/+DSdZdzyqjKb3K/+PPmfT6iImOVdD12k9glojIQpx5B8sVyNGmE8= X-Gm-Gg: ATEYQzwlcKLvQfbINT+bev8J88fRIIowlTgUD5lnWl9lWiSOmZSO79L3GatHcj7T/4A UPR515L/gDqCeEXod8A4z0oP6pWx5nIDuauMM4ORmjpk6qgrYaKNhLj6qIReXFFEENiPzrkQ89u LigIYws8GzBYx76cbDtXPo1mJD78H9gtdp/NadBuIO5LbyGoC9NGTsr+Szi97G1duht+KgvC2lR E0ikO7hFGnpchcbiWaQhBt2xQAgdy6obPGmJqmookyU+R33S+PDzyt/CF/Fc1Gmbc9yZZ/7/PK6 Pyn/CKhTfJ21qnpB+diMa9XmC2caKuvYUXX5+0DLHJVylw7gkYYNzB3LsIEuoymWGlSs9blNPKN rbtsFVoSqkxubY5GqkOR9fGU6DyVUGxl0pMVmUUzCTSdbMRfF0RUG0Dhsmaw2iAMQHKvnFxwr4d Dwt2aQYaGheTwGGQ== X-Received: by 2002:a17:903:1986:b0:2b0:4eeb:f80a with SMTP id d9443c01a7336-2b06e3c5238mr46225905ad.29.1773861218335; Wed, 18 Mar 2026 12:13:38 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b06e619428sm33536815ad.68.2026.03.18.12.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:37 -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 v3 02/12] net: tso: Add tso_dma_map helpers Date: Wed, 18 Mar 2026 12:13:07 -0700 Message-ID: <20260318191325.1819881-3-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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" 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: 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. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- v3: - 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 | 21 ++++ net/core/tso.c | 274 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 306 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 8f8d9d74e873..919058b4c9a1 100644 --- a/include/net/tso.h +++ b/include/net/tso.h @@ -68,4 +68,25 @@ struct tso_dma_map { } frags[MAX_SKB_FRAGS]; }; =20 +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_use_iova - check if this map used the DMA IOVA path + * @map: the map to check + * + * Returns true if the IOVA API was used for this mapping. When true, + * the driver must call tso_dma_map_cleanup() at completion time instead + * of doing per-region DMA unmaps. + */ +static inline bool tso_dma_map_use_iova(struct tso_dma_map *map) +{ + return dma_use_iova(&map->iova_state); +} + #endif /* _TSO_H */ diff --git a/net/core/tso.c b/net/core/tso.c index 6df997b9076e..731d5a5be1f8 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,275 @@ 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. + * + * Returns 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)); + map->linear_len =3D 0; + map->nr_frags =3D 0; + return; + } + + 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. + * + * Returns 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. + * + * Returns 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; + *mapping_len =3D (map->offset =3D=3D 0) ? region_len : 0; + } 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 Mon Apr 6 16:47:56 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 F10283F0A8A for ; Wed, 18 Mar 2026 19:13:40 +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=1773861223; cv=none; b=sxsFfS/SMWB7ikd1xeQV/agH1f3RlzFL6IZO7zRn9BiBn4JefXOP5EjhSCs/ti1Qbjg+y9MP3oLAX7Ixzq9a7UVkYH7XUEgQs+YO1jNyNPew2Why4+IMav/PuBmkYWgJcvzS24oKrlA3myGWzBbUYnxTXoryVGDoKZGdFUwOBz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861223; c=relaxed/simple; bh=22BZ7U1/BMBwqwa8TSe0Uautb58lPHHPr3F6DM186+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kbZzzGH3p7C1Sm5yZNd4ysXfWa9EaL7iwT2yPwAUiip7EyPRZFoO8EIbx2hJXVvDLp8fXfvEV57kI04BcVO/d9p0v1gT8zdVNuYILQSf//4NUIqeVR1GXj0s5iTGASxBRU/lJvW/jBAUubo6Su6BDdlpDOTHSd/Ba3fkU6snlMA= 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=i7USbMRR; 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="i7USbMRR" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2ad617d5b80so1011645ad.1 for ; Wed, 18 Mar 2026 12:13:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861220; x=1774466020; 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=QIDc8NJNVATknvweSjylLv8e3icsVcoxO5WK/CBbVqs=; b=i7USbMRR7+oP9OfJNMFZPBEYnJBbWBo85TFXK+iFkAHgz48l5oVnMicfyZx8mBtQVs sr028sfpeM/fx0OsE6jZRNPP0paN7WZhRL5t6/Mmg5S4vxWX9qfI1/2uUVHRe2fjJJus hKmGRkcfIVXyS8qTC4T37iwMUDErxICXQPdblgtc6PXzqppNTKUnqzZz+9rCSQmILdab cThZ9J1rog5NMk0x88J8Ha8envMoPcnwo4UFhQ3E2L5yAwwTLEEbLnmnObvz7DH1wX1B A9odChHHXR7UBJ6Vo+lbSNkaKH79EQskHDii9D+Ek+fmCDjdfYNjmUCJvpZDaVfA2vch cODA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861220; x=1774466020; 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=QIDc8NJNVATknvweSjylLv8e3icsVcoxO5WK/CBbVqs=; b=XjbqCH3j/8HhJeLTZfQAft/UI+y1vrqEiQ3/+UQPqdmpEY7O1Ny1CIz1oc2uPnmBSv w5xppn9a0dghw60AWACqSvF+3AGCAQ0kelT7gIbUoydgiMZ1fp7EX6x3CMN5MCFAM86H F1/J87p0PsjcjtngtsGvD890a7Op9LunXU2PuyMupXdqRQlwW+Ut0ufGeULalN+uYm60 K/oKeJcsBQASdH/xSGcWqnuZHP4Z6dq2PUGpKQ1es8cp3/QGya2elT/vcR4wGa6/pcxk 9PQ6ZFeWVJ3uitkyariqmq1hZrmgrIFGGLlV3gZhl1GMEH6vZXOAzg3mZPcrxwiXT4jc kJRg== X-Forwarded-Encrypted: i=1; AJvYcCW0A251UBuXs2aqO99cVfvqt/LWjXnrAwl4SyYpGToiVTl8Ve4nc57bvXloC2n81dZ3iczL5xpk9rbBHuw=@vger.kernel.org X-Gm-Message-State: AOJu0Yxzsz8MSfiPtPrJsKnCdNKW+XtY1EW8X/WydzBZy2HnXGbe8lTI Jf4nqoeX5D7Cxqd8Rv5a6krXnHJnOAs+s2pSeD4x7vP7OdoC92fqqNPhvfxkEqAnm+E= X-Gm-Gg: ATEYQzzfICttG517W6CLoy3+V8sXL3Q/nkg4m1Oi6ddsaMtSOUeaJBf9IiCWPQupIsJ vf4mqypF8Fs4e/CdIj3IzOeDI3RYYqSrsEuaO1ib4APrqOK4wAiAu16zf/gY26btg9OWJNFUBQx zTFnP2B7k3iQo+8s0JnP1D6s3IHwv7cMiOpygk6Q3U5E0fhQc/1yVg9lrhMlGCdj/N6wfwR+Wdg NRg1dzno2vt+KEhzrX6jNUGSYG2DnY6Majgr7jFaFvVNzBSYgm6FliZdUMapxPh9zUn/QoKKWrE 76spvNVRa5ua2VgwcCoaCzsEWKQIWzE++a6xaTLosGFxwRPqxIe962b/V1lGiXdXj3q8koP1/Qj eVq3nb8F1iUJu8874Pr4D3aPZdcIDhUza26o2P+AC+ZOX4fs/YVPo0sd3VNzVgiaSS11g3UTDxL RXhuJk X-Received: by 2002:a17:902:cec1:b0:2b0:7114:23cf with SMTP id d9443c01a7336-2b071143943mr33841125ad.36.1773861220125; Wed, 18 Mar 2026 12:13:40 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c741e5694acsm3287526a12.24.2026.03.18.12.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:39 -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 v3 03/12] net: bnxt: Export bnxt_xmit_get_cfa_action Date: Wed, 18 Mar 2026 12:13:08 -0700 Message-ID: <20260318191325.1819881-4-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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 Signed-off-by: Joe Damato Reviewed-by: Pavan Chebbi --- 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 c982aac714d1..c9206977fd54 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 90fa3e93c8d6..8147f31967b5 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -2950,6 +2950,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 Mon Apr 6 16:47:56 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4C2C3F0AB7 for ; Wed, 18 Mar 2026 19:13:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861225; cv=none; b=uBVySz2nUjYt17PjW+ebEETWFkcwMsWNdo38PX8B3q0Jb8mYuMY1sqFZm+JoZwBh6Jx1WAkiAAwMcPwTfb2wAAswrGb5aGX4Vzi57+H7R1Oc2AbDA3grrVoytiZD/AVxVY0TkXZjy87op8S7iKczFyOOJpX0IbL7ATkD056rCks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861225; c=relaxed/simple; bh=PuJu+cuvxYyzLYu/heimivKoS0LlknYg8MItINKiTSc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dJ2udhLH9cFnI9hDlAxqqjR5g9IOHdi6O4dUmQjFt/IIRJ6dNli1TgOVOtfkS/T/egBsQmeX4Shte1H1bfYPCXrWXWG0F3H6JQT5nwJVPtN7EtYzTi0RB245SpF/pyoHqBVKoKqQI28Zp57xEVIJucYOGltzHAEFQ6nCH0U2Ym0= 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=bBGLqDd0; arc=none smtp.client-ip=209.85.216.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="bBGLqDd0" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-356337f058aso228435a91.2 for ; Wed, 18 Mar 2026 12:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861222; x=1774466022; 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=yhpU0qTAGa7ThLCGsekUFVuiiOUf0jdr/bUs5nRSlS8=; b=bBGLqDd0Xtz5Qan+N91Z1RBmrw3qsZKthWXUG2UDZiRTY+ysomixJWq/dy8wZlwTH4 p/h7dGPJ0s+ZyNZMHGLGQFCkSt0SsoFcHXRRYrujXXVpPavMvh+cMx8JH0D10bNpKDpx q+KV83N5kbdDgRSS1KYH5Qlmdt1Eu2vLdIXO7o8C5CytbVzyP1x1QQpKyq64RnaDhOer HYRaSGdeTR8pf2dbWWbVIi+cT/s3GfIIYPAWxGwZ5S6jH+fHYUvy+ASuaQEMjiOkYcsS +JBqUXGP37O8U29eiZjIliFFXCqdBy0C+onmqCbdSJyAKE2XUSx4PaUOTRV6u6N1vedq uLDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861222; x=1774466022; 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=yhpU0qTAGa7ThLCGsekUFVuiiOUf0jdr/bUs5nRSlS8=; b=cU5g/BFtxdbJeAnuixgSOFoeD6GMpPk1Qhl1CSjK3wwAmkL5Eo7tAbVg77+xPLJUAc cOgCOYObU22MnNZ3t1nK8vAs39Ci7gFGRC0Y8gicgOacusIyet0U+Hl4NPvxGLurpEo1 CWuR9Nc6gni8F4rBPkuHWywIGBM4VPqOR2Tqo3Nv84BgrB15vevzIEdtUz7iDI07ZGpF gqPOxJiNdgWoBtONCMtCVblexX8LZxuip8xz9XLhiS4lrm8xtlAQ+5C0EfLm+EuegPRA 97Zd+WxExQsU8lfXMyVOCOYINEV1ATF95HcVDcS7QxdiDy+HCP9VUMNMaBosJIL3pHj9 WC5Q== X-Forwarded-Encrypted: i=1; AJvYcCXkShRpslmdqzOwLJ+wBpOR001Eic/wmsYUHwI204XhVHr8vFeH8wtYu3PWUe++CbUIE+ZZxJQeiiKLVqg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyuo5AUej5gmrkkev9YYGHMLy1I+M8ihW75ybcMYR50ZJbDEx2I RCEGHOL1xDuh4NdoDzVYMqITzqJHcE9j8QLnYHZpNdE0yl6R4rdBryHRy9ONQR3hOkM= X-Gm-Gg: ATEYQzxOEhS3ezYyQiWjvwvegeBJYJOIrpafCttiLfuV58kQG83GrvhA4Rvohb7Ac9w mj4Zk4Zz9CfF95WUK13+iwRqnvWBBipDNhx6qeLpv0aP3cHK4Gv70Oq8m1HWsrQNDKBnl5w8MbC T1e46npS8uCEp1Sq1lObNdCTT6KxHypCIVR8SJPHoCwqfbxf7qAsTEH/Ds/gOL2Ihdf/rIX7rML MB4xAqvDrZI3IWVxFr33yKMb2ct6u9RWRuEIX3Dsz63tjPeTsGIroVAos1+yXiz3xUwE+y2o+HV 7OowLJR+vPvZ/+6cYmG5J1c5DBNOatS4xYtMwfW8Gn4FqVTXCForVtJj6083yNtnHnsaRxqFPG+ Rwn5+pAdfja5dcbpABHjVmE3mL3v+5219IFE0c37JnVyw/0gIOmwFe/S7bUpSjAxjq+uPk7tc4f uwN78J X-Received: by 2002:a17:90b:3f47:b0:359:9016:1e72 with SMTP id 98e67ed59e1d1-35bb9ef6048mr3939616a91.19.1773861222027; Wed, 18 Mar 2026 12:13:42 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:42::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c741e582fa7sm3062628a12.29.2026.03.18.12.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:41 -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 v3 04/12] net: bnxt: Add a helper for tx_bd_ext Date: Wed, 18 Mar 2026 12:13:09 -0700 Message-ID: <20260318191325.1819881-5-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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 Signed-off-by: Joe Damato Reviewed-by: Pavan Chebbi --- 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 c9206977fd54..d12e4fcd5063 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 8147f31967b5..a822bbb71146 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -2834,6 +2834,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 Mon Apr 6 16:47:56 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 BE2193F1665 for ; Wed, 18 Mar 2026 19:13:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861227; cv=none; b=PzJ4nkvk0e03wmDkmZiTdlXiWVLY6w863cxUMUq9e5PCbzOBNzBHhV4X+JcS50tgSmAErnti0ahKiqn0+tO5Nu+hITdnU5i+qjUmgYup5wvYY5aWfIvBfObrQUYcC2w85tEdcUuzvdH2CXSnmxkwUi1V1jI1QDzi/Y7C2lJaIws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861227; c=relaxed/simple; bh=qLU6Qupx3PDp3jST+ZazaL48meSvYnVw5Dt9vzCSwFk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HRISGpvt7skMA+j/PUbVTwg1RamR+YoSZDq3+qNfbSPo7LOqHL/BSlfnwDHPJ89cLTqbZkmhVgmI2Dn1DxD/rmVeW0mikVq2LyoTPtwcxxWhcHvBUt0XCkiGCBQg44IaNBZOvyDI1hLM5bNcO4DuoHSz3PyhBga6JDgJpqo81hg= 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=vrMNtvCw; arc=none smtp.client-ip=209.85.214.179 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="vrMNtvCw" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2ab077e3f32so616035ad.3 for ; Wed, 18 Mar 2026 12:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861224; x=1774466024; 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=WJyTxUd6u+yzwsu9Uzqyo58WkKimIItw6uQu3GFh36E=; b=vrMNtvCwZDGjuAg0ICWh+24CTCtB3hYRe6LKdh+5QQQxQa7GMEMFFH/JOdCsNnehKE BENRnQNMK6Ni1MY8PXlZ6J+4r/47HvzmmkZp9cl9q68g9/GE3/8NuXrg4XTZA7SviD7i tYekp3T0eIXEYllVaUjeLGIi7Pptee1gGxI5ISnHRMuS4g8UNpIpI2UD8GvRrijpnYmM lJZ/7O/d+oQcQ95SAZ6QpMwkZBWXmTZyZgDiU3cyX/ILwXyvaf9+RyL5HqVP9XGBARCF +dZF6sCkcM6oleEGcmk12xRmhPuFjiCNfw1pEuUDDh4gKZoKA1jPnGvKcVTSIuptvrF1 5mPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861224; x=1774466024; 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=WJyTxUd6u+yzwsu9Uzqyo58WkKimIItw6uQu3GFh36E=; b=Xgb9yfIHhngAuEM6Dq4kWA6Jw8FHYCh+dHn7piombqaG0ZOzbqrW6nb6udSlZsM5o7 R7BQ8NIGKoPLdOugyhpM/dGsP7l7RnDX/k4z4BU4nhC6RuDqNHyK7sdpEoo593JiuCEL 76Dj6hgC8hezyzEB/Vjuxv2X9D3nJ7pP0DRshR7mcOT1/D4dHfccxb4vI2SYHkV5LZwR JDF/RPqFb5zbvna0Hl0UqrHZXhXuol40iqz/FTIegY0HYyZ58mmwDvapUfyt14XsDGwZ PM9quAI99wTliwlHiElV391+AlpH8EkJ7KkeiT2auSoIIVg3lvNNPJrwMRKVGUaEKupu /x9w== X-Forwarded-Encrypted: i=1; AJvYcCV3QT4UKWHWLvfWKN6+llU24TCAFlU2Wj/WGVcaFGScAJdOQvKnFfttX1IRjveFQ4dLHUnqJa3ecXzpObc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1gwsPFYDYfSU0DG6DLy7o8ZQ+Dx1pQTNDRUAy7AIS6+Gq4fra YAWeLekNhu0pcwviazflAwjwZYJd0SizR4zXJOfSiMFVP1gBG1ssh0tz/6eFKKBWaOIYyMg3+gx gg3DIAzw= X-Gm-Gg: ATEYQzzbiDGaJVzAJZ27Q2QejOR0259xwBwVbPwOvuiO607BrW+uQND+OCF1w56iIj7 asLjtxFEHVHatXcVvnPmwLSaAm+ETVg7w9DH5jvBQP/aKA0lFP5IdeqvMlqEkFjXZ7xnkCAWYsV B9QjJflSNUxJgZGy/+khBts+T/QLPVUkDFmCWEXWuSAoaZ4tE5ktjkh36IY/hDG+Vs0FElsqNhg TkKbEi0+Q9JFn0fb62ad5thjD5rQcqOhOuTcMfoepcutmJCLWNnvc2Twwamhmv1IJKNP8HOQ/2u lmGfjUOiQqMK3WSkJXQIGZ0UpOEFuexCCCfKAECbxG0IJlaOTTF+KhSmU0yqJF3kF60gJIukXB0 0cjNanC/pADU0LpTsAHh/Yu7V2l7DKdIOS425CBSLWPXqZZlZoJYH7fXiSbYR2pVmx5wZSLbKdO dEohdY X-Received: by 2002:a17:903:8d0:b0:2b0:5738:9817 with SMTP id d9443c01a7336-2b06e3d2f5amr51358485ad.31.1773861223849; Wed, 18 Mar 2026 12:13:43 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b0704ccc67sm29706125ad.15.2026.03.18.12.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:43 -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 v3 05/12] net: bnxt: Use dma_unmap_len for TX completion unmapping Date: Wed, 18 Mar 2026 12:13:10 -0700 Message-ID: <20260318191325.1819881-6-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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 Signed-off-by: Joe Damato Reviewed-by: Pavan Chebbi --- rfcv2: - Use some local variables to shortern 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 d12e4fcd5063..ea8081aeb5ae 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)) { @@ -3400,6 +3411,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 @@ -3410,10 +3423,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; @@ -3435,23 +3448,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 Mon Apr 6 16:47:56 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 7941F3F0764 for ; Wed, 18 Mar 2026 19:13:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861229; cv=none; b=tURObSYAQQP8NzrKDMYcFH6QvuqLm91DsVZBUMBGOGQnjrXs0J95UoX+UZ7dXXo3dVXPRs16ljxhRZb7i3vKFvOk9hka+dg9GcTyqinbsRcMH8oEL+sDg+wOHjU9CidwlFVmx3m0+chn4MJxpvFKW9WZPF6E5j0YbZf2clJXvFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861229; c=relaxed/simple; bh=7Zu0Dz91B8pcyek/pNRIrZNMIcp1uoJ9XU9YtqJIP40=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iHsPcZtL7MQ0CBKQtHAI9B0bA3bRLrHBvQUPvVt1VH8EQH1WEwiXp67Dq361UVneFWtRkJ1lTMa3ZBPyJrKSL3kfoUDqUSejuhEDO7Ssn3ZhzZJxQ5EKzl/8i/bkIaE5+7QqiUNyjN3QsABC8HLb4h/3k01P6k1HvM8uv2V5MeU= 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=NCH4DYky; arc=none smtp.client-ip=209.85.210.179 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="NCH4DYky" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-82987437624so116351b3a.1 for ; Wed, 18 Mar 2026 12:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861226; x=1774466026; 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=SXOL9iubHrTOR9uFk5hJvutezBCpUTAEEHozBYZRA8g=; b=NCH4DYkyBX58Kx7hUMDoFO5B+DtXuTiIYKM2nPQ0i7jQd2ZYCBg5CborI3YA5GGHyi WgxDPt6Ull5T4DUsZSb5OlO2ErFt+LDiT1frUsa+m0jKgbgPXEBMlxJd/PMYaBHzv4ub Z5dETOZDB8YJs99/Y+2NWQV5WsILBBqXC/hhUBeqpHAioc1KyMMWNH7uotZvF7hoeruX 8MiFzOrC27E8p+uJLOmkrx82trTXnmU3caOge/uDYuPi9gk8l7icnF5X2QksoxNO/JeN Y6qsobjmCeTPeBw7Gw9mfg4uPZBtcP9AUcmJL5fuQjQuWRN8tcFF+QacfgMLBE20MTVl tqsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861226; x=1774466026; 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=SXOL9iubHrTOR9uFk5hJvutezBCpUTAEEHozBYZRA8g=; b=rZYLHZhiKF7C6FMvTIMtTp7sMwbzxVxnCB8Bpu4cz1dZx+h1IfHbiPt4RDFM076Q/q aeFhjP2m1CTy3xt5/HS5JyfaVLCyat7Ydcj3d5cJcBWW13r8rBEiT6ar54EwFkRfFzPj ahHKwVrPDfM4NyivkpX++VcEgrDDtMXyIHrHm548oGT/ZD1KaFJJtU9nsOAB9vN52FZw A3IrAwyAevNjtFtBuqR81AWS6jNODWuYd7w888r8k9dbaDkqSFtDoR9IIOmoZKevF5Oo gN3vl9UUFNxUB18kFuBF9V6b8V2BLPhzpl2PTkcKciMUORRR6l5qNYlXwhnjjqJtFmvR S6hw== X-Forwarded-Encrypted: i=1; AJvYcCXrz7RLO7ZuaST0m3rjm/R51jAV01oLunmHE2buflnd+xgx5LZl4YuPI9nhNL474GNLQn66TnHy37oGDkc=@vger.kernel.org X-Gm-Message-State: AOJu0Ywc9JrLUIYbaVDccESKB4MXxyh/T16tnkvRP0ChLW9feBHnyF0f /iovicfa2LHd2Fk3KsYgT7Ig8Arwr1u89YQYtja8aC+1xQ+O9Mo4ZQ+vPXQJZGuZBKo= X-Gm-Gg: ATEYQzye7o2Z0w9tmcCpxnmm4lE+ISRLFu4jJJNF8H+7vj53jHwTPl80soJ+UL/DK8t erZbqR0McLzJLI26L6C6vw3yDasiiwL9kMtVeUCZp7c6WsZl5TyJkWt9lCCdcWyy+p/1QxS614S 0+yGmobS74MO7XAe3yVtutE1HwgyK+r7WY/iVtUTbmxrYRy3BjXzuYtusgg2MEiSSZWA46JOhLq yZx7A/7wIHcWYjXn4d4s9xRDvfX/ybd0pP065e24sFPnR/CM1xb+nAPlsJzon60aqoEvG4SIpZk bOXpnA7scZ56VZxW1Al6pe8Ipz11qL220OKhzfYjtMhC597v0xpmPVsfSpE2giPdtRQ36dpj7Ke xrf57JvYCKKJObafKvGeTy9un57T9rFEGMGQn9wHR5qc6m7zvR6653sZw+UBSBqmCqISBKwajtQ 2wEO0= X-Received: by 2002:aa7:9d89:0:b0:829:b23b:d150 with SMTP id d2e1a72fcca58-82a7a8eb3c8mr318691b3a.20.1773861225619; Wed, 18 Mar 2026 12:13:45 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:2::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6af06bd7sm3550133b3a.0.2026.03.18.12.13.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:45 -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 v3 06/12] net: bnxt: Add TX inline buffer infrastructure Date: Wed, 18 Mar 2026 12:13:11 -0700 Message-ID: <20260318191325.1819881-7-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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 Signed-off-by: Joe Damato --- 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 ea8081aeb5ae..8929264a54b1 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -3983,6 +3983,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; @@ -4001,6 +4034,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 a822bbb71146..d9543d6048d8 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -994,6 +994,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 Mon Apr 6 16:47:56 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 2FADE2E7F08 for ; Wed, 18 Mar 2026 19:13:48 +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=1773861232; cv=none; b=bfIdw1SjhxpXg5GqBxE1pZ5AWpG/FCfk9Tqi4/4wNVR8cnfEioT+mPblhLlFwcCZMKqXSU1WtFUH/whNo43XNGs++2mmkQI0cQ1Fk8sWShAfU2ACWB4szlxJ3OpVvZVu8rZRmSLPTiJ7m+tfgrIJxBn6Ei0Iak9e7BTDDMl9fHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861232; c=relaxed/simple; bh=e96EXxfLihKuO05dFmuztcwCzRpZVtLutKKCC6HBE8c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ehek7bvR4oNFmI/Tr66+smPqqODmKbVhIPW7NhrvDlWb+r7QJNocgEYFqbUEZTTTdhvYI15T31/zWd/MYK5jr+s7ju+0ZLnllKAnXHLmUtx8eX+1x5eAh/M11Imag14HDC7gBHjFXS5qjfV/MeM2afHkLEcugbrhlaRiAEUWA6Y= 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=MO2xs7zA; 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="MO2xs7zA" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-8297310ce0aso154611b3a.2 for ; Wed, 18 Mar 2026 12:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861228; x=1774466028; 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=LU0lxc3eKqf92oDepH/UmC/x9vwxuAnsiBKDevCcH+I=; b=MO2xs7zApCTC/XOLmS/C87uN0V9wMi6R4RG0QxjOTWaudvGe6IJB6ArNF/0mBrsb/U xaUhJy6WVPN0Eo0Mpp9bYyMT2BLRhtopa7h5Q4LzYwzLfn21wUOKeXjeZtzE1FcI5SO7 dmNy1UWKc49LYkw3s8J4e4t445YMKlceR77qeZumgoYHB8sByFZfq1mRqojAqGWA8+mE 75TaFt0Rur3pnjBM3738MpZdvHz0DlNYs8s3igdzX4EoJrKoBYOIIjin+6kkO/JyjdOK O+3sAMGklTwaD7Q1RvHy5A3mxOEuqlbCRpoG1sEDmguPhKa1Zm+xQEavD9GAgDMRXFt4 PlFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861228; x=1774466028; 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=LU0lxc3eKqf92oDepH/UmC/x9vwxuAnsiBKDevCcH+I=; b=Y2ygaCFT4WYT52hWExhHNiVqQXZopAh0+/pDzFlfErsbYhYmrkKpUDJMBkV8GjYCCb ZUzrlSRpfLI1KczY8fN2P8Qpu87hV+GA43xF8S4RRC3uzcE4EG/LJ0Yi5K9im+RGazmZ 0v60NdgclsuYeTI3dVZcUO/v1/XBkZSA8OtdJbquoRvX6H1/G1IVMBNg3md0Box4Cg4C KKLnzynT6uwgUo6c9UwKMWWMNGfWaCmELaGC6UqEhf8Sb9YOG46YfI1e0bixoy69a8Zv wpVoVqyPZ4ZDwCgpRmRbFIbOp1LL9eOj7SQlv3kEtQ/OtbOHjM2KgeRH5GbPb8AJBnYS tLMA== X-Forwarded-Encrypted: i=1; AJvYcCW6QUYj/pz7CHTcA/DVRI2k1/SoeA3CyQr+67zmnaGQgf7ffkhegsmjXDJbSGpNK78gPzxoseSkZLoU1yY=@vger.kernel.org X-Gm-Message-State: AOJu0YxpAShe4ktjxWJYAliwBZNVuJDQaHdQlQlzr0Dy6UyqlUryZZS4 4mJ38yOGf2NVOcv5Ar/Q3pRD8Tv/eGXCwFSTGYiAxUq7ZS5HiA+XRimgbFdB3sp2JcY= X-Gm-Gg: ATEYQzwQ6YyaO7yJDLjgyvhdpYeVYpPCvOy/jbnAHHjgE4eCI42/E6iu8r8I8koQ90J wB5t2roXKHLA+IkP7KTYzbVjUE99t9J+Wc3uRPtvaBFByIld2hV6mLuTREZXhKEEzJnBZYPQ2LF tekzI8aSvLWDUaJFniPqO4HmuJyJ9TBvJuJR9RnUA/2Cx/CgRkuVfPuLKluBBMNdc4P/AA8JJtH 8jOlILgkP2CPSr9sFmMo9nSe8AH9wuVBmhGdBVcDk8iH2eYFrju4DeMHeEd1ahDndfT19WzAdUd saayTw+QobBWfnwa0GU40vgkkFOtlCPZePDjpuSwL3WH9UHYc1nZwZynkNGwvx+lbFCz/Jafi8k DWl1LT1C1SJ79U+HHhKjAJUFUvlAPlcK+EhgKaZ/g9cIxlaVY7vxpu6UvHxT9htltYCONSOt93/ VO8vUI X-Received: by 2002:a05:6a00:4208:b0:827:2b3f:f9c5 with SMTP id d2e1a72fcca58-82a6b267579mr4257490b3a.60.1773861227885; Wed, 18 Mar 2026 12:13:47 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:45::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6bbe801csm3490498b3a.46.2026.03.18.12.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:47 -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 v3 07/12] net: bnxt: Add boilerplate GSO code Date: Wed, 18 Mar 2026 12:13:12 -0700 Message-ID: <20260318191325.1819881-8-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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 Signed-off-by: Joe Damato --- 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 d9543d6048d8..593b78672be8 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -891,6 +891,7 @@ struct bnxt_sw_tx_bd { u8 is_ts_pkt; u8 is_push; u8 action; + u8 is_sw_gso; unsigned short nr_frags; union { u16 rx_prod; @@ -898,6 +899,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 Mon Apr 6 16:47:56 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2435F3F54D5 for ; Wed, 18 Mar 2026 19:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861234; cv=none; b=tskdVqP6oKobUuTVT25+u+F9/buXFnkDUvjP3c2MYEuf+8CQ2gkYx65gvY8HM5TXS1dc33xzUO0pou7q5uO/hIpMDhHnAJzBerp3egEDNUY94i7ve8+LEbeKjX/nFCa+iXNSyya4m4bJQUtAKL7py0W0MLsv0yZexBLeZmbGUaA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861234; c=relaxed/simple; bh=mp3r3PQUzbU5Pid6sex6ed/lR7nGMR2Z2Hyqv6AVIiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lsyysqYHTDLWPONs/Vie5fvrcjePFRCadbtDVmxAYwz5rvMM6hWk1aQAkBitZBReUSLUL0oggjDSJunRpW0OLrweOymhAgJWFVtLtQqg/hX7LLqnkwMYVgpTCfIej1PMUN0PfuypMq8EsxUvemrpsnL/J05Mur4RlBsLWPlWyLs= 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=dhtOmgRW; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20230601.gappssmtp.com header.i=@dama-to.20230601.gappssmtp.com header.b="dhtOmgRW" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-35b9d29480aso222264a91.1 for ; Wed, 18 Mar 2026 12:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861230; x=1774466030; 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=FyW4DXhgZ+K7msZw3KHg+eG6+4FAmWnBU3tCC9UDX5E=; b=dhtOmgRWnudU031vBw4fIZ5IcLdxMQsHdtbJ3MugjcyUqeM13/sAnBXeoZbSsHEKxa K8DSxq5DL0JXvY8kPMNizsrX6YS3wXIfgQprZgnzL/Oakvsm2sTP1FTeuSKv3LhLzd86 ai4x4OtWDH0VDfhUxXZQjNNWLE1j212J3OxjcdrnYHbVReW6VlSwy92pCd1YMwXDkxdP WcgggO/KqIa0dkjWFr4EK4ZHZPhPSz1x2inTgoSR/aZgBGC3Wnd3ejrjErhIMi9Dxeen N7pPwvl4tZwnfDnx0+SNOqzUUVUhwP5JfnTPWPFt/OoWG+8wUXkBehUHW/R9rI9hRZeH CSaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861230; x=1774466030; 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=FyW4DXhgZ+K7msZw3KHg+eG6+4FAmWnBU3tCC9UDX5E=; b=GBqNf4UeS756qvENsp/u3s9u3QOvqRkeN442riP2b4n7yuy3r/z4cLpe4g/1uA9oGD dUxUf9COptSb4dpFm1RT+ZEsY6391FebxTAxqFQ7bORGKRX3hky9srYOlI/f5IXdxdHE RjnTUFF7hgZKvkMy2cCTCXKbjq3u1LdwyXDRlfWCJ/5KSjbiuD+6zDcFrmSLlm6wbbL5 ZCe7bwLx8y09/wd4XMldfmRkwsViutBLyQrjwIn0Sbe/D7T1Gcgr8JuzJxsE5NwgwmlH CO9UmJGAO+LhxA4+BJZa5PVjLi8b8Q51VAS2qf0P83y93rfbFfRTvSduz+QGFHergzj0 upCg== X-Forwarded-Encrypted: i=1; AJvYcCVu21pNup20zjhmle0cOLcQI49sjZCP/VX/ZRsef9dY893uPJyEM1qWRD4V0kHZt+VS9As/QB7t9zv3SEI=@vger.kernel.org X-Gm-Message-State: AOJu0YyFRj2CA1G0LAVO0LZUKnZNw+h7lpE8fxRZnVLhFq+WpdIPquEg uW8kI+SQoPZzwl1DxXM2sPaucf+RfqizSDVMB+3CNw+woGQ5dn/aFkQRikql3TrEDXA= X-Gm-Gg: ATEYQzxWend87nCf3zWLGSXUStmiOov58V6KIUWjq8UT3JfLNWGGb+N8yc9AJ8ZSsjI 7XOJIUGjyUC1dENpPVkrJ9K1SBkVGjpdN6BkG6sfgUbqdr/Taq3z6W82qaEaXo/KnxPVL38QOI8 dhZ99is3p7zmZLWz+iqSOb0DVzIdp3TQVIzqduG+PYvJbfMt9KU0B5xFgiKvaqVsYeBc5gw6GgG GyaoVwKeZbOPy7zWJiN5yUjjJhRst+vk4IkBgOdKPl0mLrM/f7xZvrvl+i+wsd+/VZYIHR7ah16 0//cJAciKSjqptqJUOaYT9K5V1XYpaFgIbg0htfydazVba/HqT8vlLse3M3lUMw7pLmdVedggVQ rPNVWT7nbL2RRRj4RdssmTCY3Joq3k3ag4hyIYgCqNw+ikFj8FIQGXyDIGJ6DSGnoax0h2fSHkF ZLPv6bIdVsbgMo4A== X-Received: by 2002:a17:90b:4fd0:b0:34c:2db6:578f with SMTP id 98e67ed59e1d1-35bb9eef84amr3835962a91.19.1773861230354; Wed, 18 Mar 2026 12:13:50 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35bc62e44ccsm357233a91.5.2026.03.18.12.13.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:49 -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 v3 08/12] net: bnxt: Implement software USO Date: Wed, 18 Mar 2026 12:13:13 -0700 Message-ID: <20260318191325.1819881-9-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- v3: - Added iova_state and iova_total_len to struct bnxt_sw_tx_bd. - Stores iova_state on the last segment's tx_buf during xmit. rfcv2: - set the unmap len on the last descriptor, so that when completions fire only the last completion unmaps the region. drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 + drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c | 206 ++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethern= et/broadcom/bnxt/bnxt.h index 593b78672be8..0afa0b731063 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -11,6 +11,8 @@ #ifndef BNXT_H #define BNXT_H =20 +#include + #define DRV_MODULE_NAME "bnxt_en" =20 /* DO NOT CHANGE DRV_VER_* defines @@ -897,6 +899,8 @@ struct bnxt_sw_tx_bd { u16 rx_prod; u16 txts_prod; }; + struct dma_iova_state iova_state; + size_t iova_total_len; }; =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..1d4df9a17565 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c @@ -19,11 +19,217 @@ #include "bnxt.h" #include "bnxt_gso.h" =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) { + struct bnxt_sw_tx_bd *last_unmap_buf =3D NULL; + unsigned int hdr_len, mss, num_segs; + unsigned int last_unmap_len =3D 0; + struct pci_dev *pdev =3D bp->pdev; + dma_addr_t last_unmap_addr =3D 0; + unsigned int total_payload; + int i, bds_needed, slots; + struct tso_dma_map map; + u32 vlan_tag_flags =3D 0; + 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)) + return NETDEV_TX_OK; + + /* 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; + } + + slots =3D BNXT_SW_USO_MAX_SEGS - (txr->tx_inline_prod - txr->tx_inline_co= ns); + + if (unlikely(slots < num_segs)) { + netif_txq_try_stop(txq, bnxt_tx_avail(bp, txr), + bp->tx_wake_thresh); + return NETDEV_TX_BUSY; + } + + if (unlikely(tso_dma_map_init(&map, &pdev->dev, skb, hdr_len))) + goto drop; + + cfa_action =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); + + tx_buf->is_sw_gso =3D last ? BNXT_SW_GSO_LAST : BNXT_SW_GSO_MID; + + /* Store IOVA state on the last segment for completion */ + if (last && tso_dma_map_use_iova(&map)) { + tx_buf->iova_state =3D map.iova_state; + tx_buf->iova_total_len =3D map.total_len; + } + + 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 Mon Apr 6 16:47:56 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 56A613F7A8F for ; Wed, 18 Mar 2026 19:13:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861238; cv=none; b=Rj1qLsrnwR1aGNDqfGJjBfnuiRniS+qmBcdltiF9fx7h/DdVTRvSUW8GMCvWXR0YyUqmiiGEuEBMgD6xVGHAe33c8HctXeg4ZIumgGUDJVcpfAsConE+0rDcHnC9LnkH19oBShYHW3EEWUM9zSFnWbmsdrChBZSMDvDlzW1ttRc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861238; c=relaxed/simple; bh=YzKXajmKc0ASt3KsvZpVHQxjsM4waE4u3jEZJ2oRbpA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e1KuggKUCmROUPVKUbJpROatxzA46YEPC/WJbarGy/8C4NFf9eCPOA/JBIj6YRX9gzFZ7yIOsNsUq3g/b5Egz0pWWSqBsdVQg2/u0Hlxk6NQOYFKeqVXY25gl3SOclDaTsl7Ccpb8b6nbC+tM6OMLbRqoGC3nscpcZsOFg7tT10= 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=zUmkUYP9; arc=none smtp.client-ip=209.85.216.54 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="zUmkUYP9" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-35bb9070644so123764a91.2 for ; Wed, 18 Mar 2026 12:13:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861232; x=1774466032; 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=AE0NX7RG+iFP3hDspYtJNUt8M+6AmihieJBZLfIyPVc=; b=zUmkUYP96oRjdjN8nL5VFQI7jjHpqRabhUi/Y6lpJ0F9Cev3YJPc47orxUc5C61N1T lFIS9amM9I0hi7rvt2nZwRPnS703I29N1DbagPIT8xYA6K768YMElkl7PDuXMNvvVCWr k5w+VaCTarLVqnJPZTrRHJBH4vgmr8i4P+GdOCOY3hgp6ktLX3krYTkIxwY1EGYkBw3d 5diMLXUNOR7Iz9ft8iF95YwLBJOSuexBMDzL3CBNNsWZ/jtTDVDlCSGspqCx39tljEOH JLgT3VowVkMWzjvHUU83j7FoP/s96P1jjTqFbEf8DPKej832DPljRUhrvjn8CRq74+tr DehQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861232; x=1774466032; 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=AE0NX7RG+iFP3hDspYtJNUt8M+6AmihieJBZLfIyPVc=; b=C9wgy4sqUBmXHht5aO3A/XSE7T/TCeNy9CSoFXed8YLuqVUj50VrIBQ++WachCfRe0 OafZ4Lt1QvsizjMP0DJ/HbK1FBwb1h+vDJraH9av6jiz188sgrtky3ZdlKuCuQtv2UxK jC4uItMr+OqZZw4GBn/sE0BKtPPedp+B2tEeXjnNO4V9Zd6o0TxE9AKpq56NZLnY5D0d DEUVxZ+4ZNXjNwlq2nxJodljdbpbFHOOvZAwOcy38ZG7DXE2buPYprQFYB27Kuw3ax07 LxIGRx5MXZ7f1TAgRLA8AV+m6apGFnnjeLAzSS23DDslI4+bzSBI8BkGA73YtXqwSlxt xAtg== X-Forwarded-Encrypted: i=1; AJvYcCXoxO9XWpyIMxD1zuutuMvtcatAPneleOjCkJ0Pa/kfGGPsAPYhQ04EOsDnKzkL+fUdUZmvmYalRxf8prE=@vger.kernel.org X-Gm-Message-State: AOJu0YyXgeW+1E5b35TIv99yxbPJAR0X4BsBnKkYms5fblRsy9MGdBiJ 86+ynakbk37/bNX+hKFn4kbBIOb4K3kUJMDH4zat+p2Cg3irM2zg3zKtUHBAUpEV7cg= X-Gm-Gg: ATEYQzy8Fx48QXUhE2foyoQFztmZ2J2yQ+5qv66LBc5If02aEzh2ZhYodm2dVcTZyrB hx9WsVgaqr8YWPgkZlMtyYH79GliLPL7T46fvmYoScNMcfBcMYC1IWfypOxumMVl8sJNWTkY3bp JPYpfCUfdWUC/9nqsfTIARRECa3+rap2FGT7fTAnr9HaTM13kWm6k/MuEfoCk0TGhRf1KgvTHnd ZN7p4cVypeGLznRRKkBHlzLO18TtUrHKfagJvUrzTH61ksnhVVqHgjT+0DtU1i4FUgZnBp6ii/F dfiQV0667jqsJTnXCbJNsC4z2prnHV8+4Tm4WdT/RsJffyoDE8DP9VQeUrbu4w/CNbmM1JyIM5v 1jXgF1V41ocp4/RkbKXcwmUt7vUCR9KMZ5f/DAVvFpFHBeIlcmf1Rj0UU4LUSUdRRnCNuySVLvI 84Dm4= X-Received: by 2002:a17:90b:5346:b0:352:f2a6:334 with SMTP id 98e67ed59e1d1-35bb9ef6093mr3931761a91.16.1773861232354; Wed, 18 Mar 2026 12:13:52 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:7::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35bc63093d9sm324194a91.12.2026.03.18.12.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:51 -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 v3 09/12] net: bnxt: Add SW GSO completion and teardown support Date: Wed, 18 Mar 2026 12:13:14 -0700 Message-ID: <20260318191325.1819881-10-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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: if the DMA IOVA path was used, use dma_iova_destroy to tear down the contiguous mapping. 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. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- 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 | 82 +++++++++++++++++-- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 19 ++++- 2 files changed, 91 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index 8929264a54b1..d9ca4933ee62 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,23 @@ 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) { + if (dma_use_iova(&head_buf->iova_state)) + dma_iova_destroy(&pdev->dev, + &head_buf->iova_state, + head_buf->iova_total_len, + DMA_TO_DEVICE, 0); + } 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 */ @@ -3418,6 +3438,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 @@ -3470,7 +3491,20 @@ 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) { + if (dma_use_iova(&head_buf->iova_state)) + dma_iova_destroy(&pdev->dev, + &head_buf->iova_state, + head_buf->iova_total_len, + DMA_TO_DEVICE, 0); + } else { + skb =3D NULL; + } + } + if (skb) + dev_kfree_skb(skb); } netdev_tx_reset_queue(netdev_get_tx_queue(bp->dev, idx)); } @@ -3996,9 +4030,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) @@ -4101,6 +4135,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); @@ -4643,6 +4685,10 @@ static int bnxt_init_tx_rings(struct bnxt *bp) =20 bp->tx_wake_thresh =3D max_t(int, bp->tx_ring_size / 2, BNXT_MIN_TX_DESC_CNT); + if (!(bp->flags & BNXT_FLAG_UDP_GSO_CAP) && + (bp->dev->features & NETIF_F_GSO_UDP_L4)) + bp->tx_wake_thresh =3D max_t(int, bp->tx_wake_thresh, + BNXT_SW_USO_MAX_DESCS); =20 for (i =3D 0; i < bp->tx_nr_rings; i++) { struct bnxt_tx_ring_info *txr =3D &bp->tx_ring[i]; @@ -13831,6 +13877,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 @@ -13876,6 +13927,15 @@ static int bnxt_set_features(struct net_device *de= v, netdev_features_t features) int rc =3D 0; bool re_init =3D false; =20 + if (!(bp->flags & BNXT_FLAG_UDP_GSO_CAP)) { + if (features & NETIF_F_GSO_UDP_L4) + bp->tx_wake_thresh =3D max_t(int, bp->tx_wake_thresh, + BNXT_SW_USO_MAX_DESCS); + else + bp->tx_wake_thresh =3D max_t(int, bp->tx_ring_size / 2, + BNXT_MIN_TX_DESC_CNT); + } + flags &=3D ~BNXT_FLAG_ALL_CONFIG_FEATS; if (features & NETIF_F_GRO_HW) flags |=3D BNXT_FLAG_GRO; @@ -16879,8 +16939,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; @@ -16913,8 +16972,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 48e8e3be70d3..44b3fd18fcbe 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 --=20 2.52.0 From nobody Mon Apr 6 16:47:56 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 B47493F54D1 for ; Wed, 18 Mar 2026 19:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861238; cv=none; b=m+TJCJxGyaoPekmP4VMyZx2y1biausbNCsw/nVWmEl+Te9Aw8c5q0Uvq4VhbxvklDzqRriI2MEhXuMLfzhflLD6hBf8V1PwWHra5gFdM7ndbZG9Dhgs9pX8Zw1RdNQyQe9RPb7V+11h9cds9ljNK166QBdVDrDUerGtX812aEHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861238; c=relaxed/simple; bh=92aqkYJ0b5GlsxkwOgN+ntPd5LTvqgJxwBWqWknd7Dk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hXnsSGYWkn75nXgez+FozW7/uyCVc32hwHdUNBf7EV5GcBQXnajmOHqZHub0Swa6qIlMPKZuXQIG5iwbm08yobt+xT5R+GOPc5+zO6vlyzc2Cl8eLzHRIAORq9eTDfA/llgqFR8ytG8kRS2fAAwpFZh9/ZGq1g3ooXxGoJ8Xs+8= 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=P1ZY5xpd; arc=none smtp.client-ip=209.85.210.172 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="P1ZY5xpd" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-829781b2b01so186173b3a.2 for ; Wed, 18 Mar 2026 12:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861234; x=1774466034; 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=1W18gZ6DTQpQ6YetxkK8bSGbSnx/tyFrgmhuV+UxdE8=; b=P1ZY5xpd1+Fq7EEncA1vrMQYR3hMOLllB3OD5ESebPE7CmC3Kdwy5NvQL8JTLu3af4 pKm/EvqjCPsPaxesi9T4srYqxUgHrgSg1lQCW0SkrrKWuZEsaebpJuy/xQZuMG5/dRkt Tp7r6L/LRQv9Wj1G678cJFEDpwPlEisumvq0c1REKQk8Scm5ByW/eXfQke4a1dAkWr2y TZm3rCqEYEIJUS4SoEFGmFQxR7WRqhhnOI3EHFHoaNvp4/Whyqfi8TYvigutOvbPaA/w vra1ke2ja2hlHQLef5wNKmZgGG4qPN4mRwDk71hudwGXGrknX/WV1RVzaQqK0X+naFeO YzlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861234; x=1774466034; 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=1W18gZ6DTQpQ6YetxkK8bSGbSnx/tyFrgmhuV+UxdE8=; b=Kg3q8re3DWKlEvEfdFI3hUdBSWGCHidzgpwpre09DNX7S4jvnqel0JMD/eQpU19vvP DVxQJV197p6oAvrhm1rOSBOw3SADtvvkN1NtRDqlvoj3UwthTagDUPULwomniICtw+1C rv9GMzJml+SxRo7tWR5JoxFWcb7eoaZ6um0QoGP15N/Lh4dCx2roQZuzULuH7f9q+zIv om4ppcLtus3GVuk0AY8RXxnfYYPm4Py0LY8qF19Cva7t7PjOISIKwCoziL+sHrDkf71/ vfZqiN5MRtW2vyTvgQYkzOlUVjh/buoPO6waZJoCFdSmgHhr/xX3gBpnOaXzfheDIWSL MERg== X-Forwarded-Encrypted: i=1; AJvYcCV+0uz7NjWqjL4sx+4PABA2LCuwq22CG+pSZ++84D0+gZi4A8WCX26Vbm3wbENfjPAkVRm3i1sVzvelvpE=@vger.kernel.org X-Gm-Message-State: AOJu0YyhVg6TyfhOgzr8kUg++2M3DTi1LRSqb4j2yBYXPDxfNSbYzdK3 VwDxrhxqJzWV9JV69uhnwwHeKRggqY7bFnPs9SnBGic1l1/LYsrGmST9FiWUnWimkvk= X-Gm-Gg: ATEYQzy/+yJ3f9CVh24wpePk0hBz6zC9a0ZiexsD0J2+D+f+S91m6dU/Ydh+fNfRlPJ CJD8ay13o+2gFC2pU7ZaLPJNAxWDePTQy0OaLQaOXtSbGaI1hj7VvQBBAX5N6Dq9+K83h2vCaNc N3TExma4WkDPACh+i+la8HzAvdIApUAF43iKWk0mlzjYoCQ1Mvb7Uiqs9B0ZMmBRMBZukehCOSX BHzsJiJx42Dhqk/P1eYFCVFFNRC5GqnPuQUMdbtdLM1zeuoFxBOaX6uRDLlQhrMSP8Oy+F8Okj9 nEYPIAfgF7BPFEP8Aqd5I8i3wXn6ZbS3hMAyI2jHwK0sCFXiPf2zBzPx6Ae/4rCzLJTTX4Agq73 CtTs+ZCv3LHTzkDqozcert2/kkExXNixfEaBGGbGJjcmWEVAbpfr8LA/hameAtxovcxeK5iXUHp ZA5aI= X-Received: by 2002:a05:6a00:8017:b0:82a:18a2:91b9 with SMTP id d2e1a72fcca58-82a6aec1431mr4178624b3a.49.1773861234007; Wed, 18 Mar 2026 12:13:54 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:7::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6b58f7f2sm3902845b3a.24.2026.03.18.12.13.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:53 -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 v3 10/12] net: bnxt: Dispatch to SW USO Date: Wed, 18 Mar 2026 12:13:15 -0700 Message-ID: <20260318191325.1819881-11-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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 Signed-off-by: Joe Damato --- 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 d9ca4933ee62..5c3b3adaf701 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 Mon Apr 6 16:47:56 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 6B0223F7E97 for ; Wed, 18 Mar 2026 19:13:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861239; cv=none; b=RKvkT/leAR7Jqb1W+SMHj7/8keFbHXDOtNqRSMTkeg7GfTwb8nQpSPA4rTgnrTzAMPjhr3HLzy6bjBiHMGqIY5jffAT0VkCtTNZEhFzDziHZiYPvO8CU/RNWFFZtSJeQM+J58EtaAtDA3Oivtbi2E945K1DkSF82arebLSXCg/0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861239; c=relaxed/simple; bh=G3lAJEGIzOMjHC/w2zD2WcOKWET3ZX4PkXRW3E0aC98=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rw1NpOxpBQ+h/f6C9Ap6RfwL35jn5LfCbh1nyVL7TFHJXoGMDiRE9JCij0qXUe+IZlibTBgvraam8cUT9Xt1Y03+K+kVlUrsQ6hL/7FxhU47eG6c1o/WURcNw5H8Qgk45MvfeS/o8eK6gPVIqadYvUXLowb52b5G59ESixXbJoo= 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=aQyNEZvS; arc=none smtp.client-ip=209.85.214.179 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="aQyNEZvS" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2b05fd1d147so706115ad.2 for ; Wed, 18 Mar 2026 12:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861236; x=1774466036; 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=vzxTmIvDilrbiI026msD2EOVwu+JY7leoshXAkQYWUA=; b=aQyNEZvSTwEUhJF5q6o2Xnh/zuhRhHD6Rot8YtOFJnhLl38xZWuMunSE2rZuZYAjMS Rm7h54FGt83Att7sM+Gb/cn100skDu1gsk+jZ7uy4v00sY+Q+ja0g+SJfRkToltP2nu1 8RYg9tHuHKodstPStk+QrTNQHEZ8UQ9QKe6g8wqMUzL/FlE228Am7/FBe4gWB4YdjNlg qbbLDho9ChzaRZ5awr9p7XmGE5mzy6LxyXqqoQa2aDuaf/27MqdfvyBX8qMTem5BG/n6 irGawt5jAvRiM8gwgGfe6sCxoI0HXjbHMkkGTc7Bgn34UQZLwL82NzaaGsuhrgTiB9n9 +v6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861236; x=1774466036; 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=vzxTmIvDilrbiI026msD2EOVwu+JY7leoshXAkQYWUA=; b=bByidSJhChqSy1UPBxkfjuJVydex5IF14sE0PRu6wVGKQkrq8h1CqVNUFSItlS3vBy FeBtG9QxqNp0MsafRANOUx9bAtuVe5VpRdXyXNqK0ViyftgVtGKmNSPSBbIe3pfDl1F7 PapVE2UYWDJxIlPO6z7QJSbD5D2ge5ElcATqUYehouEkhjZtTo5c/uReOoFlQDUDa5+t 6eannCzAInPPSmk0S5gXJo9ZS+6cfNj+7Wd+SOM5oVzRVrgQAmd320pU3oFuhduy5BP/ FI4Dpo61a4BUJl/gFg+MqEvJvDb5C3RwZI1ujF6QX48MK7CHkd/nhOOy/wK2vnbQqKx1 ztjQ== X-Forwarded-Encrypted: i=1; AJvYcCX0ySrO6Zc0VGOcZaHopB/9811+yyj3j3KdmTOWVGolNYORWnkpVgMZgONihOn7xyd3us+DSYP+UXfT5no=@vger.kernel.org X-Gm-Message-State: AOJu0YxbRBV35ZdvYf5//xZzLW83pG6EJUsE6WEqZnKTb0yDHq+xYQzY ipBXYgWo2zA1dl8E7uNJikoyISROjEWRDQ3fJG+RaIUHaBs4KF9BN0httrP+UH8P9HM= X-Gm-Gg: ATEYQzzhxv5m/vtzFx8H8xs665oyKeAP1tkBgmx1H9TMOy4SZNaljd3BvK9vRxh1Z8w hIT8I/dz8cpOMSXyPveqSbtA29He012wqc6h0BEDq+6wL5ViLn7kHPEsaqhbH0nJnUjzNJ98PUq SbbCU0hC0fGwrPc/MzLGtYaHMrnYe7yHoWdpaTyTWnPLDRau89EDDsh8JcGgIWpfG6o5h4C/w6Y OxpnCWxObeBgnPqWc7eLu2rKOuWaXmBPgcU7h8Y/ak6JmkP1r02UhGb6OB57LORQubGAL3LO8Ff 2sIBhrwdKfGb61wwli5RBlVSKzAysYl+0vksuw/Go/U2QrXRBCHLjLYsKUE8pbuKC+GMCl9S4ue genreZrLC/XN7adUNOlrI3LoY6K0yLbhtmbX/rLObvqBoOQH/PBv7sU0DXj7cbDQr+F4yezyFFV LG2U0= X-Received: by 2002:a17:902:ea02:b0:2b0:67cc:adc3 with SMTP id d9443c01a7336-2b06e339ee6mr43173795ad.14.1773861235661; Wed, 18 Mar 2026 12:13:55 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b06e63a971sm61344895ad.83.2026.03.18.12.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:55 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, Jakub Kicinski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni Cc: horms@kernel.org, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, linux-kernel@vger.kernel.org, leon@kernel.org, Joe Damato Subject: [net-next v3 11/12] net: netdevsim: Add support for SW USO Date: Wed, 18 Mar 2026 12:13:16 -0700 Message-ID: <20260318191325.1819881-12-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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 support for UDP Segmentation Offloading in software (SW USO). This is helpful for testing when real hardware is not available. A test which uses this codepath will be added in a following commit. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- rfcv2: - new in rfcv2 drivers/net/netdevsim/netdev.c | 100 ++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 5ec028a00c62..f7dd7692a5d9 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -30,6 +30,7 @@ #include #include #include +#include =20 #include "netdevsim.h" =20 @@ -117,6 +118,98 @@ static int nsim_forward_skb(struct net_device *tx_dev, return nsim_napi_rx(tx_dev, rx_dev, rq, skb); } =20 +static netdev_tx_t nsim_uso_segment_xmit(struct net_device *dev, + struct sk_buff *skb) +{ + unsigned int hdr_len, mss, total_payload, num_segs; + struct netdevsim *ns =3D netdev_priv(dev); + struct net_device *peer_dev; + unsigned int total_len =3D 0; + struct netdevsim *peer_ns; + struct nsim_rq *rq; + struct tso_t tso; + int i, rxq; + + 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); + + udp_hdr(skb)->check =3D 0; + if (!tso.ipv6) + ip_hdr(skb)->check =3D 0; + + rcu_read_lock(); + peer_ns =3D rcu_dereference(ns->peer); + if (!peer_ns) + goto out_drop_free; + + peer_dev =3D peer_ns->netdev; + rxq =3D skb_get_queue_mapping(skb); + if (rxq >=3D peer_dev->num_rx_queues) + rxq =3D rxq % peer_dev->num_rx_queues; + rq =3D peer_ns->rq[rxq]; + + for (i =3D 0; i < num_segs; i++) { + unsigned int seg_payload =3D min_t(unsigned int, mss, + total_payload); + bool last =3D (i =3D=3D num_segs - 1); + unsigned int seg_remaining; + struct sk_buff *seg; + + seg =3D alloc_skb(hdr_len + seg_payload, GFP_ATOMIC); + if (!seg) + break; + + seg->dev =3D dev; + + tso_build_hdr(skb, skb_put(seg, hdr_len), &tso, + seg_payload, last); + + if (!tso.ipv6) { + unsigned int nh_off =3D skb_network_offset(skb); + struct iphdr *iph; + + iph =3D (struct iphdr *)(seg->data + nh_off); + iph->check =3D ip_fast_csum(iph, iph->ihl); + } + + seg_remaining =3D seg_payload; + while (seg_remaining > 0) { + unsigned int chunk =3D min_t(unsigned int, tso.size, + seg_remaining); + + memcpy(skb_put(seg, chunk), tso.data, chunk); + tso_build_data(skb, &tso, chunk); + seg_remaining -=3D chunk; + } + + total_payload -=3D seg_payload; + + seg->ip_summed =3D CHECKSUM_UNNECESSARY; + + if (nsim_forward_skb(dev, peer_dev, seg, rq, NULL) =3D=3D NET_RX_DROP) + continue; + + total_len +=3D hdr_len + seg_payload; + } + + if (!hrtimer_active(&rq->napi_timer)) + hrtimer_start(&rq->napi_timer, us_to_ktime(5), + HRTIMER_MODE_REL); + + rcu_read_unlock(); + dev_kfree_skb(skb); + dev_dstats_tx_add(dev, total_len); + return NETDEV_TX_OK; + +out_drop_free: + dev_kfree_skb(skb); + rcu_read_unlock(); + dev_dstats_tx_dropped(dev); + return NETDEV_TX_OK; +} + static netdev_tx_t nsim_start_xmit(struct sk_buff *skb, struct net_device = *dev) { struct netdevsim *ns =3D netdev_priv(dev); @@ -129,6 +222,10 @@ static netdev_tx_t nsim_start_xmit(struct sk_buff *skb= , struct net_device *dev) int rxq; int dr; =20 + if (skb_is_gso(skb) && + skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) + return nsim_uso_segment_xmit(dev, skb); + rcu_read_lock(); if (!nsim_ipsec_tx(ns, skb)) goto out_drop_any; @@ -986,7 +1083,8 @@ static void nsim_setup(struct net_device *dev) NETIF_F_HW_CSUM | NETIF_F_LRO | NETIF_F_TSO | - NETIF_F_LOOPBACK; + NETIF_F_LOOPBACK | + NETIF_F_GSO_UDP_L4; dev->pcpu_stat_type =3D NETDEV_PCPU_STAT_DSTATS; dev->max_mtu =3D ETH_MAX_MTU; dev->xdp_features =3D NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_HW_OFFLOAD; --=20 2.52.0 From nobody Mon Apr 6 16:47:56 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 63C693F7E77 for ; Wed, 18 Mar 2026 19:13:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861241; cv=none; b=rXV4ioz76atiZ7PQDZIpqpV569A/LhncEa7KbXhDeKJtPDpNhfTV3g0x6RaaXGiVq2SknCgl6N7DRHuIZQ5J+iYL/S2gFg7PwV2zhC6DI1Yyu/tXu/6tKCXuWO8mJFZx1ugagFrySkLaZtJl/wLhqGbG/8cRqv9vjCftMUALpik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773861241; c=relaxed/simple; bh=bOIv1idMYclJig7dHHf8ZB5kdbI0WSQDOttniO+KCbs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WBYnr0HIRErvH1PFY5yFkZ2xc42q0KK897uvUP5gqAKOyZUB9QjIMSqlOWgp1VqyyvuFV0PR7qXLeIdbCBJ9Sta9TOEP5rYg2z/hh7rrnqV6FpPdQqT/lgqzo4ewo75qBkL3DNkfwlS/LywivS+DM5rz2Cwj5YkVjQjxbmmzacM= 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=Sgpm/1Fe; arc=none smtp.client-ip=209.85.214.180 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="Sgpm/1Fe" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2b06d33e84cso981165ad.3 for ; Wed, 18 Mar 2026 12:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20230601.gappssmtp.com; s=20230601; t=1773861237; x=1774466037; 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=zDgUXurlnboqnR9kUYXcG83BLVmHtjY+C3jwCrk3SN8=; b=Sgpm/1FemW4HE9FTESN1VKa0U/dX6wBSVM5HUsfiIG47WQC20EEqnxPb1t+oTS/d3e jFRrMFtgf+hDSf+1ydPyeV1lDFibFJbMaS7RXU4AqItu3W/NV5IyW1lTcCip84phvBEl E/k7MzwS9iFsAi/cRiBr8yhB7cAKPohxUQp/tFsmE5VE9AA9MkbN2KhG4z+9mQa9kiSQ Y3xRtgKXqVaLuFrSxUm/MUCR9bpWNuZkCqsEA3cMZnjrBFdD5gAUcJq1WmdLPXFY6Qzb XfUDzoAci9plLTe+bN6KY+Hers7Q0wWCTu2FwzaBTgUV2U2oyPY8NX9oHvO3cfpayZNh V24Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773861237; x=1774466037; 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=zDgUXurlnboqnR9kUYXcG83BLVmHtjY+C3jwCrk3SN8=; b=GKSQvTvco2FGhx59hT8C3TIP8VwbC5GePHpDggsFktkDokxmwLGaHHagLbxu8KAt5G jnMqrY+MpWxFsGmUZNkXim+h9s6LQS4JBzPmZLfcGADQi1Wls3MH77u1Jon6NLJkZYvO A20hn4he1XlbFdnGQaT9PFLSBvO0vCLBct4PPOi/ohYMVfM8k0hUEOYGRW4ifGhDP3Sh TQEECY1OUsr3CocBWRUyS7PKw81ebQxvW46tgiJJwN6FFtQXprV0U0QTOPx4bEm0blxS Ay/l+1WPIbFSFLQ6q/eR8INtfPvkuFu1CFkiR35wpfSW3G9TLaOSNsSobWdZdQCZ2544 iVEQ== X-Forwarded-Encrypted: i=1; AJvYcCX4YxCdvuUdLrPP9fo2Tr3KtU/0L3Udz/M6e+H0KRQ0YBF2YtCt2zlqE9fszaPFI8RwUPiZ2ZdO6/1Rqjk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7wPl260igWtx6NS0Ep2TC2ymTQq/JjAbxEQxHeHakXAolk3Gj JuNY9pQd4uJ6vupnJut6Zch+Tl9CYcow7F1vDzuYhVxEy+vRRfjC7OS4JrxcvQeTsfg= X-Gm-Gg: ATEYQzxaznLsHlgUvhynJu1s8KYuqnC0xzzuyzVKV3LWi88I8fMY0a9LI99KZOwH2gx tPECqEBJ0Ij1mtW517Ypu8vIQ8ZmPZ8OgtH+vngdXXBLMj8dSMRmZ7oDvU3dcRi2uUxMgPCFS+R 0ScfzK6M8eQJ9Gt0Wqu/h/TYFXCDNEy7szmBP3pJaFTK37aFLVD1z8ow75iNY7/dg43LAFymORJ N81DTGVWf26J9cQfdtXHYtxXiqHAyqPmVwbe/zxngLZM8b5A0/DkxGfaJI0oj2rItJNrO+As6Zu lL9j33McRRgTOpnsfjxzXF9UvJjbtZ/DrPMY6RTqBMxrN8sfGiInthL8nxQYPoduZao/ynm4vTM thDwaQpt1HWFdjmUWlkxGYgFV5Q4Q26tobrPzb1d0g90t3RbtxKV3H2NJxnyry6JkBLGMmlib3x POPwa/ X-Received: by 2002:a17:903:2a90:b0:2b0:4158:c9d1 with SMTP id d9443c01a7336-2b06e3e5bacmr53777575ad.36.1773861237621; Wed, 18 Mar 2026 12:13:57 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b06e627132sm36037645ad.74.2026.03.18.12.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:13:57 -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 v3 12/12] selftests: drv-net: Add USO test Date: Wed, 18 Mar 2026 12:13:17 -0700 Message-ID: <20260318191325.1819881-13-joe@dama.to> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318191325.1819881-1-joe@dama.to> References: <20260318191325.1819881-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. Can be used with netdevsim or real hardware. Tests both ipv4 and ipv6 with several full segments and a partial segment. Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- rfcv2: - new in rfcv2 tools/testing/selftests/drivers/net/Makefile | 1 + tools/testing/selftests/drivers/net/uso.py | 87 ++++++++++++++++++++ 2 files changed, 88 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 8154d6d429d3..800065fe443f 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -22,6 +22,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..da7a68b15734 --- /dev/null +++ b/tools/testing/selftests/drivers/net/uso.py @@ -0,0 +1,87 @@ +#!/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 socket +import struct +import time + +from lib.py import ksft_pr, ksft_run, ksft_exit, KsftSkipEx +from lib.py import ksft_eq, ksft_ge +from lib.py import NetDrvEpEnv +from lib.py import bkg, cmd, defer, ethtool, ip, rand_port, wait_port_list= en + +# 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 bytes(range(256)) * ((total_payload // 256) + 1) + payload =3D payload[:total_payload] + sock.sendto(payload, dst) + sock.close() + return payload + +def _get_rx_packets(cfg): + stats =3D ip(f"-s link show dev {cfg.remote_ifname}", + json=3DTrue, host=3Dcfg.remote)[0] + return stats['stats64']['rx']['packets'] + +def _test_uso(cfg, ipver, mss, total_payload): + cfg.require_ipver(ipver) + + try: + ethtool(f"-K {cfg.ifname} tx-udp-segmentation on") + except Exception: + raise KsftSkipEx("Device does not support tx-udp-segmentation") + defer(ethtool, f"-K {cfg.ifname} tx-udp-segmentation off") + + expected_segs =3D (total_payload + mss - 1) // mss + + rx_before =3D _get_rx_packets(cfg) + + port =3D rand_port(stype=3Dsocket.SOCK_DGRAM) + _send_uso(cfg, ipver, mss, total_payload, port) + + time.sleep(0.5) + + rx_after =3D _get_rx_packets(cfg) + rx_delta =3D rx_after - rx_before + + ksft_ge(rx_delta, expected_segs, + comment=3Df"Expected >=3D {expected_segs} rx packets, got {rx_= delta}") + +def test_uso_v4(cfg): + """USO IPv4: 11 segments (10 full + 1 partial).""" + _test_uso(cfg, "4", 1400, 1400 * 10 + 500) + +def test_uso_v6(cfg): + """USO IPv6: 11 segments (10 full + 1 partial).""" + _test_uso(cfg, "6", 1400, 1400 * 10 + 500) + +def test_uso_v4_exact(cfg): + """USO IPv4: exact multiple of MSS (5 full segments).""" + _test_uso(cfg, "4", 1400, 1400 * 5) + +def main() -> None: + with NetDrvEpEnv(__file__) as cfg: + ksft_run([test_uso_v4, + test_uso_v6, + test_uso_v4_exact], + args=3D(cfg, )) + ksft_exit() + +if __name__ =3D=3D "__main__": + main() --=20 2.52.0