On 05/17/2016 04:29 AM, Mark Bloch wrote: > > >> -----Original Message----- >> From: Doug Ledford [mailto:dledford@xxxxxxxxxx] >> Sent: Monday, May 16, 2016 8:43 PM >> To: leon@xxxxxxxxxx >> Cc: Mark Bloch <markb@xxxxxxxxxxxx>; linux-rdma@xxxxxxxxxxxxxxx >> Subject: Re: [PATCH rdma-next V2 5/5] IB/core: Integrate IB address >> resolution module into core >> Can you build netlink in and then init the ib_addr module after the >> netlink init is complete? Wouldn't that resolve the dependency ordering >> issue without changing the module names? > Sorry, but I don't understand what do you mean by this. > If you would like to keep the current module structure (ib_core.ko and ib_addr.ko) > The only way to use ibnl from within addr.c is to move the ibnl initialization to addr.c > and build netlink.c as part of ib_addr.ko, but it seems kind of strange if > ib_addr is responsible to initialize ibnl. Not according to what I was looking at. In the original patch, you moved addr.c into ib_core and changed addr_init and addr_cleanup from static to normal. You were then able to control whether the addr code went before or after the netlink code by rearranging the order of init sequences in device.c:ib_core_init(). It is entirely possible that you could leave ib_addr as a module, change addr_init to rdma_addr_init and EXPORT_SYMBOL it, and likewise with the cleanup function, and remove the module_init(addr_init); and module_exit(addr_cleanup); from the addr.c file. This would then allow you to control when ib_addr was inited by adding a call to rdma_addr_init() in device.c:ib_core_init() just like you had in your patch. It would solve the problem and give you complete control while being transparent to user space. This is what I mean: commit ec5394412286e325b83b6c64d026f4d7bab40ccd Author: Doug Ledford <dledford@xxxxxxxxxx> Date: Tue May 17 11:43:57 2016 -0400 IB/core: change module init ordering Change ib_addr to be init'ed by ib_core and not by the module load process. This gives us precise controle of when the module is initialized while still preserving the existing module names and load ordering. This is to be backward compatible with existing, older SysV init scripts. When those older systems are dead and gone, we can revisit this and change the module names and load orders however we want. Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx> diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index 337353d86cfa..fda808546e0e 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c @@ -634,7 +634,17 @@ static struct notifier_block nb = { .notifier_call = netevent_callback }; -static int __init addr_init(void) +/* + * This is a little unorthodox. We export our init function so that the + * ib_core module can call it at the right time after the other modules + * we depend on have registered. We do this solely because there are some + * user space init scripts that expect ib_addr to be loaded prior to ib_core + * and due to recent changes, we need the ib netlink code brought up before + * we bring this code up and that code is now in ib_core. When the older + * SysV init script systems that have these init scripts are dead and gone, + * we can revisit this and possibly just include addr.c in ib_core. + */ +int rdma_addr_init(void) { addr_wq = create_singlethread_workqueue("ib_addr"); if (!addr_wq) @@ -644,13 +654,12 @@ static int __init addr_init(void) rdma_addr_register_client(&self); return 0; } +EXPORT_SYMBOL(rdma_addr_init); -static void __exit addr_cleanup(void) +void rdma_addr_cleanup(void) { rdma_addr_unregister_client(&self); unregister_netevent_notifier(&nb); destroy_workqueue(addr_wq); } - -module_init(addr_init); -module_exit(addr_cleanup); +EXPORT_SYMBOL(rdma_addr_cleanup); diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h index eab32215756b..e0a5187ea98c 100644 --- a/drivers/infiniband/core/core_priv.h +++ b/drivers/infiniband/core/core_priv.h @@ -137,4 +137,7 @@ static inline bool rdma_is_upper_dev_rcu(struct net_device *dev, return _upper == upper; } +int rdma_addr_init(void); +void rdma_addr_cleanup(void); + #endif /* _CORE_PRIV_H */ diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 10979844026a..4fdf87a485cc 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -983,10 +983,18 @@ static int __init ib_core_init(void) goto err_sysfs; } + ret = rdma_addr_init(); + if (ret) { + pr_warn("Couldn't init IB address resolution module\n"); + goto err_ibnl; + } + ib_cache_setup(); return 0; +err_ibnl: + ibnl_cleanup(); err_sysfs: class_unregister(&ib_class); err_comp: @@ -999,6 +1007,7 @@ err: static void __exit ib_core_cleanup(void) { ib_cache_cleanup(); + rdma_addr_cleanup(); ibnl_cleanup(); class_unregister(&ib_class); destroy_workqueue(ib_comp_wq); -- Doug Ledford <dledford@xxxxxxxxxx> GPG KeyID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
