From nobody Thu Apr 2 22:23:30 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 From nobody Thu Apr 2 22:23:30 2026 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (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 0C8AB2C3254 for ; Fri, 13 Feb 2026 19:25:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771010718; cv=none; b=XrSj536b1qgPd+3Cgh57T2a60bUHbQe+cqjGgLky0uGPJCEIqySXTK/qEjx50OzaxRYn0dsYDvAZTnSWzII9+ycDF1MgdizIJHpUVYJPjCPQ5Xrx59eJyoFfAUukW+eB378PJ5iNqymLpSoFTTu2EuUHyAopIyBGaPz1RZagyrE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771010718; c=relaxed/simple; bh=8b0QYhOGwS2V2AItVoEQ6N4KsyNesW8120oxsVTsrdE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nq8JNghdehkqxA58zf9iAqh3DxlbYJafP6zPl4mhsDNLqfa6yN8HbqN1wZ7zhfO6qhm5ynvsMpxlAVuDVTRWEQ2A32JOB2eaKzp0whvHvcUvYUB1XguYk1SjIX3gFSzcnX79ycJuj19faOIG9wFfU/Yvo7XR1RGXVSbq/wCAv8U= 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=BTwEf+NU; arc=none smtp.client-ip=209.85.210.50 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="BTwEf+NU" Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-7d1890f7ee4so772289a34.0 for ; Fri, 13 Feb 2026 11:25:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1771010716; x=1771615516; 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=rBbOQadYCksTHWu4+/GITak2TLFEO73uM1y/DwDxxcg=; b=BTwEf+NUWikgGP2Z9hEkRrvoiPCotV+yhzrjddIbSRBoZav835hFauvGiWyvA3IhnT qRj+71vzk0MJcnXfBLMDAjWP+khVCFK/552X8FNp5/SDEI7kgiP1CQTX+QQeElXvU2rJ JKaM8HsGr1fAcRMnXyyVUPeVtN9vFaeQvPikb37bhvqlbTjbUCVS74F9ELUIhCkDLZvi +Rc3hZH+Tg40CxxlhTqFmKJ6JfW1LNKbJa2Pyui4Cla2L0UXZFuIsqkt3NbLfcj87OzI xKMvl2hNCCCQkHHaNwtfXFWUqh5ASiigLJ0mfGP6LcqlWn3flfnI2JVKljLERMfjDOQP pWJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771010716; x=1771615516; 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=rBbOQadYCksTHWu4+/GITak2TLFEO73uM1y/DwDxxcg=; b=s5UVqQTO3umq5kkLf732oJZio6liIbQ+KDgxNESmp5p8d2oEq4kNCZGp985wgQ2CBe mN1TGL6uXPVQzSab4EKnui4vosqfWlJIPAM2N6AyZYxRgMKyX8BQuxCjnNTR5ZM2f/Rd BTVK2OimgmQY5fvIVzt2uRLka+MoTgF66J+5uYfXY8OTFPxb1IsD4v8tXef6ml8Uar4c wZCm3qArdPtz0TJ94+s89zmFejmhtENlpoPiXdHYWWXjFlQzambanzEs+QinjS+vVSJk zDfKS45I6wt6iFaY3X3iPHRBAup+5JDADplitC7ww7AnW/UewGWgZ+fgV65TtuoWYP8S SxKA== X-Forwarded-Encrypted: i=1; AJvYcCVVmgeVr52yL/rncIk0ubmVitBGWma+TitLxGgpxjk/Df0oJiY843TXXukk02w3LeSMZsWqQ7tYWsSdrEQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yyrzl9kGJdDZX8NBxpZ+vfbCFR9zZ2r0w8zcSM0CozAFzLeWBP0 uTwlg/NiJCHTPYN/JnExaS+r+YyMG/F3aiR9ktsBXeHQya7KE9F3tP9H/s2gQue7MRo= X-Gm-Gg: AZuq6aLMKrkjAh5JsNrz3AhD3mhPzR8U1qAQW6758qRbPhdynGin4pnEi1lqcXvR3Ca IpuNyDte0epPUtMufN1uCoKt4VzQ8JbbA4cT3bh3gRKH1U8yN41MdU6zCBwL89YdvOVjLJy2GDL lnMB+NcvpaHRa5GWy8WIQZH06ERA26orusS+iLb81jr/QdxnwPI4mxfDB909DnWE3Ns3pxZ3xdZ yzmVz5Yr532Ob5ASXHYs1/7QRZUY1nFxY8OlT+iCJre1ESLknuOOHD+h98JVsZDzlxxns6EOTSp f7BLEoQ9/XUq84pWLPtiRnS9Gos82YIrDXcmrBVk76fAQpg+19AzvSvMMiJh2k2zlzCPTt2mu9n /2xMLfAyG/giK3bZi99OXQdSKY/USwXzSSLK+KDvWgLCZKbTtXAsFLyueEDsItj6D6Wjz8tL/JS VsGAjEwJN9 X-Received: by 2002:a05:6830:2a8c:b0:7ca:c7b0:17eb with SMTP id 46e09a7af769-7d4c300277amr2066239a34.10.1771010715968; Fri, 13 Feb 2026 11:25:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 11:25:15 -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 2/2] bnxt_en: Implement XDP RSS hash metadata extraction Date: Fri, 13 Feb 2026 13:24:28 -0600 Message-ID: <20260213192449.1294830-3-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" Add support for extracting RSS hash values and hash types from hardware completion descriptors in XDP programs for bnxt_en. Add IP_TYPE definition for determining if completion is ipv4 or ipv6. In addition add ITYPE_ICMP flag for identifying ICMP completions. Signed-off-by: Chris J Arges --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 ++ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 47 +++++++++++++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 2 + 4 files changed, 56 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethern= et/broadcom/bnxt/bnxt.c index 4c5e50bad783..42c024e9d974 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -15845,6 +15845,10 @@ static const struct net_device_ops bnxt_netdev_ops= =3D { .ndo_hwtstamp_set =3D bnxt_hwtstamp_set, }; =20 +static const struct xdp_metadata_ops bnxt_xdp_metadata_ops =3D { + .xmo_rx_hash =3D bnxt_xdp_rx_hash, +}; + static void bnxt_get_queue_stats_rx(struct net_device *dev, int i, struct netdev_queue_stats_rx *stats) { @@ -16684,6 +16688,7 @@ static int bnxt_init_one(struct pci_dev *pdev, cons= t struct pci_device_id *ent) goto init_err_free; =20 dev->netdev_ops =3D &bnxt_netdev_ops; + dev->xdp_metadata_ops =3D &bnxt_xdp_metadata_ops; dev->stat_ops =3D &bnxt_stat_ops; dev->watchdog_timeo =3D BNXT_TX_TIMEOUT; dev->ethtool_ops =3D &bnxt_ethtool_ops; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethern= et/broadcom/bnxt/bnxt.h index f88e7769a838..ef5f71c97c63 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -232,6 +232,7 @@ struct rx_cmp { #define RX_CMP_FLAGS_ITYPE_UDP (3 << 12) #define RX_CMP_FLAGS_ITYPE_FCOE (4 << 12) #define RX_CMP_FLAGS_ITYPE_ROCE (5 << 12) + #define RX_CMP_FLAGS_ITYPE_ICMP (7 << 12) #define RX_CMP_FLAGS_ITYPE_PTP_WO_TS (8 << 12) #define RX_CMP_FLAGS_ITYPE_PTP_W_TS (9 << 12) #define RX_CMP_LEN (0xffff << 16) @@ -311,6 +312,7 @@ struct rx_cmp_ext { #define RX_CMP_FLAGS2_T_IP_CS_CALC (0x1 << 2) #define RX_CMP_FLAGS2_T_L4_CS_CALC (0x1 << 3) #define RX_CMP_FLAGS2_META_FORMAT_VLAN (0x1 << 4) + #define RX_CMP_FLAGS2_IP_TYPE (0x1 << 8) __le32 rx_cmp_meta_data; #define RX_CMP_FLAGS2_METADATA_TCI_MASK 0xffff #define RX_CMP_FLAGS2_METADATA_VID_MASK 0xfff diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/et= hernet/broadcom/bnxt/bnxt_xdp.c index c94a391b1ba5..28f7f03662df 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c @@ -472,3 +472,50 @@ bnxt_xdp_build_skb(struct bnxt *bp, struct sk_buff *sk= b, u8 num_frags, xdp_buff_get_skb_flags(xdp)); return skb; } + +static int bnxt_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash, + enum xdp_rss_hash_type *rss_type) +{ + const struct bnxt_xdp_buff *xdp =3D (void *)ctx; + const struct rx_cmp *rxcmp =3D xdp->rxcmp; + const struct rx_cmp_ext *rxcmp1 =3D xdp->rxcmp1; + u32 itypes; + enum xdp_rss_hash_type hash_type =3D 0; + + if (!rxcmp || !RX_CMP_HASH_VALID(rxcmp)) + return -ENODATA; + + *hash =3D le32_to_cpu(rxcmp->rx_cmp_rss_hash); + + if (!rxcmp1) { + *rss_type =3D XDP_RSS_TYPE_L2; + return 0; + } + + if (xdp->cmp_type =3D=3D CMP_TYPE_RX_L2_CMP) { + itypes =3D RX_CMP_ITYPES(rxcmp); + if (rxcmp1->rx_cmp_flags2 & + cpu_to_le32(RX_CMP_FLAGS2_IP_TYPE)) { + hash_type |=3D XDP_RSS_TYPE_L3_IPV6; + } else { + hash_type |=3D XDP_RSS_TYPE_L3_IPV4; + } + + switch (itypes) { + case RX_CMP_FLAGS_ITYPE_TCP: + hash_type |=3D XDP_RSS_L4 | XDP_RSS_L4_TCP; + break; + case RX_CMP_FLAGS_ITYPE_UDP: + hash_type |=3D XDP_RSS_L4 | XDP_RSS_L4_UDP; + break; + case RX_CMP_FLAGS_ITYPE_ICMP: + hash_type |=3D XDP_RSS_L4 | XDP_RSS_L4_ICMP; + break; + default: + break; + } + } + + *rss_type =3D hash_type; + return 0; +} diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h b/drivers/net/et= hernet/broadcom/bnxt/bnxt_xdp.h index 5f60b848fcc4..53fed951c151 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h @@ -41,4 +41,6 @@ void bnxt_xdp_buff_frags_free(struct bnxt_rx_ring_info *r= xr, struct sk_buff *bnxt_xdp_build_skb(struct bnxt *bp, struct sk_buff *skb, u8 num_frags, struct page_pool *pool, struct xdp_buff *xdp); +int bnxt_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash, + enum xdp_rss_hash_type *rss_type); #endif --=20 2.43.0