Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Imkanmod Khan <imkanmodkhan@gmail.com>, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6.y] net/mlx5e: Don't call cleanup on profile rollback failure
Date: Thu, 23 Jan 2025 11:49:33 -0500	[thread overview]
Message-ID: <20250123114527-f0adc37d36ff5b85@stable.kernel.org> (raw)
In-Reply-To: <20250123032254.34250-1-imkanmodkhan@gmail.com>

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: 4dbc1d1a9f39c3711ad2a40addca04d07d9ab5d0

WARNING: Author mismatch between patch and upstream commit:
Backport author: Imkanmod Khan<imkanmodkhan@gmail.com>
Commit author: Cosmin Ratiu<cratiu@nvidia.com>


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:  4dbc1d1a9f39c ! 1:  cd8b1677de3fe 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@nvidia.com>
         Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
         Signed-off-by: Paolo Abeni <pabeni@redhat.com>
    +    Signed-off-by: Imkanmod Khan <imkanmodkhan@gmail.com>
     
      ## 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   |

  reply	other threads:[~2025-01-23 16:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-23  3:22 [PATCH 6.6.y] net/mlx5e: Don't call cleanup on profile rollback failure Imkanmod Khan
2025-01-23 16:49 ` Sasha Levin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-24  6:36 jianqi.ren.cn
2025-02-24 12:38 ` Sasha Levin
2025-01-03  7:08 jianqi.ren.cn
2025-01-03 14:55 ` Sasha Levin

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=20250123114527-f0adc37d36ff5b85@stable.kernel.org \
    --to=sashal@kernel.org \
    --cc=imkanmodkhan@gmail.com \
    --cc=stable@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox