From nobody Thu Apr 2 23:53:32 2026 Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.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 C162C286D40 for ; Fri, 13 Feb 2026 19:25:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771010716; cv=none; b=B26egHnUF9PlOS7IgGO/u0ZFRtPOp4LPPXwwKyw5JkjjS5hwZlEREyrvD/SByHND5rzbA2bRkX0fn9VvjYajJPhKiSYUvJvltXmvvTaVgEePfB6k6+BD/2BlsOJ+vVuH9VO8qAQSPAqVRPXnA0iEvHPRthRkNOq3gOCiO3nzc2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771010716; c=relaxed/simple; bh=1AWsqbF6uQ5IO3/lEjud9uj1H4t9rPI6+yXkNMP+snY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SostNGQ6ddazmqfd5pDET9KlpQmw+ucdVHBOM3GdfzYVfOjZk0awqCQpPR85Y4rZ1Sfmc4/2Ea2h3a0Xqvydhw72dMu7ttKPB4ptR/vrAbLPSI0QN5Reeb0HVF8raQQz3qDEPsb6TpEomlII7zxV+5nK1PBk1HYyeu/y+GV6hRg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=Vosu4kxF; arc=none smtp.client-ip=209.85.210.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="Vosu4kxF" Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-7d4cb7e10efso550774a34.0 for ; Fri, 13 Feb 2026 11:25:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1771010714; x=1771615514; 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=SDx6aNjolaLjlY/tFPaDQVZ9LraL1BXHhtWRZ+My8mI=; b=Vosu4kxF1wB/ty5K265dJlS7H9OC7tKdaHCL+9ThK2jQVIJKmQwfMDsfAJ9oUmkeVT jmL5LJ0KuJhLeeZ0/ETWr1MUQWEhFTNKZRRz7hDe3Lovk76Gz7OfprhVdGB59mixHCRo kaH/0PnlPIWAgu6LApNCo8ZEKDU7Q8psCFKGYpgmqq+uV4VZ70sP9NDTENjcPwuJg6IB V2nOC49Xs1w2l4PoQsugPk0sVW4SicxkZEemryD/PWLghuLsjOSRLkgF2Q9C55oPLLRo fwAu0U9XRmhMFdcNRc1V7qJpSFEC6QcYLq6Q3QJinvqh5BUOOXXRfEUoX4Ojc2zh6Jzl 6H3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771010714; x=1771615514; 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=SDx6aNjolaLjlY/tFPaDQVZ9LraL1BXHhtWRZ+My8mI=; b=spHwYzE3+Qc4/yyEaBgo5tav0CJhnLkyusa/qJrLQ8sS7pduAQmWftLnMQzji5nkyd Hxwje+ire9oaMBw5U5bsIP1DGjz0U0685ERrSdF631SrysPyVo4V4aGQyrwNhG3EnmrY VTL9thmbnBs99DSHNkIuCJ1vsvpLUcErT2yYSQ4Y/xdLD5POiBmFFLeaSS6L1Yy4LYG2 gVRMHTpvCpx2LCjreOrWq/L0f3vh/0qZ3RezPcR4FG8cAAsSHoKzlOPcVE8KU1CCVp5K 1LOv/YDE0zxWnYavt1e9JV7SFlcdWvdgVHd/kvNhbnX/CPlS3HzaEL7c0/D+ehPE9Qnf sQ0g== X-Forwarded-Encrypted: i=1; AJvYcCWHFlWGJvkhUtRJn81zlACPEAPRShr6iaRyyX6XgsPx/LQVaasxTNyFJ+qB3WNPkpbGK5kna6seoziGaJw=@vger.kernel.org X-Gm-Message-State: AOJu0YwyI92VuuljQB4rX4k+9XTCcRxez+njjSmncrKlEO9HXlc3z7fu HRnXb1yjSN26AxBK18WYpYsnFb7HnlOI5U93dND0xM2u+ozX1hsQ7nvKrffmDT+/8+0= X-Gm-Gg: AZuq6aI8wAbrHouVnBs6vRJmSEYbbqGqmbkEPCDn/VUtyZ/5mca64hnAIjXl1if/Qyw axAF2tDV1L0RdphRHz+SzN71188KotFrlHY+bnadGJxbiOdXzyRnoFrVK0/O7H36yakfWhu8/fP Ljkhdtxz/w4k21EqSd0u1a2uF/sB1pCsETr1d/O2vNJ/zKCcT+ApC6k+GEN9DfVyVkUwER0mpZk 8DWmyehsboVBKGhv2xO7XQBi661P6Cd7NCOWh3jbUiRmlfXOR5neQY30c1yP++OoAkqC3CC3Jfv LagQfe45GTJA015EXmNHQhPoBdKM+SmQIDO87wQ/BjbHSdlExfW0XSS3oypxbbAZcco8P8VJaaU BR0L31Kc1RrZ+/itbqxayeH672kLV9d9/GCxjxRSJfFKOmentVP+Zfr32WoZ9iF2EoIMqTN63FH 9Vq6ee9kAy X-Received: by 2002:a05:6830:6686:b0:7c7:655c:7353 with SMTP id 46e09a7af769-7d4d0adabe0mr284901a34.12.1771010713650; Fri, 13 Feb 2026 11:25:13 -0800 (PST) Received: from 20HS2G4.. ([2a09:bac1:76c0:540::499:50]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7d4a76f96b8sm6591407a34.21.2026.02.13.11.25.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 11:25:13 -0800 (PST) From: Chris J Arges To: michael.chan@broadcom.com, pavan.chebbi@broadcom.com, hawk@kernel.org, Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , John Fastabend , Stanislav Fomichev Cc: kernel-team@cloudflare.com, jbrandeburg@cloudflare.com, Chris J Arges , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH 1/2] bnxt_en: use bnxt_xdp_buff for xdp context Date: Fri, 13 Feb 2026 13:24:27 -0600 Message-ID: <20260213192449.1294830-2-carges@cloudflare.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260213192449.1294830-1-carges@cloudflare.com> References: <20260213192449.1294830-1-carges@cloudflare.com> 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" This adds bnxt_xdp_buff which embeds the xdp_buff struct and stores pointers to hardware RX completion descriptors (rx_cmp and rx_cmp_ext) along with the completion type. Signed-off-by: Chris J Arges --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 24 +++++++++++-------- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 7 ++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index 8419d1eb4035..4c5e50bad783 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -2115,7 +2115,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_c= p_ring_info *cpr, bool xdp_active =3D false; dma_addr_t dma_addr; struct sk_buff *skb; - struct xdp_buff xdp; + struct bnxt_xdp_buff bnxt_xdp; u32 flags, misc; u32 cmpl_ts; void *data; @@ -2228,9 +2228,13 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_= cp_ring_info *cpr, dma_addr =3D rx_buf->mapping; =20 if (bnxt_xdp_attached(bp, rxr)) { - bnxt_xdp_buff_init(bp, rxr, cons, data_ptr, len, &xdp); + bnxt_xdp.rxcmp =3D rxcmp; + bnxt_xdp.rxcmp1 =3D rxcmp1; + bnxt_xdp.cmp_type =3D cmp_type; + + bnxt_xdp_buff_init(bp, rxr, cons, data_ptr, len, &bnxt_xdp.xdp); if (agg_bufs) { - u32 frag_len =3D bnxt_rx_agg_netmems_xdp(bp, cpr, &xdp, + u32 frag_len =3D bnxt_rx_agg_netmems_xdp(bp, cpr, &bnxt_xdp.xdp, cp_cons, agg_bufs, false); @@ -2242,12 +2246,12 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt= _cp_ring_info *cpr, } =20 if (xdp_active) { - if (bnxt_rx_xdp(bp, rxr, cons, &xdp, data, &data_ptr, &len, event)) { + if (bnxt_rx_xdp(bp, rxr, cons, &bnxt_xdp.xdp, data, &data_ptr, &len, eve= nt)) { rc =3D 1; goto next_rx; } - if (xdp_buff_has_frags(&xdp)) { - sinfo =3D xdp_get_shared_info_from_buff(&xdp); + if (xdp_buff_has_frags(&bnxt_xdp.xdp)) { + sinfo =3D xdp_get_shared_info_from_buff(&bnxt_xdp.xdp); agg_bufs =3D sinfo->nr_frags; } else { agg_bufs =3D 0; @@ -2258,7 +2262,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_c= p_ring_info *cpr, if (!xdp_active) skb =3D bnxt_copy_skb(bnapi, data_ptr, len, dma_addr); else - skb =3D bnxt_copy_xdp(bnapi, &xdp, len, dma_addr); + skb =3D bnxt_copy_xdp(bnapi, &bnxt_xdp.xdp, len, dma_addr); bnxt_reuse_rx_data(rxr, cons, data); if (!skb) { if (agg_bufs) { @@ -2266,7 +2270,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_c= p_ring_info *cpr, bnxt_reuse_rx_agg_bufs(cpr, cp_cons, 0, agg_bufs, false); else - bnxt_xdp_buff_frags_free(rxr, &xdp); + bnxt_xdp_buff_frags_free(rxr, &bnxt_xdp.xdp); } goto oom_next_rx; } @@ -2291,10 +2295,10 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt= _cp_ring_info *cpr, goto oom_next_rx; } else { skb =3D bnxt_xdp_build_skb(bp, skb, agg_bufs, - rxr->page_pool, &xdp); + rxr->page_pool, &bnxt_xdp.xdp); if (!skb) { /* we should be able to free the old skb here */ - bnxt_xdp_buff_frags_free(rxr, &xdp); + bnxt_xdp_buff_frags_free(rxr, &bnxt_xdp.xdp); goto oom_next_rx; } } diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h b/drivers/net/et= hernet/broadcom/bnxt/bnxt_xdp.h index 220285e190fc..5f60b848fcc4 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h @@ -12,6 +12,13 @@ =20 DECLARE_STATIC_KEY_FALSE(bnxt_xdp_locking_key); =20 +struct bnxt_xdp_buff { + struct xdp_buff xdp; + struct rx_cmp *rxcmp; + struct rx_cmp_ext *rxcmp1; + u8 cmp_type; +}; + struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp, struct bnxt_tx_ring_info *txr, dma_addr_t mapping, u32 len, --=20 2.43.0