From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 011E913FD83 for ; Thu, 23 Jan 2025 16:49:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737650976; cv=none; b=SN9XTfW9/Uhtavf4RmKQgL39xOJVhkOOjVozQMST7hUFftfUIBHhD0AoFbyQ/ctleF8JZgkg2xBRYzY0/e15FYxV5Po9QVHpRe+LO/VhJ7nPZtH4KmoU59Le+vnAycEKy3IkczqJxp8KvLvAfcnnMiQgQmbHXao6glwescJaBd4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737650976; c=relaxed/simple; bh=gleMzwLKhlE/eRdVg9j+Y1FyDHzCaJWkGoSoBmbb+eg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Fzyn3xmvBQlblKcAu3W7YDqb2v/kFBkl1nOZ3tNCnkGcOdwugopAYaLyGdERdc30ljAz//8osvse7Lvj5hPYgLJE6sNZ9TeiQPp8IBlZ/yca3HGoaUlMN/JpHZrSYE3uCjhQUUJ/e1+Apq0vZuOS0ERlF9JSabKbEjrbyBktcrE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tpufJ08u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tpufJ08u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF70AC4CED3; Thu, 23 Jan 2025 16:49:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737650975; bh=gleMzwLKhlE/eRdVg9j+Y1FyDHzCaJWkGoSoBmbb+eg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tpufJ08u45AO/5XrtkuRJQLgGkaGyxcH5l8FjZl2YouptIfFl+LqmZ90jKTNa6fez F1kUZTjhHRiLp/iCIl99wkClVem2cLaHNL87bztdhh7FxsD9Ct0F0VTps4NfLj+fKC Q2AEX+lesrh/6gybhgdhl9lmfMB4oxy9CkU7IQ5QB1grWUs5k64Fy8m3Yqd2LN9h6f KB7DCnt8wXPoLSZzbV40nRfzO2xR1R3g7yu1CxvRJqdRPxgFrzFxkOT9StjQ3AjvvK cUr3Hmf+GWLhbLxOIGzXS5PpN7NMdWtmoNW1Y70FEJ/b2Del9gz0I4WEDugv6L9s4q IMbM24Gb+PD5A== From: Sasha Levin To: stable@vger.kernel.org Cc: Imkanmod Khan , Sasha Levin 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 Message-Id: <20250123114527-f0adc37d36ff5b85@stable.kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250123032254.34250-1-imkanmodkhan@gmail.com> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit [ 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 Commit author: Cosmin Ratiu 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 Signed-off-by: Tariq Toukan Signed-off-by: Paolo Abeni + Signed-off-by: Imkanmod Khan ## 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 |