Skip to content

Commit c079389

Browse files
williamtukuba-moo
authored andcommitted
net/mlx5e: clear xdp features on non-uplink representors
Non-uplink representor port does not support XDP. The patch clears the xdp feature by checking the net_device_ops.ndo_bpf is set or not. Verify using the netlink tool: $ tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml --dump dev-get Representor netdev before the patch: {'ifindex': 8, 'xdp-features': {'basic', 'ndo-xmit', 'ndo-xmit-sg', 'redirect', 'rx-sg', 'xsk-zerocopy'}, 'xdp-rx-metadata-features': set(), 'xdp-zc-max-segs': 1, 'xsk-features': set()}, With the patch: {'ifindex': 8, 'xdp-features': set(), 'xdp-rx-metadata-features': set(), 'xsk-features': set()}, Fixes: 4d5ab0a ("net/mlx5e: take into account device reconfiguration for xdp_features flag") Signed-off-by: William Tu <[email protected]> Signed-off-by: Tariq Toukan <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent dd6e972 commit c079389

File tree

1 file changed

+2
-1
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core

1 file changed

+2
-1
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4267,7 +4267,8 @@ void mlx5e_set_xdp_feature(struct net_device *netdev)
42674267
struct mlx5e_params *params = &priv->channels.params;
42684268
xdp_features_t val;
42694269

4270-
if (params->packet_merge.type != MLX5E_PACKET_MERGE_NONE) {
4270+
if (!netdev->netdev_ops->ndo_bpf ||
4271+
params->packet_merge.type != MLX5E_PACKET_MERGE_NONE) {
42714272
xdp_clear_features_flag(netdev);
42724273
return;
42734274
}

0 commit comments

Comments
 (0)