Dan McGee [Sat, 4 Feb 2012 02:29:10 +0000 (20:29 -0600)]
test-conversion: remove test/test-loaded
This was already converted to testsuite/test-loaded.
Dan McGee [Sat, 4 Feb 2012 02:29:08 +0000 (20:29 -0600)]
Update .gitignore files
Add kmod-* prefixed tool names, add 'tags' in root directory (for ctags,
matches cscope.out ignore already in there), and prefix tools/ entries
with '/' so they are absolute ignores and don't apply to subdirectories.
Dan McGee [Sat, 4 Feb 2012 02:29:07 +0000 (20:29 -0600)]
Fix simple grammar issue
Ambroz Bizjak [Fri, 3 Feb 2012 20:15:01 +0000 (18:15 -0200)]
Fix unaligned memory access in hash function
Use a function to properly get an unsigned short from memory that is
possibly unaligned.
Note that it implicitly fixes a small bug in the hash function that
was introduced when modifying the eina code: the line "hash ^= key[2]
<< 18;" is supposed to be accessing the 3rd byte of the remainder of
the input, but when 'it' was introduced, 'key' ('data' in eina code)
was no longer incremented, so this ended up accessing the 3rd byte of
the input from the beginning. This is fixed by iterating over 'key',
like the eina code does.
Before this patch depmod was failing on ARMv5 and possibly others that
don't have unaligned access. They do not calculate correctly the
dependencies as shown below:
[root@alarm ~]# modinfo bridge
filename: /lib/modules/2.6.39.4/kernel/net/bridge/bridge.ko
version: 2.3
license: GPL
srcversion:
6B583530AE2B39C7E2317BF
depends: stp,llc
vermagic: 2.6.39.4 preempt mod_unload ARMv5
[root@alarm ~]# depmod
[root@alarm ~]# cat /lib/modules/2.6.39.4/modules.dep |grep bridge
kernel/net/bridge/bridge.ko:
[root@alarm ~]#
See how modinfo properly lists the dependencies, but modules.dep which
depmod generates does not contain them. As a result, most kernel
modules fail to load because their dependencies are not loaded by
modprobe.
Lucas De Marchi [Fri, 3 Feb 2012 20:11:53 +0000 (18:11 -0200)]
TODO: add task to write testsuite/README
Lucas De Marchi [Fri, 3 Feb 2012 18:33:36 +0000 (16:33 -0200)]
man: insmod: we don't handle modules from stdin
- Gah, kmod insmod can't load from stdin anymore. :/
- What's the use case?
- zcat module.ko.gz | insmod - (but the new insmod apparently can load .gz fine)
- yes... just insmod module.ko.gz
- and actually insmod(8) says it works. :)
Not anymore...
Khem Raj [Fri, 3 Feb 2012 07:09:59 +0000 (23:09 -0800)]
depmod: Dont use errno unconditionally
fopen() will not reset errno if it succeeds so we should
make sure that we only use errno in error cases.
Also fix the diagnostic messages to not use strerror
when there is no error since strerror will not return
anything useful in this case
Dave Reisner [Thu, 2 Feb 2012 22:24:03 +0000 (17:24 -0500)]
fix building and cleaning of manpages
- add modules.dep as an explicit dependency of modules.dep.bin to ensure
parallel builds don't fail
- add generated man pages to CLEANFILES
Dave Reisner [Fri, 3 Feb 2012 13:15:36 +0000 (08:15 -0500)]
modprobe: avoid breaking on insertion failure
Dave Reisner [Thu, 2 Feb 2012 16:07:33 +0000 (11:07 -0500)]
lib/module: check initstate before inserting module
This applies to both the high level probe_insert_module() and the
underlying insert_module() functions. By checking module initstate prior
to inserting a module, we can avoid a lot of needless work just to find
out that the init_module call fails with EEXIST.
This implements a helper function, module_is_inkernel, to return a
boolean value describing if a module is live, coming, or builtin.
Dave Reisner [Thu, 2 Feb 2012 20:05:57 +0000 (15:05 -0500)]
whitespace fix -- no logical code changes
Gustavo Sverzut Barbieri [Wed, 1 Feb 2012 00:16:47 +0000 (22:16 -0200)]
fix manpage build and install.
just build and install manpages if tools are enabled.
List stub modules.dep.bin in proper variable.
Gustavo Sverzut Barbieri [Sat, 7 Jan 2012 21:37:37 +0000 (19:37 -0200)]
improve logging to mention context.
Just printing the errno string such as "%m\n" is not enough to help
debug or users understand the problem.
Change to provide more context on the failing operation.
Gustavo Sverzut Barbieri [Sat, 7 Jan 2012 21:25:03 +0000 (19:25 -0200)]
improve log when debugging.
Some messages may happen more than once in the same function and
discovering the line is hard. Now we print the actual log priority
that exposed the message as well as filename and line.
NOTE: We should consider printing the log priority in the non-debug
version as well.
Lucas De Marchi [Tue, 31 Jan 2012 19:23:35 +0000 (17:23 -0200)]
libkmod: organize public header
Lucas De Marchi [Tue, 31 Jan 2012 18:05:02 +0000 (16:05 -0200)]
Prepare for API bump
Dave Reisner [Tue, 31 Jan 2012 01:57:36 +0000 (20:57 -0500)]
modprobe: properly handle errors from init_module
Effectively catch and the zero and non-zero cases and error out
appropriately. Note that -EEXIST will only ever be returned when
KMOD_PROBE_STOP_ON_ALREADY_LOADED is set as a probe_insert_module flag.
Lucas De Marchi [Tue, 31 Jan 2012 14:05:36 +0000 (12:05 -0200)]
libkmod-module: probe: remove useless KMOD_PROBE_STOP_ON_COMMAND
Lucas De Marchi [Tue, 31 Jan 2012 13:29:06 +0000 (11:29 -0200)]
libkmod-module: probe: return -EEXIST if told to stop on already loaded
Dave Reisner [Mon, 30 Jan 2012 22:52:25 +0000 (17:52 -0500)]
testsuite: allow for expected failure of tests
Adds a bool to the test struct called 'expected_fail' which can be set
to flip the logic used to determine success and failure. Messaging is
also changed to reflect an unexpected pass or expected fail. This can be
used to write tests which may represent functionality desirable for a
future release.
Dave Reisner [Mon, 30 Jan 2012 22:16:50 +0000 (17:16 -0500)]
modprobe: post-remove module deps with 0 refcnt
This commit looks shockingly similar to
0e9bd2d1 because SOMEONE decided
to remove it in a872bba in a glorious frenzy of refactoring.
Lucas De Marchi [Mon, 30 Jan 2012 21:01:24 +0000 (19:01 -0200)]
kmod-modprobe: migrate to kmod_module_probe_insert_module()
Lucas De Marchi [Mon, 30 Jan 2012 21:00:58 +0000 (19:00 -0200)]
libkmod-module: probe: add flag to dry-run
Lucas De Marchi [Mon, 30 Jan 2012 20:54:45 +0000 (18:54 -0200)]
libkmod-module: probe: add flag to ignore loaded modules
We need a way to tell libkmod to ignore loaded modules, so modprobe can
tell it to dry-run and show dependencies. However there's a conflict
with two flags. KMOD_PROBE_STOP_ON_ALREADY_LOADED prevails if passed
together with KMOD_PROBE_IGNORE_LOADED.
Lucas De Marchi [Mon, 30 Jan 2012 19:02:06 +0000 (17:02 -0200)]
libkmod-module: probe: add print_action callback
This allows to implement dry-run in modprobe without exporting
kmod_module_get_probe_list().
Lucas De Marchi [Mon, 30 Jan 2012 18:37:57 +0000 (16:37 -0200)]
libkmod-module: probe: add room in flags for future extension
Breaking flags is one of the reasons next version will need to bump ABI.
In future we don't want to bump it just because of this.
Lucas De Marchi [Mon, 30 Jan 2012 18:33:37 +0000 (16:33 -0200)]
libkmod-module: probe: ignore-command flag can't be used in return
Lucas De Marchi [Mon, 30 Jan 2012 18:30:12 +0000 (16:30 -0200)]
libkmod-module: probe: remove useless flag to stop on failure
We always want to stop if module failed to loaded due to unknown reason.
Lucas De Marchi [Mon, 30 Jan 2012 18:26:52 +0000 (16:26 -0200)]
libkmod-module: probe: add flag to stop loading on already loaded
It's not as simple as tell user to check if the module is loaded before
calling this function. Due to race conditions, module might not be
loaded before the function call, but fail later because another process
inserted it.
Lucas De Marchi [Sun, 29 Jan 2012 18:02:20 +0000 (16:02 -0200)]
testsuite: check if dots are allowed in aliases
Lucas De Marchi [Sun, 29 Jan 2012 17:43:19 +0000 (15:43 -0200)]
testsuite: add test for kmod_module_new_from_name()
Check if module names are being correctly normalized.
Lucas De Marchi [Sun, 29 Jan 2012 17:40:58 +0000 (15:40 -0200)]
libkmod-module: split creation of new modules to share code
Share code of module creation among the several new functions. With this
we let the alias/modname/path parsing to the separate functions, and the
rest with the common one.
This fixes the issue of alias names not being able to contain dots.
Lucas De Marchi [Sun, 29 Jan 2012 17:22:09 +0000 (15:22 -0200)]
Partially fix parsing of alias with dots
Alias names may contain dots. However since kmod_module_from_alias()
still calls kmod_module_new_from_name(), the bug is not entirely fixed,
and will be completely corrected in a later patch.
Lucas De Marchi [Sun, 29 Jan 2012 04:35:46 +0000 (02:35 -0200)]
libkmod-module: probe: add flag to ignore commands
Lucas De Marchi [Sun, 29 Jan 2012 03:49:09 +0000 (01:49 -0200)]
libkmod-module: probe: change insertion to cover more use cases
Split kmod_module_probe_insert_module() in 2:
1) Get list of modules to be loaded
2) Iterate the list, loading the module
With this in future we will be able to cover use cases of modprobe,
that has a logic a bit more complicated.
With this we also change the logic to detect dependency loops: instead
of checking the recursion every STEP times, we now keep a field in
kmod_module, marking it as visited. We simply ignore already visited
modules and thus we break loops.
Lucas De Marchi [Wed, 18 Jan 2012 03:26:44 +0000 (01:26 -0200)]
libkmod-module: add visited field
This field can be used to iterate the modules, controlling whether we
are revisiting a certain module. A function to clear the values in all
modules is needed since when we are iterating, we don't know if the
module is created anew or if it's picked from the pool. Therefore we
can't know if the field is true because of a previous iteration or if
the module was indeed already visited.
Lucas De Marchi [Sun, 29 Jan 2012 18:09:59 +0000 (16:09 -0200)]
build-sys: fix make dist
Dave Reisner [Sun, 29 Jan 2012 18:22:59 +0000 (13:22 -0500)]
build-sys: declare rootfs.tar.xz as dep of rootfs/
This forces make to re-extract the tarball when it's changed
Lucas De Marchi [Mon, 30 Jan 2012 15:45:55 +0000 (13:45 -0200)]
testsuite: let stat.h take care of stat64
This fixes testsuite build in 32 bits machines.
Lucas De Marchi [Mon, 30 Jan 2012 15:29:17 +0000 (13:29 -0200)]
Use %zu for size_t
Remove warning on 32 bits systems.
Lucas De Marchi [Sat, 28 Jan 2012 23:30:57 +0000 (21:30 -0200)]
testsuite: remove unneeded call to memset()
Pedro Pedruzzi [Sat, 28 Jan 2012 05:26:32 +0000 (03:26 -0200)]
libkmod: Fix handling of square brackets expressions in function alias_normalize
Pedro Pedruzzi [Sat, 28 Jan 2012 05:22:47 +0000 (03:22 -0200)]
testsuite: add test for function alias_normalize
Lucas De Marchi [Sat, 28 Jan 2012 01:56:46 +0000 (23:56 -0200)]
modprobe: print end of configuration files
Lucas De Marchi [Thu, 26 Jan 2012 21:26:35 +0000 (19:26 -0200)]
build-sys: extract rootfs for make check
Commit "d2c2b8b build-sys: autotoolify build of check libraries" removed
rootfs extraction. Add it back.
Lucas De Marchi [Thu, 26 Jan 2012 19:01:41 +0000 (17:01 -0200)]
testsuite: add GPL license
Lucas De Marchi [Thu, 26 Jan 2012 18:10:41 +0000 (16:10 -0200)]
testsuite: trap calls to delete_module() including simple test
Lucas De Marchi [Thu, 26 Jan 2012 14:18:23 +0000 (12:18 -0200)]
build-sys: autotoolify build of check libraries
Many thanks to Iván Briano (sachieru@gmail.com) for pointing out this
thread in libtool mailing list:
http://www.mail-archive.com/libtool@gnu.org/msg09627.html
Passing '-rpath /nowhere' in LDFLAGS we are able to create shared libs
that are not installed.
Lucas De Marchi [Thu, 26 Jan 2012 04:09:28 +0000 (02:09 -0200)]
testsuite: add trap to init_module() including simple test
Lucas De Marchi [Thu, 26 Jan 2012 03:21:17 +0000 (01:21 -0200)]
elf: privately export kmod_elf_get_section()
This function is used to find a certain section in ELF file. It will be
used to get the modname from an ELF file.
Lucas De Marchi [Wed, 25 Jan 2012 22:32:48 +0000 (20:32 -0200)]
testsuite: add test for modinfo
These ext4 modules were sent by Jon Master so we can test the result of
modinfo with modules generated for different architectures.
They are now added to testsuite and their output tested automatically.
Lucas De Marchi [Wed, 25 Jan 2012 22:25:46 +0000 (20:25 -0200)]
testsuite: remind users to build tools
Lucas De Marchi [Wed, 25 Jan 2012 21:48:31 +0000 (19:48 -0200)]
testsuite: add colors to test output
Lucas De Marchi [Wed, 25 Jan 2012 20:16:45 +0000 (18:16 -0200)]
testsuite: add simple test for list of loaded modules
Lucas De Marchi [Wed, 25 Jan 2012 19:46:52 +0000 (17:46 -0200)]
testsuite: match outputs of test with a known correct one
Tests may put the correct output in a file and tell testsuite to check
if it matches the output from the test running.
Testsuite compares the outputs while running the test: it creates a pipe
between parent and child; parent reads both stdout and stderr from child
and compares with the correct output.
Lucas De Marchi [Wed, 25 Jan 2012 18:01:17 +0000 (16:01 -0200)]
testsuite: separate child from parent
Lucas De Marchi [Wed, 25 Jan 2012 17:13:45 +0000 (15:13 -0200)]
testsuite: allow to run tests outside of top_buildir
In order to locate where the shared libs to be preloaded are we need to
reference them using abs_top_buildir. Otherwise we are limited to
running tests from there.
Lucas De Marchi [Wed, 25 Jan 2012 14:42:13 +0000 (12:42 -0200)]
testsuite: add trap to opendir() including tests
Lucas De Marchi [Wed, 25 Jan 2012 14:22:50 +0000 (12:22 -0200)]
testsuite: add trap to stat() and friends including tests
Add trap to stat(): we need to trap other functions too, depending on
stat.h, the function from glibc that is actually called may be stat64 or
__xstat() too.
Lucas De Marchi [Wed, 25 Jan 2012 13:36:28 +0000 (11:36 -0200)]
testsuite: add trap to open() including tests
Lucas De Marchi [Wed, 25 Jan 2012 04:44:45 +0000 (02:44 -0200)]
testsuite: add trap to fopen() including tests
Lucas De Marchi [Wed, 25 Jan 2012 01:35:18 +0000 (23:35 -0200)]
testsuite: fake kernel 4.0.20-kmod is out
Go get it while it's fresh :-). Test fake results of "uname -r" by
LD_PRELOAD'ing uname.so.
Lucas De Marchi [Wed, 25 Jan 2012 01:31:46 +0000 (23:31 -0200)]
testsuite: export environment with flags and LD_PRELOAD
A certain config can add flags and each flag may be associated with a
lib to LD_PRELOAD. It's now done for uname(2), which requires uname.so
in order to trap the calls.
Other trap will be added in later commits.
Lucas De Marchi [Wed, 25 Jan 2012 01:28:39 +0000 (23:28 -0200)]
testsuite: move oneshot to inside the test struct
Lucas De Marchi [Wed, 25 Jan 2012 00:04:46 +0000 (22:04 -0200)]
testsuite: trap calls to uname
Lucas De Marchi [Tue, 24 Jan 2012 23:53:27 +0000 (21:53 -0200)]
testsuite: test libkmod initialization
Lucas De Marchi [Tue, 24 Jan 2012 22:59:54 +0000 (20:59 -0200)]
testsuite: add skeleton
Lucas De Marchi [Thu, 26 Jan 2012 18:01:34 +0000 (16:01 -0200)]
modprobe: fix build 'cause of excessive number of arguments
Dave Reisner [Thu, 26 Jan 2012 16:36:35 +0000 (11:36 -0500)]
modprobe: remove code referring to -t, --type
This was only useful with the --list function, which isn't implemented.
Lucas De Marchi [Mon, 23 Jan 2012 14:29:38 +0000 (12:29 -0200)]
README: add link to packages place
A lot of people trying to get latest package from cgit is not good.
They should get the package from the released versions instead.
Lucas De Marchi [Sat, 21 Jan 2012 17:38:25 +0000 (15:38 -0200)]
build-sys: do not create symlinks by default
Distro packagers should create them instead. It's too much trouble to
create them in the build system and every distro wants a different path
for them.
Lucas De Marchi [Sat, 21 Jan 2012 04:45:06 +0000 (02:45 -0200)]
modprobe: kill operations depending on path
It was not on module-init-tools and it doesn't make much sense. It will
deal with dependencies, but looking at modules in the index. This might
not be the module we want if we are loading another from outside of the
tree.
Dealing with paths causes this bug (supposing there's a module names
squashfs):
# cd /
# touch squashfs
# modprobe squashfs
That is because it detects that squashfs exists as a file and it will
try to load it instead of the alias "squashfs".
If you need to load a module from a path, use insmod.
Thanks to Silvan Calarco <silvan.calarco@mambasoft.it> who reported the
bug and helped debugging it.
Lucas De Marchi [Fri, 20 Jan 2012 15:04:43 +0000 (13:04 -0200)]
TODO: system() should not be used inside a library
Lucas De Marchi [Wed, 18 Jan 2012 18:37:59 +0000 (16:37 -0200)]
build-sys: forcefully create links
If link already existed we would fail. Really not important for
packagers (the link should not exist), but for those who manually install it.
Lucas De Marchi [Wed, 18 Jan 2012 18:02:45 +0000 (16:02 -0200)]
build-sys: move modprobe to sbindir
Lucas De Marchi [Wed, 18 Jan 2012 18:01:58 +0000 (16:01 -0200)]
Add program to calculate the shortest relative path for symlinks
Lucas De Marchi [Tue, 17 Jan 2012 23:16:23 +0000 (21:16 -0200)]
libkmod-list: allow to append an empty list
Lucas De Marchi [Tue, 17 Jan 2012 21:33:32 +0000 (19:33 -0200)]
build-sys: create symlinks if we are installing tools
Thierry Vignaud [Tue, 17 Jan 2012 19:32:48 +0000 (17:32 -0200)]
WEXITSTATUS is defined in sys/wait.h
Fix compiling with dietlibc:
../libkmod/libkmod-module.c:858:2: warning: implicit declaration of function 'WEXITSTATUS' [-Wimplicit-function-declaration]
../libkmod/libkmod-module.c:858:2: warning: nested extern declaration of 'WEXITSTATUS' [-Wnested-externs]
(...)
kmod-modprobe.c:(.text.command_do+0x157): undefined reference to `WEXITSTATUS'
Lucas De Marchi [Tue, 17 Jan 2012 14:10:42 +0000 (12:10 -0200)]
Check if struct stat has mtim member
Not all libc's have a mtim member in struct stat (dietlibc doesn't).
Change ts_usec() to receive a struct stat as parameter and implement it
accordingly for both cases.
Lucas De Marchi [Tue, 17 Jan 2012 12:05:02 +0000 (10:05 -0200)]
modprobe: flush stdout before dumping indexes
Index dump doesn't use stdio.h function and instead call write()
directly on STDOUT_FILENO file descriptor. Therefore we need to flush
stdio buffers before calling it, to be sure the configuration dump will
appear before index's.
Lucas De Marchi [Tue, 17 Jan 2012 01:03:33 +0000 (23:03 -0200)]
Fix common misspelling with codespell
-------8<-------
SUMMARY:
ommitted 1
Miklos Vajna [Tue, 17 Jan 2012 00:48:11 +0000 (01:48 +0100)]
man: spelling fixes
Lucas De Marchi [Mon, 16 Jan 2012 18:53:04 +0000 (16:53 -0200)]
kmod 4
Lucas De Marchi [Mon, 16 Jan 2012 02:42:28 +0000 (00:42 -0200)]
build-sys: add release helpers
Lucas De Marchi [Mon, 16 Jan 2012 18:43:47 +0000 (16:43 -0200)]
Add doc to kmod_dump_index
Lucas De Marchi [Mon, 16 Jan 2012 18:00:35 +0000 (16:00 -0200)]
modprobe: dump indexes as well
Lucas De Marchi [Mon, 16 Jan 2012 17:56:17 +0000 (15:56 -0200)]
libkmod: dump index files
Provide a function to dump the index files to a certain fd. It could be
more optimized (particularly the functions to dump the index that were
copied and pasted from m-i-t), but it seems like the only user of it is
'modprobe -c', used for debugging purposes. So, keep it as is.
Lucas De Marchi [Mon, 16 Jan 2012 17:46:01 +0000 (15:46 -0200)]
libkmod-util: add helper function to write to fd
Lucas De Marchi [Mon, 16 Jan 2012 17:45:12 +0000 (15:45 -0200)]
libkmod-util: adhere to coding style
Lucas De Marchi [Mon, 16 Jan 2012 14:01:48 +0000 (12:01 -0200)]
libkmod: export enum kmod_index and rename members
Lucas De Marchi [Mon, 16 Jan 2012 12:43:34 +0000 (10:43 -0200)]
libkmod: store prefix of each index
Prefix is useful when dumping the index (to be added later).
Lucas De Marchi [Sat, 14 Jan 2012 14:09:34 +0000 (12:09 -0200)]
Update documentation with recent changes
Lucas De Marchi [Sat, 14 Jan 2012 04:46:58 +0000 (02:46 -0200)]
depmod: deal with relative root dir
module paths coming from libkmod are absolute. Make sure we store the
absolute dirname to compare later.
Lucas De Marchi [Sat, 14 Jan 2012 04:31:51 +0000 (02:31 -0200)]
kmod_new(): deal with relative paths for dirname
Lucas De Marchi [Sat, 14 Jan 2012 04:04:56 +0000 (02:04 -0200)]
depmod: fix idx calculation after postponed array creation
We need to set up each module's idx when the array is created. So,
postpone its initialization as well.
Lucas De Marchi [Sat, 14 Jan 2012 04:04:31 +0000 (02:04 -0200)]
Reduce scope of counter variable
Lucas De Marchi [Sat, 14 Jan 2012 04:03:21 +0000 (02:03 -0200)]
depmod: adhere to coding style
Lucas De Marchi [Fri, 13 Jan 2012 04:35:34 +0000 (02:35 -0200)]
modprobe: dump configuration
Lucas De Marchi [Fri, 13 Jan 2012 12:49:31 +0000 (10:49 -0200)]
config: let softdeps dump their data