[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 4dbc1d1a9f39c3711ad2a40addca04d07d9ab5d0
WARNING: Author mismatch between patch and upstream commit:
Backport author: <jianqi.ren.cn@xxxxxxxxxxxxx>
Commit author: Cosmin Ratiu<cratiu@xxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
1: 4dbc1d1a9f39 ! 1: 64962bd541d3 net/mlx5e: Don't call cleanup on profile rollback failure
@@ Metadata
## Commit message ##
net/mlx5e: Don't call cleanup on profile rollback failure
+ [ Upstream commit 4dbc1d1a9f39c3711ad2a40addca04d07d9ab5d0 ]
+
When profile rollback fails in mlx5e_netdev_change_profile, the netdev
profile var is left set to NULL. Avoid a crash when unloading the driver
by not calling profile->cleanup in such a case.
@@ Commit message
Reviewed-by: Dragos Tatulea <dtatulea@xxxxxxxxxx>
Signed-off-by: Tariq Toukan <tariqt@xxxxxxxxxx>
Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
+ Signed-off-by: Jianqi Ren <jianqi.ren.cn@xxxxxxxxxxxxx>
## drivers/net/ethernet/mellanox/mlx5/core/en_main.c ##
-@@ drivers/net/ethernet/mellanox/mlx5/core/en_main.c: static void _mlx5e_remove(struct auxiliary_device *adev)
+@@ drivers/net/ethernet/mellanox/mlx5/core/en_main.c: static void mlx5e_remove(struct auxiliary_device *adev)
mlx5e_dcbnl_delete_app(priv);
unregister_netdev(priv->netdev);
- _mlx5e_suspend(adev, false);
+ mlx5e_suspend(adev, state);
- priv->profile->cleanup(priv);
+ /* Avoid cleanup if profile rollback failed. */
+ if (priv->profile)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
