From patchwork Wed Dec 14 14:01:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 33219 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp239324wrn; Wed, 14 Dec 2022 06:06:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf448LF77Iysx3OJI34qfCsdRk2lKSfgRCb05IIHLYddvFWQ6pjrRxlL9qSe0IePSJoq/sT+ X-Received: by 2002:a05:6402:370e:b0:463:398a:9fe7 with SMTP id ek14-20020a056402370e00b00463398a9fe7mr19300775edb.34.1671026799217; Wed, 14 Dec 2022 06:06:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671026799; cv=none; d=google.com; s=arc-20160816; b=gufWK9xgATMQSXpRedGU4Xuep2rmtP0kKmFQt8BkCwkdJf9WJ9vklBSQNi4rnMhYg+ XSmX3XQZxTD5osipZe/UmcaUK6mbdRC5J0+zeqC94hmp8aXJiphjaHaN+keEk6BZ3Nij NxwcPqQnBVe0DIukJYl7nweW5SoTkMuVz3cu7zG+9BvHM+hS5zYOBa/SoN4YyHScrxBL zmFYrlkKfimNW/4aT2Q1CpIa9djyaGJrdkmZpb2UoX/wMPNLfXYg5LOOwqc3NW1N8Dqc lnifJmuKHHuIH4SGXeL90VJk7R9s8bXpOHWt7fZzl51nLDrj9LzAbW5i/ufGIGmbnc1Y TV1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=FkxERXwTd9UFPb2Amdamq6j6ld3HfizD4vsZX4vJCGw=; b=fZBSe1J/oZ8GYQFJtlxQyJ2jdPOtVh1bDLonHx1cR1X8ERkA/jpHOVJFq8p45ju5ZU GztHSX1nspK8N/bgqfDzOdgLmn3ixPQHb/IvYUHOnnJLWgGGyhEUYUMST+YJYGv56qLz bUfgiHvB2rGLE1qzbjtSfRzs6DiCP12Z+b2pnSvyCeDUdff/p4DcpnBEuf2RhOSFyv/3 lqbPllszaqqYfM9EOvgVvhrwWif1CMJZrEQ09bV0lW1XHrDfYOuekWlS3o/YbJYaXvlF CQ+r1DIwpKofHOntly8wwojoW5pqgDGa3FEPZyvGmXY/ENA8R37VLalpGVp2CnHD1iYo dQWA== 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 z8-20020a05640235c800b004693eaeac13si12981406edc.570.2022.12.14.06.06.13; Wed, 14 Dec 2022 06:06:39 -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 S238518AbiLNOCV (ORCPT + 99 others); Wed, 14 Dec 2022 09:02:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238521AbiLNOCL (ORCPT ); Wed, 14 Dec 2022 09:02:11 -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 383801E3EC for ; Wed, 14 Dec 2022 06:02:11 -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 D1CB061AB0 for ; Wed, 14 Dec 2022 14:02:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40DB8C43392; Wed, 14 Dec 2022 14:02:10 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1p5SKn-000gtp-03; Wed, 14 Dec 2022 09:02:09 -0500 Message-ID: <20221214140208.881322216@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 14 Dec 2022 09:01:36 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Tom Zanussi Subject: [for-next][PATCH 3/8] tracing: Have trigger filter parsing errors show up in error_log References: <20221214140133.608431204@goodmis.org> 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?1752198597398528406?= X-GMAIL-MSGID: =?utf-8?q?1752198597398528406?= 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. Link: https://lore.kernel.org/linux-trace-kernel/20221213095602.083fa9fd@gandalf.local.home Cc: Masami Hiramatsu Cc: Tom Zanussi 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.