* [PATCH tip/master] tracing/probes: Fix a warning message to show correct maximum length
@ 2017-02-07 3:12 Masami Hiramatsu
2017-02-07 7:41 ` Ingo Molnar
0 siblings, 1 reply; 5+ messages in thread
From: Masami Hiramatsu @ 2017-02-07 3:12 UTC (permalink / raw)
To: Ingo Molnar
Cc: Masami Hiramatsu, linux-kernel, Peter Zijlstra,
Ananth N Mavinakayanahalli, Thomas Gleixner, H . Peter Anvin,
Steven Rostedt, Ravi Bangoria
Since tracing/*probe_events will accept a probe definition
up to 4096 - 2 ('\n' and '\0') bytes, it must show 4094 instead
of 4096 in warning message.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
kernel/trace/trace_probe.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 8c0553d..7138fea 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -673,8 +673,9 @@ ssize_t traceprobe_probes_write(struct file *file, const char __user *buffer,
*tmp = '\0';
size = tmp - kbuf + 1;
} else if (done + size < count) {
+ /* This can accept WRITE_BUFSIZE - 2 ('\n' + '\0') */
pr_warn("Line length is too long: Should be less than %d\n",
- WRITE_BUFSIZE);
+ WRITE_BUFSIZE - 2);
ret = -EINVAL;
goto out;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH tip/master] tracing/probes: Fix a warning message to show correct maximum length
2017-02-07 3:12 [PATCH tip/master] tracing/probes: Fix a warning message to show correct maximum length Masami Hiramatsu
@ 2017-02-07 7:41 ` Ingo Molnar
2017-02-07 11:02 ` Masami Hiramatsu
2017-02-07 11:21 ` [PATCH tip/master] tracing/probe: Show subsystem name in messages Masami Hiramatsu
0 siblings, 2 replies; 5+ messages in thread
From: Ingo Molnar @ 2017-02-07 7:41 UTC (permalink / raw)
To: Masami Hiramatsu
Cc: Ingo Molnar, linux-kernel, Peter Zijlstra,
Ananth N Mavinakayanahalli, Thomas Gleixner, H . Peter Anvin,
Steven Rostedt, Ravi Bangoria
* Masami Hiramatsu <mhiramat@kernel.org> wrote:
> Since tracing/*probe_events will accept a probe definition
> up to 4096 - 2 ('\n' and '\0') bytes, it must show 4094 instead
> of 4096 in warning message.
>
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
> kernel/trace/trace_probe.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
> index 8c0553d..7138fea 100644
> --- a/kernel/trace/trace_probe.c
> +++ b/kernel/trace/trace_probe.c
> @@ -673,8 +673,9 @@ ssize_t traceprobe_probes_write(struct file *file, const char __user *buffer,
> *tmp = '\0';
> size = tmp - kbuf + 1;
> } else if (done + size < count) {
> + /* This can accept WRITE_BUFSIZE - 2 ('\n' + '\0') */
> pr_warn("Line length is too long: Should be less than %d\n",
> - WRITE_BUFSIZE);
> + WRITE_BUFSIZE - 2);
The message should also indicate which kernel subsystem generated it - which is
useful if the message is not immediately noticed in the kernel log.
You can do this by having something like this at the top of the trace_probe file:
#define pr_fmt(fmt) "trace_probe: " fmt
Thanks,
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH tip/master] tracing/probes: Fix a warning message to show correct maximum length
2017-02-07 7:41 ` Ingo Molnar
@ 2017-02-07 11:02 ` Masami Hiramatsu
2017-02-07 11:21 ` [PATCH tip/master] tracing/probe: Show subsystem name in messages Masami Hiramatsu
1 sibling, 0 replies; 5+ messages in thread
From: Masami Hiramatsu @ 2017-02-07 11:02 UTC (permalink / raw)
To: Ingo Molnar
Cc: Ingo Molnar, linux-kernel, Peter Zijlstra,
Ananth N Mavinakayanahalli, Thomas Gleixner, H . Peter Anvin,
Steven Rostedt, Ravi Bangoria
On Tue, 7 Feb 2017 08:41:48 +0100
Ingo Molnar <mingo@kernel.org> wrote:
>
> * Masami Hiramatsu <mhiramat@kernel.org> wrote:
>
> > Since tracing/*probe_events will accept a probe definition
> > up to 4096 - 2 ('\n' and '\0') bytes, it must show 4094 instead
> > of 4096 in warning message.
> >
> > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> > ---
> > kernel/trace/trace_probe.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
> > index 8c0553d..7138fea 100644
> > --- a/kernel/trace/trace_probe.c
> > +++ b/kernel/trace/trace_probe.c
> > @@ -673,8 +673,9 @@ ssize_t traceprobe_probes_write(struct file *file, const char __user *buffer,
> > *tmp = '\0';
> > size = tmp - kbuf + 1;
> > } else if (done + size < count) {
> > + /* This can accept WRITE_BUFSIZE - 2 ('\n' + '\0') */
> > pr_warn("Line length is too long: Should be less than %d\n",
> > - WRITE_BUFSIZE);
> > + WRITE_BUFSIZE - 2);
>
> The message should also indicate which kernel subsystem generated it - which is
> useful if the message is not immediately noticed in the kernel log.
>
> You can do this by having something like this at the top of the trace_probe file:
>
> #define pr_fmt(fmt) "trace_probe: " fmt
Ah, I got it. I'll make a separate patch for that.
Thank you!
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH tip/master] tracing/probe: Show subsystem name in messages
2017-02-07 7:41 ` Ingo Molnar
2017-02-07 11:02 ` Masami Hiramatsu
@ 2017-02-07 11:21 ` Masami Hiramatsu
2017-02-14 20:07 ` Steven Rostedt
1 sibling, 1 reply; 5+ messages in thread
From: Masami Hiramatsu @ 2017-02-07 11:21 UTC (permalink / raw)
To: Ingo Molnar
Cc: Masami Hiramatsu, linux-kernel, Peter Zijlstra,
Ananth N Mavinakayanahalli, Thomas Gleixner, H . Peter Anvin,
Steven Rostedt, Ravi Bangoria
Show "trace_probe:", "trace_kprobe:" and "trace_uprobe:"
headers for each warning/error/info message. This will
help people to notice that kprobe/uprobe events caused
those messages.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
kernel/trace/trace_kprobe.c | 1 +
kernel/trace/trace_probe.c | 1 +
kernel/trace/trace_uprobe.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index d3729bd..5f688cc 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -16,6 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define pr_fmt(fmt) "trace_kprobe: " fmt
#include <linux/module.h>
#include <linux/uaccess.h>
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 7138fea..eda3a45 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -21,6 +21,7 @@
* Copyright (C) IBM Corporation, 2010-2011
* Author: Srikar Dronamraju
*/
+#define pr_fmt(fmt) "trace_probe: " fmt
#include "trace_probe.h"
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index e5445ab..2c6b2d0c 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -17,6 +17,7 @@
* Copyright (C) IBM Corporation, 2010-2012
* Author: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
*/
+#define pr_fmt(fmt) "trace_kprobe: " fmt
#include <linux/module.h>
#include <linux/uaccess.h>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH tip/master] tracing/probe: Show subsystem name in messages
2017-02-07 11:21 ` [PATCH tip/master] tracing/probe: Show subsystem name in messages Masami Hiramatsu
@ 2017-02-14 20:07 ` Steven Rostedt
0 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2017-02-14 20:07 UTC (permalink / raw)
To: Masami Hiramatsu
Cc: Ingo Molnar, linux-kernel, Peter Zijlstra,
Ananth N Mavinakayanahalli, Thomas Gleixner, H . Peter Anvin,
Ravi Bangoria
On Tue, 7 Feb 2017 20:21:28 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:
> Show "trace_probe:", "trace_kprobe:" and "trace_uprobe:"
> headers for each warning/error/info message. This will
> help people to notice that kprobe/uprobe events caused
> those messages.
>
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Applied. Thanks!
-- Steve
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-02-14 20:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-07 3:12 [PATCH tip/master] tracing/probes: Fix a warning message to show correct maximum length Masami Hiramatsu
2017-02-07 7:41 ` Ingo Molnar
2017-02-07 11:02 ` Masami Hiramatsu
2017-02-07 11:21 ` [PATCH tip/master] tracing/probe: Show subsystem name in messages Masami Hiramatsu
2017-02-14 20:07 ` Steven Rostedt
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).