Lucas De Marchi [Thu, 15 Dec 2011 17:43:58 +0000 (15:43 -0200)]
kmod 1
Lucas De Marchi [Thu, 15 Dec 2011 17:37:41 +0000 (15:37 -0200)]
Add libkmod files to EXTRA_DIST
Lucas De Marchi [Thu, 15 Dec 2011 15:43:22 +0000 (13:43 -0200)]
Remove module from hash when it's gone
Module was never being removed from hash table. Therefore, if we create
a module, unref it and create it again we will access freed memory.
Commit "53385cf Improve test of double references" introduced a new test
in test-mod-double-ref.c that previously to this commit was crashing and
now it's working fine.
Lucas De Marchi [Thu, 15 Dec 2011 15:42:54 +0000 (13:42 -0200)]
Improve test of double references
Lucas De Marchi [Thu, 15 Dec 2011 15:35:40 +0000 (13:35 -0200)]
Add safety NULL checks in exported functions
Lucas De Marchi [Thu, 15 Dec 2011 15:11:51 +0000 (13:11 -0200)]
Fix changing hash key after module is inserted in hash
The hash key is not copied so we can't change the string from:
modname/modalias
to:
modname'\0'modalias
in order to setup mod->name and mod->alias.
Now what we do is:
1) if name is in the form 'modname/modalias', the final struct
kmod_module will be:
struct kmod_module {
char *alias;------,
char *name;-----, |
char *hashkey;--|-|-,
} | | |
name <------------------' | |
alias <-------------------' |
hashkey <-------------------'
2) if name is in the simple form 'modname', then the final struct
kmod_module will be:
struct kmod_module {
char *alias;------> NULL
char *name;-----,
char *hashkey;--|---,
} | |
name <------------------*---'
Lucas De Marchi [Thu, 15 Dec 2011 15:09:46 +0000 (13:09 -0200)]
Fix docs with wrong function names
Lucas De Marchi [Thu, 15 Dec 2011 14:27:45 +0000 (12:27 -0200)]
Add comment in public header about flags not implemented
Lucas De Marchi [Thu, 15 Dec 2011 14:26:15 +0000 (12:26 -0200)]
Rename symbol group
Lucas De Marchi [Thu, 15 Dec 2011 14:15:31 +0000 (12:15 -0200)]
Remove flags that likely will not be used
Lucas De Marchi [Thu, 15 Dec 2011 14:14:43 +0000 (12:14 -0200)]
TODO: rephrase some tasks
Lucas De Marchi [Thu, 15 Dec 2011 02:43:54 +0000 (00:43 -0200)]
Add file with details regarding coding style
Lucas De Marchi [Wed, 14 Dec 2011 19:21:46 +0000 (17:21 -0200)]
Fix format of log message
Lucas De Marchi [Wed, 14 Dec 2011 19:19:19 +0000 (17:19 -0200)]
kmod_config: parse kernel command line for options and blacklist
Luis Felipe Strano Moraes [Wed, 14 Dec 2011 17:56:10 +0000 (15:56 -0200)]
Do not depend on AM_SILENT_RULES if it is not available.
Lucas De Marchi [Wed, 14 Dec 2011 17:21:10 +0000 (15:21 -0200)]
kmod_module: use 'modname/aliasname' as key for hash
1 alias may correspond to more than 1 module. This would cause a
conflict in the hash table when inserting a module there and bad things
could happen.
Now we use 'modname/aliasname' as key, '/aliasname' part being optional.
Internally kmod_module_new_from_alias() will setup a 'modname/aliasname'
string and pass to kmod_module_new_from_name() that will treat the case
with a '/' in the name.
User might call kmod_module_new_from_name() without any slashes, so the
key my not contain it.
Lucas De Marchi [Wed, 14 Dec 2011 17:05:03 +0000 (15:05 -0200)]
Use malloc + memset instead of calloc
Lucas De Marchi [Wed, 14 Dec 2011 16:02:28 +0000 (14:02 -0200)]
TODO: update tasks
Lucas De Marchi [Wed, 14 Dec 2011 14:10:02 +0000 (12:10 -0200)]
kmod_module: move function to the right section
Lucas De Marchi [Wed, 14 Dec 2011 14:07:37 +0000 (12:07 -0200)]
kmod_module: fix log message upon module removal
Lucas De Marchi [Wed, 14 Dec 2011 14:06:18 +0000 (12:06 -0200)]
kmod_module: add missing documentation
Lucas De Marchi [Wed, 14 Dec 2011 05:58:31 +0000 (03:58 -0200)]
Simplify kmod_load_resources()
We have a static vector of indexes. There's no need to check if they
have a suffix or if they are absolute, we just already know in advance
and there are no plans to change it.
Lucas De Marchi [Wed, 14 Dec 2011 05:53:43 +0000 (03:53 -0200)]
Log and break early if index is already open
Lucas De Marchi [Wed, 14 Dec 2011 05:44:38 +0000 (03:44 -0200)]
Update documentation
Lucas De Marchi [Tue, 13 Dec 2011 16:25:29 +0000 (14:25 -0200)]
Remove function kmod_resolve_alias_options()
Remove function kmod_resolve_alias_options since it's not needed
anymore. Test is using the following configuration file:
alias blablabla ac
options ac test=1
options blablabla test=2
Lookup test by module name:
$ ./test/test-lookup ac
libkmod version 1
Alias: 'ac'
Modules matching:
ac
options: 'test=1'
Lookup test by alias:
$ ./test/test-lookup blablabla
libkmod version 1
Alias: 'blablabla'
Modules matching:
ac
options: 'test=1 test=2'
Lucas De Marchi [Tue, 13 Dec 2011 16:21:24 +0000 (14:21 -0200)]
kmod_module: make get_options() search for alias names too
Lucas De Marchi [Tue, 13 Dec 2011 16:20:48 +0000 (14:20 -0200)]
Create module by alias name where appropriate
Lucas De Marchi [Tue, 13 Dec 2011 16:12:50 +0000 (14:12 -0200)]
Add private function kmod_module_new_from_alias()
This function will create a new kmod_module() by calling
kmod_module_new_from_name(), but instead of given the module name, it
gives the alias. This way, the modules' hash will contain the alias
instead of the name. If module was created successfully, then it swap
the alias with the actual name.
The downside is that the structure is not shared anymore if we create a
kmod_module by alias and after by name. However, in modprobe's
configuration it's possible to have different options for different
aliases. In future we might want to create a way to share the common
part of the structure (then having only one instance as we had before).
Lucas De Marchi [Tue, 13 Dec 2011 15:07:40 +0000 (13:07 -0200)]
kmod_module: use pointer instead of vector for its name
We still have name allocated just after the struct kmod_module, but
now we use a pointer instead of putting name as a vector in the end of
the structure.
The previous way has some problems, the worst is:
- it's not possible to swap the name with another value: this is
the real problem that this patch is solving. Later patches
will make name be swappable with alias, which is not possible
if name is a vector.
Lucas De Marchi [Tue, 13 Dec 2011 12:48:49 +0000 (10:48 -0200)]
Return early on lookup error
There's no reason to keep looking for options if alias didn't match.
Lucas De Marchi [Tue, 13 Dec 2011 12:28:00 +0000 (10:28 -0200)]
Use alias_normalize() instead of modname_normalize()
When normalizing alias names (or if we don't know if it's an alias or
modname), use alias_normalize() instead of modname_normalize(). The
difference is that alias names can contain dashes withing brackets, and
those should not be changed to underscores.
Most of the places using underscores() function might be converted to
alias_normalize(), but this is not done now.
Lucas De Marchi [Tue, 13 Dec 2011 12:24:22 +0000 (10:24 -0200)]
Add helper alias_normalize()
Lucas De Marchi [Tue, 13 Dec 2011 12:26:04 +0000 (10:26 -0200)]
Fix check for NULL variable
Lucas De Marchi [Mon, 12 Dec 2011 20:41:57 +0000 (18:41 -0200)]
Fix "Dereference of null pointer" as reported by llvm
Lucas De Marchi [Mon, 12 Dec 2011 20:36:27 +0000 (18:36 -0200)]
Fix "Dead assignments" as reported by llvm
Gustavo Sverzut Barbieri [Mon, 12 Dec 2011 20:28:52 +0000 (18:28 -0200)]
handle case where modname was not detected.
Lucas De Marchi [Mon, 12 Dec 2011 20:24:35 +0000 (18:24 -0200)]
Change licenses
libkmod is under LGPL 2.1 or later
tools/* are under GPL
Lucas De Marchi [Mon, 12 Dec 2011 19:26:47 +0000 (17:26 -0200)]
build-sys: enable debug by default in autogen.sh
Lucas De Marchi [Mon, 12 Dec 2011 19:23:19 +0000 (17:23 -0200)]
build-sys: Set CFLAGS to "-O2 -Werror" in autogen.sh
Lucas De Marchi [Mon, 12 Dec 2011 19:23:04 +0000 (17:23 -0200)]
Remove warnings: ‘err’ may be used uninitialized in this function
Lucas De Marchi [Mon, 12 Dec 2011 19:05:23 +0000 (17:05 -0200)]
build-sys: add version map file to build dependencies
Based on original patch from Jan Engelhardt <jengelh@medozas.de> to
libabc.
Lucas De Marchi [Mon, 12 Dec 2011 18:41:38 +0000 (16:41 -0200)]
Rename project from libkmod to kmod
Lucas De Marchi [Mon, 12 Dec 2011 17:41:02 +0000 (15:41 -0200)]
Do not use config if it's not needed/wanted
Lucas De Marchi [Mon, 12 Dec 2011 17:27:57 +0000 (15:27 -0200)]
Use true/false for bool return
Lucas De Marchi [Mon, 12 Dec 2011 17:23:03 +0000 (15:23 -0200)]
Directories inside config directories are not supported
This was failing silent, both in libkmod and module-init-tools. Give a
warning if we created a dir inside config directories.
Lucas De Marchi [Mon, 12 Dec 2011 17:00:51 +0000 (15:00 -0200)]
Do not stat() dir twice
Lucas De Marchi [Mon, 12 Dec 2011 16:26:45 +0000 (14:26 -0200)]
Fix leak of DIR
Lucas De Marchi [Mon, 12 Dec 2011 16:01:25 +0000 (14:01 -0200)]
Remove leftover comment
mod->path is always absolute: remove comment from previous behavior.
Lucas De Marchi [Mon, 12 Dec 2011 15:56:47 +0000 (13:56 -0200)]
Remove libkmod-loaded.c and re-order functions in libkmod-module.c
It's not possible to move functions related to "live" modules to
libkmod-loaded.c because they depend on the definition of kmod_module.
Putting this structure in the private header is not a good idea, so let
all functions related to "live" information in the end of
libkmod-module.c, and move the sole function from libkmod-loaded.c to
this place. This way all functions get the right documentation
about their sections.
Lucas De Marchi [Mon, 12 Dec 2011 15:49:27 +0000 (13:49 -0200)]
Rename kmod_loaded_get_list() to kmod_module_new_from_loaded()
Be consistent with other similar functions already present and improve
documentation.
Lucas De Marchi [Mon, 12 Dec 2011 15:39:07 +0000 (13:39 -0200)]
build-sys: replace spaces with tabs
Lucas De Marchi [Mon, 12 Dec 2011 15:37:13 +0000 (13:37 -0200)]
build-sys: move remaining warning flags to configure
Lucas De Marchi [Mon, 12 Dec 2011 15:26:34 +0000 (13:26 -0200)]
build-sys: remove duplicated warning flags
"822ce23 beef compile flags" added warning flags to configure, but some
of them were already present in autogen.sh. Remove the flags from
autogen.sh.
Lucas De Marchi [Mon, 12 Dec 2011 13:52:59 +0000 (11:52 -0200)]
coding style: be consistent with blank lines
Lucas De Marchi [Mon, 12 Dec 2011 12:48:02 +0000 (10:48 -0200)]
coding style: fix lines over 80 chars
Lines should not go over 80 chars with a few exceptions:
- headers
- function definitions with only 1 argument
- long strings, otherwise we break grep
This should go later in a coding-style file
Lucas De Marchi [Mon, 12 Dec 2011 12:30:01 +0000 (10:30 -0200)]
Merge branch 'use-mmap'
Conflicts:
libkmod/libkmod.c
Gustavo Sverzut Barbieri [Sun, 11 Dec 2011 22:37:01 +0000 (20:37 -0200)]
API-BREAK: kmod_new() takes a second parameter for configuration directory.
This is required by modprobe and also to help doing unit tests in future.
Gustavo Sverzut Barbieri [Sun, 11 Dec 2011 21:36:18 +0000 (19:36 -0200)]
tools: add modprobe
try to mimic original module-init-tools' modprobe as much as possible,
but this exposed some missing features in libkmod, these are now
listed in TODO.
Gustavo Sverzut Barbieri [Sun, 11 Dec 2011 00:19:41 +0000 (22:19 -0200)]
add lsmod, insmod and rmmod tools.
these tools are compatible with module-init-tools (except insmod does
not take data from stdin).
Gustavo Sverzut Barbieri [Sun, 11 Dec 2011 21:42:02 +0000 (19:42 -0200)]
add missing newline to log messages.
Gustavo Sverzut Barbieri [Sun, 11 Dec 2011 21:33:03 +0000 (19:33 -0200)]
be less verbose on initstate for unexistent modules.
the module may be unloaded, in this case -NOENT is returned but it
should not present an error message
Gustavo Sverzut Barbieri [Sun, 11 Dec 2011 00:26:40 +0000 (22:26 -0200)]
beef compile flags.
Beef the compile flags by using the same set recommended by systemd,
it uses attribute.m4 from the xine project to check supported flags.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 23:02:39 +0000 (21:02 -0200)]
insmod: allows providing option to module.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 23:00:19 +0000 (21:00 -0200)]
always normalize user-given alias.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 22:47:01 +0000 (20:47 -0200)]
export module's options and commands.
This will be required to implement modprobe later. The implementation
follows "man modprobe.conf" and allows options to be specified for
alias as well, thus the need for kmod_resolve_alias_options().
Example mod-a.conf:
options mod-a a=1 b=2
options mod-a c=3
alias mymod-a mod-a
options mymod-a d=4
Results in:
options mod-a a=1 b=2 c=3
options mymod-a a=1 b=2 c=3 d=4
Install commands are being concatenated with ";", but manpage is not
clean about this behavior.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 22:36:22 +0000 (20:36 -0200)]
parse_depline may be called from libkmod.c
allow parse_depline to be called when already initialized as it may be
called from libkmod.c and at that point there is no way to check
mod->init.dep
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 21:45:37 +0000 (19:45 -0200)]
fix string replace.
configure files with this would fail:
options wl x=1
were being handled as " =1".
Lucas De Marchi [Fri, 9 Dec 2011 18:42:14 +0000 (16:42 -0200)]
kmod: Add documentation and format comments
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 15:32:27 +0000 (13:32 -0200)]
update TODO
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 15:28:18 +0000 (13:28 -0200)]
index: fix memleak for non-matchin aliases.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 15:04:43 +0000 (13:04 -0200)]
index-mm: allocate values inline into node, strings points to mmap.
For mmap mode, we can avoid allocating and copying strings from the
mmap'ed memory.
With that we have fixed length "struct index_mm_value" that can be
allocated inline with "struct index_mm_node".
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 13:53:51 +0000 (11:53 -0200)]
index: cleanup header, move as much as possible to libkmod-index.c
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 13:44:31 +0000 (11:44 -0200)]
index-mm: no need to allocate prefix.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 13:36:35 +0000 (11:36 -0200)]
index-mm: fix memory access.
uint32_t reads must be aligned, they're not then use memcpy().
read_alloc_chars_mm() and read_chars_mm() were wrong, normalize all
address calculation using single byte pointer "addr" that is
incremented by the amount read, this will avoid further errors.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 12:28:11 +0000 (10:28 -0200)]
test-lookup: allow loading resources for testing.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 12:27:27 +0000 (10:27 -0200)]
kmod_load_resources: use proper full path to binary files to be mmaped.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 11:28:42 +0000 (09:28 -0200)]
kmod_lookup_alias_from_alias_bin: debug message for mmap case.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 11:26:27 +0000 (09:26 -0200)]
kmod_search_moddep: reorder to avoid creating path when not required.
if we're using mmap'ed index, say so and avoid creating the path as it
won't be used.
Gustavo Sverzut Barbieri [Sat, 10 Dec 2011 11:21:03 +0000 (09:21 -0200)]
fix snprintf usage.
snprintf() takes the full buffer size, including \0 and guarantees it
will be there.
Lucas De Marchi [Fri, 9 Dec 2011 18:42:14 +0000 (16:42 -0200)]
kmod: Add documentation and format comments
Lucas De Marchi [Fri, 9 Dec 2011 18:11:42 +0000 (16:11 -0200)]
Use alias/symbol index_mm if it's open
Lucas De Marchi [Fri, 9 Dec 2011 18:06:04 +0000 (16:06 -0200)]
Pass enum around instead of filename
This will allow us to later use the index to search these indexes.
Lucas De Marchi [Fri, 9 Dec 2011 17:47:23 +0000 (15:47 -0200)]
Use index_mm if it's open for moddep search
Lucas De Marchi [Fri, 9 Dec 2011 17:33:37 +0000 (15:33 -0200)]
Do not allocate path for known places an close resource asap
This place is not supposed to exceed PATH_MAX. So, use snprintf instead
of asprintf.
Close the index before iterating the values.
Lucas De Marchi [Thu, 8 Dec 2011 16:59:51 +0000 (14:59 -0200)]
Load and unload resources
This call will mmap all the index files and in future some of the work
done in ctx creation can be put here.
Lucas De Marchi [Thu, 8 Dec 2011 17:10:55 +0000 (15:10 -0200)]
index: mm: Add flag to open call to populate buffer
Lucas De Marchi [Thu, 8 Dec 2011 16:56:48 +0000 (14:56 -0200)]
Refactor index file handling
Put all names in a static vector and declare a enum containing the
number of indexes. This way it's easier to create vectors inside ctx
that depend on these files.
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 18:36:48 +0000 (16:36 -0200)]
remove useless look checking for duplicates
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 16:50:29 +0000 (14:50 -0200)]
index: avoid strlen() whenever possible.
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 18:35:08 +0000 (16:35 -0200)]
reduce calls to realloc() if size did not change.
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 16:36:30 +0000 (14:36 -0200)]
index: improve buffer management and reduce mallocs.
Grow buffer based on a step, avoiding hitting the system over and over
again.
Do not allocate the 'struct buffer' as in all cases the lifetime is
known and the pattern was allocate then free in every call site.
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 06:44:03 +0000 (04:44 -0200)]
fix path handling at dependencies parsing.
paths come relative to dirname, make them absolute to avoid confusion
later.
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 15:58:46 +0000 (13:58 -0200)]
NULL safety in public places, allows disable logging.
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 15:47:55 +0000 (13:47 -0200)]
log: give log function its data instead of kmod_ctx.
This will be the most common use case for logging, also changed
log_stderr() to log_filep() with data being stderr to test it.
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 06:10:49 +0000 (04:10 -0200)]
modname_normalize: fix const and buffer overflow.
"buf[NAME_MAX] = value" is invalid since it would access the byte
right after the array.
Also fix the const of modname, do not mess with it to avoid mistakes.
Lucas De Marchi [Thu, 8 Dec 2011 14:50:40 +0000 (12:50 -0200)]
kmod_loaded: document exported function
Lucas De Marchi [Thu, 8 Dec 2011 14:25:36 +0000 (12:25 -0200)]
kmod_list: document exported functions
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 06:44:03 +0000 (04:44 -0200)]
kmod_module: Remove const from path
It's an ugly hack. This is an internal variable, we know we shouldn't
change it everywhere.
Gustavo Sverzut Barbieri [Thu, 8 Dec 2011 07:17:43 +0000 (05:17 -0200)]
add kmod_module_get_filtered_blacklist()
This function will filter the given list against the known blacklist,
returning a new list with remaining modules with the reference
incremented.
Lucas De Marchi [Thu, 8 Dec 2011 12:42:34 +0000 (10:42 -0200)]
Only search path in moddep if it's not already set
rmmod/insmod should be able to operate directly on files, not relying on
indexes and configuration.
The following test was not working and now it is:
$ # go to a dir != mod->dirname
$ cd /lib/modules/$(uname -r)/kernel
$ # try to insert module giving a relative path
$ insmod drivers/acpi/ac.ko