From: Alan Maguire <alan.maguire@oracle.com>
To: rostedt@goodmis.org, mhiramat@kernel.org
Cc: corbet@lwn.net, shuah@kernel.org,
linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
Alan Maguire <alan.maguire@oracle.com>
Subject: [PATCH v2 tracing 4/6] tracing: support MAC address filter predicates
Date: Fri, 28 Apr 2023 16:34:47 +0100 [thread overview]
Message-ID: <1682696089-27937-5-git-send-email-alan.maguire@oracle.com> (raw)
In-Reply-To: <1682696089-27937-1-git-send-email-alan.maguire@oracle.com>
Support '==' and '!=' predicates for MAC address format;
for example
cd /sys/kernel/debug/tracing/events/cfg80211/rdev_get_key
echo "mac_addr == de:ad:be:ef:de:ad"
Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
---
kernel/trace/trace_events_filter.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index e2521574f3c4..f38023f490b1 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1384,7 +1384,7 @@ static int parse_pred(const char *str, void *data,
unsigned long size;
unsigned long ip;
char num_buf[24]; /* Big enough to hold an address */
- char scratch[4]; /* Big enough to hold an IPv4 address */
+ char scratch[6]; /* Big enough to hold a MAC address */
u8 *pred_val;
char *field_name;
char *name;
@@ -1738,6 +1738,24 @@ static int parse_pred(const char *str, void *data,
if (pred->op == OP_NE)
pred->not = 1;
+ } else if (field->size == 6 &&
+ sscanf(&str[i], "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+ &scratch[0], &scratch[1], &scratch[2], &scratch[3],
+ &scratch[4], &scratch[5]) == 6) {
+ /* For MAC addresses, only '==' or '!=' are supported. */
+ if (pred->op != OP_EQ && pred->op != OP_NE) {
+ parse_error(pe, FILT_ERR_ILLEGAL_FIELD_OP, pos + i);
+ goto err_free;
+ }
+ while (isalnum(str[i]) || str[i] == ':')
+ i++;
+ pred_val = kzalloc(field->size, GFP_KERNEL);
+ memcpy(pred_val, scratch, field->size);
+ pred->val = (u64)pred_val;
+ pred->fn_num = FILTER_PRED_FN_MEMCMP;
+ if (pred->op == OP_NE)
+ pred->not = 1;
+
} else if (str[i] == '0' && tolower(str[i + 1]) == 'x' &&
field->size > 8) {
/* For sizes > 8 bytes, we store hex bytes for comparison;
--
2.31.1
next prev parent reply other threads:[~2023-04-28 15:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-28 15:34 [PATCH v2 tracing 0/6] tracing: additional filter predicates Alan Maguire
2023-04-28 15:34 ` [PATCH v2 tracing 1/6] tracing: support > 8 byte array " Alan Maguire
2023-04-28 15:34 ` [PATCH v2 tracing 2/6] tracing: support IPv4 address filter predicate Alan Maguire
2023-04-28 15:34 ` [PATCH v2 tracing 3/6] tracing: support IPv6 filter predicates Alan Maguire
2023-06-09 21:12 ` Steven Rostedt
2023-06-09 21:15 ` Steven Rostedt
2023-04-28 15:34 ` Alan Maguire [this message]
2023-04-28 15:34 ` [PATCH v2 tracing 5/6] selftests/ftrace: add test coverage for " Alan Maguire
2023-04-28 15:34 ` [PATCH v2 tracing 6/6] tracing: document IPv4, IPv6, MAC address and > 8 byte numeric filtering support Alan Maguire
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1682696089-27937-5-git-send-email-alan.maguire@oracle.com \
--to=alan.maguire@oracle.com \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).