Skip to content

Commit 39f7c41

Browse files
valschneiderrostedt
authored andcommitted
tracing/filters: Enable filtering a cpumask field by another cpumask
The recently introduced ipi_send_cpumask trace event contains a cpumask field, but it currently cannot be used in filter expressions. Make event filtering aware of cpumask fields, and allow these to be filtered by a user-provided cpumask. The user-provided cpumask is to be given in cpulist format and wrapped as: "CPUS{$cpulist}". The use of curly braces instead of parentheses is to prevent predicate_parse() from parsing the contents of CPUS{...} as a full-fledged predicate subexpression. This enables e.g.: $ trace-cmd record -e 'ipi_send_cpumask' -f 'cpumask & CPUS{2,4,6,8-32}' Link: https://lkml.kernel.org/r/20230707172155.70873-3-vschneid@redhat.com Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Juri Lelli <juri.lelli@redhat.com> Cc: Daniel Bristot de Oliveira <bristot@redhat.com> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Leonardo Bras <leobras@redhat.com> Cc: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Valentin Schneider <vschneid@redhat.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent cfb58e2 commit 39f7c41

2 files changed

Lines changed: 96 additions & 2 deletions

File tree

include/linux/trace_events.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,7 @@ enum {
808808
FILTER_RDYN_STRING,
809809
FILTER_PTR_STRING,
810810
FILTER_TRACE_FN,
811+
FILTER_CPUMASK,
811812
FILTER_COMM,
812813
FILTER_CPU,
813814
FILTER_STACKTRACE,

kernel/trace/trace_events_filter.c

Lines changed: 95 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ enum filter_pred_fn {
6464
FILTER_PRED_FN_PCHAR_USER,
6565
FILTER_PRED_FN_PCHAR,
6666
FILTER_PRED_FN_CPU,
67+
FILTER_PRED_FN_CPUMASK,
6768
FILTER_PRED_FN_FUNCTION,
6869
FILTER_PRED_FN_,
6970
FILTER_PRED_TEST_VISITED,
7071
};
7172

7273
struct filter_pred {
7374
struct regex *regex;
75+
struct cpumask *mask;
7476
unsigned short *ops;
7577
struct ftrace_event_field *field;
7678
u64 val;
@@ -94,6 +96,8 @@ struct filter_pred {
9496
C(TOO_MANY_OPEN, "Too many '('"), \
9597
C(TOO_MANY_CLOSE, "Too few '('"), \
9698
C(MISSING_QUOTE, "Missing matching quote"), \
99+
C(MISSING_BRACE_OPEN, "Missing '{'"), \
100+
C(MISSING_BRACE_CLOSE, "Missing '}'"), \
97101
C(OPERAND_TOO_LONG, "Operand too long"), \
98102
C(EXPECT_STRING, "Expecting string field"), \
99103
C(EXPECT_DIGIT, "Expecting numeric field"), \
@@ -103,6 +107,7 @@ struct filter_pred {
103107
C(BAD_SUBSYS_FILTER, "Couldn't find or set field in one of a subsystem's events"), \
104108
C(TOO_MANY_PREDS, "Too many terms in predicate expression"), \
105109
C(INVALID_FILTER, "Meaningless filter expression"), \
110+
C(INVALID_CPULIST, "Invalid cpulist"), \
106111
C(IP_FIELD_ONLY, "Only 'ip' field is supported for function trace"), \
107112
C(INVALID_VALUE, "Invalid value (did you forget quotes)?"), \
108113
C(NO_FUNCTION, "Function not found"), \
@@ -190,6 +195,7 @@ static void free_predicate(struct filter_pred *pred)
190195
{
191196
if (pred) {
192197
kfree(pred->regex);
198+
kfree(pred->mask);
193199
kfree(pred);
194200
}
195201
}
@@ -877,6 +883,26 @@ static int filter_pred_cpu(struct filter_pred *pred, void *event)
877883
}
878884
}
879885

886+
/* Filter predicate for cpumask field vs user-provided cpumask */
887+
static int filter_pred_cpumask(struct filter_pred *pred, void *event)
888+
{
889+
u32 item = *(u32 *)(event + pred->offset);
890+
int loc = item & 0xffff;
891+
const struct cpumask *mask = (event + loc);
892+
const struct cpumask *cmp = pred->mask;
893+
894+
switch (pred->op) {
895+
case OP_EQ:
896+
return cpumask_equal(mask, cmp);
897+
case OP_NE:
898+
return !cpumask_equal(mask, cmp);
899+
case OP_BAND:
900+
return cpumask_intersects(mask, cmp);
901+
default:
902+
return 0;
903+
}
904+
}
905+
880906
/* Filter predicate for COMM. */
881907
static int filter_pred_comm(struct filter_pred *pred, void *event)
882908
{
@@ -1244,8 +1270,12 @@ static void filter_free_subsystem_filters(struct trace_subsystem_dir *dir,
12441270

12451271
int filter_assign_type(const char *type)
12461272
{
1247-
if (strstr(type, "__data_loc") && strstr(type, "char"))
1248-
return FILTER_DYN_STRING;
1273+
if (strstr(type, "__data_loc")) {
1274+
if (strstr(type, "char"))
1275+
return FILTER_DYN_STRING;
1276+
if (strstr(type, "cpumask_t"))
1277+
return FILTER_CPUMASK;
1278+
}
12491279

12501280
if (strstr(type, "__rel_loc") && strstr(type, "char"))
12511281
return FILTER_RDYN_STRING;
@@ -1357,6 +1387,8 @@ static int filter_pred_fn_call(struct filter_pred *pred, void *event)
13571387
return filter_pred_pchar(pred, event);
13581388
case FILTER_PRED_FN_CPU:
13591389
return filter_pred_cpu(pred, event);
1390+
case FILTER_PRED_FN_CPUMASK:
1391+
return filter_pred_cpumask(pred, event);
13601392
case FILTER_PRED_FN_FUNCTION:
13611393
return filter_pred_function(pred, event);
13621394
case FILTER_PRED_TEST_VISITED:
@@ -1568,6 +1600,67 @@ static int parse_pred(const char *str, void *data,
15681600
strncpy(pred->regex->pattern, str + s, len);
15691601
pred->regex->pattern[len] = 0;
15701602

1603+
} else if (!strncmp(str + i, "CPUS", 4)) {
1604+
unsigned int maskstart;
1605+
char *tmp;
1606+
1607+
switch (field->filter_type) {
1608+
case FILTER_CPUMASK:
1609+
break;
1610+
default:
1611+
parse_error(pe, FILT_ERR_ILLEGAL_FIELD_OP, pos + i);
1612+
goto err_free;
1613+
}
1614+
1615+
switch (op) {
1616+
case OP_EQ:
1617+
case OP_NE:
1618+
case OP_BAND:
1619+
break;
1620+
default:
1621+
parse_error(pe, FILT_ERR_ILLEGAL_FIELD_OP, pos + i);
1622+
goto err_free;
1623+
}
1624+
1625+
/* Skip CPUS */
1626+
i += 4;
1627+
if (str[i++] != '{') {
1628+
parse_error(pe, FILT_ERR_MISSING_BRACE_OPEN, pos + i);
1629+
goto err_free;
1630+
}
1631+
maskstart = i;
1632+
1633+
/* Walk the cpulist until closing } */
1634+
for (; str[i] && str[i] != '}'; i++);
1635+
if (str[i] != '}') {
1636+
parse_error(pe, FILT_ERR_MISSING_BRACE_CLOSE, pos + i);
1637+
goto err_free;
1638+
}
1639+
1640+
if (maskstart == i) {
1641+
parse_error(pe, FILT_ERR_INVALID_CPULIST, pos + i);
1642+
goto err_free;
1643+
}
1644+
1645+
/* Copy the cpulist between { and } */
1646+
tmp = kmalloc((i - maskstart) + 1, GFP_KERNEL);
1647+
strscpy(tmp, str + maskstart, (i - maskstart) + 1);
1648+
1649+
pred->mask = kzalloc(cpumask_size(), GFP_KERNEL);
1650+
if (!pred->mask)
1651+
goto err_mem;
1652+
1653+
/* Now parse it */
1654+
if (cpulist_parse(tmp, pred->mask)) {
1655+
parse_error(pe, FILT_ERR_INVALID_CPULIST, pos + i);
1656+
goto err_free;
1657+
}
1658+
1659+
/* Move along */
1660+
i++;
1661+
if (field->filter_type == FILTER_CPUMASK)
1662+
pred->fn_num = FILTER_PRED_FN_CPUMASK;
1663+
15711664
/* This is either a string, or an integer */
15721665
} else if (str[i] == '\'' || str[i] == '"') {
15731666
char q = str[i];

0 commit comments

Comments
 (0)