From patchwork Tue Dec 13 14:56:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 32850 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp167835wrn; Tue, 13 Dec 2022 06:57:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf51x3N3tBhMUm8C2OyHg/s+0gowXnyY92HLE/r1I+CZUdXXpY0m8pj7cAzjIBcfxZy5QtZK X-Received: by 2002:a05:6402:299b:b0:461:e85e:39c7 with SMTP id eq27-20020a056402299b00b00461e85e39c7mr17255581edb.1.1670943456005; Tue, 13 Dec 2022 06:57:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670943455; cv=none; d=google.com; s=arc-20160816; b=tvxyp9axxy556I37vSd8QYvJNasdGo6jgV7pdNkm8UsxjPUT/8/OknyN04wgrS2aKN CyMuMQQmZ/RC/zWO1fP5z55oNH3Xdt3zka8Lchc44jI/r2+KtWBUXfSrzIxG+HRn74EH DFYbPxU9rhUrMjepDP4mfDbjYkMS3lHGGHB4Jda4+aWIHY32HZ6W2DAUdwfWth4rmc6o ZorCFPmr16VW7CcpZbByh8Ec8Xjx5MKvp90OESAw4sozz7PbUDK9p4lxTWK0/ExCnwcC HQJy8l06q3FSDDjDZGGm4Yw8X7+hKfDJTstDkAcykR//O/jz9OxmFokytfSpFeoEvPfX ASEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:subject:cc:to:from:date; bh=utBQIE7nZZPVGKAWtoqF1nbGd1Pi/UUWyrW4t4NZwog=; b=dOx0bOqLNl923cUpeUvpGrSnPYyQbD4i13BaleUvIrMzfyecFcidghzyhkOIyq6JjH /LAYI+OJ0mLGauX9msyMh6bQuowlLFU5/VMrrzMkA5EM1CnalGJZ+RkhEzQbva8bbJzj 9NGuqNLRz2hljQ3AC2FxquUVmPviWmNdWlnfkaUNpw32SgsYJaX1Dl2G+/J/+s+VUx++ 65zWhHr2q2uH5ZOMpkEiAsYyY0+0MoTupXJDf5/FfTcjzSsbAGgqB3MjJGKP9uUYaAnq o8beIqmtjeGwLTbDEqQe27IbNlLkznxQaWv2NPdwNFNd6ZJMYLeOUMGtUcuymb/zYVJg molQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c8-20020a05640227c800b0046ccdd9c2basi11346454ede.155.2022.12.13.06.57.12; Tue, 13 Dec 2022 06:57:35 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235971AbiLMO4I (ORCPT + 99 others); Tue, 13 Dec 2022 09:56:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235944AbiLMO4G (ORCPT ); Tue, 13 Dec 2022 09:56:06 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87BEEFCC7; Tue, 13 Dec 2022 06:56:05 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2ADE7614C3; Tue, 13 Dec 2022 14:56:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7E7DC433EF; Tue, 13 Dec 2022 14:56:03 +0000 (UTC) Date: Tue, 13 Dec 2022 09:56:02 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: Masami Hiramatsu , Tom Zanussi Subject: [PATCH] tracing: Have trigger filter parsing errors show up in error_log Message-ID: <20221213095602.083fa9fd@gandalf.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752111205210246713?= X-GMAIL-MSGID: =?utf-8?q?1752111205210246713?= From: "Steven Rostedt (Google)" It is annoying that the filter parsing of triggers do not show up in the error_log. Trying to figure out what is incorrect in the input is difficult when it fails for a typo. Have the errors of filter parsing show up in error_log as well. Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_trigger.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c index 918730d74932..19ce9d22bfd7 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -1067,7 +1067,14 @@ int set_trigger_filter(char *filter_str, /* The filter is for the 'trigger' event, not the triggered event */ ret = create_event_filter(file->tr, file->event_call, - filter_str, false, &filter); + filter_str, true, &filter); + + /* Only enabled set_str for error handling */ + if (filter) { + kfree(filter->filter_string); + filter->filter_string = NULL; + } + /* * If create_event_filter() fails, filter still needs to be freed. * Which the calling code will do with data->filter.