X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=kmodloader.c;h=065ac82cccbc4a96fa5a744a42ff95de8c9c0d78;hp=f45f3dc0883827c705b2271b2d8639aee1fbb830;hb=a62c946ecdced9468ad16738325ee322029b0476;hpb=bf2483023b3f99c0a74f96fb3cdab5a0c0ef3081 diff --git a/kmodloader.c b/kmodloader.c index f45f3dc..065ac82 100644 --- a/kmodloader.c +++ b/kmodloader.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -35,14 +34,9 @@ #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) - +#define DEF_MOD_PATH "/modules/%s/" enum { SCANNED, @@ -55,6 +49,7 @@ struct module { char *name; char *depends; + char *opts; int size; int usage; @@ -63,7 +58,51 @@ struct module { }; static struct avl_tree modules; -static char *prefix = ""; + +static char **module_folders = NULL; + +static int init_module_folders(void) +{ + int n = 0; + struct stat st; + struct utsname ver; + char *s, *e, *p, path[256], 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) + return -1; + + module_folders[n++] = strdup(path); + } + + s = p + 1; + } + + if (!module_folders) + return -1; + + module_folders[n] = NULL; + return 0; +} static struct module *find_module(const char *name) { @@ -79,45 +118,20 @@ static void free_modules(void) free(m); } -static void replace_dash(char *s) -{ - while (s && *s) { - if (*s == '-') - *s = '_'; - s++; - } -} - -static void replace_underscore(char *s) -{ - while (s && *s) { - if (*s == '_') - *s = '-'; - s++; - } -} - static char* get_module_path(char *name) { + char **p; static char path[256]; - struct utsname ver; struct stat s; - if (!stat(name, &s)) + if (!stat(name, &s) && S_ISREG(s.st_mode)) return name; - uname(&ver); - snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name); - replace_dash(path); - - if (!stat(path, &s)) - return path; - - snprintf(path, 256, "%s" DEF_MOD_PATH "%s.ko", prefix, ver.release, name); - replace_underscore(path); - - if (!stat(path, &s)) - return path; + 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; } @@ -132,13 +146,11 @@ static char* get_module_name(char *path) t = strstr(name, ".ko"); if (t) *t = '\0'; - replace_dash(name); 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; @@ -159,8 +171,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; @@ -181,7 +193,20 @@ 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); + + ULOG_ERR("unknown elf format %d\n", clazz); + + return -1; +} static struct module * alloc_module(const char *name, const char *depends, int size) @@ -196,11 +221,10 @@ alloc_module(const char *name, const char *depends, int size) return NULL; m->avl.key = m->name = strcpy(_name, name); - replace_dash(_name); + m->opts = 0; if (depends) { m->depends = strcpy(_dep, depends); - replace_dash(_dep); while (*_dep) { if (*_dep == ',') *_dep = '\0'; @@ -222,7 +246,7 @@ static int scan_loaded_modules(void) fp = fopen("/proc/modules", "r"); if (!fp) { - LOG("failed to open /proc/modules\n"); + ULOG_ERR("failed to open /proc/modules\n"); return -1; } @@ -252,29 +276,29 @@ 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, *dep = NULL; - struct module *m; + char *map = MAP_FAILED, *strings, *dep = NULL; + struct module *m = NULL; struct stat s; - if (!fd) { - LOG("failed to open %s\n", module); - return NULL; + if (fd < 0) { + ULOG_ERR("failed to open %s\n", module); + goto out; } if (fstat(fd, &s) == -1) { - LOG("failed to stat %s\n", module); - return NULL; + ULOG_ERR("failed to stat %s\n", module); + goto out; } map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0); if (map == MAP_FAILED) { - LOG("failed to mmap %s\n", module); - return NULL; + ULOG_ERR("failed to mmap %s\n", module); + goto out; } if (elf_find_section(map, ".modinfo", &offset, &size)) { - LOG("failed to load the .modinfo section from %s\n", module); - return NULL; + ULOG_ERR("failed to load the .modinfo section from %s\n", module); + goto out; } strings = map + offset; @@ -295,15 +319,21 @@ static struct module* get_module_info(const char *module, const char *name) } m = alloc_module(name, dep, s.st_size); - if (!m) - return NULL; - m->state = SCANNED; + if (m) + m->state = SCANNED; + +out: + if (map != MAP_FAILED) + munmap(map, s.st_size); + + if (fd >= 0) + close(fd); return m; } -static int scan_module_folder(void) +static int scan_module_folder(const char *dir) { int gl_flags = GLOB_NOESCAPE | GLOB_MARK; struct utsname ver; @@ -312,8 +342,8 @@ static int scan_module_folder(void) int j; uname(&ver); - path = alloca(sizeof(DEF_MOD_PATH "*.ko") + strlen(ver.release) + 1); - sprintf(path, DEF_MOD_PATH "*.ko", ver.release); + path = alloca(strlen(dir) + sizeof("*.ko") + 1); + sprintf(path, "%s*.ko", dir); if (glob(path, gl_flags, NULL, &gl) < 0) return -1; @@ -335,32 +365,47 @@ static int scan_module_folder(void) return 0; } +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(char *module) { int fd = open(module, O_RDONLY); unsigned int offset, size; struct stat s; - char *map, *strings; + char *map = MAP_FAILED, *strings; + int rv = -1; - if (!fd) { - LOG("failed to open %s\n", module); - return -1; + if (fd < 0) { + ULOG_ERR("failed to open %s\n", module); + goto out; } if (fstat(fd, &s) == -1) { - LOG("failed to stat %s\n", module); - return -1; + ULOG_ERR("failed to stat %s\n", module); + goto out; } map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0); if (map == MAP_FAILED) { - LOG("failed to mmap %s\n", module); - return -1; + ULOG_ERR("failed to mmap %s\n", module); + goto out; } if (elf_find_section(map, ".modinfo", &offset, &size)) { - LOG("failed to load the .modinfo section from %s\n", module); - return -1; + ULOG_ERR("failed to load the .modinfo section from %s\n", module); + goto out; } strings = map + offset; @@ -387,7 +432,16 @@ static int print_modinfo(char *module) free(dup); } - return 0; + rv = 0; + +out: + if (map != MAP_FAILED) + munmap(map, s.st_size); + + if (fd >= 0) + close(fd); + + return rv; } static int deps_available(struct module *m, int verbose) @@ -395,7 +449,7 @@ static int deps_available(struct module *m, int verbose) char *dep; int err = 0; - if (!strcmp(m->depends, "_") || !strcmp(m->depends, "")) + if (!m->depends || !strcmp(m->depends, "-") || !strcmp(m->depends, "")) return 0; dep = m->depends; @@ -404,9 +458,9 @@ static int deps_available(struct module *m, int verbose) m = find_module(dep); if (verbose && !m) - LOG("missing dependency %s\n", dep); + ULOG_ERR("missing dependency %s\n", dep); if (verbose && m && (m->state != LOADED)) - LOG("dependency not loaded %s\n", dep); + ULOG_ERR("dependency not loaded %s\n", dep); if (!m || (m->state != LOADED)) err++; dep += strlen(dep) + 1; @@ -422,21 +476,21 @@ static int insert_module(char *path, const char *options) int fd, ret = -1; if (stat(path, &s)) { - LOG("missing module %s\n", path); + ULOG_ERR("missing module %s\n", path); return ret; } fd = open(path, O_RDONLY); - if (!fd) { - LOG("cannot open %s\n", path); + if (fd < 0) { + ULOG_ERR("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); + ret = syscall(__NR_init_module, data, (unsigned long) s.st_size, options); else - LOG("failed to read full module %s\n", path); + ULOG_ERR("failed to read full module %s\n", path); close(fd); free(data); @@ -449,7 +503,7 @@ static void load_moddeps(struct module *_m) char *dep; struct module *m; - if (!strcmp(_m->depends, "_") || !strcmp(_m->depends, "")) + if (!strcmp(_m->depends, "-") || !strcmp(_m->depends, "")) return; dep = _m->depends; @@ -458,7 +512,7 @@ static void load_moddeps(struct module *_m) m = find_module(dep); if (!m) - LOG("failed to find dependency %s\n", dep); + ULOG_ERR("failed to find dependency %s\n", dep); if (m && (m->state != LOADED)) { m->state = PROBE; load_moddeps(m); @@ -483,7 +537,7 @@ static int load_modprobe(void) todo = 0; avl_for_each_element(&modules, m, avl) { if ((m->state == PROBE) && (!deps_available(m, 0))) { - if (!insert_module(get_module_path(m->name), "")) { + if (!insert_module(get_module_path(m->name), (m->opts) ? (m->opts) : (""))) { m->state = LOADED; m->error = 0; loaded++; @@ -503,14 +557,14 @@ static int load_modprobe(void) static int print_insmod_usage(void) { - LOG("Usage:\n\tinsmod filename [args]\n"); + ULOG_INFO("Usage:\n\tinsmod filename [args]\n"); return -1; } static int print_usage(char *arg) { - LOG("Usage:\n\t%s module\n", arg); + ULOG_INFO("Usage:\n\t%s module\n", arg); return -1; } @@ -525,7 +579,7 @@ static int main_insmod(int argc, char **argv) name = get_module_name(argv[1]); if (!name) { - LOG("cannot find module - %s\n", argv[1]); + ULOG_ERR("cannot find module - %s\n", argv[1]); return -1; } @@ -533,7 +587,7 @@ static int main_insmod(int argc, char **argv) return -1; if (find_module(name)) { - LOG("module is already loaded - %s\n", name); + ULOG_ERR("module is already loaded - %s\n", name); return -1; } @@ -554,11 +608,23 @@ static int main_insmod(int argc, char **argv) cur += sprintf(cur, "%s", argv[i]); } + if (init_module_folders()) { + fprintf(stderr, "Failed to find the folder holding the modules\n"); + return -1; + } + + 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)); + ULOG_ERR("failed to insert %s\n", get_module_path(name)); return ret; } @@ -578,15 +644,15 @@ static int main_rmmod(int argc, char **argv) name = get_module_name(argv[1]); m = find_module(name); if (!m) { - LOG("module is not loaded\n"); + ULOG_ERR("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) - LOG("unloading the module failed\n"); + ULOG_ERR("unloading the module failed\n"); + + free_modules(); return ret; } @@ -594,15 +660,26 @@ static int main_rmmod(int argc, char **argv) static int main_lsmod(int argc, char **argv) { struct module *m; + char *dep; if (scan_loaded_modules()) return -1; avl_for_each_element(&modules, m, avl) - if (m->state == LOADED) - printf("%-20s%8d%3d %s\n", - m->name, m->size, m->usage, - (*m->depends == '-') ? ("") : (m->depends)); + 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(); @@ -611,18 +688,29 @@ 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) { - LOG("cannot find module - %s\n", argv[1]); + if (scan_module_folders()) + return -1; + + name = get_module_name(argv[1]); + m = find_module(name); + if (!m) { + ULOG_ERR("cannot find module - %s\n", argv[1]); + return -1; + } + + name = get_module_path(m->name); + if (!name) { + ULOG_ERR("cannot find path of module - %s\n", m->name); return -1; } - print_modinfo(module); + print_modinfo(name); return 0; } @@ -631,23 +719,30 @@ static int main_modprobe(int argc, char **argv) { struct module *m; char *name; + char *mod = NULL; + int i; - if (argc != 2) + for (i = 1; i < argc; i++) + if (argv[i][0] != '-') { + mod = argv[i]; + break; + } + if (!mod) return print_usage("modprobe"); if (scan_loaded_modules()) return -1; - if (scan_module_folder()) + if (scan_module_folders()) return -1; - name = get_module_name(argv[1]); + name = get_module_name(mod); m = find_module(name); if (m && m->state == LOADED) { - LOG("%s is already loaded\n", name); + ULOG_ERR("%s is already loaded\n", name); return -1; } else if (!m) { - LOG("failed to find a module named %s\n", name); + ULOG_ERR("failed to find a module named %s\n", name); } else { int fail; @@ -656,12 +751,12 @@ static int main_modprobe(int argc, char **argv) fail = load_modprobe(); if (fail) { - LOG("%d module%s could not be probed\n", - fail, (fail == 1) ? ("") : ("s")); + ULOG_ERR("%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); + ULOG_ERR("- %s\n", m->name); } } @@ -673,7 +768,7 @@ static int main_modprobe(int argc, char **argv) static int main_loader(int argc, char **argv) { int gl_flags = GLOB_NOESCAPE | GLOB_MARK; - char *dir = "/etc/modules.d/*"; + char *dir = "/etc/modules.d/"; struct module *m; glob_t gl; char *path; @@ -682,20 +777,21 @@ static int main_loader(int argc, char **argv) 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()) + if (scan_loaded_modules()) { + free (path); return -1; + } - if (scan_module_folder()) + if (scan_module_folders()) { + free (path); return -1; + } - syslog(0, "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; @@ -706,7 +802,7 @@ static int main_loader(int argc, char **argv) char *mod = NULL; if (!fp) { - LOG("failed to open %s\n", gl.gl_pathv[j]); + ULOG_ERR("failed to open %s\n", gl.gl_pathv[j]); continue; } @@ -726,6 +822,8 @@ static int main_loader(int argc, char **argv) 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(); @@ -736,15 +834,16 @@ static int main_loader(int argc, char **argv) } fail = load_modprobe(); - LOG("ran %d iterations\n", iterations); if (fail) { - LOG("%d module%s could not be probed\n", - fail, (fail == 1) ? ("") : ("s")); + ULOG_ERR("%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)); + ULOG_ERR("- %s - %d\n", m->name, deps_available(m, 1)); + } else { + ULOG_INFO("done loading kernel modules from %s\n", path); } out: @@ -754,11 +853,27 @@ out: 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_strcmp, false, NULL); + avl_init(&modules, avl_modcmp, false, NULL); if (!strcmp(exec, "insmod")) return main_insmod(argc, argv); @@ -774,5 +889,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); }