AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2024-11-23 23:10:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lookup aliases in the modules.builtin.modinfo

Browse Source 
New modules.builtin.modinfo duplicates modules.builtin in the built-in
module name search. If it exists, then we can use this file, but if not,
then we need to fallback to the old file.

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
This commit is contained in:
Alexey Gladkov 2019-11-08 18:25:22 +01:00 committed by Lucas De Marchi
parent 73eed2aba3
commit b866b2165a
5 changed files with 98 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libkmod/libkmod-internal.h
View File

@ -89,6 +89,7 @@ int kmod_lookup_alias_from_config(struct kmod_ctx *ctx, const char *name, struct
int kmod_lookup_alias_from_symbols_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3)));
int kmod_lookup_alias_from_aliases_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3)));
int kmod_lookup_alias_from_moddep_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3)));
int kmod_lookup_alias_from_kernel_builtin_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3)));
int kmod_lookup_alias_from_builtin_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3)));
bool kmod_lookup_alias_is_builtin(struct kmod_ctx *ctx, const char *name) __attribute__((nonnull(1, 2)));
int kmod_lookup_alias_from_commands(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3)));

10
libkmod/libkmod-module.c
View File

@ -575,10 +575,16 @@ KMOD_EXPORT int kmod_module_new_from_lookup(struct kmod_ctx *ctx,
err = kmod_lookup_alias_from_aliases_file(ctx, alias, list);
CHECK_ERR_AND_FINISH(err, fail, list, finish);
DBG(ctx, "lookup modules.builtin %s\n", alias);
err = kmod_lookup_alias_from_builtin_file(ctx, alias, list);
DBG(ctx, "lookup modules.builtin.modinfo %s\n", alias);
err = kmod_lookup_alias_from_kernel_builtin_file(ctx, alias, list);
CHECK_ERR_AND_FINISH(err, fail, list, finish);
if (err == 0) {
DBG(ctx, "lookup modules.builtin %s\n", alias);
err = kmod_lookup_alias_from_builtin_file(ctx, alias, list);
CHECK_ERR_AND_FINISH(err, fail, list, finish);
}
finish:
DBG(ctx, "lookup %s=%d, list=%p\n", alias, err, *list);
return err;

25
libkmod/libkmod.c
View File

@ -57,6 +57,7 @@ static struct _index_files {
[KMOD_INDEX_MODULES_DEP] = { .fn = "modules.dep", .prefix = "" },
[KMOD_INDEX_MODULES_ALIAS] = { .fn = "modules.alias", .prefix = "alias " },
[KMOD_INDEX_MODULES_SYMBOL] = { .fn = "modules.symbols", .prefix = "alias "},
[KMOD_INDEX_MODULES_BUILTIN_ALIAS] = { .fn = "modules.builtin.alias", .prefix = "" },
[KMOD_INDEX_MODULES_BUILTIN] = { .fn = "modules.builtin", .prefix = ""},
};
@ -522,6 +523,30 @@ static char *lookup_builtin_file(struct kmod_ctx *ctx, const char *name)
return line;
}
int kmod_lookup_alias_from_kernel_builtin_file(struct kmod_ctx *ctx,
const char *name,
struct kmod_list **list)
{
struct kmod_list *l;
int ret = kmod_lookup_alias_from_alias_bin(ctx,
KMOD_INDEX_MODULES_BUILTIN_ALIAS,
name, list);
if (ret > 0) {
kmod_list_foreach(l, *list) {
struct kmod_module *mod = l->data;
kmod_module_set_builtin(mod, true);
}
} else if (ret == -ENOSYS) {
/*
* If the system does not support this yet, then
* there is no need to return an error.
*/
ret = 0;
}
return ret;
}
int kmod_lookup_alias_from_builtin_file(struct kmod_ctx *ctx, const char *name,
struct kmod_list **list)
{

1
libkmod/libkmod.h
View File

@ -70,6 +70,7 @@ enum kmod_index {
KMOD_INDEX_MODULES_DEP = 0,
KMOD_INDEX_MODULES_ALIAS,
KMOD_INDEX_MODULES_SYMBOL,
KMOD_INDEX_MODULES_BUILTIN_ALIAS,
KMOD_INDEX_MODULES_BUILTIN,
/* Padding to make sure enum is not mapped to char */
_KMOD_INDEX_PAD = 1U << 31,

63
tools/depmod.c
View File

@ -2402,6 +2402,68 @@ static int output_devname(struct depmod *depmod, FILE *out)
return 0;
}
static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
{
int ret = 0, count = 0;
struct index_node *idx;
struct kmod_list *l, *builtin = NULL;
idx = index_create();
if (idx == NULL) {
ret = -ENOMEM;
goto fail;
}
ret = kmod_module_get_builtin(depmod->ctx, &builtin);
if (ret < 0) {
if (ret == -ENOENT)
ret = 0;
goto fail;
}
kmod_list_foreach(l, builtin) {
struct kmod_list *ll, *info_list = NULL;
struct kmod_module *mod = l->data;
const char *modname = kmod_module_get_name(mod);
ret = kmod_module_get_info(mod, &info_list);
if (ret < 0)
goto fail;
kmod_list_foreach(ll, info_list) {
char alias[PATH_MAX];
const char *key = kmod_module_info_get_key(ll);
const char *value = kmod_module_info_get_value(ll);
if (!streq(key, "alias"))
continue;
alias[0] = '\0';
if (alias_normalize(value, alias, NULL) < 0) {
WRN("Unmatched bracket in %s\n", value);
continue;
}
index_insert(idx, alias, modname, 0);
}
kmod_module_info_free_list(info_list);
index_insert(idx, modname, modname, 0);
count++;
}
if (count)
index_write(idx, out);
index_destroy(idx);
fail:
if (builtin)
kmod_module_unref_list(builtin);
return ret;
}
static int depmod_output(struct depmod *depmod, FILE *out)
{
static const struct depfile {
@ -2416,6 +2478,7 @@ static int depmod_output(struct depmod *depmod, FILE *out)
{ "modules.symbols", output_symbols },
{ "modules.symbols.bin", output_symbols_bin },
{ "modules.builtin.bin", output_builtin_bin },
{ "modules.builtin.alias.bin", output_builtin_alias_bin },
{ "modules.devname", output_devname },
{ }
};