All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 1/2] trace_uprobe: Use %lx to display offset
@ 2018-03-15  8:27 Ravi Bangoria
  2018-03-15  8:27 ` [PATCH v2 2/2] trace_uprobe: Simplify probes_seq_show() Ravi Bangoria
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Ravi Bangoria @ 2018-03-15  8:27 UTC (permalink / raw)
  To: rostedt, linux-kernel, keescook
  Cc: wangnan0, mingo, srikar, oleg, mhiramat, namhyung, Ravi Bangoria

tu->offset is unsigned long, not a pointer, thus %lx should
be used to print it, not the %px.

Fixes: 0e4d819d0893 ("trace_uprobe: Display correct offset in uprobe_events")
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
---
v2 changelog:
 - Keep prefixed 0s as is.

 kernel/trace/trace_uprobe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 2014f4351ae0..0298bd15be83 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -608,7 +608,7 @@ static int probes_seq_show(struct seq_file *m, void *v)
 
 	/* Don't print "0x  (null)" when offset is 0 */
 	if (tu->offset) {
-		seq_printf(m, "0x%px", (void *)tu->offset);
+		seq_printf(m, "0x%0*lx", (int)(sizeof(void *) * 2), tu->offset);
 	} else {
 		switch (sizeof(void *)) {
 		case 4:
-- 
2.13.6

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH v2 2/2] trace_uprobe: Simplify probes_seq_show()
  2018-03-15  8:27 [PATCH v2 1/2] trace_uprobe: Use %lx to display offset Ravi Bangoria
@ 2018-03-15  8:27 ` Ravi Bangoria
  2018-03-15  9:31   ` Masami Hiramatsu
  2018-03-15  9:29 ` [PATCH v2 1/2] trace_uprobe: Use %lx to display offset Masami Hiramatsu
  2018-04-11  6:12 ` Ravi Bangoria
  2 siblings, 1 reply; 6+ messages in thread
From: Ravi Bangoria @ 2018-03-15  8:27 UTC (permalink / raw)
  To: rostedt, linux-kernel, keescook
  Cc: wangnan0, mingo, srikar, oleg, mhiramat, namhyung, Ravi Bangoria

Simplify probes_seq_show() function. No change in output
before and after patch.

Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
---
 kernel/trace/trace_uprobe.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 0298bd15be83..544fa10a471b 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -602,24 +602,9 @@ static int probes_seq_show(struct seq_file *m, void *v)
 	char c = is_ret_probe(tu) ? 'r' : 'p';
 	int i;
 
-	seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system,
-			trace_event_name(&tu->tp.call));
-	seq_printf(m, " %s:", tu->filename);
-
-	/* Don't print "0x  (null)" when offset is 0 */
-	if (tu->offset) {
-		seq_printf(m, "0x%0*lx", (int)(sizeof(void *) * 2), tu->offset);
-	} else {
-		switch (sizeof(void *)) {
-		case 4:
-			seq_printf(m, "0x00000000");
-			break;
-		case 8:
-		default:
-			seq_printf(m, "0x0000000000000000");
-			break;
-		}
-	}
+	seq_printf(m, "%c:%s/%s %s:0x%0*lx", c, tu->tp.call.class->system,
+			trace_event_name(&tu->tp.call), tu->filename,
+			(int)(sizeof(void *) * 2), tu->offset);
 
 	for (i = 0; i < tu->tp.nr_args; i++)
 		seq_printf(m, " %s=%s", tu->tp.args[i].name, tu->tp.args[i].comm);
-- 
2.13.6

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] trace_uprobe: Use %lx to display offset
  2018-03-15  8:27 [PATCH v2 1/2] trace_uprobe: Use %lx to display offset Ravi Bangoria
  2018-03-15  8:27 ` [PATCH v2 2/2] trace_uprobe: Simplify probes_seq_show() Ravi Bangoria
@ 2018-03-15  9:29 ` Masami Hiramatsu
  2018-04-11  6:12 ` Ravi Bangoria
  2 siblings, 0 replies; 6+ messages in thread
From: Masami Hiramatsu @ 2018-03-15  9:29 UTC (permalink / raw)
  To: Ravi Bangoria
  Cc: rostedt, linux-kernel, keescook, wangnan0, mingo, srikar, oleg,
	mhiramat, namhyung

On Thu, 15 Mar 2018 13:57:55 +0530
Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> wrote:

> tu->offset is unsigned long, not a pointer, thus %lx should
> be used to print it, not the %px.
> 

This looks good to me.

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thanks,

