diff mbox series

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

Message ID 168010736349.3039990.15736472596192726923.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 matching indiviual Completion Queue Entry (CQE) status bits.

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
 drivers/net/ethernet/mellanox/mlx4/en_rx.c |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 4b5e459b6d49..f3b7351daa05 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -684,12 +684,28 @@  int mlx4_en_xdp_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp)
 int mlx4_en_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash)
 {
 	struct mlx4_en_xdp_buff *_ctx = (void *)ctx;
+	struct mlx4_cqe *cqe = _ctx->cqe;
+	enum xdp_rss_hash_type xht = 0;
+	__be16 status;
 
 	if (unlikely(!(_ctx->dev->features & NETIF_F_RXHASH)))
 		return -ENODATA;
 
-	*hash = be32_to_cpu(_ctx->cqe->immed_rss_invalid);
-	return 0;
+	status = cqe->status;
+	if (status & cpu_to_be16(MLX4_CQE_STATUS_TCP))
+		xht = XDP_RSS_L4_TCP;
+	if (status & cpu_to_be16(MLX4_CQE_STATUS_UDP))
+		xht = XDP_RSS_L4_UDP;
+	if (status & cpu_to_be16(MLX4_CQE_STATUS_IPV4|MLX4_CQE_STATUS_IPV4F))
+		xht |= XDP_RSS_L3_IPV4;
+	if (status & cpu_to_be16(MLX4_CQE_STATUS_IPV6)) {
+		xht |= XDP_RSS_L3_IPV6;
+		if (cqe->ipv6_ext_mask)
+			xht |= XDP_RSS_BIT_EX;
+	}
+
+	*hash = be32_to_cpu(cqe->immed_rss_invalid);
+	return xht;
 }
 
 int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int budget)