From 75444a8590b1bba8cb7f7b60697627f193d7db4c Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 5 Dec 2008 16:47:30 +0000 Subject: [PATCH] When the SYSINIT() to load a module invokes the MOD_LOAD event successfully, move that module to the head of the associated linker file's list of modules. The end result is that once all the modules are loaded, they are sorted in the reverse of their load order. This causes the kernel linker to invoke the MOD_QUIESCE and MOD_UNLOAD events in the reverse of the order that MOD_LOAD was invoked. This means that the ordering of MOD_LOAD events that is set by the SI_* paramters to DECLARE_MODULE() are now honored in the same order they would be for SYSUNINIT() for the MOD_QUIESCE and MOD_UNLOAD events. MFC after: 1 month --- sys/kern/kern_module.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index fef7f87652fb..9c53bf6f4638 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -130,6 +130,21 @@ module_register_init(const void *arg) printf("module_register_init: MOD_LOAD (%s, %p, %p) error" " %d\n", data->name, (void *)data->evhand, data->priv, error); + } else { + MOD_XLOCK; + if (mod->file) { + /* + * Once a module is succesfully loaded, move + * it to the head of the module list for this + * linker file. This resorts the list so that + * when the kernel linker iterates over the + * modules to unload them, it will unload them + * in the reverse order they were loaded. + */ + TAILQ_REMOVE(&mod->file->modules, mod, flink); + TAILQ_INSERT_HEAD(&mod->file->modules, mod, flink); + } + MOD_XUNLOCK; } mtx_unlock(&Giant); }