Commit 9994ad4d authored by Gal Pressman's avatar Gal Pressman Committed by Jakub Kicinski
Browse files

net/mlx5e: Fix features not applied during netdev registration 



mlx5e_fix_features() returns early when the netdevice is not present.
This is correct during profile transitions where priv is cleared, but it
also incorrectly blocks feature fixups during register_netdev(), when
the device is also not yet present.

It is not trivial to distinguish between both cases as we cannot use
priv to carry state, and in both cases reg_state == NETREG_REGISTERED.

Force a netdev features update after register_netdev() completes, where
the device is present and fix_features() can actually work.

This is not a pretty solution, as it results in an additional features
update call (register_netdevice() already calls
__netdev_update_features() internally), but it is the simplest,
cleanest, and most robust way I found to fix this issue after multiple
attempts.

This fixes an issue on systems where CQE compression is enabled by
default, RXHASH remains enabled after registration despite the two
features being mutually exclusive.

Fixes: ab4b01bf ("net/mlx5e: Verify dev is present for fix features ndo")
Signed-off-by: default avatarGal Pressman <gal@nvidia.com>
Reviewed-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20260409202852.158059-2-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d114bfdc

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

+8 −0
Original line number Diff line number Diff line
@@ -6756,6 +6756,14 @@ static int _mlx5e_probe(struct auxiliary_device *adev) 
		goto err_resume;

	}



	/* mlx5e_fix_features() returns early when the device is not present

	 * to avoid dereferencing cleared priv during profile changes.

	 * This also causes it to be a no-op during register_netdev(), where

	 * the device is not yet present.

	 * Trigger an additional features update that will actually work.

	 */

	mlx5e_update_features(netdev);



	mlx5e_dcbnl_init_app(priv);

	mlx5_core_uplink_netdev_set(mdev, netdev);

	mlx5e_params_print_info(mdev, &priv->channels.params);