From: Kees Cook <keescook@chromium.org>
To: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Petr Mladek <pmladek@suse.com>, Tony Luck <tony.luck@intel.com>,
Kees Cook <keescook@chromium.org>,
Jonathan Corbet <corbet@lwn.net>,
Anton Vorontsov <anton@enomsg.org>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
devicetree@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Colin Cross <ccross@android.com>,
Enric Balletbo i Serra <enric.balletbo@collabora.com>,
linuxppc-dev@lists.ozlabs.org, Benson Leung <bleung@chromium.org>
Subject: [PATCH v4 1/6] printk: Collapse shutdown types into a single dump reason
Date: Fri, 15 May 2020 11:44:29 -0700 [thread overview]
Message-ID: <20200515184434.8470-2-keescook@chromium.org> (raw)
In-Reply-To: <20200515184434.8470-1-keescook@chromium.org>
To turn the KMSG_DUMP_* reasons into a more ordered list, collapse
the redundant KMSG_DUMP_(RESTART|HALT|POWEROFF) reasons into
KMSG_DUMP_SHUTDOWN. The current users already don't meaningfully
distinguish between them, so there's no need to, as discussed here:
https://lore.kernel.org/lkml/CA+CK2bAPv5u1ih5y9t5FUnTyximtFCtDYXJCpuyjOyHNOkRdqw@mail.gmail.com/
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/powerpc/kernel/nvram_64.c | 4 +---
fs/pstore/platform.c | 8 ++------
include/linux/kmsg_dump.h | 4 +---
kernel/reboot.c | 6 +++---
4 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index fb4f61096613..0cd1c88bfc8b 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -655,9 +655,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,
int rc = -1;
switch (reason) {
- case KMSG_DUMP_RESTART:
- case KMSG_DUMP_HALT:
- case KMSG_DUMP_POWEROFF:
+ case KMSG_DUMP_SHUTDOWN:
/* These are almost always orderly shutdowns. */
return;
case KMSG_DUMP_OOPS:
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 072440457c08..90d74ebaa70a 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -144,12 +144,8 @@ static const char *get_reason_str(enum kmsg_dump_reason reason)
return "Oops";
case KMSG_DUMP_EMERG:
return "Emergency";
- case KMSG_DUMP_RESTART:
- return "Restart";
- case KMSG_DUMP_HALT:
- return "Halt";
- case KMSG_DUMP_POWEROFF:
- return "Poweroff";
+ case KMSG_DUMP_SHUTDOWN:
+ return "Shutdown";
default:
return "Unknown";
}
diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h
index 2e7a1e032c71..3f82b5cb2d82 100644
--- a/include/linux/kmsg_dump.h
+++ b/include/linux/kmsg_dump.h
@@ -25,9 +25,7 @@ enum kmsg_dump_reason {
KMSG_DUMP_PANIC,
KMSG_DUMP_OOPS,
KMSG_DUMP_EMERG,
- KMSG_DUMP_RESTART,
- KMSG_DUMP_HALT,
- KMSG_DUMP_POWEROFF,
+ KMSG_DUMP_SHUTDOWN,
};
/**
diff --git a/kernel/reboot.c b/kernel/reboot.c
index c4d472b7f1b4..491f1347bf43 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -250,7 +250,7 @@ void kernel_restart(char *cmd)
pr_emerg("Restarting system\n");
else
pr_emerg("Restarting system with command '%s'\n", cmd);
- kmsg_dump(KMSG_DUMP_RESTART);
+ kmsg_dump(KMSG_DUMP_SHUTDOWN);
machine_restart(cmd);
}
EXPORT_SYMBOL_GPL(kernel_restart);
@@ -274,7 +274,7 @@ void kernel_halt(void)
migrate_to_reboot_cpu();
syscore_shutdown();
pr_emerg("System halted\n");
- kmsg_dump(KMSG_DUMP_HALT);
+ kmsg_dump(KMSG_DUMP_SHUTDOWN);
machine_halt();
}
EXPORT_SYMBOL_GPL(kernel_halt);
@@ -292,7 +292,7 @@ void kernel_power_off(void)
migrate_to_reboot_cpu();
syscore_shutdown();
pr_emerg("Power down\n");
- kmsg_dump(KMSG_DUMP_POWEROFF);
+ kmsg_dump(KMSG_DUMP_SHUTDOWN);
machine_power_off();
}
EXPORT_SYMBOL_GPL(kernel_power_off);
--
2.20.1
next prev parent reply other threads:[~2020-05-15 18:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 18:44 [PATCH v4 0/6] allow ramoops to collect all kmesg_dump events Kees Cook
2020-05-15 18:44 ` Kees Cook [this message]
2020-05-15 19:17 ` [PATCH v4 1/6] printk: Collapse shutdown types into a single dump reason Pavel Tatashin
2020-05-22 16:21 ` Petr Mladek
2020-05-23 11:16 ` Michael Ellerman
2020-05-15 18:44 ` [PATCH v4 2/6] printk: honor the max_reason field in kmsg_dumper Kees Cook
2020-05-22 16:51 ` Petr Mladek
2020-05-22 17:34 ` Kees Cook
2020-05-15 18:44 ` [PATCH v4 3/6] printk: Introduce kmsg_dump_reason_str() Kees Cook
2020-05-15 19:23 ` Pavel Tatashin
2020-05-15 18:44 ` [PATCH v4 4/6] pstore/platform: Pass max_reason to kmesg dump Kees Cook
2020-05-15 18:44 ` [PATCH v4 5/6] pstore/ram: Introduce max_reason and convert dump_oops Kees Cook
2020-05-15 19:30 ` Pavel Tatashin
2020-05-15 19:48 ` Kees Cook
2020-05-15 19:40 ` Pavel Tatashin
2020-05-15 19:53 ` Kees Cook
2020-05-15 18:44 ` [PATCH v4 6/6] ramoops: Add max_reason optional field to ramoops DT node Kees Cook
2020-05-18 22:45 ` Rob Herring
2020-05-18 23:04 ` Kees Cook
2020-05-15 19:13 ` [PATCH v4 0/6] allow ramoops to collect all kmesg_dump events Pavel Tatashin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200515184434.8470-2-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=anton@enomsg.org \
--cc=bleung@chromium.org \
--cc=ccross@android.com \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=enric.balletbo@collabora.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=pasha.tatashin@soleen.com \
--cc=paulus@samba.org \
--cc=pmladek@suse.com \
--cc=robh+dt@kernel.org \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).