> Fixes: 0e4d819d0893 ("trace_uprobe: Display correct offset in uprobe_events")
> Suggested-by: Kees Cook <keescook@chromium.org>
> Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
> ---
> v2 changelog:
>  - Keep prefixed 0s as is.
> 
>  kernel/trace/trace_uprobe.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> index 2014f4351ae0..0298bd15be83 100644
> --- a/kernel/trace/trace_uprobe.c
> +++ b/kernel/trace/trace_uprobe.c
> @@ -608,7 +608,7 @@ static int probes_seq_show(struct seq_file *m, void *v)
>  
>  	/* Don't print "0x  (null)" when offset is 0 */
>  	if (tu->offset) {
> -		seq_printf(m, "0x%px", (void *)tu->offset);
> +		seq_printf(m, "0x%0*lx", (int)(sizeof(void *) * 2), tu->offset);
>  	} else {
>  		switch (sizeof(void *)) {
>  		case 4:
> -- 
> 2.13.6
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] trace_uprobe: Simplify probes_seq_show()
  2018-03-15  8:27 ` [PATCH v2 2/2] trace_uprobe: Simplify probes_seq_show() Ravi Bangoria
@ 2018-03-15  9:31   ` Masami Hiramatsu
  0 siblings, 0 replies; 6+ messages in thread
From: Masami Hiramatsu @ 2018-03-15  9:31 UTC (permalink / raw)
  To: Ravi Bangoria
  Cc: rostedt, linux-kernel, keescook, wangnan0, mingo, srikar, oleg,
	mhiramat, namhyung

On Thu, 15 Mar 2018 13:57:56 +0530
Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> wrote:

> Simplify probes_seq_show() function. No change in output
> before and after patch.

Yeah, we don't need this trick anymore.

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thank you!

> 
> Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
> ---
>  kernel/trace/trace_uprobe.c | 21 +++------------------
>  1 file changed, 3 insertions(+), 18 deletions(-)
> 
> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> index 0298bd15be83..544fa10a471b 100644
> --- a/kernel/trace/trace_uprobe.c
> +++ b/kernel/trace/trace_uprobe.c
> @@ -602,24 +602,9 @@ static int probes_seq_show(struct seq_file *m, void *v)
>  	char c = is_ret_probe(tu) ? 'r' : 'p';
>  	int i;
>  
> -	seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system,
> -			trace_event_name(&tu->tp.call));
> -	seq_printf(m, " %s:", tu->filename);
> -
> -	/* Don't print "0x  (null)" when offset is 0 */
> -	if (tu->offset) {
> -		seq_printf(m, "0x%0*lx", (int)(sizeof(void *) * 2), tu->offset);
> -	} else {
> -		switch (sizeof(void *)) {
> -		case 4:
> -			seq_printf(m, "0x00000000");
> -			break;
> -		case 8:
> -		default:
> -			seq_printf(m, "0x0000000000000000");
> -			break;
> -		}
> -	}
> +	seq_printf(m, "%c:%s/%s %s:0x%0*lx", c, tu->tp.call.class->system,
> +			trace_event_name(&tu->tp.call), tu->filename,
> +			(int)(sizeof(void *) * 2), tu->offset);
>  
>  	for (i = 0; i < tu->tp.nr_args; i++)
>  		seq_printf(m, " %s=%s", tu->tp.args[i].name, tu->tp.args[i].comm);
> -- 
> 2.13.6
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] trace_uprobe: Use %lx to display offset
  2018-03-15  8:27 [PATCH v2 1/2] trace_uprobe: Use %lx to display offset Ravi Bangoria
  2018-03-15  8:27 ` [PATCH v2 2/2] trace_uprobe: Simplify probes_seq_show() Ravi Bangoria
  2018-03-15  9:29 ` [PATCH v2 1/2] trace_uprobe: Use %lx to display offset Masami Hiramatsu
@ 2018-04-11  6:12 ` Ravi Bangoria
  2018-04-11 12:43   ` Steven Rostedt
  2 siblings, 1 reply; 6+ messages in thread
From: Ravi Bangoria @ 2018-04-11  6:12 UTC (permalink / raw)
  To: rostedt
  Cc: linux-kernel, keescook, wangnan0, mingo, srikar, oleg, mhiramat,
	namhyung, Ravi Bangoria

Hi Steve,

Can you please pull these patches.

Thanks,
Ravi

On 03/15/2018 01:57 PM, Ravi Bangoria wrote:
> tu->offset is unsigned long, not a pointer, thus %lx should
> be used to print it, not the %px.
>
> Fixes: 0e4d819d0893 ("trace_uprobe: Display correct offset in uprobe_events")
> Suggested-by: Kees Cook <keescook@chromium.org>
> Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
> ---
> v2 changelog:
>  - Keep prefixed 0s as is.
>
>  kernel/trace/trace_uprobe.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> index 2014f4351ae0..0298bd15be83 100644
> --- a/kernel/trace/trace_uprobe.c
> +++ b/kernel/trace/trace_uprobe.c
> @@ -608,7 +608,7 @@ static int probes_seq_show(struct seq_file *m, void *v)
>
>  	/* Don't print "0x  (null)" when offset is 0 */
>  	if (tu->offset) {
> -		seq_printf(m, "0x%px", (void *)tu->offset);
> +		seq_printf(m, "0x%0*lx", (int)(sizeof(void *) * 2), tu->offset);
>  	} else {
>  		switch (sizeof(void *)) {
>  		case 4:

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] trace_uprobe: Use %lx to display offset
  2018-04-11  6:12 ` Ravi Bangoria
@ 2018-04-11 12:43   ` Steven Rostedt
  0 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2018-04-11 12:43 UTC (permalink / raw)
  To: Ravi Bangoria
  Cc: linux-kernel, keescook, wangnan0, mingo, srikar, oleg, mhiramat,
	namhyung

On Wed, 11 Apr 2018 11:42:51 +0530
Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> wrote:

> Hi Steve,
> 
> Can you please pull these patches.
> 

Sure. I'll pull them in now and start testing them.

-- Steve

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-04-11 12:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-15  8:27 [PATCH v2 1/2] trace_uprobe: Use %lx to display offset Ravi Bangoria
2018-03-15  8:27 ` [PATCH v2 2/2] trace_uprobe: Simplify probes_seq_show() Ravi Bangoria
2018-03-15  9:31   ` Masami Hiramatsu
2018-03-15  9:29 ` [PATCH v2 1/2] trace_uprobe: Use %lx to display offset Masami Hiramatsu
2018-04-11  6:12 ` Ravi Bangoria
2018-04-11 12:43   ` Steven Rostedt

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.