The patch titled
Subject: bug: consolidate __WARN_FLAGS usage
has been added to the -mm tree. Its filename is
bug-consolidate-__warn_flags-usage.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/bug-consolidate-__warn_flags-usage.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/bug-consolidate-__warn_flags-usage.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Kees Cook <keescook@xxxxxxxxxxxx>
Subject: bug: consolidate __WARN_FLAGS usage
Instead of having separate tests for __WARN_FLAGS, merge the two #ifdef
blocks and replace the synonym WANT_WARN_ON_SLOWPATH macro.
Link: http://lkml.kernel.org/r/20190819234111.9019-7-keescook@xxxxxxxxxxxx
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Cc: Christophe Leroy <christophe.leroy@xxxxxx>
Cc: Drew Davenport <ddavenport@xxxxxxxxxxxx>
Cc: Feng Tang <feng.tang@xxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab+samsung@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxxx>
Cc: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>
Cc: YueHaibing <yuehaibing@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/bug.h | 18 +++++++-----------
kernel/panic.c | 2 +-
2 files changed, 8 insertions(+), 12 deletions(-)
--- a/include/asm-generic/bug.h~bug-consolidate-__warn_flags-usage
+++ a/include/asm-generic/bug.h
@@ -61,16 +61,6 @@ struct bug_entry {
#define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while (0)
#endif
-#ifdef __WARN_FLAGS
-#define WARN_ON_ONCE(condition) ({ \
- int __ret_warn_on = !!(condition); \
- if (unlikely(__ret_warn_on)) \
- __WARN_FLAGS(BUGFLAG_ONCE | \
- BUGFLAG_TAINT(TAINT_WARN)); \
- unlikely(__ret_warn_on); \
-})
-#endif
-
/*
* WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report
* significant kernel issues that need prompt attention if they should ever
@@ -91,7 +81,6 @@ struct bug_entry {
extern __printf(4, 5)
void warn_slowpath_fmt(const char *file, const int line, unsigned taint,
const char *fmt, ...);
-#define WANT_WARN_ON_SLOWPATH
#define __WARN() __WARN_printf(TAINT_WARN, NULL)
#define __WARN_printf(taint, arg...) \
warn_slowpath_fmt(__FILE__, __LINE__, taint, arg)
@@ -105,6 +94,13 @@ extern __printf(1, 2) void __warn_printk
__warn_printk(arg); \
__WARN_FLAGS(BUGFLAG_TAINT(taint)); \
} while (0)
+#define WARN_ON_ONCE(condition) ({ \
+ int __ret_warn_on = !!(condition); \
+ if (unlikely(__ret_warn_on)) \
+ __WARN_FLAGS(BUGFLAG_ONCE | \
+ BUGFLAG_TAINT(TAINT_WARN)); \
+ unlikely(__ret_warn_on); \
+})
#endif
/* used internally by panic.c */
--- a/kernel/panic.c~bug-consolidate-__warn_flags-usage
+++ a/kernel/panic.c
@@ -596,7 +596,7 @@ void __warn(const char *file, int line,
add_taint(taint, LOCKDEP_STILL_OK);
}
-#ifdef WANT_WARN_ON_SLOWPATH
+#ifndef __WARN_FLAGS
void warn_slowpath_fmt(const char *file, int line, unsigned taint,
const char *fmt, ...)
{
_
Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are
strscpy-reject-buffer-sizes-larger-than-int_max.patch
bug-refactor-away-warn_slowpath_fmt_taint.patch
bug-rename-__warn_printf_taint-to-__warn_printf.patch
bug-consolidate-warn_slowpath_fmt-usage.patch
bug-lift-cut-here-out-of-__warn.patch
bug-clean-up-helper-macros-to-remove-__warn_taint.patch
bug-consolidate-__warn_flags-usage.patch
bug-move-warn_on-cut-here-into-exception-handler.patch
