From patchwork Sat Dec 10 13:58:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 32027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1326971wrr; Sat, 10 Dec 2022 06:02:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf6OWBuWPP26csKh5p0LePQBWAFITNUTFbZkT+TQs9IAht2roJHOCe34c1Kde4Ii83dMJrYQ X-Received: by 2002:a17:907:80c3:b0:78d:f454:3868 with SMTP id io3-20020a17090780c300b0078df4543868mr8820251ejc.37.1670680805570; Sat, 10 Dec 2022 06:00:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670680805; cv=none; d=google.com; s=arc-20160816; b=WEFnr+O6QYNhyFkyWZ7IbcKK1i0V8JzoEYPWrtlxOH6K9zH85D7XdZKHE6yYbC8xXh qu+8Rfy9DmUdiJ2X/6DvV0snEafhpPy30OwCWc8u4RNXmZpsvrol8/kMcKedtG17GUpr qsqVaWfxNHSCBAgCSUaNGcKd1wU045TR3vjPBuTMO9VAnV8sT7yPzbeK8Klu3GFIzwsg kioL9D/6m8XeuNBOQi0GWhfsTmFD+mTeOkOltDbwxWGXJm2g4nFMX5wjoWF8kecI6ab9 OzM388gueAOXd2EV98p/YdfLrvncLL7AAjCZZNO/pC4QJ/VGXKq9I/R8o3pzskpVSi7Y 9h2g== 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=TNVmxmhjNG0Z/pVq1vIadNV0dEWLkxwRGKIFjKQfxdQ=; b=O2ZE1L3/TNEcAXXe37sxpQqZJ9nYlYh+JamHKn+xUJbUHGGdI1UQmvLbjT6YxGtixL 4DqdCkvMt+QiGWOS+x/Vn5UsHelIl+xwJLQM4Oo1InKBHbRlVvEx7xhPVRH2FsS8OFqs LwEeC+ztyp/hDM6Y8yN+cRNyDvrNeSYnPD1q8Qjc2dCca8Hg3tnZZnIfIEyoEqGbjeQR j6BqzC+hjihWRBhCddiNcqf9FtqqOF166Y5RgN+CBLq9MG04ld1LDrhAlX/v6GePf8As w/ZauMgn+kU5bTJA3kLAiZAf3/86/xOFj1zS2akQP2zxtFp4/iC5v0px8KwQ89/rpaTK RsyQ== 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 l22-20020a170906795600b007c087110276si2562699ejo.151.2022.12.10.05.59.42; Sat, 10 Dec 2022 06:00:05 -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 S230013AbiLJN7D (ORCPT + 99 others); Sat, 10 Dec 2022 08:59:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229691AbiLJN62 (ORCPT ); Sat, 10 Dec 2022 08:58:28 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E83E183B4 for ; Sat, 10 Dec 2022 05:58:27 -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 0A29960C2A for ; Sat, 10 Dec 2022 13:58:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D90B7C4339E; Sat, 10 Dec 2022 13:58:26 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1p40Mz-000ksq-3C; Sat, 10 Dec 2022 08:58:25 -0500 Message-ID: <20221210135825.860445357@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 10 Dec 2022 08:58:07 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , , Zheng Yejian Subject: [for-next][PATCH 17/25] tracing/hist: Fix issue of losting command info in error_log References: <20221210135750.425719934@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?1751835796316954332?= X-GMAIL-MSGID: =?utf-8?q?1751835796316954332?= From: Zheng Yejian When input some constructed invalid 'trigger' command, command info in 'error_log' are lost [1]. The root cause is that there is a path that event_hist_trigger_parse() is recursely called once and 'last_cmd' which save origin command is cleared, then later calling of hist_err() will no longer record origin command info: event_hist_trigger_parse() { last_cmd_set() // <1> 'last_cmd' save origin command here at first create_actions() { onmatch_create() { action_create() { trace_action_create() { trace_action_create_field_var() { create_field_var_hist() { event_hist_trigger_parse() { // <2> recursely called once hist_err_clear() // <3> 'last_cmd' is cleared here } hist_err() // <4> No longer find origin command!!! Since 'glob' is empty string while running into the recurse call, we can trickly check it and bypass the call of hist_err_clear() to solve it. [1] # cd /sys/kernel/tracing # echo "my_synth_event int v1; int v2; int v3;" >> synthetic_events # echo 'hist:keys=pid' >> events/sched/sched_waking/trigger # echo "hist:keys=next_pid:onmatch(sched.sched_waking).my_synth_event(\ pid,pid1)" >> events/sched/sched_switch/trigger # cat error_log [ 8.405018] hist:sched:sched_switch: error: Couldn't find synthetic event Command: hist:keys=next_pid:onmatch(sched.sched_waking).my_synth_event(pid,pid1) ^ [ 8.816902] hist:sched:sched_switch: error: Couldn't find field Command: hist:keys=next_pid:onmatch(sched.sched_waking).my_synth_event(pid,pid1) ^ [ 8.816902] hist:sched:sched_switch: error: Couldn't parse field variable Command: hist:keys=next_pid:onmatch(sched.sched_waking).my_synth_event(pid,pid1) ^ [ 8.999880] : error: Couldn't find field Command: ^ [ 8.999880] : error: Couldn't parse field variable Command: ^ [ 8.999880] : error: Couldn't find field Command: ^ [ 8.999880] : error: Couldn't create histogram for field Command: ^ Link: https://lore.kernel.org/linux-trace-kernel/20221207135326.3483216-1-zhengyejian1@huawei.com Cc: Cc: Fixes: f404da6e1d46 ("tracing: Add 'last error' error facility for hist triggers") Signed-off-by: Zheng Yejian Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_hist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 8264b28d5a57..fcaf226b7744 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -6576,7 +6576,7 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops, if (se) se->ref++; out: - if (ret == 0) + if (ret == 0 && glob[0]) hist_err_clear(); return ret;