diff v1→v2 (patch 2) | series

Inter-revision diff: patch 2

Comparing v1 (message) to v2 (message)
--- v1
+++ v2
@@ -1,186 +1,50 @@
 From: Tanner Love <tannerlove@google.com>
 
-DO_ONCE_LITE(_IF)? abstracts this "do once" functionality, presenting
-an opportunity for code reuse.
-
-This commit changes the behavior of xfs_printk_once, printk_once and
-printk_deferred_once. Before, these macros resulted in code ultimately
-evaluating to __print_once. Now, they ultimately evaluate to true.
-This is acceptable because none of the clients of these macros relies
-on the value.
+Printing this stack dump multiple times does not provide additional
+useful information, and consumes time in the data path. Printing once
+is sufficient.
 
 Signed-off-by: Tanner Love <tannerlove@google.com>
 Acked-by: Eric Dumazet <edumazet@google.com>
 Acked-by: Mahesh Bandewar <maheshb@google.com>
 ---
- fs/xfs/xfs_message.h      | 13 +++----------
- include/asm-generic/bug.h | 37 +++++++------------------------------
- include/linux/printk.h    | 23 +++--------------------
- kernel/trace/trace.h      | 13 +++----------
- 4 files changed, 16 insertions(+), 70 deletions(-)
+ net/core/dev.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
 
-diff --git a/fs/xfs/xfs_message.h b/fs/xfs/xfs_message.h
-index 3c392b1512ac..e587e8df6e73 100644
---- a/fs/xfs/xfs_message.h
-+++ b/fs/xfs/xfs_message.h
-@@ -2,6 +2,8 @@
- #ifndef __XFS_MESSAGE_H
- #define __XFS_MESSAGE_H 1
+diff --git a/net/core/dev.c b/net/core/dev.c
+index febb23708184..af2d109b7266 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -148,6 +148,7 @@
+ #include <net/devlink.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/prandom.h>
++#include <linux/once_lite.h>
  
-+#include <linux/once.h>
+ #include "net-sysfs.h"
+ 
+@@ -3487,13 +3488,16 @@ EXPORT_SYMBOL(__skb_gso_segment);
+ 
+ /* Take action when hardware reception checksum errors are detected. */
+ #ifdef CONFIG_BUG
++static void do_netdev_rx_csum_fault(struct net_device *dev, struct sk_buff *skb)
++{
++	pr_err("%s: hw csum failure\n", dev ? dev->name : "<unknown>");
++	skb_dump(KERN_ERR, skb, true);
++	dump_stack();
++}
 +
- struct xfs_mount;
- 
- extern __printf(2, 3)
-@@ -41,16 +43,7 @@ do {									\
- } while (0)
- 
- #define xfs_printk_once(func, dev, fmt, ...)			\
--({								\
--	static bool __section(".data.once") __print_once;	\
--	bool __ret_print_once = !__print_once; 			\
--								\
--	if (!__print_once) {					\
--		__print_once = true;				\
--		func(dev, fmt, ##__VA_ARGS__);			\
--	}							\
--	unlikely(__ret_print_once);				\
--})
-+	DO_ONCE_LITE(func, dev, fmt, ##__VA_ARGS__)
- 
- #define xfs_emerg_ratelimited(dev, fmt, ...)				\
- 	xfs_printk_ratelimited(xfs_emerg, dev, fmt, ##__VA_ARGS__)
-diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
-index 76a10e0dca9f..c93adb63780e 100644
---- a/include/asm-generic/bug.h
-+++ b/include/asm-generic/bug.h
-@@ -4,6 +4,7 @@
- 
- #include <linux/compiler.h>
- #include <linux/instrumentation.h>
-+#include <linux/once.h>
- 
- #define CUT_HERE		"------------[ cut here ]------------\n"
- 
-@@ -140,39 +141,15 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
- })
- 
- #ifndef WARN_ON_ONCE
--#define WARN_ON_ONCE(condition)	({				\
--	static bool __section(".data.once") __warned;		\
--	int __ret_warn_once = !!(condition);			\
--								\
--	if (unlikely(__ret_warn_once && !__warned)) {		\
--		__warned = true;				\
--		WARN_ON(1);					\
--	}							\
--	unlikely(__ret_warn_once);				\
--})
-+#define WARN_ON_ONCE(condition)					\
-+	DO_ONCE_LITE_IF(condition, WARN_ON, 1)
+ void netdev_rx_csum_fault(struct net_device *dev, struct sk_buff *skb)
+ {
+-	if (net_ratelimit()) {
+-		pr_err("%s: hw csum failure\n", dev ? dev->name : "<unknown>");
+-		skb_dump(KERN_ERR, skb, true);
+-		dump_stack();
+-	}
++	DO_ONCE_LITE(do_netdev_rx_csum_fault, dev, skb);
+ }
+ EXPORT_SYMBOL(netdev_rx_csum_fault);
  #endif
