kmodloader: support duplicate module names and aliases
[project/ubox.git] / kmodloader.c
index 62b2d5bcaa4cd32b4f3ac032e597471e3c2a27ec..865f2e2eab5ebc32ee993b68a3e473e3e76fc8b8 100644 (file)
@@ -14,6 +14,9 @@
 
 #define _GNU_SOURCE
 #include <sys/syscall.h>
+#include <sys/mman.h>
+#include <sys/utsname.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <syslog.h>
+#include <libgen.h>
 #include <glob.h>
-#include <sys/utsname.h>
+#include <elf.h>
+#include <ctype.h>
+
+#include <libubox/avl.h>
+#include <libubox/avl-cmp.h>
+#include <libubox/utils.h>
+#include <libubox/ulog.h>
+#include <libubox/kvlist.h>
+#include <libubox/list.h>
+
+#define DEF_MOD_PATH "/modules/%s/"
+#define MOD_BUILTIN "modules.builtin"
+#define MOD_BUILTIN_MODINFO "modules.builtin.modinfo"
+/* duplicated from in-kernel include/linux/module.h */
+#define MODULE_NAME_LEN (64 - sizeof(unsigned long))
+
+struct param {
+       char *name;
+       char *desc;
+       char *type;
+       struct list_head list;
+};
+
+enum {
+       BUILTIN,
+       SCANNED,
+       PROBE,
+       LOADED,
+       BLACKLISTED,
+};
 
