remove redundant comments from /proc/bootconfig
Subsystems (4)
PATCH 1/1 remove redundant comments from /proc/bootconfig
commit 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig") adds bootloader argument comments into /proc/bootconfig.
/proc/bootconfig shows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.
Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...
key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...
fs/proc/bootconfig.c +6 -6
@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } -if (ret >=0 && boot_command_line[0 ]) { - ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , - boot_command_line); -if (ret >0 ) - dst += ret; - } + } +if (ret >=0 && boot_command_line[0 ]) { + ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , + boot_command_line); +if (ret >0 ) + dst += ret; } out:kfree (key);
Quoted 22 lines · On Wed, 3 Apr 2024 12:16:28 -0700 "Paul E. McKenney" <[email protected]> wrote:
commit
717c7c894d4b("fs/proc: Add boot loader arguments as comment to/proc/bootconfig") adds bootloader argument comments into/proc/bootconfig.
/proc/bootconfigshows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...
Quoted 6 lines
Fixes 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")Signed-off-by Zhenhua Huang <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc <[email protected]>Cc <[email protected]>
OOps, good catch! Let me pick it.
Thank you!
Quoted 24 lines
fs/proc/bootconfig.c +6
-6@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } -if (ret >=0 && boot_command_line[0 ]) { - ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , - boot_command_line); -if (ret >0 ) - dst += ret; - } + } +if (ret >=0 && boot_command_line[0 ]) { + ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , + boot_command_line); +if (ret >0 ) + dst += ret; } out:kfree (key);
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Quoted 32 lines · Masami Hiramatsu
Quoted 22 lines · On Wed, 3 Apr 2024 12:16:28 -0700 "Paul E. McKenney" <[email protected]> wrote:
commit
717c7c894d4b("fs/proc: Add boot loader arguments as comment to/proc/bootconfig") adds bootloader argument comments into/proc/bootconfig.
/proc/bootconfigshows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...Quoted 6 lines
Fixes 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")Signed-off-by Zhenhua Huang <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc <[email protected]>Cc <[email protected]>
Quoted 3 lines
OOps, good catch! Let me pick it.
Thank you, and I have applied your ack and pulled this into its own bootconfig.2024.04.04a.
My guess is that you will push this via your own tree, and so I will drop my copy as soon as yours hits -next.
Thanx, Paul
Quoted 30 lines
Thank you!
Quoted 24 lines
fs/proc/bootconfig.c +6
-6@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } -if (ret >=0 && boot_command_line[0 ]) { - ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , - boot_command_line); -if (ret >0 ) - dst += ret; - } + } +if (ret >=0 && boot_command_line[0 ]) { + ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , + boot_command_line); +if (ret >0 ) + dst += ret; } out:kfree (key);Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Masami Hiramatsu (Google)
maintainerQuoted 35 lines · On Thu, 4 Apr 2024 10:43:14 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 34 lines · Masami Hiramatsu
Quoted 22 lines · On Wed, 3 Apr 2024 12:16:28 -0700 "Paul E. McKenney" <[email protected]> wrote:
commit
717c7c894d4b("fs/proc: Add boot loader arguments as comment to/proc/bootconfig") adds bootloader argument comments into/proc/bootconfig.
/proc/bootconfigshows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...Quoted 6 lines
Fixes 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")Signed-off-by Zhenhua Huang <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc <[email protected]>Cc <[email protected]>OOps, good catch! Let me pick it.
Quoted 7 lines
Quoted 1 line
Thank you, and I have applied your ack and pulled this into its own bootconfig.2024.04.04a.
My guess is that you will push this via your own tree, and so I will drop my copy as soon as yours hits -next.
Thanks! I would like to make PR this soon as bootconfig fixes for v6.9-rc2.
Thank you,
Quoted 33 lines
Thanx, Paul
Quoted 30 lines
Thank you!
Quoted 24 lines
fs/proc/bootconfig.c +6
-6@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } -if (ret >=0 && boot_command_line[0 ]) { - ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , - boot_command_line); -if (ret >0 ) - dst += ret; - } + } +if (ret >=0 && boot_command_line[0 ]) { + ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , + boot_command_line); +if (ret >0 ) + dst += ret; } out:kfree (key);Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Masami Hiramatsu (Google)
maintainerQuoted 40 lines · On Fri, 5 Apr 2024 10:23:24 +0900 Masami Hiramatsu (Google)…
Quoted 37 lines · On Thu, 4 Apr 2024 10:43:14 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 35 lines · Masami Hiramatsu
Quoted 22 lines · On Wed, 3 Apr 2024 12:16:28 -0700 "Paul E. McKenney" <[email protected]> wrote:
commit
717c7c894d4b("fs/proc: Add boot loader arguments as comment to/proc/bootconfig") adds bootloader argument comments into/proc/bootconfig.
/proc/bootconfigshows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...Quoted 6 lines
Fixes 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")Signed-off-by Zhenhua Huang <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc <[email protected]>Cc <[email protected]>OOps, good catch! Let me pick it.
Quoted 8 lines
Quoted 5 lines
Thank you, and I have applied your ack and pulled this into its own bootconfig.2024.04.04a.
My guess is that you will push this via your own tree, and so I will drop my copy as soon as yours hits -next.
Thanks! I would like to make PR this soon as bootconfig fixes for v6.9-rc2.
Hmm I found that this always shows the command line comment in /proc/bootconfig even without "bootconfig" option.
I think that is easier for user-tools but changes the behavior and a bit redundant.
We should skip showing this original argument comment if bootconfig is not initialized (no "bootconfig" in cmdline) as it is now.
Thank you,
Quoted 39 lines
Thank you,
Quoted 33 lines
Thanx, Paul
Quoted 30 lines
Thank you!
Quoted 24 lines
fs/proc/bootconfig.c +6
-6@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } -if (ret >=0 && boot_command_line[0 ]) { - ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , - boot_command_line); -if (ret >0 ) - dst += ret; - } + } +if (ret >=0 && boot_command_line[0 ]) { + ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , + boot_command_line); +if (ret >0 ) + dst += ret; } out:kfree (key);Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Quoted 51 lines · Masami Hiramatsu
Quoted 40 lines · On Fri, 5 Apr 2024 10:23:24 +0900 Masami Hiramatsu (Google)…
Quoted 37 lines · On Thu, 4 Apr 2024 10:43:14 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 35 lines · Masami Hiramatsu
Quoted 22 lines · On Wed, 3 Apr 2024 12:16:28 -0700 "Paul E. McKenney" <[email protected]> wrote:
commit
717c7c894d4b("fs/proc: Add boot loader arguments as comment to/proc/bootconfig") adds bootloader argument comments into/proc/bootconfig.
/proc/bootconfigshows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...Quoted 6 lines
Fixes 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")Signed-off-by Zhenhua Huang <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc <[email protected]>Cc <[email protected]>OOps, good catch! Let me pick it.
Quoted 7 lines
Quoted 5 lines
Thank you, and I have applied your ack and pulled this into its own bootconfig.2024.04.04a.
My guess is that you will push this via your own tree, and so I will drop my copy as soon as yours hits -next.
Thanks! I would like to make PR this soon as bootconfig fixes for v6.9-rc2.
Quoted 7 lines
Hmm I found that this always shows the command line comment in
/proc/bootconfigeven without "bootconfig" option.
I think that is easier for user-tools but changes the behavior and a bit redundant.We should skip showing this original argument comment if bootconfig is not initialized (no "bootconfig" in cmdline) as it is now.
So something like this folded into that patch?
------------------------------------------------------------------------
fs/proc/bootconfig.c +1 -1
@@ -63,7 +63,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (bootconfig_is_present () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )
include/linux/bootconfig.h +1 -0
@@ -10,6 +10,7 @@#ifdef __KERNEL__#include <linux/kernel.h> #include <linux/types.h> +int bootconfig_is_present (void );#else /* !__KERNEL__ */ /* * NOTE: This is only for tools/bootconfig, because tools/bootconfig will
init/main.c +5 -0
@@ -1572,3 +1572,8 @@ static noinline void __init kernel_init_freeable(void)integrity_load_keys (); } + +int bootconfig_is_present (void ) +{ +return bootconfig_found ||IS_ENABLED (CONFIG_BOOT_CONFIG_FORCE ); +}
------------------------------------------------------------------------
Give or take placement of the bootconfig_is_present() function's declaration and definition.
Thanx, Paul
Thanx, Paul
Quoted 46 lines
Thank you,
Quoted 39 lines
Thank you,
Quoted 33 lines
Thanx, Paul
Quoted 30 lines
Thank you!
Quoted 24 lines
fs/proc/bootconfig.c +6
-6@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } -if (ret >=0 && boot_command_line[0 ]) { - ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , - boot_command_line); -if (ret >0 ) - dst += ret; - } + } +if (ret >=0 && boot_command_line[0 ]) { + ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , + boot_command_line); +if (ret >0 ) + dst += ret; } out:kfree (key);Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Masami Hiramatsu (Google)
maintainerQuoted 57 lines · On Thu, 4 Apr 2024 21:25:41 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 56 lines · Masami Hiramatsu
Quoted 40 lines · On Fri, 5 Apr 2024 10:23:24 +0900 Masami Hiramatsu (Google)…
Quoted 37 lines · On Thu, 4 Apr 2024 10:43:14 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 35 lines · Masami Hiramatsu
Quoted 22 lines · On Wed, 3 Apr 2024 12:16:28 -0700 "Paul E. McKenney" <[email protected]> wrote:
commit
717c7c894d4b("fs/proc: Add boot loader arguments as comment to/proc/bootconfig") adds bootloader argument comments into/proc/bootconfig.
/proc/bootconfigshows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...Quoted 6 lines
Fixes 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")Signed-off-by Zhenhua Huang <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc <[email protected]>Cc <[email protected]>OOps, good catch! Let me pick it.
Quoted 7 lines
Quoted 5 lines
Thank you, and I have applied your ack and pulled this into its own bootconfig.2024.04.04a.
My guess is that you will push this via your own tree, and so I will drop my copy as soon as yours hits -next.
Thanks! I would like to make PR this soon as bootconfig fixes for v6.9-rc2.
Hmm I found that this always shows the command line comment in
/proc/bootconfigeven without "bootconfig" option.
I think that is easier for user-tools but changes the behavior and a bit redundant.
Quoted 4 lines
Quoted 2 lines
We should skip showing this original argument comment if bootconfig is not initialized (no "bootconfig" in cmdline) as it is now.
So something like this folded into that patch?
Hm, I expected just checking it in the loop as below.
------------------------------------------------------------------------
fs/proc/bootconfig.c +3 -1
@@ -27,6 +27,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) {struct xbc_node *leaf, *vnode;char *key, *end = dst + size; +bool empty = true;const char *val;char q;int ret =0 ;
@@ -62,8 +63,9 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } + empty = false; } -if (ret >=0 && boot_command_line[0 ]) { +if (!empty && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )
------------------------------------------------------------------------
The difference is checking "bootconfig" cmdline option or checking the "bootconfig" is actually empty. So the behaviors are different when the "bootconfig" is specified but there is no bootconfig data.
Another idea is to check whether the cmdline is actually updated by bootconfig and show original one only if it is updated. (I think this fits the purpose of the original patch better.)
------------------------------------------------------------------------
fs/proc/bootconfig.c +4 -1
@@ -10,6 +10,9 @@#include <linux/bootconfig.h> #include <linux/slab.h> +/* defined in main/init.c */ +bool __init cmdline_has_extra_options (void ); +static char *saved_boot_config;static int boot_config_proc_show (struct seq_file *m,void *v)
@@ -63,7 +66,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (cmdline_has_extra_options () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )
init/main.c +5 -0
@@ -487,6 +487,11 @@ static int __init warn_bootconfig(char *str)early_param ("bootconfig" , warn_bootconfig); +bool __init cmdline_has_extra_options (void ) +{ +return extra_command_line || extra_init_args; +} +/* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string (char *param,char *val) {
------------------------------------------------------------------------
Thank you,
Quoted 97 lines
------------------------------------------------------------------------
fs/proc/bootconfig.c +1
-1@@ -63,7 +63,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (bootconfig_is_present () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )include/linux/bootconfig.h +1
-0@@ -10,6 +10,7 @@#ifdef __KERNEL__#include <linux/kernel.h> #include <linux/types.h> +int bootconfig_is_present (void );#else /* !__KERNEL__ */ /* * NOTE: This is only for tools/bootconfig, because tools/bootconfig will init/main.c +5
-1@@ -1572,3 +1572,8 @@ static noinline void __init kernel_init_freeable(void)integrity_load_keys (); } + +int bootconfig_is_present (void ) +{ +return bootconfig_found ||IS_ENABLED (CONFIG_BOOT_CONFIG_FORCE ); +} ------------------------------------------------------------------------Give or take placement of the
bootconfig_is_present()function's declaration and definition.Thanx, Paul
Thanx, Paul
Quoted 46 lines
Thank you,
Quoted 39 lines
Thank you,
Quoted 33 lines
Thanx, Paul
Quoted 30 lines
Thank you!
Quoted 24 lines
fs/proc/bootconfig.c +6
-6@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } -if (ret >=0 && boot_command_line[0 ]) { - ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , - boot_command_line); -if (ret >0 ) - dst += ret; - } + } +if (ret >=0 && boot_command_line[0 ]) { + ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , + boot_command_line); +if (ret >0 ) + dst += ret; } out:kfree (key);Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Quoted 94 lines · Masami Hiramatsu
Quoted 57 lines · On Thu, 4 Apr 2024 21:25:41 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 56 lines · Masami Hiramatsu
Quoted 40 lines · On Fri, 5 Apr 2024 10:23:24 +0900 Masami Hiramatsu (Google)…
Quoted 37 lines · On Thu, 4 Apr 2024 10:43:14 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 35 lines · Masami Hiramatsu
Quoted 22 lines · On Wed, 3 Apr 2024 12:16:28 -0700 "Paul E. McKenney" <[email protected]> wrote:
commit
717c7c894d4b("fs/proc: Add boot loader arguments as comment to/proc/bootconfig") adds bootloader argument comments into/proc/bootconfig.
/proc/bootconfigshows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...Quoted 6 lines
Fixes 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")Signed-off-by Zhenhua Huang <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc <[email protected]>Cc <[email protected]>OOps, good catch! Let me pick it.
Quoted 7 lines
Quoted 5 lines
Thank you, and I have applied your ack and pulled this into its own bootconfig.2024.04.04a.
My guess is that you will push this via your own tree, and so I will drop my copy as soon as yours hits -next.
Thanks! I would like to make PR this soon as bootconfig fixes for v6.9-rc2.
Hmm I found that this always shows the command line comment in
/proc/bootconfigeven without "bootconfig" option.
I think that is easier for user-tools but changes the behavior and a bit redundant.Quoted 4 lines
Quoted 2 lines
We should skip showing this original argument comment if bootconfig is not initialized (no "bootconfig" in cmdline) as it is now.
So something like this folded into that patch?
Hm, I expected just checking it in the loop as below.
------------------------------------------------------------------------
fs/proc/bootconfig.c +3
-2@@ -27,6 +27,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) {struct xbc_node *leaf, *vnode;char *key, *end = dst + size; +bool empty = true;const char *val;char q;int ret =0 ;@@ -62,8 +63,9 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } + empty = false; } -if (ret >=0 && boot_command_line[0 ]) { +if (!empty && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 ) ------------------------------------------------------------------------
Quoted 3 lines
The difference is checking "bootconfig" cmdline option or checking the "bootconfig" is actually empty. So the behaviors are different when the "bootconfig" is specified but there is no bootconfig data.
Ah, understood, the point is to avoid the comment in cases where its content would be identical to /proc/cmdline.
Quoted 35 lines
Another idea is to check whether the cmdline is actually updated by bootconfig and show original one only if it is updated. (I think this fits the purpose of the original patch better.)
------------------------------------------------------------------------
fs/proc/bootconfig.c +4
-1@@ -10,6 +10,9 @@#include <linux/bootconfig.h> #include <linux/slab.h> +/* defined in main/init.c */ +bool __init cmdline_has_extra_options (void ); +static char *saved_boot_config;static int boot_config_proc_show (struct seq_file *m,void *v)@@ -63,7 +66,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (cmdline_has_extra_options () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )init/main.c +0
-0@@ -487,6 +487,11 @@ static int __init warn_bootconfig(char *str)early_param ("bootconfig" , warn_bootconfig);
init/main.c static int __init warn_bootconfig(char *str)
Quoted 10 lines
init/main.c +5
-1+bool __init cmdline_has_extra_options (void ) +{ +return extra_command_line || extra_init_args; +} +/* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string (char *param,char *val) { ------------------------------------------------------------------------
This one looks good to me!
I had to move the declaration from /fs/proc/bootconfig.c to include/linux/bootconfig.h in order to avoid a build error. (The build system wants the declaration and definition to be visible as a cross-check.)
Does the resulting patch below work for you?
Thanx, Paul
------------------------------------------------------------------------
commit 8d95b50c523fba7133368650b3b5f71b169c76b5
Author: Masami Hiramatsu <[email protected]> Date: Mon Apr 8 12:10:38 2024 -0700
fs/proc: Skip bootloader comment if no embedded kernel parameters
If the "bootconfig" kernel command-line argument was specified or if the kernel was built with CONFIG_BOOT_CONFIG_FORCE, but if there are no embedded kernel parameter, omit the "# Parameters from bootloader:" comment from the /proc/bootconfig file. This will cause automation to fall back to the /proc/cmdline file, which will be identical to the comment in this no-embedded-kernel-parameters case.
fs/proc/bootconfig.c +1 -1
@@ -63,7 +63,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (cmdline_has_extra_options () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )
include/linux/bootconfig.h +1 -0
@@ -10,6 +10,7 @@#ifdef __KERNEL__#include <linux/kernel.h> #include <linux/types.h> +bool __init cmdline_has_extra_options (void );#else /* !__KERNEL__ */ /* * NOTE: This is only for tools/bootconfig, because tools/bootconfig will
init/main.c +5 -0
@@ -487,6 +487,11 @@ static int __init warn_bootconfig(char *str)early_param ("bootconfig" , warn_bootconfig); +bool __init cmdline_has_extra_options (void ) +{ +return extra_command_line || extra_init_args; +} +/* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string (char *param,char *val) {
Masami Hiramatsu (Google)
maintainerQuoted 150 lines · On Mon, 8 Apr 2024 12:18:19 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 94 lines · Masami Hiramatsu
Quoted 57 lines · On Thu, 4 Apr 2024 21:25:41 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 56 lines · Masami Hiramatsu
Quoted 40 lines · On Fri, 5 Apr 2024 10:23:24 +0900 Masami Hiramatsu (Google)…
Quoted 37 lines · On Thu, 4 Apr 2024 10:43:14 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 35 lines · Masami Hiramatsu
Quoted 22 lines · On Wed, 3 Apr 2024 12:16:28 -0700 "Paul E. McKenney" <[email protected]> wrote:
commit
717c7c894d4b("fs/proc: Add boot loader arguments as comment to/proc/bootconfig") adds bootloader argument comments into/proc/bootconfig.
/proc/bootconfigshows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...Quoted 6 lines
Fixes 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")Signed-off-by Zhenhua Huang <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc <[email protected]>Cc <[email protected]>OOps, good catch! Let me pick it.
Quoted 7 lines
Quoted 5 lines
Thank you, and I have applied your ack and pulled this into its own bootconfig.2024.04.04a.
My guess is that you will push this via your own tree, and so I will drop my copy as soon as yours hits -next.
Thanks! I would like to make PR this soon as bootconfig fixes for v6.9-rc2.
Hmm I found that this always shows the command line comment in
/proc/bootconfigeven without "bootconfig" option.
I think that is easier for user-tools but changes the behavior and a bit redundant.Quoted 4 lines
Quoted 2 lines
We should skip showing this original argument comment if bootconfig is not initialized (no "bootconfig" in cmdline) as it is now.
So something like this folded into that patch?
Hm, I expected just checking it in the loop as below.
------------------------------------------------------------------------
fs/proc/bootconfig.c +3
-2@@ -27,6 +27,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) {struct xbc_node *leaf, *vnode;char *key, *end = dst + size; +bool empty = true;const char *val;char q;int ret =0 ;@@ -62,8 +63,9 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } + empty = false; } -if (ret >=0 && boot_command_line[0 ]) { +if (!empty && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 ) ------------------------------------------------------------------------Quoted 3 lines
The difference is checking "bootconfig" cmdline option or checking the "bootconfig" is actually empty. So the behaviors are different when the "bootconfig" is specified but there is no bootconfig data.
Ah, understood, the point is to avoid the comment in cases where its content would be identical to
/proc/cmdline.Quoted 35 lines
Another idea is to check whether the cmdline is actually updated by bootconfig and show original one only if it is updated. (I think this fits the purpose of the original patch better.)
------------------------------------------------------------------------
fs/proc/bootconfig.c +4
-1@@ -10,6 +10,9 @@#include <linux/bootconfig.h> #include <linux/slab.h> +/* defined in main/init.c */ +bool __init cmdline_has_extra_options (void ); +static char *saved_boot_config;static int boot_config_proc_show (struct seq_file *m,void *v)@@ -63,7 +66,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (cmdline_has_extra_options () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )init/main.c +0
-0@@ -487,6 +487,11 @@ static int __init warn_bootconfig(char *str)early_param ("bootconfig" , warn_bootconfig);init/main.c static int __init warn_bootconfig(char *str)
Quoted 10 lines
init/main.c +5
-1+bool __init cmdline_has_extra_options (void ) +{ +return extra_command_line || extra_init_args; +} +/* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string (char *param,char *val) { ------------------------------------------------------------------------This one looks good to me!
Quoted 6 lines
I had to move the declaration from /fs/proc/bootconfig.c to
include/linux/bootconfig.hin order to avoid a build error. (The build system wants the declaration and definition to be visible as a cross-check.)Does the resulting patch below work for you?
Yes, this looks good to me. BTW, shouldn't we push this with the previous fix (from the viewpoint of memory usage, this is a kind of fix for redundant memory usage)?
Thank you!
Quoted 62 lines
Thanx, Paul
------------------------------------------------------------------------
commit
8d95b50c523fba7133368650b3b5f71b169c76b5Author: Masami Hiramatsu <[email protected]> Date: Mon Apr 8 12:10:38 2024 -0700fs/proc: Skip bootloader comment if no embedded kernel parameters
If the "bootconfig" kernel command-line argument was specified or if the kernel was built with
CONFIG_BOOT_CONFIG_FORCE, but if there are no embedded kernel parameter, omit the "# Parameters from bootloader:" comment from the/proc/bootconfigfile. This will cause automation to fall back to the/proc/cmdlinefile, which will be identical to the comment in this no-embedded-kernel-parameters case.Signed-off-by Masami Hiramatsu <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>fs/proc/bootconfig.c +1
-1@@ -63,7 +63,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (cmdline_has_extra_options () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )include/linux/bootconfig.h +1
-0@@ -10,6 +10,7 @@#ifdef __KERNEL__#include <linux/kernel.h> #include <linux/types.h> +bool __init cmdline_has_extra_options (void );#else /* !__KERNEL__ */ /* * NOTE: This is only for tools/bootconfig, because tools/bootconfig will init/main.c +5
-0@@ -487,6 +487,11 @@ static int __init warn_bootconfig(char *str)early_param ("bootconfig" , warn_bootconfig); +bool __init cmdline_has_extra_options (void ) +{ +return extra_command_line || extra_init_args; +} +/* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string (char *param,char *val) {
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Quoted 158 lines · Masami Hiramatsu
Quoted 155 lines · On Mon, 8 Apr 2024 12:18:19 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 94 lines · Masami Hiramatsu
Quoted 57 lines · On Thu, 4 Apr 2024 21:25:41 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 56 lines · Masami Hiramatsu
Quoted 40 lines · On Fri, 5 Apr 2024 10:23:24 +0900 Masami Hiramatsu (Google)…
Quoted 37 lines · On Thu, 4 Apr 2024 10:43:14 -0700 "Paul E. McKenney" <[email protected]> wrote:
Quoted 35 lines · Masami Hiramatsu
Quoted 22 lines · On Wed, 3 Apr 2024 12:16:28 -0700 "Paul E. McKenney" <[email protected]> wrote:
commit
717c7c894d4b("fs/proc: Add boot loader arguments as comment to/proc/bootconfig") adds bootloader argument comments into/proc/bootconfig.
/proc/bootconfigshows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...Quoted 6 lines
Fixes 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")Signed-off-by Zhenhua Huang <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc <[email protected]>Cc <[email protected]>OOps, good catch! Let me pick it.
Quoted 7 lines
Quoted 5 lines
Thank you, and I have applied your ack and pulled this into its own bootconfig.2024.04.04a.
My guess is that you will push this via your own tree, and so I will drop my copy as soon as yours hits -next.
Thanks! I would like to make PR this soon as bootconfig fixes for v6.9-rc2.
Hmm I found that this always shows the command line comment in
/proc/bootconfigeven without "bootconfig" option.
I think that is easier for user-tools but changes the behavior and a bit redundant.Quoted 4 lines
Quoted 2 lines
We should skip showing this original argument comment if bootconfig is not initialized (no "bootconfig" in cmdline) as it is now.
So something like this folded into that patch?
Hm, I expected just checking it in the loop as below.
------------------------------------------------------------------------
fs/proc/bootconfig.c +3
-2@@ -27,6 +27,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) {struct xbc_node *leaf, *vnode;char *key, *end = dst + size; +bool empty = true;const char *val;char q;int ret =0 ;@@ -62,8 +63,9 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } + empty = false; } -if (ret >=0 && boot_command_line[0 ]) { +if (!empty && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 ) ------------------------------------------------------------------------Quoted 3 lines
The difference is checking "bootconfig" cmdline option or checking the "bootconfig" is actually empty. So the behaviors are different when the "bootconfig" is specified but there is no bootconfig data.
Ah, understood, the point is to avoid the comment in cases where its content would be identical to
/proc/cmdline.Quoted 35 lines
Another idea is to check whether the cmdline is actually updated by bootconfig and show original one only if it is updated. (I think this fits the purpose of the original patch better.)
------------------------------------------------------------------------
fs/proc/bootconfig.c +4
-1@@ -10,6 +10,9 @@#include <linux/bootconfig.h> #include <linux/slab.h> +/* defined in main/init.c */ +bool __init cmdline_has_extra_options (void ); +static char *saved_boot_config;static int boot_config_proc_show (struct seq_file *m,void *v)@@ -63,7 +66,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (cmdline_has_extra_options () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )init/main.c +0
-0@@ -487,6 +487,11 @@ static int __init warn_bootconfig(char *str)early_param ("bootconfig" , warn_bootconfig);init/main.c static int __init warn_bootconfig(char *str)
Quoted 10 lines
init/main.c +5
-1+bool __init cmdline_has_extra_options (void ) +{ +return extra_command_line || extra_init_args; +} +/* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string (char *param,char *val) { ------------------------------------------------------------------------This one looks good to me!
I had to move the declaration from /fs/proc/bootconfig.c to
include/linux/bootconfig.hin order to avoid a build error. (The build system wants the declaration and definition to be visible as a cross-check.)
Quoted 5 lines
Quoted 1 line
Does the resulting patch below work for you?
Yes, this looks good to me. BTW, shouldn't we push this with the previous fix (from the viewpoint of memory usage, this is a kind of fix for redundant memory usage)?
Makes sense to me! Let me run a few tests on it.
For whatever it is worth, I have them both queued on their own branch on -rcu:
4facfdfaec7a ("fs/proc: remove redundant comments from /proc/bootconfig") 8d95b50c523f ("fs/proc: Skip bootloader comment if no embedded kernel parameters")
Thanx, Paul
Quoted 68 lines
Thank you!
Quoted 62 lines
Thanx, Paul
------------------------------------------------------------------------
commit
8d95b50c523fba7133368650b3b5f71b169c76b5Author: Masami Hiramatsu <[email protected]> Date: Mon Apr 8 12:10:38 2024 -0700fs/proc: Skip bootloader comment if no embedded kernel parameters
If the "bootconfig" kernel command-line argument was specified or if the kernel was built with
CONFIG_BOOT_CONFIG_FORCE, but if there are no embedded kernel parameter, omit the "# Parameters from bootloader:" comment from the/proc/bootconfigfile. This will cause automation to fall back to the/proc/cmdlinefile, which will be identical to the comment in this no-embedded-kernel-parameters case.Signed-off-by Masami Hiramatsu <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>fs/proc/bootconfig.c +1
-1@@ -63,7 +63,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (cmdline_has_extra_options () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )include/linux/bootconfig.h +1
-0@@ -10,6 +10,7 @@#ifdef __KERNEL__#include <linux/kernel.h> #include <linux/types.h> +bool __init cmdline_has_extra_options (void );#else /* !__KERNEL__ */ /* * NOTE: This is only for tools/bootconfig, because tools/bootconfig will init/main.c +5
-0@@ -487,6 +487,11 @@ static int __init warn_bootconfig(char *str)early_param ("bootconfig" , warn_bootconfig); +bool __init cmdline_has_extra_options (void ) +{ +return extra_command_line || extra_init_args; +} +/* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string (char *param,char *val) {Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
v2 cover remove redundant comments from /proc/bootconfig
In reply to Paul E. McKenneyHello!
This series removes redundant comments from /proc/bootconfig:
1. fs/proc: remove redundant comments from /proc/bootconfig,
courtesy of Zhenhua Huang.
2. fs/proc: Skip bootloader comment if no embedded kernel parameters,
courtesy of Masami Hiramatsu.
Thanx, Paul
------------------------------------------------------------------------
b/fs/proc/bootconfig.c | 12 ++++++------ b/include/linux/bootconfig.h | 1 + b/init/main.c | 5 +++++ fs/proc/bootconfig.c | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-)
PATCH v2 1/2 fs/proc: remove redundant comments from /proc/bootconfig
From: Zhenhua Huang <[email protected]>
commit 717c7c894d4b ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig") adds bootloader argument comments into /proc/bootconfig.
/proc/bootconfig shows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones.
Output before and after the fix is like:
key1 = value1
*bootloader argument comments*
key2 = value2
*bootloader argument comments*
key3 = value3
*bootloader argument comments*
...
key1 = value1
key2 = value2
key3 = value3
*bootloader argument comments*
...
--- fs/proc/bootconfig.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/proc/bootconfig.c +6 -6
@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)break ; dst += ret; } -if (ret >=0 && boot_command_line[0 ]) { - ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , - boot_command_line); -if (ret >0 ) - dst += ret; - } + } +if (ret >=0 && boot_command_line[0 ]) { + ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , + boot_command_line); +if (ret >0 ) + dst += ret; } out:kfree (key);
Signature · 1 line
2.40.1
PATCH v2 2/2 fs/proc: Skip bootloader comment if no embedded kernel parameters
In reply to Paul E. McKenneyFrom: Masami Hiramatsu <[email protected]>
If the "bootconfig" kernel command-line argument was specified or if the kernel was built with CONFIG_BOOT_CONFIG_FORCE, but if there are no embedded kernel parameter, omit the "# Parameters from bootloader:" comment from the /proc/bootconfig file. This will cause automation to fall back to the /proc/cmdline file, which will be identical to the comment in this no-embedded-kernel-parameters case.
--- fs/proc/bootconfig.c | 2 +- include/linux/bootconfig.h | 1 + init/main.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-)
fs/proc/bootconfig.c +1 -1
@@ -63,7 +63,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) dst += ret; } } -if (ret >=0 && boot_command_line[0 ]) { +if (cmdline_has_extra_options () && ret >=0 && boot_command_line[0 ]) { ret =snprintf (dst,rest (dst, end),"# Parameters from bootloader:\n# %s\n" , boot_command_line);if (ret >0 )
include/linux/bootconfig.h +1 -0
@@ -10,6 +10,7 @@#ifdef __KERNEL__#include <linux/kernel.h> #include <linux/types.h> +bool __init cmdline_has_extra_options (void );#else /* !__KERNEL__ */ /* * NOTE: This is only for tools/bootconfig, because tools/bootconfig will
init/main.c +5 -0
@@ -487,6 +487,11 @@ static int __init warn_bootconfig(char *str)early_param ("bootconfig" , warn_bootconfig); +bool __init cmdline_has_extra_options (void ) +{ +return extra_command_line || extra_init_args; +} +/* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string (char *param,char *val) {
Signature · 1 line
2.40.1
Hi Paul,
Thanks, both looks good to me.
Let me update bootconfig/fixes.
Quoted 20 lines · On Mon, 8 Apr 2024 21:42:49 -0700 "Paul E. McKenney" <[email protected]> wrote:
Hello!
This series removes redundant comments from
/proc/bootconfig:1. fs/proc: remove redundant comments from
/proc/bootconfig,
courtesy of Zhenhua Huang.2. fs/proc: Skip bootloader comment if no embedded kernel parameters,
courtesy of Masami Hiramatsu.Thanx, Paul
------------------------------------------------------------------------
b/fs/proc/bootconfig.c | 12 ++++++------ b/include/linux/bootconfig.h | 1 + b/init/main.c | 5 +++++ fs/proc/bootconfig.c | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-)
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Quoted 7 lines · Masami Hiramatsu
Hi Paul,
Thanks, both looks good to me.
Let me update bootconfig/fixes.
Thank you very much! As soon as I see them in -next from you, I will drop them from -rcu.
Thanx, Paul
Quoted 27 lines
Quoted 20 lines · On Mon, 8 Apr 2024 21:42:49 -0700 "Paul E. McKenney" <[email protected]> wrote:
Hello!
This series removes redundant comments from
/proc/bootconfig:1. fs/proc: remove redundant comments from
/proc/bootconfig,
courtesy of Zhenhua Huang.2. fs/proc: Skip bootloader comment if no embedded kernel parameters,
courtesy of Masami Hiramatsu.Thanx, Paul
------------------------------------------------------------------------
b/fs/proc/bootconfig.c | 12 ++++++------ b/include/linux/bootconfig.h | 1 + b/init/main.c | 5 +++++ fs/proc/bootconfig.c | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-)Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>