From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3D5C384232 for ; Fri, 13 Mar 2026 22:30:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773441059; cv=none; b=aqvqkm4vYGalv2JwMRmLupDpsKs/pJuJzC+K9os9NvoaPBYcp9wE4vaXCebRqRgefMkHG3TSli6JRfH5LXOfJImfbtsPF4Pq3gzNg84jBvCvEu2njvnCnB/7NC79juXZjqN9K/QASM+jGEu6KWbglUOIY4v+1hnUQaVA9/013rs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773441059; c=relaxed/simple; bh=+1Nr0Jil7w93d9S780sxk/ZwDE85Lpd4DcR7sfP5MRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DQBdaRnrH+ZDsdvoxxRBhfn6tHfzlzh2uIDydaaE6y0Vpz63zev6Q89fov4JJz86uHAStE/rIps4qUAwOtkAnh+Lxb4F583NJihjtXHAawu/7IP7mdIKfieS1qYXQYJgP9Vof3329GB+NcFye65rhIFKwQsNijnhHOreJPHwIH0= 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=HumhbsnZ; arc=none smtp.client-ip=209.85.167.173 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="HumhbsnZ" Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-4672076355aso1886346b6e.2 for ; Fri, 13 Mar 2026 15:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1773441056; x=1774045856; 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=H2JdvacgjZAGz3EP35cm2jBWXr/fY7/W6wCgdpj3LTQ=; b=HumhbsnZ0OQqImvM/FAuL+yvccY6TB3Qa+TqffYleAjmL3FMy0oE/p2MLdQepEwO6K Jl8lTK69o2R1NHuDvmhWAyw8eEzX2n4A1yk21/7Ek4r7LX+cX+8pj8e3ihmyxlJlcbQh vXAGEZhOFiLPoXFGksnppg3lFDbq0zpvaoTur5joGoCbsLHXf0+a+zbvpdkD0BaAqLP8 wBPK9M1IwnNVGMGZvfyspY9SRZgjbykn8kdCf2g07KCT9tR1kOJx7bMu6KjgKoIrwvV8 quIyHdTBfuBePYyKpT+l8GhVaorgpORG+hu7y/EDWfNr8WHT/U0OoNqkh/pLb4ZMpiic V0Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773441056; x=1774045856; 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=H2JdvacgjZAGz3EP35cm2jBWXr/fY7/W6wCgdpj3LTQ=; b=j6SIsIUvMmRdp31+2TSPctg+9nI9DR3FyKIAQ20rOCEqh0ODRt+lhpYxCDHXZjrRx3 YRJDZFyJzzM8z3s2GvjO7+7RU3fR62eIQdqTZ+I+hTHznLjI0od3ybT68ra1m4C0anCV Nz/2GfVqFoTnmSHPVYW+1gRsmK+4Juq40e8BrvV8S0LXI3H+H7a21KC+uDXIefFNob/z hXkIGaIpx/8w7DY9tu+Vd6wn+YNI9ErGj66wJAy4Ew9I5xvq+ZObygpVsyv1qXyVk+KK 8Bq1Y+0Y1sZnBl7NC2JKIeT9sS+ZVE/+Csq+m1PUtZCb/Ern7GtxXh78HYIvqlgpgnsy C+uw== X-Forwarded-Encrypted: i=1; AJvYcCXPufnsT+Uf2td9Ocz2LWNpiSb22cevU8Zyx0ZA/x7weuyEz3JennTrV758HW/vHvrZUYxP2F8=@vger.kernel.org X-Gm-Message-State: AOJu0YyUMqX6as3HLNxyZRmtnik2NDlxghfalrnwZlG4MBaIOOKgXFtU v1T0Ih+ZbzD97PwfYieLbPQNMGoQDyTaJ8KYEi3OPvIuiLAHFHmRSi3b1tC9MCPX898= X-Gm-Gg: ATEYQzzGvZZbvjIIhY1HBehAqxBpskSSZl6qZfIbo/oZEIHbSta1/MadfptMD8qojHp sve7Oexj1v7X8ikC8HsNfcc6976Uzbb7I0vHeT663pkSH4EShD1JJ38LswMsixk2J3CJf9+xj0T C9B9tfi69kF7HSbSIy/iWPnBiCprBk+gJIW1nFrKwOxONACmvJ0UjQLzvXRn5dSq3QqLnaSJjTQ ZRAmtuClq46rkLy+IcgWOIUHqUPi42PfxTtJRD1MKzwXNsY9CU8Y5YKmMIalv4WHA8sY2N+hHuI nZBBFBaasnOTQrHM+frDvkI/pEAChwTY9p1mWSLkATF+J6me7ud6j9N3hq2/wBY4vUU3zGe4Iny GGGV5zGZVu6Md6kKUix7bTV7/qpCsWaoj+hMAYgUy1oxosBrxTrGef45kO61cnsoNMdprOmbfgw d1eI3qlFhn X-Received: by 2002:a05:6808:4f66:b0:45e:e52c:8a9b with SMTP id 5614622812f47-46757649336mr2867556b6e.59.1773441055758; Fri, 13 Mar 2026 15:30:55 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 15:30:54 -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 2/6] bnxt_en: Implement XDP RSS hash metadata extraction Date: Fri, 13 Mar 2026 17:27:32 -0500 Message-ID: <20260313223029.454755-3-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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Joe Damato Reviewed-by: Andy Gospodarek --- v4: no changes --- 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 | 3 ++ 4 files changed, 57 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 1b170b9cf461..4881d9359549 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -15906,6 +15906,10 @@ static const struct net_device_ops bnxt_netdev_ops = { .ndo_hwtstamp_set = bnxt_hwtstamp_set, }; +static const struct xdp_metadata_ops bnxt_xdp_metadata_ops = { + .xmo_rx_hash = bnxt_xdp_rx_hash, +}; + static void bnxt_get_queue_stats_rx(struct net_device *dev, int i, struct netdev_queue_stats_rx *stats) { @@ -16790,6 +16794,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) goto init_err_free; dev->netdev_ops = &bnxt_netdev_ops; + dev->xdp_metadata_ops = &bnxt_xdp_metadata_ops; dev->stat_ops = &bnxt_stat_ops; dev->watchdog_timeo = BNXT_TX_TIMEOUT; dev->ethtool_ops = &bnxt_ethtool_ops; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 90fa3e93c8d6..34bb98709f2b 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/ethernet/broadcom/bnxt/bnxt_xdp.c index 85cbeb35681c..1f920464b426 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 *skb, u8 num_frags, xdp_buff_get_skb_flags(xdp)); return skb; } + +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 = (void *)ctx; + const struct rx_cmp_ext *rxcmp1 = xdp->rxcmp1; + const struct rx_cmp *rxcmp = xdp->rxcmp; + enum xdp_rss_hash_type hash_type = 0; + u32 itypes; + + if (!rxcmp || !RX_CMP_HASH_VALID(rxcmp)) + return -ENODATA; + + *hash = le32_to_cpu(rxcmp->rx_cmp_rss_hash); + + if (!rxcmp1) { + *rss_type = XDP_RSS_TYPE_L2; + return 0; + } + + if (xdp->cmp_type == CMP_TYPE_RX_L2_CMP) { + itypes = RX_CMP_ITYPES(rxcmp); + if (rxcmp1->rx_cmp_flags2 & + cpu_to_le32(RX_CMP_FLAGS2_IP_TYPE)) { + hash_type |= XDP_RSS_TYPE_L3_IPV6; + } else { + hash_type |= XDP_RSS_TYPE_L3_IPV4; + } + + switch (itypes) { + case RX_CMP_FLAGS_ITYPE_TCP: + hash_type |= XDP_RSS_L4 | XDP_RSS_L4_TCP; + break; + case RX_CMP_FLAGS_ITYPE_UDP: + hash_type |= XDP_RSS_L4 | XDP_RSS_L4_UDP; + break; + case RX_CMP_FLAGS_ITYPE_ICMP: + hash_type |= XDP_RSS_L4 | XDP_RSS_L4_ICMP; + break; + default: + break; + } + } + + *rss_type = hash_type; + return 0; +} diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h index 8c66698bde11..fb4f9143929f 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h @@ -41,4 +41,7 @@ void bnxt_xdp_buff_frags_free(struct bnxt_rx_ring_info *rxr, struct sk_buff *bnxt_xdp_build_skb(struct bnxt *bp, struct sk_buff *skb, u8 num_frags, struct bnxt_rx_ring_info *rxr, struct xdp_buff *xdp); +int bnxt_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash, + enum xdp_rss_hash_type *rss_type); + #endif -- 2.43.0