Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Alan Maguire <alan.maguire@oracle.com>
To:     rostedt@goodmis.org
Cc:     corbet@lwn.net, mingo@redhat.com, shuah@kernel.org,
        linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-kselftest@vger.kernel.org,
        Alan Maguire <alan.maguire@oracle.com>
Subject: [RFC tracing 2/4] tracing: support > 8 byte array filter predicates
Date:   Sun,  7 Aug 2022 23:21:21 +0100
Message-Id: <1659910883-18223-3-git-send-email-alan.maguire@oracle.com>
In-Reply-To: <1659910883-18223-1-git-send-email-alan.maguire@oracle.com>
References: <1659910883-18223-1-git-send-email-alan.maguire@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?K+LNFeVgwth7BYTHa2NFMDW0H2Kxb4UE+7QqnNifLyBH2El/uNKrkaEYwgY7?=
 =?us-ascii?Q?EiKx/2mY58j06XyU86Z6IChlzZvrDeqvpaHlzz4wFxR+ElORAT/VTQqfMpsF?=
 =?us-ascii?Q?2EcIr/Y/Mux3rTJk1KO4vwyYHgiVS+2XMZiiLLVO/1SNrassl1tJWS2Vvg8Q?=
 =?us-ascii?Q?3rY8uqF4Oqo+VTKkM8sFVweE0cMdxfP+Nkg/tWNnSUstfwtfWDrUzPw6l7FD?=
 =?us-ascii?Q?MLzA/8cJAkA4ZBgpFvz0ZSX5HRo8gVNNycAc02ZdasRjL0MzDn8fFzaG0+ei?=
 =?us-ascii?Q?aBvqftAP6UqiPMy4LVCcLrXOS2X7ZcxLBhkFxzabgQJJBHQxoRIlscPTIJWD?=
 =?us-ascii?Q?2QebLpVmLsVenakWKLj2YFWtkfa8nHGnzEpjyin8lujSyNOi96MLOIWMfeL4?=
 =?us-ascii?Q?1NfzMVE6JpjEpRc98l5CIpnOf2fS9jonTR+DAW9zuvdBWjv/uQrraXu1CAoi?=
 =?us-ascii?Q?1iOfcP622cxhXSUTp5nltHS8wQSdCNIza/Fbq47Zteh7GgpCBi3VmU0ay0yU?=
 =?us-ascii?Q?SXK+IHtFCht7xPYYgHElfhyAuXIRQtVdZIrgX8AJzHEAxDGz8r6QmbNj5ozY?=
 =?us-ascii?Q?cdk8TgrMDtff9ch9si5hRQx8Fm8CPnoxL1w4HYsGPsF7qRFGwbW0wYQhQ7nA?=
 =?us-ascii?Q?Y0OdjavCV89DrqHFCZPA5DQXF86lTene1RlWjEmgrkegKbNiH8VOOruxVWaa?=
 =?us-ascii?Q?6Wp3OC/ggg8n2y14m/85BMWF+1h1GvsrQTz4Nbf6KkDYSPHI44cB0sQuRycO?=
 =?us-ascii?Q?ANdHo/czSGJUOSTs2GNYsLj95uc1C/GoqZ/BRPfketvrxpIeklN6aF64w9ER?=
 =?us-ascii?Q?817w3eFglZu5RgvPqYXKFdNjcVPgOgSnbCyubEPBQVlJYRwXxbKfaFSBf0Tw?=
 =?us-ascii?Q?UXvwq/n4/pdRu42bGgpTCZZLe4UU04gVUmu7FQiTxHzr2WX7d/LoSgC8uvIL?=
 =?us-ascii?Q?8+xm4Dlz+qDTA73hrLVBv9aRFDMjt7TBThvSw4B7wX5KSD5GLwhF874Nbf+K?=
 =?us-ascii?Q?cyO28+XLOPXyzYMR8/dJkskiruLTguAD6/MwivLmMNJn2xfPF3tAnrxXKQHq?=
 =?us-ascii?Q?OZwULy0yF7ttyT1yf+jv61+aDj49HVnnRfNIGrnUykJBcqLfq6x0q/VWJ6pn?=
 =?us-ascii?Q?ygh1HStV95WGwEWfXbu3gJTenWvjPadWH3HL8HFIW5cE1BxfhGd902TDTJje?=
 =?us-ascii?Q?3j6GxKa3cRa4G48tcHFksIAUcIDuEPbcLUa0XrZ7gvJcIg6oET7BCglsU/ZQ?=
 =?us-ascii?Q?/jghfuHWJKYK7JwtGwiynGaOoLMZiaIzj2sNs7rFm6G8wQojaGLVQ+GihL5y?=
 =?us-ascii?Q?geFYTW48uflYM68eUIadsBhWaAKHgtyuM8wucsxgeNb+xV4XRlWExSiXlOsQ?=
 =?us-ascii?Q?wZ7DGtwrzdlYGsHg7emdSTz+21kJQB1hxYohsOjUSoS9ATqwfd4xqDRBUsoQ?=
 =?us-ascii?Q?j+J2JM1FCVrC2pDUxyf5xkW99mbRMT4/btnF1t5saCeRlKlI/3Am6dWLlnuu?=
 =?us-ascii?Q?IgumokN/8Qtx2y7dliUWUDqq76ZvXBs3cULE4oRxLzsTyNl3skb8BITZ9qA6?=
 =?us-ascii?Q?AZP+0pi704qDoqJD3xyMbnk8rsBk7Ta9JPHcWfBf?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 23a8a8f5-227b-48d6-7a54-08da78c3370b
