diff mbox series

[net-next] dpll: check that pin is registered in __dpll_pin_unregister()

Message ID 20240206074853.345744-1-jiri@resnulli.us (mailing list archive)
State Accepted
Commit 9736c648370d237f61065a7e45e668e2db4374e9
Delegated to: Netdev Maintainers
Headers show
Series [net-next] dpll: check that pin is registered in __dpll_pin_unregister() | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 1050 this patch: 1050
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 4 of 4 maintainers
netdev/build_clang success Errors and warnings before: 1066 this patch: 1066
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 1067 this patch: 1067
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 15 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-02-07--00-00 (tests: 684)

Commit Message

Jiri Pirko Feb. 6, 2024, 7:48 a.m. UTC 
From: Jiri Pirko <jiri@nvidia.com>

Similar to what is done in dpll_device_unregister(), add assertion to
__dpll_pin_unregister() to make sure driver does not try to unregister
non-registered pin.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
 drivers/dpll/dpll_core.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Vadim Fedorenko Feb. 6, 2024, 10:18 a.m. UTC | #1 
On 06/02/2024 07:48, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
> 
> Similar to what is done in dpll_device_unregister(), add assertion to
> __dpll_pin_unregister() to make sure driver does not try to unregister
> non-registered pin.
> 
> Signed-off-by: Jiri Pirko <jiri@nvidia.com>
> ---
>   drivers/dpll/dpll_core.c | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/dpll/dpll_core.c b/drivers/dpll/dpll_core.c
> index 61e5c607a72f..93c1bb7a6ef7 100644
> --- a/drivers/dpll/dpll_core.c
> +++ b/drivers/dpll/dpll_core.c
> @@ -29,6 +29,8 @@ static u32 dpll_pin_xa_id;
>   	WARN_ON_ONCE(!xa_get_mark(&dpll_device_xa, (d)->id, DPLL_REGISTERED))
>   #define ASSERT_DPLL_NOT_REGISTERED(d)	\
>   	WARN_ON_ONCE(xa_get_mark(&dpll_device_xa, (d)->id, DPLL_REGISTERED))
> +#define ASSERT_DPLL_PIN_REGISTERED(p) \
> +	WARN_ON_ONCE(!xa_get_mark(&dpll_pin_xa, (p)->id, DPLL_REGISTERED))
>   
>   struct dpll_device_registration {
>   	struct list_head list;
> @@ -631,6 +633,7 @@ static void
>   __dpll_pin_unregister(struct dpll_device *dpll, struct dpll_pin *pin,
>   		      const struct dpll_pin_ops *ops, void *priv)
>   {
> +	ASSERT_DPLL_PIN_REGISTERED(pin);
>   	dpll_xa_ref_pin_del(&dpll->pin_refs, pin, ops, priv);
>   	dpll_xa_ref_dpll_del(&pin->dpll_refs, dpll, ops, priv);
>   	if (xa_empty(&pin->dpll_refs))

Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Kubalewski, Arkadiusz Feb. 7, 2024, 6:16 p.m. UTC | #2 
>From: Jiri Pirko <jiri@resnulli.us>
>Sent: Tuesday, February 6, 2024 8:49 AM
>
>From: Jiri Pirko <jiri@nvidia.com>
>
>Similar to what is done in dpll_device_unregister(), add assertion to
>__dpll_pin_unregister() to make sure driver does not try to unregister
>non-registered pin.
>
>Signed-off-by: Jiri Pirko <jiri@nvidia.com>
>---
> drivers/dpll/dpll_core.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/drivers/dpll/dpll_core.c b/drivers/dpll/dpll_core.c
>index 61e5c607a72f..93c1bb7a6ef7 100644
>--- a/drivers/dpll/dpll_core.c
>+++ b/drivers/dpll/dpll_core.c
>@@ -29,6 +29,8 @@ static u32 dpll_pin_xa_id;
> 	WARN_ON_ONCE(!xa_get_mark(&dpll_device_xa, (d)->id, DPLL_REGISTERED))
> #define ASSERT_DPLL_NOT_REGISTERED(d)	\
> 	WARN_ON_ONCE(xa_get_mark(&dpll_device_xa, (d)->id, DPLL_REGISTERED))
>+#define ASSERT_DPLL_PIN_REGISTERED(p) \
>+	WARN_ON_ONCE(!xa_get_mark(&dpll_pin_xa, (p)->id, DPLL_REGISTERED))
>
> struct dpll_device_registration {
> 	struct list_head list;
>@@ -631,6 +633,7 @@ static void
> __dpll_pin_unregister(struct dpll_device *dpll, struct dpll_pin *pin,
> 		      const struct dpll_pin_ops *ops, void *priv)
> {
>+	ASSERT_DPLL_PIN_REGISTERED(pin);
> 	dpll_xa_ref_pin_del(&dpll->pin_refs, pin, ops, priv);
> 	dpll_xa_ref_dpll_del(&pin->dpll_refs, dpll, ops, priv);
> 	if (xa_empty(&pin->dpll_refs))
>--
>2.43.0

LGTM, Thank you!

Reviewed-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
patchwork-bot+netdevbpf@kernel.org Feb. 7, 2024, 7 p.m. UTC | #3 
Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Tue,  6 Feb 2024 08:48:53 +0100 you wrote:
> From: Jiri Pirko <jiri@nvidia.com>
> 
> Similar to what is done in dpll_device_unregister(), add assertion to
> __dpll_pin_unregister() to make sure driver does not try to unregister
> non-registered pin.
> 
> Signed-off-by: Jiri Pirko <jiri@nvidia.com>
> 
> [...]

Here is the summary with links:
  - [net-next] dpll: check that pin is registered in __dpll_pin_unregister()
    https://git.kernel.org/netdev/net-next/c/9736c648370d

You are awesome, thank you!
diff mbox series

Patch

diff --git a/drivers/dpll/dpll_core.c b/drivers/dpll/dpll_core.c
index 61e5c607a72f..93c1bb7a6ef7 100644
--- a/drivers/dpll/dpll_core.c
+++ b/drivers/dpll/dpll_core.c
@@ -29,6 +29,8 @@  static u32 dpll_pin_xa_id;
 	WARN_ON_ONCE(!xa_get_mark(&dpll_device_xa, (d)->id, DPLL_REGISTERED))
 #define ASSERT_DPLL_NOT_REGISTERED(d)	\
 	WARN_ON_ONCE(xa_get_mark(&dpll_device_xa, (d)->id, DPLL_REGISTERED))
+#define ASSERT_DPLL_PIN_REGISTERED(p) \
+	WARN_ON_ONCE(!xa_get_mark(&dpll_pin_xa, (p)->id, DPLL_REGISTERED))
 
 struct dpll_device_registration {
 	struct list_head list;
@@ -631,6 +633,7 @@  static void
 __dpll_pin_unregister(struct dpll_device *dpll, struct dpll_pin *pin,
 		      const struct dpll_pin_ops *ops, void *priv)
 {
+	ASSERT_DPLL_PIN_REGISTERED(pin);
 	dpll_xa_ref_pin_del(&dpll->pin_refs, pin, ops, priv);
 	dpll_xa_ref_dpll_del(&pin->dpll_refs, dpll, ops, priv);
 	if (xa_empty(&pin->dpll_refs))