X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=kmodloader.c;h=ed8f833fc3932caa7bfcc54228e21bd460a1a728;hp=9fe7d7f56cbd1c6677b2fe86744165ef5e87301e;hb=21a4bd04062e16164f4f3e1c67005a062f470b0c;hpb=eacc426152ded54312fd1440bf6558ff2b69851f diff --git a/kmodloader.c b/kmodloader.c index 9fe7d7f..ed8f833 100644 --- a/kmodloader.c +++ b/kmodloader.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -46,8 +45,6 @@ enum { }; struct module { - struct avl_node avl; - char *name; char *depends; char *opts; @@ -56,12 +53,21 @@ struct module { 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 char **module_folders = NULL; +static void free_module(struct module *m); + static int init_module_folders(void) { int n = 0; @@ -107,16 +113,26 @@ static int init_module_folders(void) static struct module *find_module(const char *name) { - struct module *m; - return avl_find_element(&modules, name, m, avl); + 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 *m, *tmp; + struct module_node *mn, *tmp; - avl_remove_all_elements(&modules, m, avl, tmp) - free(m); + 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) @@ -209,11 +225,30 @@ static int elf_find_section(char *map, const char *section, unsigned int *offset 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; + avl_insert(&modules, &mn->avl); + m->refcnt += 1; + } + return mn; +} + static struct module * -alloc_module(const char *name, const char *depends, int size) +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, @@ -221,7 +256,7 @@ alloc_module(const char *name, const char *depends, int size) if (!m) return NULL; - m->avl.key = m->name = strcpy(_name, name); + m->name = strcpy(_name, name); m->opts = 0; if (depends) { @@ -232,13 +267,23 @@ alloc_module(const char *name, const char *depends, int size) _dep++; } } - m->size = size; - avl_insert(&modules, &m->avl); + + m->refcnt = 0; + alloc_module_node(m->name, m, false); + for (i = 0; i < naliases; i++) + 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; @@ -263,7 +308,11 @@ static int scan_loaded_modules(void) if (!m.name || !m.depends) continue; - n = alloc_module(m.name, m.depends, m.size); + n = find_module(m.name); + if (!n) { + /* possibly a module outside /lib/modules// */ + n = alloc_module(m.name, NULL, 0, m.depends, m.size); + } n->usage = m.usage; n->state = LOADED; } @@ -278,6 +327,8 @@ static struct module* get_module_info(const char *module, const char *name) int fd = open(module, O_RDONLY); unsigned int offset, size; char *map = MAP_FAILED, *strings, *dep = NULL; + const char *aliases[32]; + int naliases = 0; struct module *m = NULL; struct stat s; @@ -303,12 +354,14 @@ static struct module* get_module_info(const char *module, const char *name) } strings = map + offset; - while (strings && (strings < map + offset + size)) { + while (true) { char *sep; int len; while (!strings[0]) strings++; + if (strings >= map + offset + size) + break; sep = strstr(strings, "="); if (!sep) break; @@ -316,10 +369,17 @@ static struct module* get_module_info(const char *module, const char *name) sep++; if (!strncmp(strings, "depends=", len + 1)) dep = sep; + else if (!strncmp(strings, "alias=", len + 1)) { + if (naliases < ARRAY_SIZE(aliases)) + aliases[naliases++] = sep; + else + ULOG_WARN("module %s has more than %d aliases: truncated", + name, ARRAY_SIZE(aliases)); + } strings = &sep[strlen(sep)]; } - m = alloc_module(name, dep, s.st_size); + m = alloc_module(name, aliases, naliases, dep, s.st_size); if (m) m->state = SCANNED; @@ -411,12 +471,14 @@ static int print_modinfo(char *module) strings = map + offset; printf("module:\t\t%s\n", module); - while (strings && (strings < map + offset + size)) { + while (true) { char *dup = NULL; char *sep; while (!strings[0]) strings++; + if (strings >= map + offset + size) + break; sep = strstr(strings, "="); if (!sep) break; @@ -488,8 +550,11 @@ static int insert_module(char *path, const char *options) } data = malloc(s.st_size); - if (read(fd, data, s.st_size) == s.st_size) + if (read(fd, data, s.st_size) == s.st_size) { 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); @@ -527,16 +592,24 @@ static int iterations = 0; static int load_modprobe(void) { int loaded, todo; + struct module_node *mn; struct module *m; - avl_for_each_element(&modules, m, avl) + 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; todo = 0; - avl_for_each_element(&modules, m, avl) { + avl_for_each_element(&modules, mn, avl) { + if (mn->is_alias) + continue; + m = mn->m; if ((m->state == PROBE) && (!deps_available(m, 0))) { if (!insert_module(get_module_path(m->name), (m->opts) ? (m->opts) : (""))) { m->state = LOADED; @@ -563,6 +636,13 @@ static int print_insmod_usage(void) return -1; } +static int print_modprobe_usage(void) +{ + ULOG_INFO("Usage:\n\tmodprobe [-q] filename\n"); + + return -1; +} + static int print_usage(char *arg) { ULOG_INFO("Usage:\n\t%s module\n", arg); @@ -660,13 +740,17 @@ static int main_rmmod(int argc, char **argv) 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, m, avl) + 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); @@ -681,6 +765,7 @@ static int main_lsmod(int argc, char **argv) } printf("\n"); } + } free_modules(); @@ -718,25 +803,45 @@ static int main_modinfo(int argc, char **argv) static int main_modprobe(int argc, char **argv) { + struct module_node *mn; struct module *m; char *name; + char *mod = NULL; + int opt; + bool quiet = false; + + while ((opt = getopt(argc, argv, "q")) != -1 ) { + switch (opt) { + case 'q': /* shhhh! */ + quiet = true; + break; + default: /* '?' */ + return print_modprobe_usage(); + break; + } + } - if (argc != 2) - return print_usage("modprobe"); + if (optind >= argc) + return print_modprobe_usage(); /* expected module after options */ - if (scan_loaded_modules()) - return -1; + mod = argv[optind]; if (scan_module_folders()) return -1; - name = get_module_name(argv[1]); + if (scan_loaded_modules()) + return -1; + + name = get_module_name(mod); m = find_module(name); if (m && m->state == LOADED) { - ULOG_ERR("%s is already loaded\n", name); - return -1; + if (!quiet) + ULOG_ERR("%s is already loaded\n", name); + return 0; } else if (!m) { - ULOG_ERR("failed to find a module named %s\n", name); + if (!quiet) + ULOG_ERR("failed to find a module named %s\n", name); + return -1; } else { int fail; @@ -748,9 +853,13 @@ static int main_modprobe(int argc, char **argv) ULOG_ERR("%d module%s could not be probed\n", fail, (fail == 1) ? ("") : ("s")); - avl_for_each_element(&modules, m, avl) + 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); + } } } @@ -763,6 +872,7 @@ static int main_loader(int argc, char **argv) { int gl_flags = GLOB_NOESCAPE | GLOB_MARK; char *dir = "/etc/modules.d/"; + struct module_node *mn; struct module *m; glob_t gl; char *path; @@ -775,17 +885,17 @@ static int main_loader(int argc, char **argv) strcpy(path, dir); strcat(path, "*"); - if (scan_loaded_modules()) { + if (scan_module_folders()) { free (path); return -1; } - if (scan_module_folders()) { + if (scan_loaded_modules()) { free (path); return -1; } - syslog(LOG_INFO, "kmodloader: loading kernel modules from %s\n", path); + ULOG_INFO("loading kernel modules from %s\n", path); if (glob(path, gl_flags, NULL, &gl) < 0) goto out; @@ -833,9 +943,15 @@ static int main_loader(int argc, char **argv) ULOG_ERR("%d module%s could not be probed\n", fail, (fail == 1) ? ("") : ("s")); - avl_for_each_element(&modules, m, avl) + 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: @@ -845,20 +961,23 @@ out: return 0; } +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 && ((*s1 == *s2) || - ((*s1 == '_') && (*s2 == '-')) || - ((*s1 == '-') && (*s2 == '_')))) + while (*s1 && (weight(*s1) == weight(*s2))) { s1++; s2++; } - return *(const unsigned char *)s1 - *(const unsigned char *)s2; + return (unsigned char)weight(*s1) - (unsigned char)weight(*s2); } int main(int argc, char **argv) @@ -881,5 +1000,6 @@ int main(int argc, char **argv) if (!strcmp(exec, "modprobe")) return main_modprobe(argc, argv); + ulog_open(ULOG_KMSG, LOG_USER, "kmodloader"); return main_loader(argc, argv); }