X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5267.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2022 22:21:46.7230
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JtPnmc3762FC3I3G4Vz6CqLR52IQYSOEsZ9KDwrUFbfFMa8P8Wr21XiMnO+m61jkB/MXd1WVN63QHDRDUvPw5w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2381
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-07_15,2022-08-05_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 mlxscore=0
 spamscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2208070119
X-Proofpoint-ORIG-GUID: jm-nh2aDWMHdwcPpab0ipnfpKq3U6Efl
X-Proofpoint-GUID: jm-nh2aDWMHdwcPpab0ipnfpKq3U6Efl
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

For > 8 byte values, allow simple binary '==', '!=' predicates
where the user passes in a hex ASCII representation of the
desired value.  This representation must match the field size
exactly, and a simple memory comparison between predicate and
actual values is carried out.  This will allow predicates with
for example IPv6 addresses to be supported, such as filtering
on ::1

	cd /sys/kernel/debug/tracing/events/tcp/tcp_receive_reset
	echo "saddr_v6 == 0x00000000000000000000000000000001" > filter

Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
---
 kernel/trace/trace_events_filter.c | 54 +++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 65e01c8d48d9..31c900b6a83c 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -147,6 +147,8 @@ enum {
 	PROCESS_OR	= 4,
 };
 
+static int filter_pred_memcmp(struct filter_pred *pred, void *event);
+
 /*
  * Without going into a formal proof, this explains the method that is used in
  * parsing the logical expressions.
@@ -583,8 +585,11 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
 	kfree(op_stack);
 	kfree(inverts);
 	if (prog_stack) {
-		for (i = 0; prog_stack[i].pred; i++)
+		for (i = 0; prog_stack[i].pred; i++) {
+			if (prog_stack[i].pred->fn == filter_pred_memcmp)
+				kfree((u8 *)prog_stack[i].pred->val);
 			kfree(prog_stack[i].pred);
+		}
 		kfree(prog_stack);
 	}
 	return ERR_PTR(ret);
@@ -841,6 +846,14 @@ static int filter_pred_none(struct filter_pred *pred, void *event)
 	return 0;
 }
 
+static int filter_pred_memcmp(struct filter_pred *pred, void *event)
+{
+	u8 *mem = (u8 *)(event + pred->offset);
+	u8 *cmp = (u8 *)(pred->val);
+
+	return (memcmp(mem, cmp, pred->field->size) == 0) ^ pred->not;
+}
+
 /*
  * regex_match_foo - Basic regex callbacks
  *
@@ -1443,6 +1456,45 @@ static int parse_pred(const char *str, void *data,
 		/* go past the last quote */
 		i++;
 
+	} else if (str[i] == '0' && tolower(str[i + 1]) == 'x' &&
+		   field->size > 8) {
+		u8 *pred_val;
+
+		/* For sizes > 8 bytes, we store a binary representation
+		 * for comparison; only '==' and '!=' are supported.
+		 * To keep things simple, the predicate value must specify
+		 * a value that matches the field size exactly, with leading
+		 * 0s if necessary.
+		 */
+		if (pred->op != OP_EQ && pred->op != OP_NE) {
+			parse_error(pe, FILT_ERR_ILLEGAL_FIELD_OP, pos + i);
+			goto err_free;
+		}
+
+		/* skip required 0x */
+		s += 2;
+		i += 2;
+
+		while (isalnum(str[i]))
+			i++;
+
+		len = i - s;
+		if (len != (field->size * 2)) {
+			parse_error(pe, FILT_ERR_ILLEGAL_FIELD_OP, pos + s);
+			goto err_free;
+		}
+
+		pred_val = kzalloc(field->size, GFP_KERNEL);
+		if (hex2bin(pred_val, str + s, field->size)) {
+			parse_error(pe, FILT_ERR_ILLEGAL_INTVAL, pos + s);
+			kfree(pred_val);
+			goto err_free;
+		}
+		pred->val = (u64)pred_val;
+		pred->fn = filter_pred_memcmp;
+		if (pred->op == OP_NE)
+			pred->not = 1;
+
 	} else if (isdigit(str[i]) || str[i] == '-') {
 
 		/* Make sure the field is not a string */
-- 
2.31.1