- 
--#define WARN_ONCE(condition, format...)	({			\
--	static bool __section(".data.once") __warned;		\
--	int __ret_warn_once = !!(condition);			\
--								\
--	if (unlikely(__ret_warn_once && !__warned)) {		\
--		__warned = true;				\
--		WARN(1, format);				\
--	}							\
--	unlikely(__ret_warn_once);				\
--})
-+#define WARN_ONCE(condition, format...)				\
-+	DO_ONCE_LITE_IF(condition, WARN, 1, format)
- 
--#define WARN_TAINT_ONCE(condition, taint, format...)	({	\
--	static bool __section(".data.once") __warned;		\
--	int __ret_warn_once = !!(condition);			\
--								\
--	if (unlikely(__ret_warn_once && !__warned)) {		\
--		__warned = true;				\
--		WARN_TAINT(1, taint, format);			\
--	}							\
--	unlikely(__ret_warn_once);				\
--})
-+#define WARN_TAINT_ONCE(condition, taint, format...)		\
-+	DO_ONCE_LITE_IF(condition, WARN_TAINT, 1, taint, format)
- 
- #else /* !CONFIG_BUG */
- #ifndef HAVE_ARCH_BUG
-diff --git a/include/linux/printk.h b/include/linux/printk.h
-index fe7eb2351610..f706be99f0b6 100644
---- a/include/linux/printk.h
-+++ b/include/linux/printk.h
-@@ -8,6 +8,7 @@
- #include <linux/linkage.h>
- #include <linux/cache.h>
- #include <linux/ratelimit_types.h>
-+#include <linux/once.h>
- 
- extern const char linux_banner[];
- extern const char linux_proc_banner[];
-@@ -436,27 +437,9 @@ extern int kptr_restrict;
- 
- #ifdef CONFIG_PRINTK
- #define printk_once(fmt, ...)					\
--({								\
--	static bool __section(".data.once") __print_once;	\
--	bool __ret_print_once = !__print_once;			\
--								\
--	if (!__print_once) {					\
--		__print_once = true;				\
--		printk(fmt, ##__VA_ARGS__);			\
--	}							\
--	unlikely(__ret_print_once);				\
--})
-+	DO_ONCE_LITE(printk, fmt, ##__VA_ARGS__)
- #define printk_deferred_once(fmt, ...)				\
--({								\
--	static bool __section(".data.once") __print_once;	\
--	bool __ret_print_once = !__print_once;			\
--								\
--	if (!__print_once) {					\
--		__print_once = true;				\
--		printk_deferred(fmt, ##__VA_ARGS__);		\
--	}							\
--	unlikely(__ret_print_once);				\
--})
-+	DO_ONCE_LITE(printk_deferred, fmt, ##__VA_ARGS__)
- #else
- #define printk_once(fmt, ...)					\
- 	no_printk(fmt, ##__VA_ARGS__)
-diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index a6446c03cfbc..8c868e5b4525 100644
---- a/kernel/trace/trace.h
-+++ b/kernel/trace/trace.h
-@@ -20,6 +20,7 @@
- #include <linux/irq_work.h>
- #include <linux/workqueue.h>
- #include <linux/ctype.h>
-+#include <linux/once.h>
- 
- #ifdef CONFIG_FTRACE_SYSCALLS
- #include <asm/unistd.h>		/* For NR_SYSCALLS	     */
-@@ -98,16 +99,8 @@ enum trace_type {
- #include "trace_entries.h"
- 
- /* Use this for memory failure errors */
--#define MEM_FAIL(condition, fmt, ...) ({			\
--	static bool __section(".data.once") __warned;		\
--	int __ret_warn_once = !!(condition);			\
--								\
--	if (unlikely(__ret_warn_once && !__warned)) {		\
--		__warned = true;				\
--		pr_err("ERROR: " fmt, ##__VA_ARGS__);		\
--	}							\
--	unlikely(__ret_warn_once);				\
--})
-+#define MEM_FAIL(condition, fmt, ...)					\
-+	DO_ONCE_LITE_IF(condition, pr_err, "ERROR: " fmt, ##__VA_ARGS__)
- 
- /*
-  * syscalls are special, and need special handling, this is why
 -- 
-2.31.1.498.g6c1eba8ee3d-goog
+2.32.0.rc0.204.g9fa02ecfa5-goog
`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help