89 lines
2.9 KiB
Diff
89 lines
2.9 KiB
Diff
From debb682ed668b08f9b59751749f9d83c3a496622 Mon Sep 17 00:00:00 2001
|
|
From: Kamal Heib <kheib@redhat.com>
|
|
Date: Mon, 20 Apr 2026 15:05:59 -0400
|
|
Subject: [PATCH] net/mlx5e: Support XDP target xmit with dummy program
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-169055
|
|
Conflicts:
|
|
Context diff due to the missing of the following commit:
|
|
8f7b00307bf1 ("net/mlx5e: Convert mlx5 netdevs to instance locking")
|
|
|
|
commit d4aa0cc9bd31f3e0cd5f067d649bf39135e4b46b
|
|
Author: Tariq Toukan <tariqt@nvidia.com>
|
|
Date: Sun Nov 30 12:13:37 2025 +0200
|
|
|
|
net/mlx5e: Support XDP target xmit with dummy program
|
|
|
|
Save per-channel resources in default, in device and host memory.
|
|
|
|
As no better API exist, make the XDP-redirect-target SQ available by
|
|
loading a dummy XDP program.
|
|
|
|
This improves the latency of interface up/down operations when feature
|
|
is disabled.
|
|
|
|
Perf numbers:
|
|
NIC: Connect-X7.
|
|
Setup: 248 channels, default mtu and rx/tx ring sizes.
|
|
|
|
Interface up + down:
|
|
Before: 2.246 secs
|
|
After: 1.798 secs (-0.448 sec)
|
|
|
|
Saves ~1.8 msec per channel.
|
|
|
|
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
|
|
Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com>
|
|
Reviewed-by: William Tu <witu@nvidia.com>
|
|
Link: https://patch.msgid.link/1764497617-1326331-3-git-send-email-tariqt@nvidia.com
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
|
|
Signed-off-by: Kamal Heib <kheib@redhat.com>
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
|
|
index 7c1f458a61f5..e69a67aa54f4 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
|
|
@@ -2584,7 +2584,7 @@ static int mlx5e_open_queues(struct mlx5e_channel *c,
|
|
if (err)
|
|
goto err_close_icosq_cq;
|
|
|
|
- if (netdev_ops->ndo_xdp_xmit) {
|
|
+ if (netdev_ops->ndo_xdp_xmit && c->xdp) {
|
|
c->xdpsq = mlx5e_open_xdpredirect_sq(c, params, cparam, &ccp);
|
|
if (IS_ERR(c->xdpsq)) {
|
|
err = PTR_ERR(c->xdpsq);
|
|
@@ -4382,19 +4382,18 @@ void mlx5e_set_xdp_feature(struct mlx5e_priv *priv)
|
|
{
|
|
struct mlx5e_params *params = &priv->channels.params;
|
|
struct net_device *netdev = priv->netdev;
|
|
- xdp_features_t val;
|
|
+ xdp_features_t val = 0;
|
|
|
|
- if (!netdev->netdev_ops->ndo_bpf ||
|
|
- params->packet_merge.type != MLX5E_PACKET_MERGE_NONE) {
|
|
- xdp_clear_features_flag(netdev);
|
|
- return;
|
|
- }
|
|
+ if (netdev->netdev_ops->ndo_bpf &&
|
|
+ params->packet_merge.type == MLX5E_PACKET_MERGE_NONE)
|
|
+ val = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT |
|
|
+ NETDEV_XDP_ACT_XSK_ZEROCOPY |
|
|
+ NETDEV_XDP_ACT_RX_SG;
|
|
+
|
|
+ if (netdev->netdev_ops->ndo_xdp_xmit && params->xdp_prog)
|
|
+ val |= NETDEV_XDP_ACT_NDO_XMIT |
|
|
+ NETDEV_XDP_ACT_NDO_XMIT_SG;
|
|
|
|
- val = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT |
|
|
- NETDEV_XDP_ACT_XSK_ZEROCOPY |
|
|
- NETDEV_XDP_ACT_RX_SG |
|
|
- NETDEV_XDP_ACT_NDO_XMIT |
|
|
- NETDEV_XDP_ACT_NDO_XMIT_SG;
|
|
xdp_set_features_flag(netdev, val);
|
|
}
|
|
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|