* [PATCH] trace: use WARN instead of printk and WARN_ON
@ 2021-12-07 12:55 Qing Wang
2021-12-07 14:18 ` Steven Rostedt
[not found] ` <AHoASQC9E8*4-sq3w2XY7ao3.9.1638886730256.Hmail.wangqing@vivo.com.@PDIwMjExMjA3MDkxODQzLjA3NjVmYTNmQGdhbmRhbGYubG9jYWwuaG9tZT4=>
0 siblings, 2 replies; 5+ messages in thread
From: Qing Wang @ 2021-12-07 12:55 UTC (permalink / raw)
To: Steven Rostedt, Ingo Molnar, linux-kernel; +Cc: Wang Qing
From: Wang Qing <wangqing@vivo.com>
Simply use WARN instead of printk(KERN_WARNING, ...) and WARN_ON.
Signed-off-by: Wang Qing <wangqing@vivo.com>
---
kernel/trace/trace_output.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 3547e71..e0348ec
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -775,8 +775,7 @@ int register_trace_event(struct trace_event *event)
list_add_tail(&event->list, list);
} else if (event->type > __TRACE_LAST_TYPE) {
- printk(KERN_WARNING "Need to add type to trace.h\n");
- WARN_ON(1);
+ WARN(1, "Need to add type to trace.h\n");
goto out;
} else {
/* Is this event already used */
@@ -1569,11 +1568,9 @@ __init static int init_events(void)
event = events[i];
ret = register_trace_event(event);
- if (!ret) {
- printk(KERN_WARNING "event %d failed to register\n",
- event->type);
- WARN_ON_ONCE(1);
- }
+ if (!ret)
+ WARN_ONCE(1, "event %d failed to register\n",
+ event->type);
}
return 0;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] trace: use WARN instead of printk and WARN_ON
2021-12-07 12:55 [PATCH] trace: use WARN instead of printk and WARN_ON Qing Wang
@ 2021-12-07 14:18 ` Steven Rostedt
2022-04-24 12:09 ` [PATCH v2] " Guo Zhengkui
2022-04-24 13:19 ` Guo Zhengkui
[not found] ` <AHoASQC9E8*4-sq3w2XY7ao3.9.1638886730256.Hmail.wangqing@vivo.com.@PDIwMjExMjA3MDkxODQzLjA3NjVmYTNmQGdhbmRhbGYubG9jYWwuaG9tZT4=>
1 sibling, 2 replies; 5+ messages in thread
From: Steven Rostedt @ 2021-12-07 14:18 UTC (permalink / raw)
To: Qing Wang; +Cc: Ingo Molnar, linux-kernel
On Tue, 7 Dec 2021 04:55:32 -0800
Qing Wang <wangqing@vivo.com> wrote:
> From: Wang Qing <wangqing@vivo.com>
>
> Simply use WARN instead of printk(KERN_WARNING, ...) and WARN_ON.
>
> Signed-off-by: Wang Qing <wangqing@vivo.com>
> ---
> kernel/trace/trace_output.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
> index 3547e71..e0348ec
> --- a/kernel/trace/trace_output.c
> +++ b/kernel/trace/trace_output.c
> @@ -775,8 +775,7 @@ int register_trace_event(struct trace_event *event)
> list_add_tail(&event->list, list);
>
> } else if (event->type > __TRACE_LAST_TYPE) {
> - printk(KERN_WARNING "Need to add type to trace.h\n");
> - WARN_ON(1);
> + WARN(1, "Need to add type to trace.h\n");
If you are going to fix this, then please fix it properly.
} else if (WARN(event->type > __TRACE_LAST_TYPE,
"Need to add type to trace.h")) {
> goto out;
> } else {
> /* Is this event already used */
> @@ -1569,11 +1568,9 @@ __init static int init_events(void)
> event = events[i];
>
> ret = register_trace_event(event);
> - if (!ret) {
> - printk(KERN_WARNING "event %d failed to register\n",
> - event->type);
> - WARN_ON_ONCE(1);
> - }
> + if (!ret)
> + WARN_ONCE(1, "event %d failed to register\n",
> + event->type);
And this should just turn into:
WARN_ONCE(!ret, "event %d failed to register", event->type);
-- Steve
> }
>
> return 0;
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] trace: use WARN instead of printk and WARN_ON
[not found] ` <AHoASQC9E8*4-sq3w2XY7ao3.9.1638886730256.Hmail.wangqing@vivo.com.@PDIwMjExMjA3MDkxODQzLjA3NjVmYTNmQGdhbmRhbGYubG9jYWwuaG9tZT4=>
@ 2021-12-08 8:11 ` 王擎
0 siblings, 0 replies; 5+ messages in thread
From: 王擎 @ 2021-12-08 8:11 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Ingo Molnar, linux-kernel
>> From: Wang Qing <wangqing@vivo.com>
>>
>> Simply use WARN instead of printk(KERN_WARNING, ...) and WARN_ON.
>>
>> Signed-off-by: Wang Qing <wangqing@vivo.com>
>> ---
>> kernel/trace/trace_output.c | 11 ++++-------
>> 1 file changed, 4 insertions(+), 7 deletions(-)
>>
>> diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
>> index 3547e71..e0348ec
>> --- a/kernel/trace/trace_output.c
>> +++ b/kernel/trace/trace_output.c
>> @@ -775,8 +775,7 @@ int register_trace_event(struct trace_event *event)
>> list_add_tail(&event->list, list);
>>
>> } else if (event->type > __TRACE_LAST_TYPE) {
>> - printk(KERN_WARNING "Need to add type to trace.h\n");
>> - WARN_ON(1);
>> + WARN(1, "Need to add type to trace.h\n");
>
>If you are going to fix this, then please fix it properly.
Is there any problem with this modification?
>
> } else if (WARN(event->type > __TRACE_LAST_TYPE,
>> "Need to add type to trace.h")) {
>
>> goto out;
>> } else {
>> /* Is this event already used */
>> @@ -1569,11 +1568,9 @@ __init static int init_events(void)
>> event = events[i];
>>
>> ret = register_trace_event(event);
>> - if (!ret) {
>> - printk(KERN_WARNING "event %d failed to register\n",
>> - event->type);
>> - WARN_ON_ONCE(1);
>> - }
>> + if (!ret)
>> + WARN_ONCE(1, "event %d failed to register\n",
>> + event->type);
>
>And this should just turn into:
>
> WARN_ONCE(!ret, "event %d failed to register", event->type);
Yes，this should be right.
Thanks,
Qing
>-- Steve
>
>
>> }
>>
>> return 0;
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] trace: use WARN instead of printk and WARN_ON
2021-12-07 14:18 ` Steven Rostedt
@ 2022-04-24 12:09 ` Guo Zhengkui
2022-04-24 13:19 ` Guo Zhengkui
1 sibling, 0 replies; 5+ messages in thread
From: Guo Zhengkui @ 2022-04-24 12:09 UTC (permalink / raw)
To: Steven Rostedt, Ingo Molnar, open list
Cc: zhengkui_guo, Guo Zhengkui, Qing Wang
Use `WARN(cond, ...)` instead of `if (cond)` + `printk(...)` +
`WARN_ON(1)`.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Qing Wang <wangqing@vivo.com>
Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
v1 -> v2: Put WARN in the condition according to Steven's suggestion.
kernel/trace/trace_output.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 8aa493d25c73..d89e3f7e26eb 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -778,9 +778,8 @@ int register_trace_event(struct trace_event *event)
list_add_tail(&event->list, list);
- } else if (event->type > __TRACE_LAST_TYPE) {
- printk(KERN_WARNING "Need to add type to trace.h\n");
- WARN_ON(1);
+ } else if (WARN(event->type > __TRACE_LAST_TYPE,
+ "Need to add type to trace.h")) {
goto out;
} else {
/* Is this event already used */
@@ -1571,13 +1570,8 @@ __init static int init_events(void)
for (i = 0; events[i]; i++) {
event = events[i];
-
ret = register_trace_event(event);
- if (!ret) {
- printk(KERN_WARNING "event %d failed to register\n",
- event->type);
- WARN_ON_ONCE(1);
- }
+ WARN_ONCE(!ret, "event %d failed to register", event->type);
}
return 0;
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2] trace: use WARN instead of printk and WARN_ON
2021-12-07 14:18 ` Steven Rostedt
2022-04-24 12:09 ` [PATCH v2] " Guo Zhengkui
@ 2022-04-24 13:19 ` Guo Zhengkui
1 sibling, 0 replies; 5+ messages in thread
From: Guo Zhengkui @ 2022-04-24 13:19 UTC (permalink / raw)
To: Steven Rostedt, Ingo Molnar, open list; +Cc: zhengkui_guo, Guo Zhengkui
Use `WARN(cond, ...)` instead of `if (cond)` + `printk(...)` +
`WARN_ON(1)`.
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
v1 -> v2: Put WARN in the condition according to Steven's suggestion.
kernel/trace/trace_output.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 8aa493d25c73..d89e3f7e26eb 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -778,9 +778,8 @@ int register_trace_event(struct trace_event *event)
list_add_tail(&event->list, list);
- } else if (event->type > __TRACE_LAST_TYPE) {
- printk(KERN_WARNING "Need to add type to trace.h\n");
- WARN_ON(1);
+ } else if (WARN(event->type > __TRACE_LAST_TYPE,
+ "Need to add type to trace.h")) {
goto out;
} else {
/* Is this event already used */
@@ -1571,13 +1570,8 @@ __init static int init_events(void)
for (i = 0; events[i]; i++) {
event = events[i];
-
ret = register_trace_event(event);
- if (!ret) {
- printk(KERN_WARNING "event %d failed to register\n",
- event->type);
- WARN_ON_ONCE(1);
- }
+ WARN_ONCE(!ret, "event %d failed to register", event->type);
}
return 0;
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-04-24 13:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-07 12:55 [PATCH] trace: use WARN instead of printk and WARN_ON Qing Wang
2021-12-07 14:18 ` Steven Rostedt
2022-04-24 12:09 ` [PATCH v2] " Guo Zhengkui
2022-04-24 13:19 ` Guo Zhengkui
[not found] ` <AHoASQC9E8*4-sq3w2XY7ao3.9.1638886730256.Hmail.wangqing@vivo.com.@PDIwMjExMjA3MDkxODQzLjA3NjVmYTNmQGdhbmRhbGYubG9jYWwuaG9tZT4=>
2021-12-08 8:11 ` [PATCH] " 王擎
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).