Skip to contentSkip to conversation

pstore: Move kmsg_bytes default into Kconfig

PATCH In review Kees Cook 2 participants 4 messages Dec 1, 2020 – Dec 2, 2020 Pstore filesystem

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 pstore: Move kmsg_bytes default into Kconfig

From: Vasile-Laurentiu Stanimir <[email protected]>

While kmsg_bytes can be set for pstore via mount, if a crash occurs before the mount only partial console log will be stored as kmsg_bytes defaults to a potentially different hardcoded value in the kernel (PSTORE_DEFAULT_KMSG_BYTES). This makes it impossible to analyze valuable post-mortem data especially on the embedded development or in the process of bringing up new boards. Change this value to be a Kconfig option with the default of old PSTORE_DEFAULT_KMSG_BYTES

---
This was sent off-list, so I'm resending it to lkml (with the commit log cleaned up sligthly) before I push it into for-next/pstore.

---
 fs/pstore/Kconfig    | 8 ++++++++
 fs/pstore/inode.c    | 2 +-
 fs/pstore/internal.h | 1 -
 fs/pstore/platform.c | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
fs/pstore/Kconfig +8 -0
index e16a49ebfe54..8adabde685f1 100644
@@ -14,6 +14,14 @@ config PSTORE
 	   If you don't have a platform persistent store driver,
 	   say N.
 
+config PSTORE_DEFAULT_KMSG_BYTES
+	int "Default kernel log storage space" if EXPERT
+	depends on PSTORE
+	default "10240"
+	help
+	  Defines default size of pstore kernel log storage.
+	  Can be enlarged if needed, not recommended to shrink it.
+
 config PSTORE_DEFLATE_COMPRESS
 	tristate "DEFLATE (ZLIB) compression"
 	default y
fs/pstore/inode.c +1 -1
index c331efe8de95..93a217e4f563 100644
@@ -266,7 +266,7 @@ static void parse_options(char *options)
  */
 static int pstore_show_options(struct seq_file *m, struct dentry *root)
 {
-	if (kmsg_bytes != PSTORE_DEFAULT_KMSG_BYTES)
+	if (kmsg_bytes != CONFIG_PSTORE_DEFAULT_KMSG_BYTES)
 		seq_printf(m, ",kmsg_bytes=%lu", kmsg_bytes);
 	return 0;
 }
fs/pstore/internal.h +0 -1
index 7fb219042f13..801d6c0b170c 100644
@@ -6,7 +6,6 @@
 #include <linux/time.h>
 #include <linux/pstore.h>
 
-#define PSTORE_DEFAULT_KMSG_BYTES 10240
 extern unsigned long kmsg_bytes;
 
 #ifdef CONFIG_PSTORE_FTRACE
fs/pstore/platform.c +1 -1
index 36714df37d5d..32f64abc277c 100644
@@ -101,7 +101,7 @@ static char *big_oops_buf;
 static size_t big_oops_buf_sz;
 
 /* How much of the console log to snapshot */
-unsigned long kmsg_bytes = PSTORE_DEFAULT_KMSG_BYTES;
+unsigned long kmsg_bytes = CONFIG_PSTORE_DEFAULT_KMSG_BYTES;
 
 void pstore_set_kmsg_bytes(int bytes)
 {
Signature · 1 line
2.25.1
#1 lore raw
Quoted 3 lines · Kees Cook

---
This was sent off-list, so I'm resending it to lkml (with the commit log cleaned up sligthly) before I push it into for-next/pstore.

Also, nice:

Writing /tmp/20201201_keescook_pstore_move_kmsg_bytes_default_into_kconfig.mbx
✔ [PATCH] pstore: Move kmsg_bytes default into Kconfig
---
✔ Attestation-by: Kees Cook <[email protected]> (pgp: 8972F4DFDC6DC026)

Did you use the sendemail-validate hook for this?

:)

author
#2 lore raw
Quoted 11 lines · Konstantin Ryabitsev
Quoted 3 lines · Kees Cook

---
This was sent off-list, so I'm resending it to lkml (with the commit log cleaned up sligthly) before I push it into for-next/pstore.

Also, nice:

Writing /tmp/20201201_keescook_pstore_move_kmsg_bytes_default_into_kconfig.mbx
✔ [PATCH] pstore: Move kmsg_bytes default into Kconfig
---
✔ Attestation-by: Kees Cook <[email protected]> (pgp: 8972F4DFDC6DC026)

Yay! :)

Quoted 1 line

Did you use the sendemail-validate hook for this?

In my scripts right now, I'm doing this before "git send-email":

# Construct header-based attestations
b4 attest outgoing/*

I haven't yet converted to using the git hook.

Signature · 1 line
Kees Cook
#3 lore raw
Quoted 8 lines · Kees Cook
Quoted 1 line

Did you use the sendemail-validate hook for this?

In my scripts right now, I'm doing this before "git send-email":

# Construct header-based attestations
b4 attest outgoing/*

I haven't yet converted to using the git hook.

You don't have to if you're already using wrapper scripts. It's more useful for folks who call git-send-email directly and don't want to remember to call "b4 attest" first.

Best regards,
-K