X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=kmodloader.c;h=633570fd5b84bfe2b8cc1fb0b87fcc21ebc24c4d;hp=d72a1f452287e09a886792548eba24727e4e6778;hb=e616114c0d3886f83706a1b505e1f5e6c0d838b8;hpb=d6e6825c4697513d201fc3b146fb167c61404a04 diff --git a/kmodloader.c b/kmodloader.c index d72a1f4..633570f 100644 --- a/kmodloader.c +++ b/kmodloader.c @@ -28,61 +28,56 @@ #include #include #include +#include #include #include -#include +#include +#include +#include #define DEF_MOD_PATH "/lib/modules/%s/" +#define LOG(fmt, ...) do { \ + syslog(LOG_INFO, fmt, ## __VA_ARGS__); \ + printf("kmod: "fmt, ## __VA_ARGS__); \ + } while (0) + + enum { SCANNED, PROBE, LOADED, - FAILED, }; struct module { - struct list_head list; + struct avl_node avl; char *name; char *depends; + char *opts; int size; int usage; int state; + int error; }; -static LIST_HEAD(modules); +static struct avl_tree modules; +static char *prefix = ""; -static struct module* find_module(char *name) +static struct module *find_module(const char *name) { - struct module *m = NULL; - - list_for_each_entry(m, &modules, list) - if (!strcmp(m->name, name)) - return m; - return NULL; -} - -static void free_module(struct module *m) -{ - if (m->name) - free(m->name); - if (m->depends) - free(m->depends); - free(m); + struct module *m; + return avl_find_element(&modules, name, m, avl); } static void free_modules(void) { - struct list_head *p, *n; + struct module *m, *tmp; - list_for_each_safe(p, n, &modules) { - struct module *m = container_of(p, struct module, list); - list_del(p); - free_module(m); - } + avl_remove_all_elements(&modules, m, avl, tmp) + free(m); } static char* get_module_path(char *name) @@ -90,25 +85,12 @@ static char* get_module_path(char *name) static char path[256]; struct utsname ver; struct stat s; - char *t; if (!stat(name, &s)) return name; uname(&ver); - snprintf(path, 256, DEF_MOD_PATH "%s.ko", ver.release, name); - - if (!stat(path, &s)) - return path; - - t = name; - while (t && *t) { - if (*t == '_') - *t = '-'; - t++; - } - - snprintf(path, 256, DEF_MOD_PATH "%s.ko", ver.release, name); + snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name); if (!stat(path, &s)) return path; @@ -126,18 +108,11 @@ static char* get_module_name(char *path) t = strstr(name, ".ko"); if (t) *t = '\0'; - t = name; - while (t && *t) { - if (*t == '-') - *t = '_'; - t++; - } return name; } -#if __WORDSIZE == 64 -static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size) +static int elf64_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size) { const char *secnames; Elf64_Ehdr *e; @@ -158,8 +133,8 @@ static int elf_find_section(char *map, const char *section, unsigned int *offset return -1; } -#else -static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size) + +static int elf32_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size) { const char *secnames; Elf32_Ehdr *e; @@ -180,19 +155,64 @@ static int elf_find_section(char *map, const char *section, unsigned int *offset return -1; } -#endif + +static int elf_find_section(char *map, const char *section, unsigned int *offset, unsigned int *size) +{ + int clazz = map[EI_CLASS]; + + if (clazz == ELFCLASS32) + return elf32_find_section(map, section, offset, size); + else if (clazz == ELFCLASS64) + return elf64_find_section(map, section, offset, size); + + LOG("unknown elf format %d\n", clazz); + + return -1; +} + +static struct module * +alloc_module(const char *name, const char *depends, int size) +{ + struct module *m; + char *_name, *_dep; + + m = calloc_a(sizeof(*m), + &_name, strlen(name) + 1, + &_dep, depends ? strlen(depends) + 2 : 0); + if (!m) + return NULL; + + m->avl.key = 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; + avl_insert(&modules, &m->avl); + + return m; +} static int scan_loaded_modules(void) { - FILE *fp = fopen("/proc/modules", "r"); - char buf[256]; + size_t buf_len = 0; + char *buf = NULL; + FILE *fp; + fp = fopen("/proc/modules", "r"); if (!fp) { - fprintf(stderr, "failed to open /proc/modules\n"); + LOG("failed to open /proc/modules\n"); return -1; } - while (fgets(buf, sizeof(buf), fp)) { + while (getline(&buf, &buf_len, fp) > 0) { struct module m; struct module *n; @@ -204,58 +224,46 @@ static int scan_loaded_modules(void) if (!m.name || !m.depends) continue; - n = malloc(sizeof(struct module)); - if (!n) - continue; - - n->name = strdup(m.name); - n->depends = strdup(m.depends); - n->size = m.size; + n = alloc_module(m.name, m.depends, m.size); n->usage = m.usage; n->state = LOADED; - - list_add_tail(&n->list, &modules); } + free(buf); + fclose(fp); return 0; } -static struct module* get_module_info(char *module) +static struct module* get_module_info(const char *module, const char *name) { int fd = open(module, O_RDONLY); unsigned int offset, size; - char *map, *strings; + char *map, *strings, *dep = NULL; struct module *m; struct stat s; if (!fd) { - fprintf(stderr, "failed to open %s\n", module); + LOG("failed to open %s\n", module); return NULL; } if (fstat(fd, &s) == -1) { - fprintf(stderr, "failed to stat %s\n", module); + LOG("failed to stat %s\n", module); return NULL; } map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0); if (map == MAP_FAILED) { - fprintf(stderr, "failed to mmap %s\n", module); + LOG("failed to mmap %s\n", module); return NULL; } if (elf_find_section(map, ".modinfo", &offset, &size)) { - fprintf(stderr, "failed to load the .modinfo section from %s\n", module); + LOG("failed to load the .modinfo section from %s\n", module); return NULL; } strings = map + offset; - m = malloc(sizeof(struct module)); - if (!m) - return NULL; - - memset(m, 0, sizeof(struct module)); - m->size = s.st_size; while (strings && (strings < map + offset + size)) { char *sep; int len; @@ -268,22 +276,32 @@ static struct module* get_module_info(char *module) len = sep - strings; sep++; if (!strncmp(strings, "depends=", len + 1)) - m->depends = strdup(sep); + dep = sep; strings = &sep[strlen(sep)]; } + m = alloc_module(name, dep, s.st_size); + if (!m) + return NULL; + m->state = SCANNED; return m; } -static int scan_module_folder(char *dir) +static int scan_module_folder(void) { int gl_flags = GLOB_NOESCAPE | GLOB_MARK; - int j; + struct utsname ver; + char *path; glob_t gl; + int j; - if (glob(dir, gl_flags, NULL, &gl) < 0) + uname(&ver); + path = alloca(sizeof(DEF_MOD_PATH "*.ko") + strlen(prefix) + strlen(ver.release) + 1); + sprintf(path, "%s" DEF_MOD_PATH "*.ko", prefix, ver.release); + + if (glob(path, gl_flags, NULL, &gl) < 0) return -1; for (j = 0; j < gl.gl_pathc; j++) { @@ -294,11 +312,8 @@ static int scan_module_folder(char *dir) continue; m = find_module(name); - if (!m) { - m = get_module_info(gl.gl_pathv[j]); - m->name = strdup(name); - list_add_tail(&m->list, &modules); - } + if (!m) + get_module_info(gl.gl_pathv[j], name); } globfree(&gl); @@ -314,23 +329,23 @@ static int print_modinfo(char *module) char *map, *strings; if (!fd) { - fprintf(stderr, "failed to open %s\n", module); + LOG("failed to open %s\n", module); return -1; } if (fstat(fd, &s) == -1) { - fprintf(stderr, "failed to stat %s\n", module); + LOG("failed to stat %s\n", module); return -1; } map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0); if (map == MAP_FAILED) { - fprintf(stderr, "failed to mmap %s\n", module); + LOG("failed to mmap %s\n", module); return -1; } if (elf_find_section(map, ".modinfo", &offset, &size)) { - fprintf(stderr, "failed to load the .modinfo section from %s\n", module); + LOG("failed to load the .modinfo section from %s\n", module); return -1; } @@ -361,6 +376,31 @@ static int print_modinfo(char *module) return 0; } +static int deps_available(struct module *m, int verbose) +{ + char *dep; + int err = 0; + + if (!strcmp(m->depends, "-") || !strcmp(m->depends, "")) + return 0; + + dep = m->depends; + + while (*dep) { + m = find_module(dep); + + if (verbose && !m) + LOG("missing dependency %s\n", dep); + if (verbose && m && (m->state != LOADED)) + LOG("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; @@ -368,24 +408,21 @@ static int insert_module(char *path, const char *options) int fd, ret = -1; if (stat(path, &s)) { - fprintf(stderr, "missing module %s\n", path); + LOG("missing module %s\n", path); return ret; } fd = open(path, O_RDONLY); if (!fd) { - fprintf(stderr, "cannot open %s\n", path); + LOG("cannot open %s\n", path); return ret; } data = malloc(s.st_size); - 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 to insert %s\n", path); - } else { - fprintf(stderr, "failed to read full module %s\n", path); - } + if (read(fd, data, s.st_size) == s.st_size) + ret = syscall(__NR_init_module, data, (unsigned long) s.st_size, options); + else + LOG("failed to read full module %s\n", path); close(fd); free(data); @@ -393,81 +430,88 @@ static int insert_module(char *path, const char *options) return ret; } -static int deps_available(struct module *m) +static void load_moddeps(struct module *_m) { - char *deps = m->depends; - char *comma; + char *dep; + struct module *m; - if (!strcmp(deps, "-")) - return 0; - while (*deps && (NULL != ((comma = strstr(deps, ","))))) { - *comma = '\0'; + if (!strcmp(_m->depends, "-") || !strcmp(_m->depends, "")) + return; - m = find_module(deps); + dep = _m->depends; - if (!m || (m->state != LOADED)) - return -1; + while (*dep) { + m = find_module(dep); - deps = ++comma; - } + if (!m) + LOG("failed to find dependency %s\n", dep); + if (m && (m->state != LOADED)) { + m->state = PROBE; + load_moddeps(m); + } - return 0; + dep = dep + strlen(dep) + 1; + } } -static int load_depmod(void) +static int iterations = 0; +static int load_modprobe(void) { int loaded, todo; struct module *m; + avl_for_each_element(&modules, m, avl) + if (m->state == PROBE) + load_moddeps(m); + do { loaded = 0; todo = 0; - list_for_each_entry(m, &modules, list) { - if ((m->state == PROBE) && (!deps_available(m))) { - if (!insert_module(get_module_path(m->name), "")) { + avl_for_each_element(&modules, m, avl) { + if ((m->state == PROBE) && (!deps_available(m, 0))) { + if (!insert_module(get_module_path(m->name), (m->opts) ? (m->opts) : (""))) { m->state = LOADED; + m->error = 0; loaded++; continue; } - m->state = FAILED; - } else if (m->state == PROBE) { - todo++; + m->error = 1; } + + if ((m->state == PROBE) || m->error) + todo++; } -// printf("loaded %d modules this pass\n", loaded); + iterations++; } while (loaded); -// printf("missing todos %d\n", todo); - - return -todo; + return todo; } static int print_insmod_usage(void) { - fprintf(stderr, "Usage:\n\tinsmod filename [args]\n"); + LOG("Usage:\n\tinsmod filename [args]\n"); return -1; } static int print_usage(char *arg) { - fprintf(stderr, "Usage:\n\t%s module\n", arg); + LOG("Usage:\n\t%s module\n", arg); return -1; } static int main_insmod(int argc, char **argv) { - char options[256] = ""; - char *name; - int i; + char *name, *cur, *options; + int i, ret, len; if (argc < 2) return print_insmod_usage(); name = get_module_name(argv[1]); if (!name) { - fprintf(stderr, "cannot find module - %s\n", argv[1]); + LOG("cannot find module - %s\n", argv[1]); return -1; } @@ -475,20 +519,41 @@ static int main_insmod(int argc, char **argv) return -1; if (find_module(name)) { - fprintf(stderr, "module is already loaded - %s\n", name); + LOG("module is already loaded - %s\n", name); return -1; } free_modules(); - for (i = 2; i < argc; i++) - if (snprintf(options, sizeof(options), "%s %s", options, argv[i]) >= sizeof(options)) { - fprintf(stderr, "argument line too long - %s\n", options); - return -1; + for (len = 0, i = 2; i < argc; i++) + len += strlen(argv[i]) + 1; + + options = malloc(len); + options[0] = 0; + cur = options; + for (i = 2; i < argc; i++) { + if (options[0]) { + *cur = ' '; + cur++; } + cur += sprintf(cur, "%s", argv[i]); + } + + if (get_module_path(argv[1])) { + name = argv[1]; + } else if (!get_module_path(name)) { + fprintf(stderr, "Failed to find %s. Maybe it is a built in module ?\n", name); + return -1; + } + + ret = insert_module(get_module_path(name), options); + free(options); + + if (ret) + LOG("failed to insert %s\n", get_module_path(name)); - return insert_module(get_module_path(name), options); + return ret; } static int main_rmmod(int argc, char **argv) @@ -506,15 +571,15 @@ static int main_rmmod(int argc, char **argv) name = get_module_name(argv[1]); m = find_module(name); if (!m) { - fprintf(stderr, "module is not loaded\n"); + LOG("module is not loaded\n"); return -1; } - free_modules(); - - ret = syscall(__NR_delete_module, name, 0); + ret = syscall(__NR_delete_module, m->name, 0); if (ret) - fprintf(stderr, "unloading the module failed\n"); + LOG("unloading the module failed\n"); + + free_modules(); return ret; } @@ -526,7 +591,7 @@ static int main_lsmod(int argc, char **argv) if (scan_loaded_modules()) return -1; - list_for_each_entry(m, &modules, list) + avl_for_each_element(&modules, m, avl) if (m->state == LOADED) printf("%-20s%8d%3d %s\n", m->name, m->size, m->usage, @@ -539,50 +604,69 @@ static int main_lsmod(int argc, char **argv) static int main_modinfo(int argc, char **argv) { - char *module; + struct module *m; + char *name; if (argc != 2) return print_usage("modinfo"); - module = get_module_path(argv[1]); - if (!module) { - fprintf(stderr, "cannot find module - %s\n", argv[1]); + if (scan_module_folder()) + return -1; + + name = get_module_name(argv[1]); + m = find_module(name); + if (!m) { + LOG("cannot find module - %s\n", argv[1]); return -1; } - print_modinfo(module); + name = get_module_path(m->name); + if (!name) { + LOG("cannot find path of module - %s\n", m->name); + return -1; + } + + print_modinfo(name); return 0; } -static int main_depmod(int argc, char **argv) +static int main_modprobe(int argc, char **argv) { - struct utsname ver; struct module *m; - char path[128]; char *name; if (argc != 2) - return print_usage("depmod"); + return print_usage("modprobe"); if (scan_loaded_modules()) return -1; - uname(&ver); - snprintf(path, sizeof(path), DEF_MOD_PATH "*.ko", ver.release); - - scan_module_folder(path); + if (scan_module_folder()) + return -1; name = get_module_name(argv[1]); m = find_module(name); if (m && m->state == LOADED) { - fprintf(stderr, "%s is already loaded\n", name); + LOG("%s is already loaded\n", name); return -1; } else if (!m) { - fprintf(stderr, "failed to find a module named %s\n", name); + LOG("failed to find a module named %s\n", name); } else { + int fail; + m->state = PROBE; - load_depmod(); + + fail = load_modprobe(); + + if (fail) { + LOG("%d module%s could not be probed\n", + fail, (fail == 1) ? ("") : ("s")); + + avl_for_each_element(&modules, m, avl) + if ((m->state == PROBE) || m->error) + LOG("- %s\n", m->name); + } } free_modules(); @@ -594,57 +678,109 @@ static int main_loader(int argc, char **argv) { int gl_flags = GLOB_NOESCAPE | GLOB_MARK; char *dir = "/etc/modules.d/*"; + struct module *m; glob_t gl; char *path; + int fail, j; if (argc > 1) dir = argv[1]; + if (argc > 2) + prefix = argv[2]; + path = malloc(strlen(dir) + 2); strcpy(path, dir); strcat(path, "*"); + if (scan_loaded_modules()) + return -1; + + if (scan_module_folder()) + return -1; + syslog(0, "kmodloader: loading kernel modules from %s\n", path); - if (glob(path, gl_flags, NULL, &gl) >= 0) { - int j; + 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"); + 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) { - fprintf(stderr, "failed to open %s\n", gl.gl_pathv[j]); - } else { - char mod[256]; + if (!fp) { + LOG("failed to open %s\n", gl.gl_pathv[j]); + continue; + } - while (fgets(mod, sizeof(mod), fp)) { - char *nl = strchr(mod, '\n'); - char *opts; + while (getline(&mod, &mod_len, fp) > 0) { + char *nl = strchr(mod, '\n'); + struct module *m; + char *opts; - if (nl) - *nl = '\0'; + if (nl) + *nl = '\0'; - opts = strchr(mod, ' '); - if (opts) - *opts++ = '\0'; + opts = strchr(mod, ' '); + if (opts) + *opts++ = '\0'; + + m = find_module(get_module_name(mod)); + if (!m || (m->state == LOADED)) + continue; + + if (opts) + m->opts = strdup(opts); + m->state = PROBE; + if (basename(gl.gl_pathv[j])[0] - '0' <= 9) + load_modprobe(); - insert_module(get_module_path(mod), (opts) ? (opts) : ("")); - } - fclose(fp); - } } + free(mod); + fclose(fp); } + fail = load_modprobe(); + LOG("ran %d iterations\n", iterations); + + if (fail) { + LOG("%d module%s could not be probed\n", + fail, (fail == 1) ? ("") : ("s")); + + avl_for_each_element(&modules, m, avl) + if ((m->state == PROBE) || (m->error)) + LOG("- %s - %d\n", m->name, deps_available(m, 1)); + } + +out: globfree(&gl); free(path); return 0; } +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 == '_')))) + { + s1++; + s2++; + } + + return *(const unsigned char *)s1 - *(const unsigned char *)s2; +} + int main(int argc, char **argv) { char *exec = basename(*argv); + avl_init(&modules, avl_modcmp, false, NULL); if (!strcmp(exec, "insmod")) return main_insmod(argc, argv); @@ -657,8 +793,8 @@ int main(int argc, char **argv) if (!strcmp(exec, "modinfo")) return main_modinfo(argc, argv); - if (!strcmp(exec, "depmod")) - return main_depmod(argc, argv); + if (!strcmp(exec, "modprobe")) + return main_modprobe(argc, argv); return main_loader(argc, argv); }