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 C9E3413FE4 for ; Fri, 8 Sep 2023 18:18:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2642DC433BA; Fri, 8 Sep 2023 18:18:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694197089; bh=oUXLTAR6wipgwTCMH3ruuFaVgj2xazre3nnKr6URNlA=; h=From:To:Cc:Subject:Date:From; b=bFl7rQaY4QDO7d0Vz4+296BqWsfUdbepB/SDw/1sZeWl0c9Y2ZRAAQWHTYF2EPffU c2fRExO119ge5Fj0AEARmkF38M/v0cZXnLI6x62gx6SRGUiDoNMDAjRDjZq0Is4RIi cUkfl/H9GVLwPYjsPV1BXEIAYoVGCERwQ5gb5fkcI7YUpbDOLFb9Px6v51Gbvocj7h l4juZiiqNoOBSK3apCIGnYd0mS1/6nw2WUL2AT+jkcMABM1JH1LTKsscK/sbFf1niK hMF0h/jspi9xUKwXc7EWMmlWY3v0Mcw9EY7yjS8p/zok9vSy+csXvGDF06fInxieuT 1KhT/7pqm5b2w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiri Pirko , Ido Schimmel , Jakub Kicinski , "David S . Miller" , Sasha Levin , edumazet@google.com, pabeni@redhat.com, jiri@resnulli.us, jacob.e.keller@intel.com, michal.wilczynski@intel.com, shayd@nvidia.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 01/26] devlink: remove reload failed checks in params get/set callbacks Date: Fri, 8 Sep 2023 14:17:39 -0400 Message-Id: <20230908181806.3460164-1-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.52 Content-Transfer-Encoding: 8bit From: Jiri Pirko [ Upstream commit 633d76ad01ad0321a1ace3e5cc4fed06753d7ac4 ] The checks in question were introduced by: commit 6b4db2e528f6 ("devlink: Fix use-after-free after a failed reload"). That fixed an issue of reload with mlxsw driver. Back then, that was a valid fix, because there was a limitation in place that prevented drivers from registering/unregistering params when devlink instance was registered. It was possible to do the fix differently by changing drivers to register/unregister params in appropriate places making sure the ops operate only on memory which is allocated and initialized. But that, as a dependency, would require to remove the limitation mentioned above. Eventually, this limitation was lifted by: commit 1d18bb1a4ddd ("devlink: allow registering parameters after the instance") Also, the alternative fix (which also fixed another issue) was done by: commit 74cbc3c03c82 ("mlxsw: spectrum_acl_tcam: Move devlink param to TCAM code"). Therefore, the checks are no longer relevant. Each driver should make sure to have the params registered only when the memory the ops are working with is allocated and initialized. So remove the checks. Signed-off-by: Jiri Pirko Reviewed-by: Ido Schimmel Reviewed-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/devlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index 5a4a4b34ac15c..6ab335d2a0f56 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -5218,7 +5218,7 @@ static int devlink_param_get(struct devlink *devlink, const struct devlink_param *param, struct devlink_param_gset_ctx *ctx) { - if (!param->get || devlink->reload_failed) + if (!param->get) return -EOPNOTSUPP; return param->get(devlink, param->id, ctx); } @@ -5227,7 +5227,7 @@ static int devlink_param_set(struct devlink *devlink, const struct devlink_param *param, struct devlink_param_gset_ctx *ctx) { - if (!param->set || devlink->reload_failed) + if (!param->set) return -EOPNOTSUPP; return param->set(devlink, param->id, ctx); } -- 2.40.1