diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-01 13:49:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-01 13:49:25 -0400 |
commit | 02201e3f1b46aed7c6348f406b7b40de80ba6de3 (patch) | |
tree | 2392c9098359725c195dd82a72b20ccedc1a1509 /init | |
parent | 0890a264794f33df540fbaf274699146903b4e6b (diff) | |
parent | 20bdc2cfdbc484777b30b96fcdbb8994038f3ce1 (diff) |
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module updates from Rusty Russell:
"Main excitement here is Peter Zijlstra's lockless rbtree optimization
to speed module address lookup. He found some abusers of the module
lock doing that too.
A little bit of parameter work here too; including Dan Streetman's
breaking up the big param mutex so writing a parameter can load
another module (yeah, really). Unfortunately that broke the usual
suspects, !CONFIG_MODULES and !CONFIG_SYSFS, so those fixes were
appended too"
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (26 commits)
modules: only use mod->param_lock if CONFIG_MODULES
param: fix module param locks when !CONFIG_SYSFS.
rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE()
module: add per-module param_lock
module: make perm const
params: suppress unused variable error, warn once just in case code changes.
modules: clarify CONFIG_MODULE_COMPRESS help, suggest 'N'.
kernel/module.c: avoid ifdefs for sig_enforce declaration
kernel/workqueue.c: remove ifdefs over wq_power_efficient
kernel/params.c: export param_ops_bool_enable_only
kernel/params.c: generalize bool_enable_only
kernel/module.c: use generic module param operaters for sig_enforce
kernel/params: constify struct kernel_param_ops uses
sysfs: tightened sysfs permission checks
module: Rework module_addr_{min,max}
module: Use __module_address() for module_address_lookup()
module: Make the mod_tree stuff conditional on PERF_EVENTS || TRACING
module: Optimize __module_address() using a latched RB-tree
rbtree: Implement generic latch_tree
seqlock: Introduce raw_read_seqcount_latch()
...
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/init/Kconfig b/init/Kconfig index 7d1ffd2ae536..bcc41bd19999 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1941,26 +1941,21 @@ config MODULE_COMPRESS | |||
1941 | bool "Compress modules on installation" | 1941 | bool "Compress modules on installation" |
1942 | depends on MODULES | 1942 | depends on MODULES |
1943 | help | 1943 | help |
1944 | This option compresses the kernel modules when 'make | ||
1945 | modules_install' is run. | ||
1946 | 1944 | ||
1947 | The modules will be compressed either using gzip or xz depend on the | 1945 | Compresses kernel modules when 'make modules_install' is run; gzip or |
1948 | choice made in "Compression algorithm". | 1946 | xz depending on "Compression algorithm" below. |
1949 | 1947 | ||
1950 | module-init-tools has support for gzip format while kmod handle gzip | 1948 | module-init-tools MAY support gzip, and kmod MAY support gzip and xz. |
1951 | and xz compressed modules. | ||
1952 | 1949 | ||
1953 | When a kernel module is installed from outside of the main kernel | 1950 | Out-of-tree kernel modules installed using Kbuild will also be |
1954 | source and uses the Kbuild system for installing modules then that | 1951 | compressed upon installation. |
1955 | kernel module will also be compressed when it is installed. | ||
1956 | 1952 | ||
1957 | This option provides little benefit when the modules are to be used inside | 1953 | Note: for modules inside an initrd or initramfs, it's more efficient |
1958 | an initrd or initramfs, it generally is more efficient to compress the whole | 1954 | to compress the whole initrd or initramfs instead. |
1959 | initrd or initramfs instead. | ||
1960 | 1955 | ||
1961 | This is fully compatible with signed modules while the signed module is | 1956 | Note: This is fully compatible with signed modules. |
1962 | compressed. module-init-tools or kmod handles decompression and provide to | 1957 | |
1963 | other layer the uncompressed but signed payload. | 1958 | If in doubt, say N. |
1964 | 1959 | ||
1965 | choice | 1960 | choice |
1966 | prompt "Compression algorithm" | 1961 | prompt "Compression algorithm" |
@@ -1982,6 +1977,10 @@ endchoice | |||
1982 | 1977 | ||
1983 | endif # MODULES | 1978 | endif # MODULES |
1984 | 1979 | ||
1980 | config MODULES_TREE_LOOKUP | ||
1981 | def_bool y | ||
1982 | depends on PERF_EVENTS || TRACING | ||
1983 | |||
1985 | config INIT_ALL_POSSIBLE | 1984 | config INIT_ALL_POSSIBLE |
1986 | bool | 1985 | bool |
1987 | help | 1986 | help |