-#define DEF_MOD_PATH "/lib/modules/%s/%s.ko"
-static int insmod(char *module, const char *options)
+struct module {
+       char *name;
+       char *depends;
+       char *opts;
+
+       int size;
+       int usage;
+       int state;
+       int error;
+       int refcnt;                     /* number of references from module_node.m */
+};
+
+struct module_node {
+       struct avl_node avl;
+       struct module *m;
+       bool is_alias;
+};
+
+static struct avl_tree modules;
+static KVLIST(options, kvlist_strlen);
+
+static char **module_folders = NULL;
+
+static void free_module(struct module *m);
+
+static int init_module_folders(void)
 {
+       int n = 0;
+       struct stat st;
        struct utsname ver;
-       char path[256];
+       char *s, *e, *p, path[330], ldpath[256];
+
+       e = ldpath;
+       s = getenv("LD_LIBRARY_PATH");
+
+       if (s)
+               e += snprintf(ldpath, sizeof(ldpath), "%s:", s);
+
+       e += snprintf(e, sizeof(ldpath) - (e - ldpath), "/lib");
+
+       uname(&ver);
+
+       for (s = p = ldpath; p <= e; p++) {
+               if (*p != ':' && *p != '\0')
+                       continue;
+
+               *p = 0;
+               snprintf(path, sizeof(path), "%s" DEF_MOD_PATH, s, ver.release);
+
+               if (!stat(path, &st) && S_ISDIR(st.st_mode)) {
+                       module_folders = realloc(module_folders, sizeof(p) * (n + 2));
+
+                       if (!module_folders) {
+                               ULOG_ERR("out of memory\n");
+                               return -1;
+                       }
+
+                       module_folders[n++] = strdup(path);
+               }
+
+               s = p + 1;
+       }
+
+       if (!module_folders) {
+               ULOG_ERR("no module folders for kernel version %s found\n", ver.release);
+               return -1;
+       }
+
+       module_folders[n] = NULL;
+       return 0;
+}
+
+static void free_module_folders(void)
+{
+       int n = 0;
+
+       if (!module_folders)
+               return;
+       while (module_folders[n])
+               free(module_folders[n++]);
+       free(module_folders);
+}
+
+static struct module *find_module(const char *name)
+{
+       struct module_node *mn;
+       mn = avl_find_element(&modules, name, mn, avl);
+       if (mn)
+               return mn->m;
+       else
+               return NULL;
+}
+
+static void free_modules(void)
+{
+       struct module_node *mn, *tmp;
+
+       avl_remove_all_elements(&modules, mn, avl, tmp) {
+               struct module *m = mn->m;
+
+               m->refcnt -= 1;
+               if (m->refcnt == 0)
+                       free_module(m);
+               free(mn);
+       }
+}
+
+static char* get_module_path(char *name)
+{
+       char **p;
+       static char path[256];
+       struct stat s;
+
+       if (!stat(name, &s) && S_ISREG(s.st_mode))
+               return name;
+
+       for (p = module_folders; *p; p++) {
+               snprintf(path, sizeof(path), "%s%s.ko", *p, name);
+               if (!stat(path, &s) && S_ISREG(s.st_mode))
+                       return path;
+       }
+
+       return NULL;
+}
+
+static char* get_module_name(char *path)
+{
+       static char name[MODULE_NAME_LEN];
+       char *t;
+
+       strncpy(name, basename(path), sizeof(name) - 1);
+
+       t = strstr(name, ".ko");
+       if (t)
+               *t = '\0';
+
+       return name;
+}
+
+static int elf64_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
+{
+       const char *secnames;
+       Elf64_Ehdr *e;
+       Elf64_Shdr *sh;
+       int i;
+
+       e = (Elf64_Ehdr *) map;
+       sh = (Elf64_Shdr *) (map + e->e_shoff);
+
+       secnames = map + sh[e->e_shstrndx].sh_offset;
+       for (i = 0; i < e->e_shnum; i++) {
+               if (!strcmp(section, secnames + sh[i].sh_name)) {
+                       *size = sh[i].sh_size;
+                       *offset = sh[i].sh_offset;
+                       return 0;
+               }
+       }
+
+       return -1;
+}
+
+static int elf32_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
+{
+       const char *secnames;
+       Elf32_Ehdr *e;
+       Elf32_Shdr *sh;
+       int i;
+
+       e = (Elf32_Ehdr *) map;
+       sh = (Elf32_Shdr *) (map + e->e_shoff);
+
+       secnames = map + sh[e->e_shstrndx].sh_offset;
+       for (i = 0; i < e->e_shnum; i++) {
+               if (!strcmp(section, secnames + sh[i].sh_name)) {
+                       *size = sh[i].sh_size;
+                       *offset = sh[i].sh_offset;
+                       return 0;
+               }
+       }
+
+       return -1;
+}
+
+static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size)
+{
+       int clazz = map[EI_CLASS];
+       int endian = map[EI_DATA];
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+       if (endian != ELFDATA2LSB)
+#elif __BYTE_ORDER == __BIG_ENDIAN
+       if (endian != ELFDATA2MSB)
+#else
+#error "unsupported endian"
+#endif
+       {
+               ULOG_ERR("invalid endianess: %d\n", endian);
+               return -1;
+       }
+
+       if (clazz == ELFCLASS32)
+               return elf32_find_section(map, section, offset, size);
+       else if (clazz == ELFCLASS64)
+               return elf64_find_section(map, section, offset, size);
+
+       ULOG_ERR("unknown elf format %d\n", clazz);
+
+       return -1;
+}
+
+static struct module_node *
+alloc_module_node(const char *name, struct module *m, bool is_alias)
+{
+       struct module_node *mn;
+       char *_name;
+
+       mn = calloc_a(sizeof(*mn),
+               &_name, strlen(name) + 1);
+       if (mn) {
+               mn->avl.key = strcpy(_name, name);
+               mn->m = m;
+               mn->is_alias = is_alias;
+               if (avl_insert(&modules, &mn->avl) == 0)
+                       m->refcnt += 1;
+               else
+                       free(mn);
+       }
+       return mn;
+}
+
+static int avl_modcmp(const void *k1, const void *k2, void *ptr);
+
+static struct module *
+alloc_module(const char *name, const char * const *aliases, int naliases, const char *depends, int size)
+{
+       struct module *m;
+       char *_name, *_dep;
+       int i;
+
+       m = calloc_a(sizeof(*m),
+               &_name, strlen(name) + 1,
+               &_dep, depends ? strlen(depends) + 2 : 0);
+       if (!m)
+               return NULL;
+
+       m->name = strcpy(_name, name);
+       m->opts = 0;
+
+       if (depends) {
+               m->depends = strcpy(_dep, depends);
+               while (*_dep) {
+                       if (*_dep == ',')
+                               *_dep = '\0';
+                       _dep++;
+               }
+       }
+       m->size = size;
+
+       m->refcnt = 0;
+       alloc_module_node(m->name, m, false);
+       for (i = 0; i < naliases; i++)
+               if (avl_modcmp(m->name, aliases[i], NULL))
+                       alloc_module_node(aliases[i], m, true);
+
+       return m;
+}
+
+static void free_module(struct module *m)
+{
+       if (m->opts)
+               free(m->opts);
+       free(m);
+}
+
+static int scan_loaded_modules(void)
+{
+       size_t buf_len = 0;
+       char *buf = NULL;
+       int rv = -1;
+       FILE *fp;
+
+       fp = fopen("/proc/modules", "r");
+       if (!fp) {
+               ULOG_ERR("failed to open /proc/modules\n");
+               return -1;
+       }
+
+       while (getline(&buf, &buf_len, fp) > 0) {
+               struct module m;
+               struct module *n;
+
+               m.name = strtok(buf, " ");
+               m.size = atoi(strtok(NULL, " "));
+               m.usage = atoi(strtok(NULL, " "));
+               m.depends = strtok(NULL, " ");
+
+               if (!m.name || !m.depends)
+                       continue;
+
+               n = find_module(m.name);
+               if (!n) {
+                       /* possibly a module outside /lib/modules/<ver>/ */
+                       n = alloc_module(m.name, NULL, 0, m.depends, m.size);
+               }
+               if (!n) {
+                       ULOG_ERR("Failed to allocate memory for module\n");
+                       goto out;
+               }
+
+               n->usage = m.usage;
+               n->state = LOADED;
+       }
+       rv = 0;
+out:
+       free(buf);
+       fclose(fp);
+
+       return rv;
+}
+
+static char *mmap_modinfo(const char *module, const char *name, struct stat *s, unsigned int *offset, unsigned int *size)
+{
+       const bool is_builtin = (module == NULL);
+       const char *mpath = NULL;
+       char *map = MAP_FAILED;
+       char path[350], **f;
+       int fd = -1;
+
+       if (is_builtin)
+               for (f = module_folders; *f; f++) {
+                       snprintf(path, sizeof(path), "%s%s", *f, MOD_BUILTIN_MODINFO);
+                       if (!stat(path, s) && S_ISREG(s->st_mode)) {
+                               mpath = path;
+                               break;
+                       }
+               }
+       else
+               mpath = module;
+
+       if (!mpath) {
+               ULOG_ERR("cannot find modinfo path of module - %s\n", name);
+               goto out;
+       }
+
+       fd = open(mpath, O_RDONLY);
+       if (fd < 0) {
+               ULOG_ERR("failed to open %s\n", mpath);
+               goto out;
+       }
+
+       if (fstat(fd, s) == -1) {
+               ULOG_ERR("failed to stat %s\n", mpath);
+               goto out;
+       }
+
+       map = mmap(NULL, s->st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+       if (map == MAP_FAILED) {
+               ULOG_ERR("failed to mmap %s\n", mpath);
+               goto out;
+       }
+
+       if (is_builtin) {
+               *offset = 0;
+               *size = s->st_size;
+       } else if (elf_find_section(map, ".modinfo", offset, size)) {
+               ULOG_ERR("failed to load the .modinfo section from %s\n", mpath);
+               munmap(map, s->st_size);
+               map = MAP_FAILED;
+       }
+
+out:
+       if (fd >= 0)
+               close(fd);
+       return map;
+}
+
+static struct module* get_module_info(const char *module, const char *name)
+{
+       const bool is_builtin = (module == NULL);
+       unsigned int offset, size;
+       char *map, *strings, *dep = NULL;
+       const char **aliases = NULL;
+       const char **aliasesr;
+       int naliases = 0;
+       struct module *m = NULL;
+       struct stat s;
+
+       map = mmap_modinfo(module, name, &s, &offset, &size);
+       if (map == MAP_FAILED)
+               goto out;
+
+       strings = map + offset;
+       while (true) {
+               char *end = map + offset + size;
+               char *sep;
+               int len;
+
+               while ((strings < end) && !strings[0])
+                       strings++;
+               if (strings >= end)
+                       break;
+               if (is_builtin) {
+                       sep = strstr(strings, ".");
+                       if (!sep)
+                               break;
+                       if (strlen(name) == (sep - strings) &&
+                           !strncmp(strings, name, sep - strings))
+                               strings = sep + 1;
+                       else
+                               goto next_string;
+               }
+               sep = strstr(strings, "=");
+               if (!sep)
+                       break;
+               len = sep - strings;
+               sep++;
+               if (!strncmp(strings, "depends=", len + 1))
+                       dep = sep;
+               else if (!strncmp(strings, "alias=", len + 1)) {
+                       aliasesr = realloc(aliases, sizeof(sep) * (naliases + 1));
+                       if (!aliasesr) {
+                               ULOG_ERR("out of memory\n");
+                               goto out;
+                       }
+
+                       aliases = aliasesr;
+                       aliases[naliases++] = sep;
+               }
+next_string:
+               strings = &sep[strlen(sep)];
+       }
+
+       m = alloc_module(name, aliases, naliases, dep, is_builtin ? 0 : s.st_size);
+
+       if (m)
+               m->state = is_builtin ? BUILTIN : SCANNED;
+
+out:
+       if (map != MAP_FAILED)
+               munmap(map, s.st_size);
+
+       free(aliases);
+
+       return m;
+}
+
+static int scan_builtin_modules(void)
+{
+       char **p, path[350];
+       size_t buf_len = 0;
+       char *buf = NULL;
+       struct stat st;
+       FILE *fp = NULL;
+       int rv = -1;
+
+       if (!module_folders && init_module_folders())
+               return -1;
+       for (p = module_folders; *p; p++) {
+               snprintf(path, sizeof(path), "%s%s", *p, MOD_BUILTIN);
+               fp = fopen(path, "r");
+               if (!fp)
+                       continue;
+
+               if (!fstat(fileno(fp), &st) && S_ISREG(st.st_mode))
+                       break;
+
+               /* Not regular file, close it and check next */
+               fclose(fp);
+               fp = NULL;
+       }
+       if (!fp)
+               return 0;       /* OK if modules.builtin unavailable */
+
+       while (getline(&buf, &buf_len, fp) > 0) {
+               struct module *m;
+               char *name;
+
+               name = get_module_name(buf);
+               if (!name)
+                       continue;
+               m = find_module(name);
+               if (m && !strcmp(m->name, name)) {
+                       ULOG_WARN("found duplicate builtin module %s\n", name);
+                       continue;
+               }
+               m = get_module_info(NULL, name);
+               if (!m) {
+                       ULOG_ERR("failed to find info for builtin module %s\n", name);
+                       goto err;
+               }
+       }
+
+       rv = 0;
+err:
+       free(buf);
+       fclose(fp);
+
+       return rv;
+}
+
+static int scan_module_folder(const char *dir)
+{
+       int gl_flags = GLOB_NOESCAPE | GLOB_MARK;
+       char *path;
+       glob_t gl;
+       int j, rv = 0;
+
+       path = alloca(strlen(dir) + sizeof("*.ko") + 1);
+       sprintf(path, "%s*.ko", dir);
+
+       if (glob(path, gl_flags, NULL, &gl) < 0)
+               return -1;
+
+       for (j = 0; j < gl.gl_pathc; j++) {
+               char *name = get_module_name(gl.gl_pathv[j]);
+               struct module *m;
+               char *opts;
+
+               if (!name)
+                       continue;
+
+               m = find_module(name);
+               if (m)
+                       continue;
+
+               m = get_module_info(gl.gl_pathv[j], name);
+               if (!m) {
+                       rv |= -1;
+                       continue;
+               }
+
+               opts = kvlist_get(&options, name);
+               if (!opts)
+                       continue;
+
+               if (*opts == '\x01')
+                       m->state = BLACKLISTED;
+               else
+                       m->opts = strdup(opts);
+       }
+
+       globfree(&gl);
+
+       return rv;
+}
+
+static int scan_module_folders(void)
+{
+       int rv = 0;
+       char **p;
+
+       if (init_module_folders())
+               return -1;
+
+       for (p = module_folders; *p; p++)
+               rv |= scan_module_folder(*p);
+
+       return rv;
+}
+
+static int print_modinfo(const struct module *m)
+{
+       const bool is_builtin = (m->state == BUILTIN);
+       unsigned int offset, size;
+       struct param *p;
+       struct stat s;
+       char *map, *strings, *mpath;
+       int rv = -1;
+
+       LIST_HEAD(params);
+
+       mpath = get_module_path(m->name);
+       map = mmap_modinfo(mpath, m->name, &s, &offset, &size);
+       if (map == MAP_FAILED)
+               goto out;
+
+       strings = map + offset;
+       if (is_builtin)
+               printf("name:\t\t%s\n", m->name);
+       printf("filename:\t%s\n", is_builtin ? "(builtin)" : mpath);
+       while (true) {
+               char *end = map + offset + size;
+               char *pname, *pdata;
+               char *dup = NULL;
+               char *sep, *sep2;
+
+               while ((strings < end) && !strings[0])
+                       strings++;
+               if (strings >= end)
+                       break;
+               if (is_builtin) {
+                       sep = strstr(strings, ".");
+                       if (!sep)
+                               break;
+                       if (strlen(m->name) == (sep - strings) &&
+                           !strncmp(strings, m->name, sep - strings))
+                               strings = sep + 1;
+                       else
+                               goto next_string;
+               }
+               sep = strstr(strings, "=");
+               if (!sep)
+                       break;
+               dup = strndup(strings, sep - strings);
+               sep++;
+               if (strncmp(strings, "parm", 4)) {
+                       if (strlen(dup) < 7)
+                               printf("%s:\t\t%s\n",  dup, sep);
+                       else
+                               printf("%s:\t%s\n",  dup, sep);
+               } else {
+                       sep2 = strstr(sep, ":");
+                       if (!sep2) {
+                               free(dup);
+                               break;
+                       }
+
+                       pname = strndup(sep, sep2 - sep);
+                       sep2++;
+                       pdata = strdup(sep2);
+
+                       list_for_each_entry(p, &params, list)
+                               if (!strcmp(pname, p->name))
+                                       break;
+
+                       if (list_entry_is_h(p, &params, list)) {
+                               p = alloca(sizeof(*p));
+                               p->name = pname;
+                               p->desc = p->type = NULL;
+                               list_add(&p->list, &params);
+                       } else {
+                               free(pname);
+                       }
+
+                       if (!strcmp(dup, "parmtype"))
+                               p->type = pdata;
+                       else
+                               p->desc = pdata;
+               }
+
+               free(dup);
+next_string:
+               strings = &sep[strlen(sep)];
+       }
+
+       list_for_each_entry(p, &params, list) {
+               printf("parm:\t\t%s",  p->name);
+               if (p->desc)
+                       printf(":%s", p->desc);
+               if (p->type)
+                       printf(" (%s)", p->type);
+               printf("\n");
+               free(p->name);
+               free(p->desc);
+               free(p->type);
+       }
+
+       rv = 0;
+
+out:
+       if (map != MAP_FAILED)
+               munmap(map, s.st_size);
+
+       return rv;
+}
+
+static int deps_available(struct module *m, int verbose)
+{
+       char *dep;
+       int err = 0;
+
+       if (!m->depends || !strcmp(m->depends, "-") || !strcmp(m->depends, ""))
+               return 0;
+
+       dep = m->depends;
+
+       while (*dep) {
+               m = find_module(dep);
+
+               if (verbose && !m)
+                       ULOG_ERR("missing dependency %s\n", dep);
+               if (verbose && m && (m->state != LOADED))
+                       ULOG_ERR("dependency not loaded %s\n", dep);
+               if (!m || (m->state != LOADED))
+                       err++;
+               dep += strlen(dep) + 1;
+       }
+
+       return err;
+}
+
+static int insert_module(char *path, const char *options)
+{
        void *data = 0;
        struct stat s;
        int fd, ret = -1;
 
-       uname(&ver);
-       snprintf(path, 256, DEF_MOD_PATH, ver.release, module);
+       if (!path) {
+               ULOG_ERR("Path not specified\n");
+               return ret;
+       }
 
        if (stat(path, &s)) {
-               fprintf(stderr, "missing module %s\n", path);
+               ULOG_ERR("missing module %s\n", path);
                return ret;
        }
 
        fd = open(path, O_RDONLY);
-       if (!fd) {
-               fprintf(stderr, "cannot open %s\n", path);
+       if (fd < 0) {
+               ULOG_ERR("cannot open %s\n", path);
                return ret;
        }
 
        data = malloc(s.st_size);
+       if (!data) {
+               ULOG_ERR("out of memory\n");
+               goto out;
+       }
+
        if (read(fd, data, s.st_size) == s.st_size) {
-               ret = syscall(__NR_init_module, data, s.st_size, options);
-               if (ret)
-                       fprintf(stderr, "failed insert %s\n", module);
-       } else {
-               fprintf(stderr, "failed to read full module %s\n", path);
+               ret = syscall(__NR_init_module, data, (unsigned long) s.st_size, options);
+               if (errno == EEXIST)
+                       ret = 0;
        }
+       else
+               ULOG_ERR("failed to read full module %s\n", path);
 
+out:
        close(fd);
        free(data);
 
        return ret;
 }
 
-/*static void rmmod(char *module)
+static void load_moddeps(struct module *_m)
 {
-       syscall(__NR_delete_module, module, 0);
-}*/
+       char *dep;
+       struct module *m;
 
-int main(int argc, char **argv)
+       if (!strcmp(_m->depends, "-") || !strcmp(_m->depends, ""))
+               return;
+
+       dep = _m->depends;
+
+       while (*dep) {
+               m = find_module(dep);
+
+               if (!m)
+                       ULOG_ERR("failed to find dependency %s\n", dep);
+               if (m && (m->state != LOADED)) {
+                       m->state = PROBE;
+                       load_moddeps(m);
+               }
+
+               dep = dep + strlen(dep) + 1;
+       }
+}
+
+static int load_modprobe(bool allow_load_retry)
+{
+       int loaded, skipped, failed;
+       struct module_node *mn;
+       struct module *m;
+       bool load_retry = false;
+       static bool first_iteration = true;
+
+       avl_for_each_element(&modules, mn, avl) {
+               if (mn->is_alias)
+                       continue;
+               m = mn->m;
+               if (m->state == PROBE)
+                       load_moddeps(m);
+       }
+
+       do {
+               loaded = 0;
+               skipped = 0;
+               failed = 0;
+               avl_for_each_element(&modules, mn, avl) {
+                       if (mn->is_alias)
+                               continue;
+                       m = mn->m;
+                       if ((m->state == PROBE) && (!deps_available(m, 0)) && (!m->error || load_retry)) {
+                               if (!insert_module(get_module_path(m->name), (m->opts) ? (m->opts) : (""))) {
+                                       m->state = LOADED;
+                                       m->error = 0;
+                                       loaded++;
+                                       continue;
+                               }
+
+                               m->error = 1;
+                       }
+
+                       if (m->error)
+                               failed++;
+                       else if (m->state == PROBE)
+                               skipped++;
+               }
+
+               if (allow_load_retry) {
+                       /* if we can't load anything else let's try to load failed modules */
+                       load_retry = loaded ? (failed && !skipped) : (failed && !load_retry && !first_iteration);
+               }
+
+               first_iteration = false;
+       } while (loaded || load_retry);
+
+       return skipped + failed;
+}
+
+static int print_insmod_usage(void)
+{
+       ULOG_INFO("Usage:\n\tinsmod filename [args]\n");
+
+       return -1;
+}
+
+static int print_modprobe_usage(void)
+{
+       ULOG_INFO(
+               "Usage:\n"
+               "\tmodprobe [-q] [-v] filename\n"
+               "\tmodprobe -a [-q] [-v] filename [filename...]\n"
+       );
+
+       return -1;
+}
+
+static int print_usage(char *arg)
+{
+       ULOG_INFO("Usage:\n\t%s module\n", arg);
+
+       return -1;
+}
+
+static int main_insmod(int argc, char **argv)
+{
+       char *name, *path, *cur, *opts = NULL;
+       int i, ret = -1, len;
+
+       if (argc < 2)
+               return print_insmod_usage();
+
+       name = get_module_name(argv[1]);
+       if (!name) {
+               ULOG_ERR("cannot find module - %s\n", argv[1]);
+               return -1;
+       }
+
+       if (scan_loaded_modules())
+               return -1;
+
+       if (find_module(name)) {
+               ULOG_ERR("module is already loaded - %s\n", name);
+               goto err;
+
+       }
+
+       for (len = 1, i = 2; i < argc; i++)
+               len += strlen(argv[i]) + 1;
+
+       opts = malloc(len);
+       if (!opts) {
+               ULOG_ERR("out of memory\n");
+               goto err;
+       }
+
+       opts[0] = 0;
+       cur = opts;
+       for (i = 2; i < argc; i++) {
+               if (opts[0]) {
+                       *cur = ' ';
+                       cur++;
+               }
+               cur += sprintf(cur, "%s", argv[i]);
+       }
+
+       if (init_module_folders()) {
+               fprintf(stderr, "Failed to find the folder holding the modules\n");
+               goto err;
+       }
+
+       if (!(path = get_module_path(argv[1])) ||
+            (path = get_module_path(name))) {
+               fprintf(stderr, "Failed to find %s. Maybe it is a built in module ?\n", name);
+               goto err;
+       }
+
+       ret = insert_module(path, opts);
+       if (ret)
+               ULOG_ERR("failed to insert %s\n", get_module_path(name));
+
+err:
+       free(opts);
+       free_modules();
+       free_module_folders();
+
+       return ret;
+}
+
+static int main_rmmod(int argc, char **argv)
+{
+       struct module *m;
+       char *name;
+       int ret = -1;
+
+       if (argc != 2)
+               return print_usage("rmmod");
+
+       if (scan_loaded_modules())
+               return -1;
+
+       if (scan_builtin_modules())
+               return -1;
+
+       name = get_module_name(argv[1]);
+       m = find_module(name);
+       if (!m) {
+               ULOG_ERR("module is not loaded\n");
+               goto err;
+       }
+       if (m->state == BUILTIN) {
+               ULOG_ERR("module is builtin\n");
+               goto err;
+       }
+       ret = syscall(__NR_delete_module, m->name, 0);
+
+       if (ret)
+               ULOG_ERR("unloading the module failed\n");
+
+err:
+       free_modules();
+       free_module_folders();
+
+       return ret;
+}
+
+static int main_lsmod(int argc, char **argv)
+{
+       struct module_node *mn;
+       struct module *m;
+       char *dep;
+
+       if (scan_loaded_modules())
+               return -1;
+
+       avl_for_each_element(&modules, mn, avl) {
+               if (mn->is_alias)
+                       continue;
+               m = mn->m;
+               if (m->state == LOADED) {
+                       printf("%-20s%8d%3d ",
+                               m->name, m->size, m->usage);
+                       if (m->depends && strcmp(m->depends, "-") && strcmp(m->depends, "")) {
+                               dep = m->depends;
+                               while (*dep) {
+                                       printf("%s", dep);
+                                       dep = dep + strlen(dep) + 1;
+                                       if (*dep)
+                                               printf(",");
+                               }
+                       }
+                       printf("\n");
+               }
+       }
+
+       free_modules();
+
+       return 0;
+}
+
+static int main_modinfo(int argc, char **argv)
+{
+       struct module_node *mn;
+       int rv = -1;
+       char *name;
+
+       if (argc != 2)
+               return print_usage("modinfo");
+
+       if (scan_module_folders())
+               return -1;
+
+       if (scan_builtin_modules())
+               return -1;
+
+       name = get_module_name(argv[1]);
+       mn = avl_find_element(&modules, name, mn, avl);
+       if (!mn) {
+               ULOG_ERR("cannot find module - %s\n", argv[1]);
+               goto err;
+       }
+
+       if (!mn->avl.leader)
+               print_modinfo(mn->m);
+       else
+               do {
+                       print_modinfo(mn->m);
+                       mn = (struct module_node *) mn->avl.list.next;
+               } while (!avl_modcmp(name, mn->avl.key, NULL));
+       rv = 0;
+err:
+       free_modules();
+       free_module_folders();
+
+       return rv;
+}
+
+static int main_modprobe(int argc, char **argv)
+{
+       struct module_node *mn;
+       struct module *m;
+       int exit_code = 0;
+       int load_fail;
+       int log_level = LOG_WARNING;
+       int opt;
+       bool quiet = false;
+       bool use_all = false;
+
+       while ((opt = getopt(argc, argv, "aqv")) != -1 ) {
+               switch (opt) {
+                       case 'a':
+                               use_all = true;
+                               break;
+                       case 'q': /* shhhh! */
+                               quiet = true;
+                               break;
+                       case 'v':
+                               log_level = LOG_DEBUG;
+                               break;
+                       default: /* '?' */
+                               return print_modprobe_usage();
+                               break;
+                       }
+       }
+
+       if (optind >= argc)
+               return print_modprobe_usage(); /* expected module after options */
+
+       /* after print_modprobe_usage() so it won't be filtered out */
+       ulog_threshold(log_level);
+
+       if (scan_module_folders())
+               return -1;
+
+       if (scan_loaded_modules())
+               return -1;
+
+       if (scan_builtin_modules())
+               return -1;
+
+       do {
+               char *name;
+
+               name = get_module_name(argv[optind]);
+               m = find_module(name);
+
+               if (m && m->state == BLACKLISTED) {
+                       if (!quiet)
+                               ULOG_INFO("%s is blacklisted\n", name);
+               } else if (m && m->state == LOADED) {
+                       if (!quiet)
+                               ULOG_INFO("%s is already loaded\n", name);
+               } else if (m && m->state == BUILTIN) {
+                       if (!quiet)
+                               ULOG_INFO("%s is builtin\n", name);
+               } else if (!m) {
+                       if (!quiet)
+                               ULOG_ERR("failed to find a module named %s\n", name);
+                       exit_code = -1;
+               } else {
+                       m->state = PROBE;
+               }
+
+               optind++;
+       } while (use_all && optind < argc);
+
+       load_fail = load_modprobe(true);
+       if (load_fail) {
+               ULOG_ERR("%d module%s could not be probed\n",
+                        load_fail, (load_fail == 1) ? ("") : ("s"));
+
+               avl_for_each_element(&modules, mn, avl) {
+                       if (mn->is_alias)
+                               continue;
+                       m = mn->m;
+                       if ((m->state == PROBE) || m->error)
+                               ULOG_ERR("- %s\n", m->name);
+               }
+
+               exit_code = -1;
+       }
+
+       free_modules();
+       free_module_folders();
+
+       return exit_code;
+}
+
+static int main_loader(int argc, char **argv)
 {
-       glob_t gl;
        int gl_flags = GLOB_NOESCAPE | GLOB_MARK;
-       char *tmp = malloc(256);
-       char *dir = "/etc/modules.d/*";
+       char *dir = "/etc/modules.d/";
+       struct module_node *mn;
+       struct module *m;
+       glob_t gl;
+       char *path;
+       int ret = 0, fail, j;
 
        if (argc > 1)
                dir = argv[1];
 
-       syslog(0, "kmodloader: loading kernel modules from %s\n", dir);
+       path = malloc(strlen(dir) + 2);
+       if (!path) {
+               ULOG_ERR("out of memory\n");
+               return -1;
+       }
 
-       if (glob(dir, gl_flags, NULL, &gl) >= 0) {
-               int j;
+       strcpy(path, dir);
+       strcat(path, "*");
 
-               for (j = 0; j < gl.gl_pathc; j++) {
-                       FILE *fp = fopen(gl.gl_pathv[j], "r");
+       if (scan_module_folders()) {
+               ret = -1;
+               goto free_path;
+       }
 
-                       if (!fp) {
-                               fprintf(stderr, "failed to open %s\n", gl.gl_pathv[j]);
-                       } else {
-                               char mod[64];
+       if (scan_loaded_modules()) {
+               ret = -1;
+               goto free_path;
+       }
 
-                               while (fgets(mod, 64, fp)) {
-                                       mod[strlen(mod) - 1] = '\0';
-                                       insmod(mod, "");
+       ULOG_INFO("loading kernel modules from %s\n", path);
+
+       if (glob(path, gl_flags, NULL, &gl) < 0)
+               goto out;
+
+       for (j = 0; j < gl.gl_pathc; j++) {
+               FILE *fp = fopen(gl.gl_pathv[j], "r");
+               size_t mod_len = 0;
+               char *mod = NULL;
+
+               if (!fp) {
+                       ULOG_ERR("failed to open %s\n", gl.gl_pathv[j]);
+                       continue;
+               }
+
+               while (getline(&mod, &mod_len, fp) > 0) {
+                       char *nl = strchr(mod, '\n');
+                       struct module *m;
+                       char *opts;
+
+                       if (nl)
+                               *nl = '\0';
+
+                       opts = strchr(mod, ' ');
+                       if (opts)
+                               *opts++ = '\0';
+
+                       m = find_module(get_module_name(mod));
+                       if (!m || m->state == LOADED || m->state == BLACKLISTED)
+                               continue;
+
+                       if (opts) {
+                               if (m->opts) {
+                                       char *prev = m->opts;
+
+                                       fail = asprintf(&m->opts, "%s %s", prev, opts);
+                                       free(prev);
+                                       if (fail < 0) {
+                                               ULOG_ERR("out of memory for opts %s\n", opts);
+                                               free(mod);
+                                               fclose(fp);
+                                               ret = -1;
+                                               goto out;
+                                       }
+                               } else {
+                                       m->opts = strdup(opts);
                                }
-                               fclose(fp);
                        }
+                       m->state = PROBE;
+                       if (basename(gl.gl_pathv[j])[0] - '0' <= 9)
+                               load_modprobe(false);
+
+               }
+               free(mod);
+               fclose(fp);
+       }
+
+       fail = load_modprobe(true);
+
+       if (fail) {
+               ULOG_ERR("%d module%s could not be probed\n",
+                        fail, (fail == 1) ? ("") : ("s"));
+
+               avl_for_each_element(&modules, mn, avl) {
+                       if (mn->is_alias)
+                               continue;
+                       m = mn->m;
+                       if ((m->state == PROBE) || (m->error))
+                               ULOG_ERR("- %s - %d\n", m->name, deps_available(m, 1));
                }
+       } else {
+               ULOG_INFO("done loading kernel modules from %s\n", path);
        }
 
+out:
        globfree(&gl);
-       free(tmp);
+       free_modules();
+       free_module_folders();
+free_path:
+       free(path);
 
-       return 0;
+       return ret;
+}
+
+static inline char weight(char c)
+{
+       return c == '_' ? '-' : c;
+}
+
+static int avl_modcmp(const void *k1, const void *k2, void *ptr)
+{
+       const char *s1 = k1;
+       const char *s2 = k2;
+
+       while (*s1 && (weight(*s1) == weight(*s2)))
+       {
+               s1++;
+               s2++;
+       }
+
+       return (unsigned char)weight(*s1) - (unsigned char)weight(*s2);
+}
+
+static void
+load_options(void)
+{
+       static char buf[512];
+       char *s;
+       FILE *f;
+
+       f = fopen("/etc/modules.conf", "r");
+       if (!f)
+               return;
+
+       while ((s = fgets(buf, sizeof(buf), f)) != NULL) {
+               char *c, *cmd, *mod;
+
+               while (isspace(*s))
+                       s++;
+
+               c = strchr(s, '#');
+               if (c)
+                       *c = 0;
+
+               while (isspace(*s))
+                       s++;
+
+               c = s + strlen(s);
+               while (c > s && isspace(c[-1])) {
+                       c[-1] = 0;
+                       c--;
+               }
+
+               cmd = strsep(&s, " \t");
+               if (!cmd || !*cmd)
+                       continue;
+
+               while (isspace(*s))
+                       s++;
+
+               mod = strsep(&s, " \t");
+               if (!mod || !*mod)
+                       continue;
+
+               if (!strcmp(cmd, "blacklist")) {
+                       kvlist_set(&options, mod, "\x01");
+                       continue;
+               }
+
+               if (!strcmp(cmd, "options")) {
+                       char *prev = kvlist_get(&options, mod);
+                       char *val = NULL;
+
+                       while (isspace(*s))
+                               s++;
+
+                       if (!*s)
+                               continue;
+
+                       if (prev && prev[0] == '\x01')
+                               continue;
+
+                       if (!prev) {
+                               kvlist_set(&options, mod, s);
+                               continue;
+                       }
+
+                       if (asprintf(&val, "%s %s", prev, s) < 0)
+                               continue;
+
+                       kvlist_set(&options, mod, val);
+                       free(val);
+                       continue;
+               }
+       }
+
+       fclose(f);
+}
+
+int main(int argc, char **argv)
+{
+       char *exec = basename(*argv);
+
+       avl_init(&modules, avl_modcmp, true, NULL);
+       if (!strcmp(exec, "insmod"))
+               return main_insmod(argc, argv);
+
+       if (!strcmp(exec, "rmmod"))
+               return main_rmmod(argc, argv);
+
+       if (!strcmp(exec, "lsmod"))
+               return main_lsmod(argc, argv);
+
+       if (!strcmp(exec, "modinfo"))
+               return main_modinfo(argc, argv);
+
+       load_options();
+
+       if (!strcmp(exec, "modprobe"))
+               return main_modprobe(argc, argv);
+
+       ulog_open(ULOG_KMSG, LOG_USER, "kmodloader");
+       return main_loader(argc, argv);
 }