kernel/sysctl.c: remove to major base directories
Subsystems (2)
v2 cover kernel/sysctl.c: remove to major base directories
Changes on this v2:
o remove header changes to architecture code. If they were already comiling this should not fail
Now that Joel has cleaned up and removed one of the routines which we wanted to deprecate, remove two major arrays from kernel/sysctl.c which are empty or almost empty. One of them, the debug one just needs moving to its source, so do that.
The move for the signal sysctl costs us 23 bytes but we have already saved 1465 bytes with the other recent cleanup Joel made. The next step is to depreecate one more call and then we can simplify the registration to only use ARRAY_SIZE() completely and remove the extra empty entries all over. That should save us tons of bytes all around in the kernel and we'd then later kill for good all recursion possible sysctl registration calls.
These patches apply on top of sysctl-next [0] which already carry Joel's patches.
[0] https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git/log/?h=sysctl-next
Luis Chamberlain (2):
sysctl: remove empty dev table
signal: move show_unhandled_signals sysctl to its own file
kernel/signal.c | 23 +++++++++++++++++++++++ kernel/sysctl.c | 19 ------------------- 2 files changed, 23 insertions(+), 19 deletions(-)
Signature · 1 line
2.39.2
PATCH v2 1/2 sysctl: remove empty dev table
Now that all the dev sysctls have been moved out we can remove the dev sysctl base directory. We don't need to create base directories, they are created for you as if using 'mkdir -p' with register_syctl() and register_sysctl_init(). For details refer to sysctl_mkdir_p() usage.
We save 90 bytes with this changes:
./scripts/bloat-o-meter vmlinux.2.remove-sysctl-table vmlinux.3-remove-dev-table add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-90 (-90)
Function old new deltasysctl_init_bases 111 85 -26dev_table 64 - -64
Total: Before=21257057, After=21256967, chg -0.00%
--- kernel/sysctl.c | 5 ----- 1 file changed, 5 deletions(-)
kernel/sysctl.c +0 -5
@@ -2344,16 +2344,11 @@ static struct ctl_table debug_table[] = { { } }; -static struct ctl_table dev_table[] = { - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table);register_sysctl_init ("debug" , debug_table); -register_sysctl_init ("dev" , dev_table);return 0 ; }
Signature · 1 line
2.39.2
Re: [PATCH v2 1/2] sysctl: remove empty dev table
Quoted 44 lines · Luis Chamberlain
Now that all the dev sysctls have been moved out we can remove the dev sysctl base directory. We don't need to create base directories, they are created for you as if using 'mkdir -p' with
register_syctl()andregister_sysctl_init(). For details refer tosysctl_mkdir_p()usage.We save 90 bytes with this changes:
./scripts/bloat-o-metervmlinux.2.remove-sysctl-table vmlinux.3-remove-dev-table add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-90 (-90)
Function old new deltasysctl_init_bases111 85 -26dev_table64 - -64
Total: Before=21257057, After=21256967, chg -0.00%Signed-off-by Luis Chamberlain <[email protected]>--- kernel/sysctl.c | 5 ----- 1 file changed, 5 deletions(-)kernel/sysctl.c +0
-5@@ -2344,16 +2344,11 @@ static struct ctl_table debug_table[] = { { } }; -static struct ctl_table dev_table[] = { - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table);register_sysctl_init ("debug" , debug_table); -register_sysctl_init ("dev" , dev_table);return 0 ; }Signature · 1 line
2.39.2
LGTM.
Review
But why was dev there to begin with?
Best
Signature · 1 line
Joel Granados
Re: [PATCH v2 1/2] sysctl: remove empty dev table
Quoted 40 lines · Joel Granados
Quoted 39 lines · Luis Chamberlain
Now that all the dev sysctls have been moved out we can remove the dev sysctl base directory. We don't need to create base directories, they are created for you as if using 'mkdir -p' with
register_syctl()andregister_sysctl_init(). For details refer tosysctl_mkdir_p()usage.We save 90 bytes with this changes:
./scripts/bloat-o-metervmlinux.2.remove-sysctl-table vmlinux.3-remove-dev-table add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-90 (-90)
Function old new deltasysctl_init_bases111 85 -26dev_table64 - -64
Total: Before=21257057, After=21256967, chg -0.00%Signed-off-by Luis Chamberlain <[email protected]>--- kernel/sysctl.c | 5 ----- 1 file changed, 5 deletions(-)kernel/sysctl.c +0
-5@@ -2344,16 +2344,11 @@ static struct ctl_table debug_table[] = { { } }; -static struct ctl_table dev_table[] = { - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table);register_sysctl_init ("debug" , debug_table); -register_sysctl_init ("dev" , dev_table);
Quoted 6 lines
Quoted 5 lines
kernel/sysctl.c +0
-0return 0 ; }Signature · 1 line
2.39.2LGTM.
BTW, please use proper tags like Reviewed-by, and so on even if you use LGTM so that then if anyone uses things like b4 it can pick the tags for you.
Quoted 1 line
But why was dev there to begin with?
I will enhance the commit log to mention that, it was there because old APIs didn't create the directory for you, and now it is clear it is not needed. I checked ant he dev table was there since the beginning of sysctl.c on v2.5.0.
Luis
Re: [PATCH v2 1/2] sysctl: remove empty dev table
Quoted 48 lines · Luis Chamberlain
Quoted 40 lines · Joel Granados
Quoted 39 lines · Luis Chamberlain
Now that all the dev sysctls have been moved out we can remove the dev sysctl base directory. We don't need to create base directories, they are created for you as if using 'mkdir -p' with
register_syctl()andregister_sysctl_init(). For details refer tosysctl_mkdir_p()usage.We save 90 bytes with this changes:
./scripts/bloat-o-metervmlinux.2.remove-sysctl-table vmlinux.3-remove-dev-table add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-90 (-90)
Function old new deltasysctl_init_bases111 85 -26dev_table64 - -64
Total: Before=21257057, After=21256967, chg -0.00%Signed-off-by Luis Chamberlain <[email protected]>--- kernel/sysctl.c | 5 ----- 1 file changed, 5 deletions(-)kernel/sysctl.c +0
-5@@ -2344,16 +2344,11 @@ static struct ctl_table debug_table[] = { { } }; -static struct ctl_table dev_table[] = { - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table);register_sysctl_init ("debug" , debug_table); -register_sysctl_init ("dev" , dev_table);Quoted 6 lines
Quoted 5 lines
kernel/sysctl.c +0
-0return 0 ; }Signature · 1 line
2.39.2LGTM.
Quoted 3 lines
BTW, please use proper tags like Reviewed-by, and so on even if you use LGTM so that then if anyone uses things like b4 it can pick the tags for you.
Sure thing. Will send the reviewed-by for the patches
Quoted 7 lines
Quoted 2 lines
But why was dev there to begin with?
I will enhance the commit log to mention that, it was there because old APIs didn't create the directory for you, and now it is clear it is not needed. I checked ant he dev table was there since the beginning of
sysctl.con v2.5.0.
That would be great!
Quoted 2 lines
Luis
Signature · 1 line
Joel Granados
Re: [PATCH v2 1/2] sysctl: remove empty dev table
In reply to Luis ChamberlainQuoted 52 lines · Luis Chamberlain
Quoted 40 lines · Joel Granados
Quoted 39 lines · Luis Chamberlain
Now that all the dev sysctls have been moved out we can remove the dev sysctl base directory. We don't need to create base directories, they are created for you as if using 'mkdir -p' with
register_syctl()andregister_sysctl_init(). For details refer tosysctl_mkdir_p()usage.We save 90 bytes with this changes:
./scripts/bloat-o-metervmlinux.2.remove-sysctl-table vmlinux.3-remove-dev-table add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-90 (-90)
Function old new deltasysctl_init_bases111 85 -26dev_table64 - -64
Total: Before=21257057, After=21256967, chg -0.00%Signed-off-by Luis Chamberlain <[email protected]>--- kernel/sysctl.c | 5 ----- 1 file changed, 5 deletions(-)kernel/sysctl.c +0
-5@@ -2344,16 +2344,11 @@ static struct ctl_table debug_table[] = { { } }; -static struct ctl_table dev_table[] = { - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table);register_sysctl_init ("debug" , debug_table); -register_sysctl_init ("dev" , dev_table);Quoted 6 lines
Quoted 5 lines
kernel/sysctl.c +0
-0return 0 ; }Signature · 1 line
2.39.2LGTM.
BTW, please use proper tags like Reviewed-by, and so on even if you use LGTM so that then if anyone uses things like b4 it can pick the tags for you.
Quoted 6 lines
Quoted 1 line
But why was dev there to begin with?
I will enhance the commit log to mention that, it was there because old APIs didn't create the directory for you, and now it is clear it is not needed. I checked ant he dev table was there since the beginning of
sysctl.con v2.5.0.
I've extended the commmit log with this very importance piece of information:
The empty dev table has been in place since the v2.5.0 days because back then ordering was essentialy. But later commit 7ec66d06362d ("sysctl:
Stop requiring explicit management of sysctl directories"), merged as of v3.4-rc1, the entire ordering of directories was replaced by allowing sysctl directory autogeneration. This new mechanism introduced on v3.4 allows for sysctl directories to automatically be created for sysctl tables when they are needed and automatically removes them when no sysctl tables use them. That commit also added a dedicated struct ctl_dir as a new type for these autogenerated directories.
Luis
Re: [PATCH v2 1/2] sysctl: remove empty dev table
Quoted 55 lines · Luis Chamberlain
Quoted 54 lines · Luis Chamberlain
Quoted 40 lines · Joel Granados
Quoted 39 lines · Luis Chamberlain
Now that all the dev sysctls have been moved out we can remove the dev sysctl base directory. We don't need to create base directories, they are created for you as if using 'mkdir -p' with
register_syctl()andregister_sysctl_init(). For details refer tosysctl_mkdir_p()usage.We save 90 bytes with this changes:
./scripts/bloat-o-metervmlinux.2.remove-sysctl-table vmlinux.3-remove-dev-table add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-90 (-90)
Function old new deltasysctl_init_bases111 85 -26dev_table64 - -64
Total: Before=21257057, After=21256967, chg -0.00%Signed-off-by Luis Chamberlain <[email protected]>--- kernel/sysctl.c | 5 ----- 1 file changed, 5 deletions(-)kernel/sysctl.c +0
-5@@ -2344,16 +2344,11 @@ static struct ctl_table debug_table[] = { { } }; -static struct ctl_table dev_table[] = { - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table);register_sysctl_init ("debug" , debug_table); -register_sysctl_init ("dev" , dev_table);Quoted 6 lines
Quoted 5 lines
kernel/sysctl.c +0
-0return 0 ; }Signature · 1 line
2.39.2LGTM.
BTW, please use proper tags like Reviewed-by, and so on even if you use LGTM so that then if anyone uses things like b4 it can pick the tags for you.
Quoted 1 line
But why was dev there to begin with?
Quoted 7 lines
Quoted 4 lines
I will enhance the commit log to mention that, it was there because old APIs didn't create the directory for you, and now it is clear it is not needed. I checked ant he dev table was there since the beginning of
sysctl.con v2.5.0.I've extended the commmit log with this very importance piece of information:
Awesome!
Quoted 3 lines
The empty dev table has been in place since the v2.5.0 days because back then ordering was essentialy. But later commit
7ec66d06362d("sysctl:
*essential ?
Quoted 9 lines
Stop requiring explicit management of sysctl directories"), merged as of v3.4-rc1, the entire ordering of directories was replaced by allowing sysctl directory autogeneration. This new mechanism introduced on v3.4 allows for sysctl directories to automatically be created for sysctl tables when they are needed and automatically removes them when no sysctl tables use them. That commit also added a dedicated struct
ctl_diras a new type for these autogenerated directories.Luis
Signature · 1 line
Joel Granados
Re: [PATCH v2 1/2] sysctl: remove empty dev table
In reply to Luis ChamberlainQuoted 44 lines · Luis Chamberlain
Now that all the dev sysctls have been moved out we can remove the dev sysctl base directory. We don't need to create base directories, they are created for you as if using 'mkdir -p' with
register_syctl()andregister_sysctl_init(). For details refer tosysctl_mkdir_p()usage.We save 90 bytes with this changes:
./scripts/bloat-o-metervmlinux.2.remove-sysctl-table vmlinux.3-remove-dev-table add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-90 (-90)
Function old new deltasysctl_init_bases111 85 -26dev_table64 - -64
Total: Before=21257057, After=21256967, chg -0.00%Signed-off-by Luis Chamberlain <[email protected]>--- kernel/sysctl.c | 5 ----- 1 file changed, 5 deletions(-)kernel/sysctl.c +0
-5@@ -2344,16 +2344,11 @@ static struct ctl_table debug_table[] = { { } }; -static struct ctl_table dev_table[] = { - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table);register_sysctl_init ("debug" , debug_table); -register_sysctl_init ("dev" , dev_table);return 0 ; }Signature · 1 line
2.39.2
Signature · 1 line
Joel Granados
PATCH v2 2/2 signal: move show_unhandled_signals sysctl to its own file
In reply to Luis ChamberlainThe show_unhandled_signals sysctl is the only sysctl for debug left on kernel/sysctl.c. We've been moving the syctls out from kernel/sysctl.c so to help avoid merge conflicts as the shared array gets out of hand.
This change incurs simplifies sysctl registration by localizing it where it should go for a penalty in size of increasing the kernel by 23 bytes, we accept this given recent cleanups have actually already saved us 1465 bytes in the prior commits.
./scripts/bloat-o-meter vmlinux.3-remove-dev-table vmlinux.4-remove-debug-table add/remove: 3/1 grow/shrink: 0/1 up/down: 177/-154 (23)
Function old new delta
signal_debug_table - 128 +128 init_signal_sysctls - 33 +33 __pfx_init_signal_sysctls - 16 +16
sysctl_init_bases 85 59 -26debug_table 128 - -128
Total: Before=21256967, After=21256990, chg +0.00%
--- kernel/signal.c | 23 +++++++++++++++++++++++ kernel/sysctl.c | 14 -------------- 2 files changed, 23 insertions(+), 14 deletions(-)
kernel/signal.c +23 -0
@@ -45,6 +45,7 @@#include <linux/posix-timers.h> #include <linux/cgroup.h> #include <linux/audit.h> +#include <linux/sysctl.h> #define CREATE_TRACE_POINTS #include <trace/events/signal.h>
@@ -4771,6 +4772,28 @@ static inline void siginfo_buildtime_checks(void)#endif } +#if defined(CONFIG_SYSCTL ) +static struct ctl_table signal_debug_table[] = { +#ifdef CONFIG_SYSCTL_EXCEPTION_TRACE + { + .procname = "exception-trace", + .data = &show_unhandled_signals, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec + }, +#endif + { } +}; + +static int __init init_signal_sysctls (void ) +{ +register_sysctl_init ("debug" , signal_debug_table); +return 0 ; +} +early_initcall (init_signal_sysctls); +#endif /* CONFIG_SYSCTL */ +void __init signals_init (void ) {siginfo_buildtime_checks ();
kernel/sysctl.c +0 -14
@@ -2331,24 +2331,10 @@ static struct ctl_table vm_table[] = { { } }; -static struct ctl_table debug_table[] = { -#ifdef CONFIG_SYSCTL_EXCEPTION_TRACE - { - .procname = "exception-trace", - .data = &show_unhandled_signals, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec - }, -#endif - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table); -register_sysctl_init ("debug" , debug_table);return 0 ; }
Signature · 1 line
2.39.2
Re: [PATCH v2 2/2] signal: move show_unhandled_signals sysctl to its own file
Quoted 99 lines · Luis Chamberlain
The
show_unhandled_signalssysctl is the only sysctl for debug left onkernel/sysctl.c. We've been moving the syctls out fromkernel/sysctl.cso to help avoid merge conflicts as the shared array gets out of hand.This change incurs simplifies sysctl registration by localizing it where it should go for a penalty in size of increasing the kernel by 23 bytes, we accept this given recent cleanups have actually already saved us 1465 bytes in the prior commits.
./scripts/bloat-o-metervmlinux.3-remove-dev-table vmlinux.4-remove-debug-table add/remove: 3/1 grow/shrink: 0/1 up/down: 177/-154 (23)
Function old new deltasignal_debug_table - 128 +128 init_signal_sysctls - 33 +33 __pfx_init_signal_sysctls - 16 +16
sysctl_init_bases85 59 -26debug_table128 - -128
Total: Before=21256967, After=21256990, chg +0.00%Signed-off-by Luis Chamberlain <[email protected]>--- kernel/signal.c | 23 +++++++++++++++++++++++ kernel/sysctl.c | 14 -------------- 2 files changed, 23 insertions(+), 14 deletions(-)kernel/signal.c +23
-0@@ -45,6 +45,7 @@#include <linux/posix-timers.h> #include <linux/cgroup.h> #include <linux/audit.h> +#include <linux/sysctl.h> #define CREATE_TRACE_POINTS #include <trace/events/signal.h> @@ -4771,6 +4772,28 @@ static inline void siginfo_buildtime_checks(void)#endif } +#if defined(CONFIG_SYSCTL ) +static struct ctl_table signal_debug_table[] = { +#ifdef CONFIG_SYSCTL_EXCEPTION_TRACE + { + .procname = "exception-trace", + .data = &show_unhandled_signals, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec + }, +#endif + { } +}; + +static int __init init_signal_sysctls (void ) +{ +register_sysctl_init ("debug" , signal_debug_table); +return 0 ; +} +early_initcall (init_signal_sysctls); +#endif /* CONFIG_SYSCTL */ +void __init signals_init (void ) {siginfo_buildtime_checks ();kernel/sysctl.c +0
-14@@ -2331,24 +2331,10 @@ static struct ctl_table vm_table[] = { { } }; -static struct ctl_table debug_table[] = { -#ifdef CONFIG_SYSCTL_EXCEPTION_TRACE - { - .procname = "exception-trace", - .data = &show_unhandled_signals, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec - }, -#endif - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table); -register_sysctl_init ("debug" , debug_table);return 0 ; }Signature · 1 line
2.39.2
LGTM
Signature · 1 line
Joel Granados
Re: [PATCH v2 2/2] signal: move show_unhandled_signals sysctl to its own file
In reply to Luis ChamberlainQuoted 99 lines · Luis Chamberlain
The
show_unhandled_signalssysctl is the only sysctl for debug left onkernel/sysctl.c. We've been moving the syctls out fromkernel/sysctl.cso to help avoid merge conflicts as the shared array gets out of hand.This change incurs simplifies sysctl registration by localizing it where it should go for a penalty in size of increasing the kernel by 23 bytes, we accept this given recent cleanups have actually already saved us 1465 bytes in the prior commits.
./scripts/bloat-o-metervmlinux.3-remove-dev-table vmlinux.4-remove-debug-table add/remove: 3/1 grow/shrink: 0/1 up/down: 177/-154 (23)
Function old new deltasignal_debug_table - 128 +128 init_signal_sysctls - 33 +33 __pfx_init_signal_sysctls - 16 +16
sysctl_init_bases85 59 -26debug_table128 - -128
Total: Before=21256967, After=21256990, chg +0.00%Signed-off-by Luis Chamberlain <[email protected]>--- kernel/signal.c | 23 +++++++++++++++++++++++ kernel/sysctl.c | 14 -------------- 2 files changed, 23 insertions(+), 14 deletions(-)kernel/signal.c +23
-0@@ -45,6 +45,7 @@#include <linux/posix-timers.h> #include <linux/cgroup.h> #include <linux/audit.h> +#include <linux/sysctl.h> #define CREATE_TRACE_POINTS #include <trace/events/signal.h> @@ -4771,6 +4772,28 @@ static inline void siginfo_buildtime_checks(void)#endif } +#if defined(CONFIG_SYSCTL ) +static struct ctl_table signal_debug_table[] = { +#ifdef CONFIG_SYSCTL_EXCEPTION_TRACE + { + .procname = "exception-trace", + .data = &show_unhandled_signals, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec + }, +#endif + { } +}; + +static int __init init_signal_sysctls (void ) +{ +register_sysctl_init ("debug" , signal_debug_table); +return 0 ; +} +early_initcall (init_signal_sysctls); +#endif /* CONFIG_SYSCTL */ +void __init signals_init (void ) {siginfo_buildtime_checks ();kernel/sysctl.c +0
-14@@ -2331,24 +2331,10 @@ static struct ctl_table vm_table[] = { { } }; -static struct ctl_table debug_table[] = { -#ifdef CONFIG_SYSCTL_EXCEPTION_TRACE - { - .procname = "exception-trace", - .data = &show_unhandled_signals, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec - }, -#endif - { } -}; -int __init sysctl_init_bases (void ) {register_sysctl_init ("kernel" , kern_table);register_sysctl_init ("vm" , vm_table); -register_sysctl_init ("debug" , debug_table);return 0 ; }Signature · 1 line
2.39.2
Signature · 1 line
Joel Granados