All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jesper Dangaard Brouer <brouer@redhat.com>
To: bpf@vger.kernel.org, "Stanislav Fomichev" <sdf@google.com>,
	"Toke Høiland-Jørgensen" <toke@redhat.com>
Cc: ast@kernel.org, edumazet@google.com, anthony.l.nguyen@intel.com,
	boon.leong.ong@intel.com, hawk@kernel.org,
	xdp-hints@xdp-project.net, daniel@iogearbox.net,
	linux-rdma@vger.kernel.org, john.fastabend@gmail.com,
	jesse.brandeburg@intel.com, intel-wired-lan@lists.osuosl.org,
	Jesper Dangaard Brouer <brouer@redhat.com>,
	kuba@kernel.org, pabeni@redhat.com, martin.lau@kernel.org,
	larysa.zaremba@intel.com, leon@kernel.org,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	tariqt@nvidia.com, yoong.siang.song@intel.com, saeedm@nvidia.com,
	davem@davemloft.net
Subject: [Intel-wired-lan] [PATCH bpf V10 5/6] mlx4: bpf_xdp_metadata_rx_hash add xdp rss hash type
Date: Wed, 12 Apr 2023 21:48:55 +0200	[thread overview]
Message-ID: <168132893562.340624.12779118462402031248.stgit@firesoul> (raw)
In-Reply-To: <168132888942.340624.2449617439220153267.stgit@firesoul>

Update API for bpf_xdp_metadata_rx_hash() with arg for xdp rss hash type
via matching individual Completion Queue Entry (CQE) status bits.

Fixes: ab46182d0dcb ("net/mlx4_en: Support RX XDP metadata")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Acked-by: Stanislav Fomichev <sdf@google.com>
---
 drivers/net/ethernet/mellanox/mlx4/en_rx.c |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 73d10aa4c503..332472fe4990 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -685,11 +685,28 @@ int mlx4_en_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash,
 			enum xdp_rss_hash_type *rss_type)
 {
 	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);
+	*hash = be32_to_cpu(cqe->immed_rss_invalid);
+	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_L3_DYNHDR;
+	}
+	*rss_type = xht;
+
 	return 0;
 }
 


_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

WARNING: multiple messages have this Message-ID (diff)
From: Jesper Dangaard Brouer <brouer@redhat.com>
To: bpf@vger.kernel.org, "Stanislav Fomichev" <sdf@google.com>,
	"Toke Høiland-Jørgensen" <toke@redhat.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	martin.lau@kernel.org, ast@kernel.org, daniel@iogearbox.net,
	alexandr.lobakin@intel.com, larysa.zaremba@intel.com,
	xdp-hints@xdp-project.net, anthony.l.nguyen@intel.com,
	yoong.siang.song@intel.com, boon.leong.ong@intel.com,
	intel-wired-lan@lists.osuosl.org, pabeni@redhat.com,
	jesse.brandeburg@intel.com, kuba@kernel.org, edumazet@google.com,
	john.fastabend@gmail.com, hawk@kernel.org, davem@davemloft.net,
	tariqt@nvidia.com, saeedm@nvidia.com, leon@kernel.org,
	linux-rdma@vger.kernel.org
Subject: [PATCH bpf V10 5/6] mlx4: bpf_xdp_metadata_rx_hash add xdp rss hash type
Date: Wed, 12 Apr 2023 21:48:55 +0200	[thread overview]
Message-ID: <168132893562.340624.12779118462402031248.stgit@firesoul> (raw)
In-Reply-To: <168132888942.340624.2449617439220153267.stgit@firesoul>

Update API for bpf_xdp_metadata_rx_hash() with arg for xdp rss hash type
via matching individual Completion Queue Entry (CQE) status bits.

Fixes: ab46182d0dcb ("net/mlx4_en: Support RX XDP metadata")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Acked-by: Stanislav Fomichev <sdf@google.com>
---
 drivers/net/ethernet/mellanox/mlx4/en_rx.c |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 73d10aa4c503..332472fe4990 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -685,11 +685,28 @@ int mlx4_en_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash,
 			enum xdp_rss_hash_type *rss_type)
 {
 	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);
+	*hash = be32_to_cpu(cqe->immed_rss_invalid);
+	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_L3_DYNHDR;
+	}
+	*rss_type = xht;
+
 	return 0;
 }
 



  parent reply	other threads:[~2023-04-12 19:49 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-12 19:48 [Intel-wired-lan] [PATCH bpf V10 0/6] XDP-hints: API change for RX-hash kfunc bpf_xdp_metadata_rx_hash Jesper Dangaard Brouer
2023-04-12 19:48 ` Jesper Dangaard Brouer
2023-04-12 19:48 ` [Intel-wired-lan] [PATCH bpf V10 1/6] selftests/bpf: xdp_hw_metadata remove bpf_printk and add counters Jesper Dangaard Brouer
2023-04-12 19:48   ` Jesper Dangaard Brouer
2023-04-12 19:48 ` [Intel-wired-lan] [PATCH bpf V10 2/6] xdp: rss hash types representation Jesper Dangaard Brouer
2023-04-12 19:48   ` Jesper Dangaard Brouer
2023-04-12 19:48 ` [Intel-wired-lan] [PATCH bpf V10 3/6] mlx5: bpf_xdp_metadata_rx_hash add xdp rss hash type Jesper Dangaard Brouer
2023-04-12 19:48   ` Jesper Dangaard Brouer
2023-04-12 20:48   ` [Intel-wired-lan] " Jacob Keller
2023-04-12 19:48 ` [Intel-wired-lan] [PATCH bpf V10 4/6] veth: " Jesper Dangaard Brouer
2023-04-12 19:48   ` Jesper Dangaard Brouer
2023-04-12 20:48   ` [Intel-wired-lan] " Jacob Keller
2023-04-12 19:48 ` Jesper Dangaard Brouer [this message]
2023-04-12 19:48   ` [PATCH bpf V10 5/6] mlx4: " Jesper Dangaard Brouer
2023-04-12 20:49   ` [Intel-wired-lan] " Jacob Keller
2023-04-12 19:49 ` [Intel-wired-lan] [PATCH bpf V10 6/6] selftests/bpf: Adjust bpf_xdp_metadata_rx_hash for new arg Jesper Dangaard Brouer
2023-04-12 19:49   ` Jesper Dangaard Brouer
2023-04-13 20:30 ` [PATCH bpf V10 0/6] XDP-hints: API change for RX-hash kfunc bpf_xdp_metadata_rx_hash patchwork-bot+netdevbpf
2023-04-13 20:30   ` [Intel-wired-lan] " patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=168132893562.340624.12779118462402031248.stgit@firesoul \
    --to=brouer@redhat.com \
    --cc=anthony.l.nguyen@intel.com \
    --cc=ast@kernel.org \
    --cc=boon.leong.ong@intel.com \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=hawk@kernel.org \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=jesse.brandeburg@intel.com \
    --cc=john.fastabend@gmail.com \
    --cc=kuba@kernel.org \
    --cc=larysa.zaremba@intel.com \
    --cc=leon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=martin.lau@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=saeedm@nvidia.com \
    --cc=sdf@google.com \
    --cc=tariqt@nvidia.com \
    --cc=toke@redhat.com \
    --cc=xdp-hints@xdp-project.net \
    --cc=yoong.siang.song@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.