Re: [PATCH v4 1/3] tracing: kdb: The skip_lines parameter should have been skip_entries

[Daniel Thompson]

On Fri, Mar 15, 2019 at 04:09:04PM -0700, Douglas Anderson wrote:
> The things skipped by kdb's "ftdump" command when you pass it a
> parameter has always been entries, not lines.  The difference usually
> doesn't matter but when the trace buffer has multi-line entries (like
> a stack dump) it can matter.
> 
> Let's fix this both in the help text for ftdump and also in the local
> variable names.
> 
> Signed-off-by: Douglas Anderson <dianders@xxxxxxxxxxxx>

Acked-by: Daniel Thompson <daniel.thompson@xxxxxxxxxx>

> ---
> 
> Changes in v4:
> - skip_lines => skip_entries new for v4.
> 
> Changes in v3: None
> 
>  kernel/trace/trace_kdb.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/kernel/trace/trace_kdb.c b/kernel/trace/trace_kdb.c
> index 810d78a8d14c..4b666643d69f 100644
> --- a/kernel/trace/trace_kdb.c
> +++ b/kernel/trace/trace_kdb.c
> @@ -17,7 +17,7 @@
>  #include "trace.h"
>  #include "trace_output.h"
>  
> -static void ftrace_dump_buf(int skip_lines, long cpu_file)
> +static void ftrace_dump_buf(int skip_entries, long cpu_file)
>  {
>  	/* use static because iter can be a bit big for the stack */
>  	static struct trace_iterator iter;
> @@ -70,11 +70,11 @@ static void ftrace_dump_buf(int skip_lines, long cpu_file)
>  			kdb_printf("---------------------------------\n");
>  		cnt++;
>  
> -		if (!skip_lines) {
> +		if (!skip_entries) {
>  			print_trace_line(&iter);
>  			trace_printk_seq(&iter.seq);
>  		} else {
> -			skip_lines--;
> +			skip_entries--;
>  		}
>  
>  		if (KDB_FLAG(CMD_INTERRUPT))
> @@ -106,7 +106,7 @@ static void ftrace_dump_buf(int skip_lines, long cpu_file)
>   */
>  static int kdb_ftdump(int argc, const char **argv)
>  {
> -	int skip_lines = 0;
> +	int skip_entries = 0;
>  	long cpu_file;
>  	char *cp;
>  
> @@ -114,9 +114,9 @@ static int kdb_ftdump(int argc, const char **argv)
>  		return KDB_ARGCOUNT;
>  
>  	if (argc) {
> -		skip_lines = simple_strtol(argv[1], &cp, 0);
> +		skip_entries = simple_strtol(argv[1], &cp, 0);
>  		if (*cp)
> -			skip_lines = 0;
> +			skip_entries = 0;
>  	}
>  
>  	if (argc == 2) {
> @@ -129,7 +129,7 @@ static int kdb_ftdump(int argc, const char **argv)
>  	}
>  
>  	kdb_trap_printk++;
> -	ftrace_dump_buf(skip_lines, cpu_file);
> +	ftrace_dump_buf(skip_entries, cpu_file);
>  	kdb_trap_printk--;
>  
>  	return 0;
> @@ -137,7 +137,7 @@ static int kdb_ftdump(int argc, const char **argv)
>  
>  static __init int kdb_ftrace_register(void)
>  {
> -	kdb_register_flags("ftdump", kdb_ftdump, "[skip_#lines] [cpu]",
> +	kdb_register_flags("ftdump", kdb_ftdump, "[skip_#entries] [cpu]",
>  			    "Dump ftrace log", 0, KDB_ENABLE_ALWAYS_SAFE);
>  	return 0;
>  }
> -- 
> 2.21.0.360.g471c308f928-goog
>