From: Jiri Pirko <jiri@nvidia.com>
Date: Wed, 2 Nov 2022 16:02:08 +0000 (+0100)
Subject: net: devlink: add not cleared type warning to port unregister
X-Git-Tag: v6.2-rc1~99^2~296^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e705a621c071b43e4ea971abb70d7677dc640c27;p=thirdparty%2Fkernel%2Flinux.git

net: devlink: add not cleared type warning to port unregister

By the time port unregister is called. There should be no type set. Make
sure that the driver cleared it before and warn in case it didn't. This
enforces symmetricity with type set and port register.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 38de3a1dff367..4a0ba86b86ed5 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -9977,6 +9977,7 @@ EXPORT_SYMBOL_GPL(devlink_port_register);
 void devl_port_unregister(struct devlink_port *devlink_port)
 {
 	lockdep_assert_held(&devlink_port->devlink->lock);
+	WARN_ON(devlink_port->type != DEVLINK_PORT_TYPE_NOTSET);
 
 	devlink_port_type_warn_cancel(devlink_port);
 	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_DEL);