From nobody Tue Apr 7 10:37:43 2026 Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.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 3D190259CB9 for ; Fri, 13 Mar 2026 22:30:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773441055; cv=none; b=ASy7nxCpaEf0Rabf+/opJ8HjG0i/Ui0EeNKp+eTb40703yWEqfcD6YVisFcGmzmkLlbwgMlTfarXMaEaM7N/YVDufRN812HT1sWxdfOwBa2ZZAXfN2bvfUFTBUvzrS+3Gz3ETNMQDuy8HtdnfS5tXJeSb1WZ2TsPkGgX4WzTO5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773441055; c=relaxed/simple; bh=q92wW6u9jfkve4Jnxrkv5vS9DQpou808H07Lfmn6g9A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cr40E586FgNoGzC2aInZAsFSWjqWWhNtdBdSP9YEfkGaRYAqFTYeRS0uwlIrB/+HVIlrQqd7Hu/EULvGHWSW6DArnsWcnJH5iH8WguOszAU7XPbO9lKFpdATNj7pmapAYTseRnOnMkcVIoaFbiKIYC/qKCWhXGmpmGF8jbenPkE= 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=Fg67lBn6; arc=none smtp.client-ip=209.85.167.174 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="Fg67lBn6" Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-4670676ba03so1038349b6e.1 for ; Fri, 13 Mar 2026 15:30:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1773441053; x=1774045853; 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=UIfbn2R80P+GEE142tyIwDUaWaiGTo/JYywBsc0gehU=; b=Fg67lBn6VNth/bzG0G0XGngQWSejaH5rpNdNd2+0QfcFy/qko+S0kwN5JJv/WJjkDm tcV4ZOXiae8W2FHTEXABUy/IGMt3mCclSECY9ei5imBSHLDhCFyTkhZZcdEWRBqgq5+k FnJVSBU4hbz9iPHvAyf2qXarRWOtZri99lQgAwjAiJXoHPyRXQ7rz+62FZ+Y0Uehe2NW LdeJunjbjJoFaHET/OFM2QRT7jasxLJt41YeJLsDqdgMFNcah0epyE7FX06axESPfZ18 GnjRsarrVkuregBk+gt7OiA9hOybChLJn5/lKnog+uXUeFfaqJzQTexhTbq6A9Ge/oVe xo8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773441053; x=1774045853; 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=UIfbn2R80P+GEE142tyIwDUaWaiGTo/JYywBsc0gehU=; b=nFrPVtEYgj7fOamUJsc+WGzlo77Yw/2bhJ2+l1Q0ugNi6/wAPXx7QlSqw0b5tvR6VJ b29ph+HUEnJLlLuSjjRUwUpvulSJwwELo2nKVN98NB1L9QVyp1qIX7Z/wni6yOkW8FYt JTLrY0IpdVmCR1CHy6G8zL4K8hIek4KN67Ftj120h45esRSV+NrVH8XQIuB+wm8HAWez eJ/mLKoGx5hUhdRQnkCDu6MobsoKPc2+WGy0FaPBvQV1jVrGCcdldWxuQ5VyGzINvcUi XrWOq1uJsNNc0FpkGTTT9MCieC4o1wtEfqoiFs0AOGjFuXJi44+NSPjh2xyJFTYDUvcV G+3Q== X-Forwarded-Encrypted: i=1; AJvYcCXx3gNYvNnz0l+362CYQx6iYDIP3VYdlrj77zIUw2jcZh0NC11zPdMOcJw+gKrDRqawrTDkhKi9E9w8cg8=@vger.kernel.org X-Gm-Message-State: AOJu0YyosDg6hC4lCScuxfY30ZMG2mQDt0vS8KfHKwZZjXn6x/TRI9i3 ipqn5labeGo/YHYyfXS5D6ElMoVvNMQItmkn0s2l1/pkXtxtZdb++/xA5uHyCWB+dMc= X-Gm-Gg: ATEYQzyYPpyjyC6kAUzeSGZpzWy1RRdGv4a7+CrlNz2SYGLCHIZjfPxem6M9wK+XPQF DtH5arYnNhzxCQvQkvcZF6Ao1nXe2jSYxVFKiM0sZqh3E/tcgnXNh11ffxtsbPeDHT5bCdPWvRo /Fuf+vQfEBBXjKKcebHdy2e+fhdvHrdDkHQBeL3st7zNycHpRE9ge95XHGkitXo18gsd/0Ajy0N e/dBOdFsSzVqRkBzUZWFfk7D0fzJ6bNXp3RN/z1rHG4OMF+J9K8/nZD7zg9RReaimnJtKmWWgFK BoJvqcbXz0YeVQqo/9aiToPdGVkuAl2lhqZEHDW4BNL92Kr/yAarOYVOF1zitZ+JDh5TVx9UlBA EMw36k8c7pnrL9ufqPN7GCuSgtHjXeyxxWHWw5980ixTh0uIHFNWTcC03LgRbDA+cDJpikKRY8k 0ZCQAEOIHram9KTEAqsG4= X-Received: by 2002:a05:6808:e8b:b0:467:21dd:aa94 with SMTP id 5614622812f47-4675762d0dbmr2499832b6e.55.1773441053170; Fri, 13 Mar 2026 15:30:53 -0700 (PDT) Received: from 20HS2G4.. ([2a09:bac1:76c0:540::22f:7d]) by smtp.gmail.com with ESMTPSA id 5614622812f47-467342fab49sm5408516b6e.16.2026.03.13.15.30.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 15:30:52 -0700 (PDT) From: Chris J Arges To: Joe Damato , Jakub Kicinski , Andy Gospodarek , Michael Chan , Pavan Chebbi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev Cc: Chris J Arges , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH net-next v4 1/6] bnxt_en: use bnxt_xdp_buff for xdp context Date: Fri, 13 Mar 2026 17:27:31 -0500 Message-ID: <20260313223029.454755-2-carges@cloudflare.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260313223029.454755-1-carges@cloudflare.com> References: <20260313223029.454755-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 Reviewed-by: Joe Damato --- v4: moved bnxt_xdp declaration to follow RCT style --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 25 +++++++++++-------- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 7 ++++++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index c982aac714d1..1b170b9cf461 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -2115,10 +2115,10 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt= _cp_ring_info *cpr, struct bnxt_sw_rx_bd *rx_buf; unsigned int len; u8 *data_ptr, agg_bufs, cmp_type; + struct bnxt_xdp_buff bnxt_xdp; bool xdp_active =3D false; dma_addr_t dma_addr; struct sk_buff *skb; - struct xdp_buff xdp; u32 flags, misc; u32 cmpl_ts; void *data; @@ -2231,9 +2231,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); @@ -2245,12 +2249,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; @@ -2261,7 +2265,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) { @@ -2269,7 +2273,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; } @@ -2293,10 +2297,11 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt= _cp_ring_info *cpr, if (!skb) goto oom_next_rx; } else { - skb =3D bnxt_xdp_build_skb(bp, skb, agg_bufs, rxr, &xdp); + skb =3D bnxt_xdp_build_skb(bp, skb, agg_bufs, + rxr, &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 8933a0dec09a..8c66698bde11 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