diff mbox series

[bpf,RFC-V2,2/5] igc: bpf_xdp_metadata_rx_hash return xdp rss hash type

Message ID 168010734832.3039990.11189218865563948327.stgit@firesoul (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series XDP-hints: API change for RX-hash kfunc bpf_xdp_metadata_rx_hash | expand

Checks

Context Check Description
bpf/vmtest-bpf-PR success PR summary
bpf/vmtest-bpf-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-VM_Test-2 success Logs for ShellCheck
bpf/vmtest-bpf-VM_Test-3 success Logs for build for aarch64 with gcc
bpf/vmtest-bpf-VM_Test-4 success Logs for build for aarch64 with gcc
bpf/vmtest-bpf-VM_Test-5 success Logs for build for aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-6 success Logs for build for aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-7 success Logs for build for s390x with gcc
bpf/vmtest-bpf-VM_Test-8 success Logs for build for s390x with gcc
bpf/vmtest-bpf-VM_Test-9 success Logs for build for x86_64 with gcc
bpf/vmtest-bpf-VM_Test-10 success Logs for build for x86_64 with gcc
bpf/vmtest-bpf-VM_Test-11 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-12 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-13 success Logs for set-matrix
bpf/vmtest-bpf-VM_Test-14 success Logs for set-matrix
bpf/vmtest-bpf-VM_Test-15 success Logs for test_maps on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-16 success Logs for test_maps on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-17 success Logs for test_maps on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-18 success Logs for test_maps on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-19 pending Logs for test_maps on s390x with gcc
bpf/vmtest-bpf-VM_Test-20 success Logs for test_maps on s390x with gcc
bpf/vmtest-bpf-VM_Test-21 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-22 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-23 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-24 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-25 fail Logs for test_progs on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-26 fail Logs for test_progs on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-27 fail Logs for test_progs on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-28 fail Logs for test_progs on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-29 fail Logs for test_progs on s390x with gcc
bpf/vmtest-bpf-VM_Test-30 fail Logs for test_progs on s390x with gcc
bpf/vmtest-bpf-VM_Test-31 fail Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-32 fail Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-33 fail Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-34 fail Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-35 fail Logs for test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-36 fail Logs for test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-37 fail Logs for test_progs_no_alu32 on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-38 fail Logs for test_progs_no_alu32 on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-39 pending Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-VM_Test-40 fail Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-VM_Test-41 fail Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-42 fail Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-43 fail Logs for test_progs_no_alu32 on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-44 fail Logs for test_progs_no_alu32 on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-45 success Logs for test_progs_no_alu32_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-46 success Logs for test_progs_no_alu32_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-47 success Logs for test_progs_no_alu32_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-48 success Logs for test_progs_no_alu32_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-49 success Logs for test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-50 success Logs for test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-51 success Logs for test_progs_no_alu32_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-52 success Logs for test_progs_no_alu32_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-53 success Logs for test_progs_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-54 success Logs for test_progs_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-55 success Logs for test_progs_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-56 success Logs for test_progs_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-57 success Logs for test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-58 success Logs for test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-59 success Logs for test_progs_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-60 success Logs for test_progs_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-61 success Logs for test_verifier on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-62 success Logs for test_verifier on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-63 success Logs for test_verifier on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-64 success Logs for test_verifier on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-65 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-VM_Test-66 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-VM_Test-67 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-68 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-69 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-70 success Logs for test_verifier on x86_64 with llvm-16
netdev/tree_selection success Clearly marked for bpf
netdev/apply fail Patch does not apply to bpf

Commit Message

Jesper Dangaard Brouer March 29, 2023, 4:29 p.m. UTC 
Update API for bpf_xdp_metadata_rx_hash() by returning xdp rss hash type
via mapping table.

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
 drivers/net/ethernet/intel/igc/igc_main.c |   22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index b382476f347c..a14f0597524a 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -6496,6 +6496,26 @@  static int igc_xdp_rx_timestamp(const struct xdp_md *_ctx, u64 *timestamp)
 	return -ENODATA;
 }
 
+/* Mapping HW RSS Type to enum xdp_rss_hash_type */
+enum xdp_rss_hash_type igc_xdp_rss_type[IGC_RSS_TYPE_MAX_TABLE] = {
+	[IGC_RSS_TYPE_NO_HASH]		= XDP_RSS_TYPE_L2,
+	[IGC_RSS_TYPE_HASH_TCP_IPV4]	= XDP_RSS_TYPE_L4_IPV4_TCP,
+	[IGC_RSS_TYPE_HASH_IPV4]	= XDP_RSS_TYPE_L3_IPV4,
+	[IGC_RSS_TYPE_HASH_TCP_IPV6]	= XDP_RSS_TYPE_L4_IPV6_TCP,
+	[IGC_RSS_TYPE_HASH_IPV6_EX]	= XDP_RSS_TYPE_L3_IPV6_EX,
+	[IGC_RSS_TYPE_HASH_IPV6]	= XDP_RSS_TYPE_L3_IPV6,
+	[IGC_RSS_TYPE_HASH_TCP_IPV6_EX] = XDP_RSS_TYPE_L4_IPV6_TCP_EX,
+	[IGC_RSS_TYPE_HASH_UDP_IPV4]	= XDP_RSS_TYPE_L4_IPV4_UDP,
+	[IGC_RSS_TYPE_HASH_UDP_IPV6]	= XDP_RSS_TYPE_L4_IPV6_UDP,
+	[IGC_RSS_TYPE_HASH_UDP_IPV6_EX] = XDP_RSS_TYPE_L4_IPV6_UDP_EX,
+	[10] = XDP_RSS_TYPE_NONE, /* RSS Type above 9 "Reserved" by HW  */
+	[11] = XDP_RSS_TYPE_NONE, /* keep array sized for SW bit-mask   */
+	[12] = XDP_RSS_TYPE_NONE, /* to handle future HW revisons       */
+	[13] = XDP_RSS_TYPE_NONE,
+	[14] = XDP_RSS_TYPE_NONE,
+	[15] = XDP_RSS_TYPE_NONE,
+};
+
 static int igc_xdp_rx_hash(const struct xdp_md *_ctx, u32 *hash)
 {
 	const struct igc_xdp_buff *ctx = (void *)_ctx;
@@ -6505,7 +6525,7 @@  static int igc_xdp_rx_hash(const struct xdp_md *_ctx, u32 *hash)
 
 	*hash = le32_to_cpu(ctx->rx_desc->wb.lower.hi_dword.rss);
 
-	return 0;
+	return igc_xdp_rss_type[igc_rss_type(ctx->rx_desc)];
 }
 
 const struct xdp_metadata_ops igc_xdp_metadata_ops = {