From: Luis Chamberlain <mcgrof@kernel.org>
To: jeyu@kernel.org, davem@davemloft.net, kuba@kernel.org
Cc: michael.chan@broadcom.com, dchickles@marvell.com,
sburla@marvell.com, fmanlunas@marvell.com, aelior@marvell.com,
GR-everest-linux-l2@marvell.com, kvalo@codeaurora.org,
johannes@sipsolutions.net, akpm@linux-foundation.org,
arnd@arndb.de, rostedt@goodmis.org, mingo@redhat.com,
aquini@redhat.com, cai@lca.pw, dyoung@redhat.com, bhe@redhat.com,
peterz@infradead.org, tglx@linutronix.de, gpiccoli@canonical.com,
pmladek@suse.com, tiwai@suse.de, schlad@suse.de,
andriy.shevchenko@linux.intel.com, derosier@gmail.com,
keescook@chromium.org, daniel.vetter@ffwll.ch, will@kernel.org,
mchehab+samsung@kernel.org, vkoul@kernel.org,
mchehab+huawei@kernel.org, robh@kernel.org, mhiramat@kernel.org,
sfr@canb.auug.org.au, linux@dominikbrodowski.net,
glider@google.com, paulmck@kernel.org, elver@google.com,
bauerman@linux.ibm.com, yamada.masahiro@socionext.com,
samitolvanen@google.com, yzaikin@google.com, dvyukov@google.com,
rdunlap@infradead.org, corbet@lwn.net, dianders@chromium.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org, Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v3 4/8] panic: make taint data type clearer
Date: Tue, 26 May 2020 14:58:11 +0000 [thread overview]
Message-ID: <20200526145815.6415-5-mcgrof@kernel.org> (raw)
In-Reply-To: <20200526145815.6415-1-mcgrof@kernel.org>
Let us be clearer about the the data type for the taint flag.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
include/asm-generic/bug.h | 4 ++--
include/linux/kernel.h | 4 ++--
kernel/panic.c | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index c94e33ae3e7b..87dbe57301f4 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -80,7 +80,7 @@ struct bug_entry {
*/
#ifndef __WARN_FLAGS
extern __printf(4, 5)
-void warn_slowpath_fmt(const char *file, const int line, unsigned taint,
+void warn_slowpath_fmt(const char *file, const int line, unsigned int taint,
const char *fmt, ...);
#define __WARN() __WARN_printf(TAINT_WARN, NULL)
#define __WARN_printf(taint, arg...) do { \
@@ -110,7 +110,7 @@ extern __printf(1, 2) void __warn_printk(const char *fmt, ...);
struct warn_args;
struct pt_regs;
-void __warn(const char *file, int line, void *caller, unsigned taint,
+void __warn(const char *file, int line, void *caller, unsigned int taint,
struct pt_regs *regs, struct warn_args *args);
#ifndef WARN_ON
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index a1974907c320..d154844eb9cd 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -563,8 +563,8 @@ enum lockdep_ok {
LOCKDEP_STILL_OK,
LOCKDEP_NOW_UNRELIABLE
};
-extern void add_taint(unsigned flag, enum lockdep_ok);
-extern int test_taint(unsigned flag);
+extern void add_taint(unsigned int flag, enum lockdep_ok);
+extern int test_taint(unsigned int flag);
extern unsigned long get_taint(void);
extern int root_mountflags;
diff --git a/kernel/panic.c b/kernel/panic.c
index cb1c5619e983..3cfe84318ecf 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -421,7 +421,7 @@ const char *print_tainted(void)
return buf;
}
-int test_taint(unsigned flag)
+int test_taint(unsigned int flag)
{
return test_bit(flag, &tainted_mask);
}
@@ -440,7 +440,7 @@ unsigned long get_taint(void)
* If something bad has gone wrong, you'll want @lockdebug_ok = false, but for
* some notewortht-but-not-corrupting cases, it can be set to true.
*/
-void add_taint(unsigned flag, enum lockdep_ok lockdep_ok)
+void add_taint(unsigned int flag, enum lockdep_ok lockdep_ok)
{
if (lockdep_ok == LOCKDEP_NOW_UNRELIABLE && __debug_locks_off()) {
pr_warn("Disabling lock debugging due to kernel taint\n");
@@ -579,7 +579,7 @@ struct warn_args {
va_list args;
};
-void __warn(const char *file, int line, void *caller, unsigned taint,
+void __warn(const char *file, int line, void *caller, unsigned int taint,
struct pt_regs *regs, struct warn_args *args)
{
disable_trace_on_warning();
@@ -622,7 +622,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
}
#ifndef __WARN_FLAGS
-void warn_slowpath_fmt(const char *file, int line, unsigned taint,
+void warn_slowpath_fmt(const char *file, int line, unsigned int taint,
const char *fmt, ...)
{
struct warn_args args;
--
2.26.2
next prev parent reply other threads:[~2020-05-27 12:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 14:58 [PATCH v3 0/8] kernel: taint when the driver firmware crashes Luis Chamberlain
2020-05-26 14:58 ` [PATCH v3 1/8] kernel.h: move taint and system state flags to uapi Luis Chamberlain
2020-05-26 14:58 ` [PATCH v3 2/8] panic: add uevent support Luis Chamberlain
2020-05-26 14:58 ` [PATCH v3 3/8] taint: add firmware crash taint support Luis Chamberlain
2020-05-26 14:58 ` Luis Chamberlain [this message]
2020-05-26 14:58 ` [PATCH v3 5/8] ath10k: use new taint_firmware_crashed() Luis Chamberlain
2020-06-02 21:01 ` Brian Norris
2020-05-26 14:58 ` [PATCH v3 6/8] bnxt_en: " Luis Chamberlain
2020-05-26 18:09 ` Michael Chan
2020-05-26 14:58 ` [PATCH v3 7/8] liquidio: " Luis Chamberlain
2020-05-26 14:58 ` [PATCH v3 8/8] qed: " Luis Chamberlain
2020-05-26 22:46 ` [PATCH v3 0/8] kernel: taint when the driver firmware crashes Jakub Kicinski
2020-05-26 23:07 ` Luis Chamberlain
2020-05-26 23:30 ` Jakub Kicinski
2020-05-27 3:19 ` Luis Chamberlain
2020-05-27 21:36 ` Jakub Kicinski
2020-05-28 14:27 ` Luis Chamberlain
2020-05-28 15:04 ` Ben Greear
2020-05-28 16:33 ` Luis Chamberlain
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=20200526145815.6415-5-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=GR-everest-linux-l2@marvell.com \
--cc=aelior@marvell.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=aquini@redhat.com \
--cc=arnd@arndb.de \
--cc=bauerman@linux.ibm.com \
--cc=bhe@redhat.com \
--cc=cai@lca.pw \
--cc=corbet@lwn.net \
--cc=daniel.vetter@ffwll.ch \
--cc=davem@davemloft.net \
--cc=dchickles@marvell.com \
--cc=derosier@gmail.com \
--cc=dianders@chromium.org \
--cc=dvyukov@google.com \
--cc=dyoung@redhat.com \
--cc=elver@google.com \
--cc=fmanlunas@marvell.com \
--cc=glider@google.com \
--cc=gpiccoli@canonical.com \
--cc=jeyu@kernel.org \
--cc=johannes@sipsolutions.net \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=mhiramat@kernel.org \
--cc=michael.chan@broadcom.com \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=rdunlap@infradead.org \
--cc=robh@kernel.org \
--cc=rostedt@goodmis.org \
--cc=samitolvanen@google.com \
--cc=sburla@marvell.com \
--cc=schlad@suse.de \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.de \
--cc=vkoul@kernel.org \
--cc=will@kernel.org \
--cc=yamada.masahiro@socionext.com \
--cc=yzaikin@google.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).