diff mbox

[RFC,2/3] arm64: refactor save_stack_trace()

Message ID 20150716121658.7982fdf5@gandalf.local.home (mailing list archive)
State New, archived
Headers show

Commit Message

Steven Rostedt July 16, 2015, 4:16 p.m. UTC
On Thu, 16 Jul 2015 11:31:15 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:

> > 
> > In case of the number of entries, the following diff might be needed
> > as I suggested in the previous reply. ;)
> > 
> > ----8<----
> > 
> > @@ -330,7 +333,7 @@ static int t_show(struct seq_file *m, void *v)
> >  		seq_printf(m, "        Depth    Size   Location"
> >  			   "    (%d entries)\n"
> >  			   "        -----    ----   --------\n",
> > -			   max_stack_trace.nr_entries - 1);
> > +			   max_stack_trace.nr_entries);
> 
> This would break x86.

Nope, you were correct. But it was also missing another change:

-- Steve

Comments

Mark Rutland July 17, 2015, 12:40 p.m. UTC | #1
Hi,

> @@ -354,7 +330,7 @@ static int t_show(struct seq_file *m, vo
>  		seq_printf(m, "        Depth    Size   Location"
>  			   "    (%d entries)\n"
>  			   "        -----    ----   --------\n",
> -			   max_stack_trace.nr_entries - 1);
> +			   max_stack_trace.nr_entries);

I believe you'll want the same fix in print_max_stack, given it's a
carbon copy.

Mark
Steven Rostedt July 17, 2015, 12:51 p.m. UTC | #2
On Fri, 17 Jul 2015 13:40:54 +0100
Mark Rutland <mark.rutland@arm.com> wrote:

> Hi,
> 
> > @@ -354,7 +330,7 @@ static int t_show(struct seq_file *m, vo
> >  		seq_printf(m, "        Depth    Size   Location"
> >  			   "    (%d entries)\n"
> >  			   "        -----    ----   --------\n",
> > -			   max_stack_trace.nr_entries - 1);
> > +			   max_stack_trace.nr_entries);
> 
> I believe you'll want the same fix in print_max_stack, given it's a
> carbon copy.

Yep, thanks for pointing that out.

-- Steve
diff mbox

Patch

Index: linux-trace.git/kernel/trace/trace_stack.c
===================================================================
--- linux-trace.git.orig/kernel/trace/trace_stack.c	2015-07-16 11:45:17.816249113 -0400
+++ linux-trace.git/kernel/trace/trace_stack.c	2015-07-16 12:01:51.051403333 -0400
@@ -284,7 +260,7 @@  __next(struct seq_file *m, loff_t *pos)
 {
 	long n = *pos - 1;
 
-	if (n >= max_stack_trace.nr_entries || stack_dump_trace[n] == ULONG_MAX)
+	if (n > max_stack_trace.nr_entries || stack_dump_trace[n] == ULONG_MAX)
 		return NULL;
 
 	m->private = (void *)n;
@@ -354,7 +330,7 @@  static int t_show(struct seq_file *m, vo
 		seq_printf(m, "        Depth    Size   Location"
 			   "    (%d entries)\n"
 			   "        -----    ----   --------\n",
-			   max_stack_trace.nr_entries - 1);
+			   max_stack_trace.nr_entries);
 
 		if (!stack_tracer_enabled && !max_stack_size)
 			print_disabled(m);