#include <libubox/avl.h>
#include <libubox/avl-cmp.h>
#include <libubox/utils.h>
+#include <libubox/ulog.h>
-#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,
char *name;
char *depends;
- char *options;
+ char *opts;
int size;
int usage;
};
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)
{
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);
-
- 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;
}
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;
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;
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)
return NULL;
m->avl.key = m->name = strcpy(_name, name);
+ m->opts = 0;
if (depends) {
m->depends = strcpy(_dep, depends);
fp = fopen("/proc/modules", "r");
if (!fp) {
- LOG("failed to open /proc/modules\n");
+ ULOG_ERR("failed to open /proc/modules\n");
return -1;
}
{
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;
}
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;
int j;
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);
+ path = alloca(strlen(dir) + sizeof("*.ko") + 1);
+ sprintf(path, "%s*.ko", dir);
if (glob(path, gl_flags, NULL, &gl) < 0)
return -1;
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;
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)
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;
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;
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);
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);
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), m->options)) {
+ if (!insert_module(get_module_path(m->name), (m->opts) ? (m->opts) : (""))) {
m->state = LOADED;
m->error = 0;
loaded++;
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;
}
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;
}
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;
}
cur += sprintf(cur, "%s", argv[i]);
}
+ if (init_module_folders()) {
+ fprintf(stderr, "falied 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;
}
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;
}
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();
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();
if (argc != 2)
return print_usage("modinfo");
- if (scan_module_folder())
+ if (scan_module_folders())
return -1;
name = get_module_name(argv[1]);
m = find_module(name);
if (!m) {
- LOG("cannot find module - %s\n", argv[1]);
+ ULOG_ERR("cannot find module - %s\n", argv[1]);
return -1;
}
name = get_module_path(m->name);
if (!name) {
- LOG("cannot find path of module - %s\n", m->name);
+ ULOG_ERR("cannot find path of module - %s\n", m->name);
return -1;
}
if (scan_loaded_modules())
return -1;
- if (scan_module_folder())
+ if (scan_module_folders())
return -1;
name = get_module_name(argv[1]);
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;
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);
}
}
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())
+ if (scan_module_folders())
return -1;
- syslog(0, "kmodloader: loading kernel modules from %s\n", path);
+ syslog(LOG_INFO, "kmodloader: loading kernel modules from %s\n", path);
if (glob(path, gl_flags, NULL, &gl) < 0)
goto out;
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;
}
if (!m || (m->state == LOADED))
continue;
- m->options = opts;
+ if (opts)
+ m->opts = strdup(opts);
m->state = PROBE;
if (basename(gl.gl_pathv[j])[0] - '0' <= 9)
load_modprobe();
}
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));
}
out:
projects / project / ubox.git / blobdiff