Optimize pid filters and add --no-filter option
cover Optimize pid filters and add --no-filter option
This patchset optimizes how pid filters are expressed and makes it less likely that we overflow ftrace filters' size limit of one page.
Slavomir Kaslev (2):
trace-cmd: Optimize how pid filters are expressed
trace-cmd: Add --no-filter option to not filter recording processes
tracecmd/trace-record.c | 126 +++++++++++++++++++++++++++------------- tracecmd/trace-usage.c | 1 + 2 files changed, 87 insertions(+), 40 deletions(-)
Signature · 1 line
2.19.1
PATCH 1/2 trace-cmd: Optimize how pid filters are expressed
Express pid filters as allowed/disallowed filter ranges
(pid>=100&&pid<=103)
instead of specifying them per pid
(pid==100||pid==101||pid==102||pid==103)
This makes the size of the resulting filter smaller (and faster) and avoids overflowing the filter size limit of one page which we can hit on bigger machines (say >160 CPUs).
--- tracecmd/trace-record.c | 112 +++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 37 deletions(-)
tracecmd/trace-record.c +75 -37
@@ -950,10 +950,61 @@ static void update_ftrace_pids(int reset)static void update_event_filters (struct buffer_instance *instance);static void update_pid_event_filters (struct buffer_instance *instance); +static void append_filter_pid_range (char **filter,int *curr_len, +const char *field, +int start_pid,int end_pid,bool exclude) +{ +char *op, *op1, *op2, *op3; +int len; + + op = *filter && **filter ?"||" :"" ; + +// Handle thus case explicitly so that we get `pid==3` instead of +// `pid>=3&&pid<=3` for singleton ranges +if (start_pid == end_pid) { +#define FMT "%s(%s%s%d)" + len =snprintf (NULL ,0 ,FMT , op, + field, exclude ?"!=" :"==" , start_pid); + *filter =realloc (*filter, *curr_len + len +1 ); +if (!*filter) +die ("realloc" ); + + len =snprintf (*filter + *curr_len, len +1 ,FMT , op, + field, exclude ?"!=" :"==" , start_pid); + *curr_len += len; + +return ; +#undef FMT + } + +if (exclude) { + op1 ="<" ; + op2 ="||" ; + op3 =">" ; + }else { + op1 =">=" ; + op2 ="&&" ; + op3 ="<=" ; + } + +#define FMT "%s(%s%s%d%s%s%s%d)" + len =snprintf (NULL ,0 ,FMT , op, + field, op1, start_pid, op2, + field, op3, end_pid); + *filter =realloc (*filter, *curr_len + len +1 ); +if (!*filter) +die ("realloc" ); + + len =snprintf (*filter + *curr_len, len +1 ,FMT , op, + field, op1, start_pid, op2, + field, op3, end_pid); + *curr_len += len; +} +/** * make_pid_filter - create a filter string to all pids against @field * @curr_filter: Append to a previous filter (may realloc). Can be NULL -* @field: The fild to compare the pids against +* @field: The field to compare the pids against * * Creates a new string or appends to an existing one if @curr_filter * is not NULL. The new string will contain a filter with all pids
@@ -963,54 +1014,41 @@ static void update_pid_event_filters(struct buffer_instance *instance);*/ static char *make_pid_filter (char *curr_filter,const char *field) { +int curr_len =0 , last_exclude =-1 ; +int start_pid =-1 , last_pid =-1 ; +char *filter =NULL , *save;struct filter_pids *p; -char *filter; -char *orit; -char *match; -char *str; -int curr_len =0 ; -int len;/* Use the new method if possible */ if (have_set_event_pid)return NULL ; - len = len_filter_pids + (strlen (field) +strlen ("(==)||" )) * nr_filter_pids; - -if (curr_filter) { - curr_len =strlen (curr_filter); - filter =realloc (curr_filter, curr_len + len +strlen ("(&&())" )); -if (!filter) -die ("realloc" ); -memmove (filter+1 , curr_filter, curr_len); - filter[0 ] ='(' ; -strcat (filter,")&&(" ); - curr_len =strlen (filter); - }else - filter =malloc (len); -if (!filter) -die ("Failed to allocate pid filter" ); - -/* Last '||' that is not used will cover the \0 */ - str = filter + curr_len; +if (!filter_pids) +return curr_filter;for (p = filter_pids; p; p = p->next) { -if (p->exclude) { - match ="!=" ; - orit ="&&" ; - }else { - match ="==" ; - orit ="||" ; +if (p->pid == last_pid -1 && p->exclude == last_exclude) { + last_pid = p->pid; +continue ; } -if (p == filter_pids) - orit ="" ; - len =sprintf (str,"%s(%s%s%d)" , orit, field, match, p->pid); - str += len; +if (start_pid !=-1 ) +append_filter_pid_range (&filter, &curr_len, field, + start_pid, last_pid, + last_exclude); + + start_pid = last_pid = p->pid; + last_exclude = p->exclude; + } +append_filter_pid_range (&filter, &curr_len, field, + start_pid, last_pid, last_exclude); -if (curr_len) -sprintf (str,")" ); +if (curr_filter) { + save = filter; +asprintf (&filter,"(%s)&&(%s)" , curr_filter, filter); +free (save); + }return filter; }
Signature · 1 line
2.19.1
Re: [PATCH 1/2] trace-cmd: Optimize how pid filters are expressed
Quoted 7 lines · Slavomir Kaslev
Express pid filters as allowed/disallowed filter ranges
(pid>=100&&pid<=103)
instead of specifying them per pid
Quoted 7 lines
(pid==100||pid==101||pid==102||pid==103)
This makes the size of the resulting filter smaller (and faster) and avoids overflowing the filter size limit of one page which we can hit on bigger machines (say >160 CPUs).
Signed-off-by Slavomir Kaslev <[email protected]>
I missed to add some tags:
-- Slavi
PATCH 2/2 trace-cmd: Add --no-filter option to not filter recording processes
In reply to Slavomir KaslevAdd --no-filter option which doesn't install filters for the trace-cmd recording processes pids.
--- tracecmd/trace-record.c | 14 +++++++++++--- tracecmd/trace-usage.c | 1 + 2 files changed, 12 insertions(+), 3 deletions(-)
tracecmd/trace-record.c +11 -3
@@ -86,6 +86,7 @@ static int do_ptrace;static int filter_task;static int filter_pid =-1 ; +static bool no_filter = false;static int local_cpu_count;
@@ -1058,6 +1059,9 @@ static void update_task_filter(void)struct buffer_instance *instance;int pid =getpid (); +if (no_filter) +return ; +if (filter_task)add_filter_pid (pid,0 );
@@ -4372,9 +4376,9 @@ void update_first_instance(struct buffer_instance *instance, int topt) }enum { - - OPT_quiet =246 , - OPT_debug =247 , + OPT_quiet =245 , + OPT_debug =246 , + OPT_no_filter =247 , OPT_max_graph_depth =248 , OPT_tsoffset =249 , OPT_bycomm =250 ,
@@ -4598,6 +4602,7 @@ static void parse_record_options(int argc, {"by-comm", no_argument, NULL, OPT_bycomm}, {"ts-offset", required_argument, NULL, OPT_tsoffset}, {"max-graph-depth", required_argument, NULL, OPT_max_graph_depth}, + {"no-filter", no_argument, NULL, OPT_no_filter}, {"debug", no_argument, NULL, OPT_debug}, {"quiet", no_argument, NULL, OPT_quiet}, {"help", no_argument, NULL, '?'},
@@ -4872,6 +4877,9 @@ static void parse_record_options(int argc,if (!ctx->max_graph_depth)die ("Could not allocate option" );break ; +case OPT_no_filter: + no_filter = true; +break ;case OPT_debug: debug =1 ;break ;
tracecmd/trace-usage.c +1 -0
@@ -56,6 +56,7 @@ static struct usage_help usage_help[] = {" --func-stack perform a stack trace for function tracer\n" " (use with caution)\n" " --max-graph-depth limit function_graph depth\n" +" --no-filter do not set any event filters\n" }, { "start",
Signature · 1 line
2.19.1
Quoted 14 lines · On Mon, Apr 15, 2019 at 01:43:41PM +0300 Slavomir Kaslev wrote:
This patchset optimizes how pid filters are expressed and makes it less likely that we overflow ftrace filters' size limit of one page.
Slavomir Kaslev (2):
trace-cmd: Optimize how pid filters are expressed
trace-cmd: Add --no-filter option to not filter recording processestracecmd/trace-record.c | 126 +++++++++++++++++++++++++++------------- tracecmd/trace-usage.c | 1 + 2 files changed, 87 insertions(+), 40 deletions(-)Signature · 1 line
2.19.1
That worked very nicely on my setup. Collapsed from len 6300+ to :
WRITE: /sys/kernel/tracing/events/sched/sched_switch/filter, len 70, data "(common_pid<13247||common_pid>13088)||(next_pid<13247||next_pid>13088)"
--no-filter also worked as advertised.
Thanks!