Commit ae3bbc04 authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

net: devlink: add port_init/fini() helpers to allow pre-register/post-unregister functions 



Lifetime of some of the devlink objects, like regions, is currently
forced to be different for devlink instance and devlink port instance
(per-port regions). The reason is that for devlink ports, the internal
structures initialization happens only after devlink_port_register() is
called.

To resolve this inconsistency, introduce new set of helpers to allow
driver to initialize devlink pointer and region list before
devlink_register() is called. That allows port regions to be created
before devlink port registration and destroyed after devlink
port unregistration.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 081adcfe

include/net/devlink.h

+5 −1
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ struct devlink_port { 
	struct devlink_port_attrs attrs;

	u8 attrs_set:1,

	   switch_port:1,

	   registered:1;

	   registered:1,

	   initialized:1;

	struct delayed_work type_warn_dw;

	struct list_head reporter_list;

	struct mutex reporters_lock; /* Protects reporter_list */
@@ -1563,6 +1564,9 @@ void devlink_set_features(struct devlink *devlink, u64 features); 
void devlink_register(struct devlink *devlink);

void devlink_unregister(struct devlink *devlink);

void devlink_free(struct devlink *devlink);

void devlink_port_init(struct devlink *devlink,

		       struct devlink_port *devlink_port);

void devlink_port_fini(struct devlink_port *devlink_port);

int devl_port_register(struct devlink *devlink,

		       struct devlink_port *devlink_port,

		       unsigned int port_index);

net/core/devlink.c

+43 −3
Original line number Diff line number Diff line
@@ -375,6 +375,8 @@ static struct devlink *devlink_get_from_attrs(struct net *net, 
	WARN_ON_ONCE(!(devlink_port)->registered)

#define ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port)			\

	WARN_ON_ONCE((devlink_port)->registered)

#define ASSERT_DEVLINK_PORT_INITIALIZED(devlink_port)				\

	WARN_ON_ONCE(!(devlink_port)->initialized)



static struct devlink_port *devlink_port_get_by_index(struct devlink *devlink,

						      unsigned int port_index)
@@ -9852,6 +9854,44 @@ static void devlink_port_type_warn_cancel(struct devlink_port *devlink_port) 
	cancel_delayed_work_sync(&devlink_port->type_warn_dw);

}



/**

 * devlink_port_init() - Init devlink port

 *

 * @devlink: devlink

 * @devlink_port: devlink port

 *

 * Initialize essencial stuff that is needed for functions

 * that may be called before devlink port registration.

 * Call to this function is optional and not needed

 * in case the driver does not use such functions.

 */

void devlink_port_init(struct devlink *devlink,

		       struct devlink_port *devlink_port)

{

	if (devlink_port->initialized)

		return;

	devlink_port->devlink = devlink;

	INIT_LIST_HEAD(&devlink_port->region_list);

	devlink_port->initialized = true;

}

EXPORT_SYMBOL_GPL(devlink_port_init);



/**

 * devlink_port_fini() - Deinitialize devlink port

 *

 * @devlink_port: devlink port

 *

 * Deinitialize essencial stuff that is in use for functions

 * that may be called after devlink port unregistration.

 * Call to this function is optional and not needed

 * in case the driver does not use such functions.

 */

void devlink_port_fini(struct devlink_port *devlink_port)

{

	WARN_ON(!list_empty(&devlink_port->region_list));

}

EXPORT_SYMBOL_GPL(devlink_port_fini);



/**

 * devl_port_register() - Register devlink port

 *
@@ -9876,14 +9916,13 @@ int devl_port_register(struct devlink *devlink, 


	ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);



	devlink_port_init(devlink, devlink_port);

	devlink_port->registered = true;

	devlink_port->devlink = devlink;

	devlink_port->index = port_index;

	spin_lock_init(&devlink_port->type_lock);

	INIT_LIST_HEAD(&devlink_port->reporter_list);

	mutex_init(&devlink_port->reporters_lock);

	list_add_tail(&devlink_port->list, &devlink->port_list);

	INIT_LIST_HEAD(&devlink_port->region_list);



	INIT_DELAYED_WORK(&devlink_port->type_warn_dw, &devlink_port_type_warn);

	devlink_port_type_warn_schedule(devlink_port);
@@ -9933,7 +9972,6 @@ void devl_port_unregister(struct devlink_port *devlink_port) 
	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_DEL);

	list_del(&devlink_port->list);

	WARN_ON(!list_empty(&devlink_port->reporter_list));

	WARN_ON(!list_empty(&devlink_port->region_list));

	mutex_destroy(&devlink_port->reporters_lock);

	devlink_port->registered = false;

}
@@ -11347,6 +11385,8 @@ devlink_port_region_create(struct devlink_port *port, 
	struct devlink_region *region;

	int err = 0;



	ASSERT_DEVLINK_PORT_INITIALIZED(port);



	if (WARN_ON(!ops) || WARN_ON(!ops->destructor))

		return ERR_PTR(-EINVAL);