From patchwork Tue Aug 22 02:38:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 136453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp3419669vqi; Mon, 21 Aug 2023 22:29:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJ7I2+e5Zs024/Wj4TdscURzA2JnKZHEh3BtY8gCM0ay5XB/J/vopy3GZXvFS3HdAQxIzh X-Received: by 2002:a17:907:60c6:b0:9a1:7919:d3c9 with SMTP id hv6-20020a17090760c600b009a17919d3c9mr6259419ejc.1.1692682192777; Mon, 21 Aug 2023 22:29:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692682192; cv=none; d=google.com; s=arc-20160816; b=ZRatRiizl2a43/Y9E1e5ViaW4NOyNNuyJeWvs5ugaCiLL8n1yiiUZbI+79C9a1qiVC 7vZmDiBvI0QbfZApxSIl7x515VAkWbxYmjeeUEJCtSDZ6JOsiCCriy2xdlHXNAIKwDGX 6Zif885aj4qw+amQQZV0GnoBvLpsa67P1rPOrWo4IpQHQpNiZotAiciKcdJHkzORT5QG AN1/qt1MyHBeb1y9PJnerzvoWnPjAIvarQFtEgJe/nz51Ul7vx1+cICHcJXC/7HtjrG4 L42oQiCN9O6QhL8XlP8LGEQRX5qDMZED5oNjWYbnD1fKDLOX9FN2uuHlDq25llMhqkkm 9QIQ== 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=PQIDGdA/MZ7PsPjPB57M/+jai3fUJHn4s3P9SHjxF+g=; fh=sGIGjVMeMNkwUeNFy8RNznGI5bzzhAUwvsFNKStEEzk=; b=QWuTMDsQaBDJ2Oop2tt5UtaK6sXGgDuIjh2aWV9dPXmsN1nStHa0ZXEAw9MHzf51pH cp2q7+JQCr4HWVSrJIWbZUIv+V3wAV0tK5/UaeSJ16fp0uO4WFc0nEWd5QbU1ol6TJCL cVnYUKV0dOyIGcaaPVLlAI2Fett47q5Y9BmdWVvir6Rivpu0VIC5MqTqOciuQxsP2gZ7 Mi1aUTF5f6kf5l47wHiL3+7axqOls1e4ywH3UBF4fqO72jOjd61DMMypBn6FwHwMNWpd S4QZf/zs6jVUV0uUhw+UAdOv290zfoOabq8tMeHhDQpQvCLNFmz3c5YKUyKYkPr3y+/0 XRsg== 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 r17-20020a170906281100b00992ac6d8893si7390970ejc.792.2023.08.21.22.29.28; Mon, 21 Aug 2023 22:29:52 -0700 (PDT) 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 S232299AbjHVCij (ORCPT + 99 others); Mon, 21 Aug 2023 22:38:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232218AbjHVCi3 (ORCPT ); Mon, 21 Aug 2023 22:38:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 378C3196 for ; Mon, 21 Aug 2023 19:38:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8F394647E8 for ; Tue, 22 Aug 2023 02:38:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED087C4339A; Tue, 22 Aug 2023 02:38:25 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qYHI2-001bau-0J; Mon, 21 Aug 2023 22:38:42 -0400 Message-ID: <20230822023841.911139514@goodmis.org> User-Agent: quilt/0.66 Date: Mon, 21 Aug 2023 22:38:07 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Sven Schnelle Subject: [for-linus][PATCH 4/8] tracing/synthetic: Skip first entry for stack traces References: <20230822023803.605698724@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_PASS autolearn=no 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: INBOX X-GMAIL-THRID: 1774905922863532839 X-GMAIL-MSGID: 1774905922863532839 From: Sven Schnelle While debugging another issue I noticed that the stack trace output contains the number of entries on top: -0 [000] d..4. 203.322502: wake_lat: pid=0 delta=2268270616 stack=STACK: => 0x10 => __schedule+0xac6/0x1a98 => schedule+0x126/0x2c0 => schedule_timeout+0x242/0x2c0 => __wait_for_common+0x434/0x680 => __wait_rcu_gp+0x198/0x3e0 => synchronize_rcu+0x112/0x138 => ring_buffer_reset_online_cpus+0x140/0x2e0 => tracing_reset_online_cpus+0x15c/0x1d0 => tracing_set_clock+0x180/0x1d8 => hist_register_trigger+0x486/0x670 => event_hist_trigger_parse+0x494/0x1318 => trigger_process_regex+0x1d4/0x258 => event_trigger_write+0xb4/0x170 => vfs_write+0x210/0xad0 => ksys_write+0x122/0x208 Fix this by skipping the first element. Also replace the pointer logic with an index variable which is easier to read. Link: https://lkml.kernel.org/r/20230816154928.4171614-3-svens@linux.ibm.com Cc: Masami Hiramatsu Fixes: 00cf3d672a9d ("tracing: Allow synthetic events to pass around stacktraces") Signed-off-by: Sven Schnelle Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_synth.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index 7fff8235075f..80a2a832f857 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -350,7 +350,7 @@ static enum print_line_t print_synth_event(struct trace_iterator *iter, struct trace_seq *s = &iter->seq; struct synth_trace_event *entry; struct synth_event *se; - unsigned int i, n_u64; + unsigned int i, j, n_u64; char print_fmt[32]; const char *fmt; @@ -389,18 +389,13 @@ static enum print_line_t print_synth_event(struct trace_iterator *iter, n_u64 += STR_VAR_LEN_MAX / sizeof(u64); } } else if (se->fields[i]->is_stack) { - unsigned long *p, *end; union trace_synth_field *data = &entry->fields[n_u64]; - - p = (void *)entry + data->as_dynamic.offset; - end = (void *)p + data->as_dynamic.len - (sizeof(long) - 1); + unsigned long *p = (void *)entry + data->as_dynamic.offset; trace_seq_printf(s, "%s=STACK:\n", se->fields[i]->name); - - for (; *p && p < end; p++) - trace_seq_printf(s, "=> %pS\n", (void *)*p); + for (j = 1; j < data->as_dynamic.len / sizeof(long); j++) + trace_seq_printf(s, "=> %pS\n", (void *)p[j]); n_u64++; - } else { struct trace_print_flags __flags[] = { __def_gfpflag_names, {-1, NULL} }; @@ -490,10 +485,6 @@ static unsigned int trace_stack(struct synth_trace_event *entry, break; } - /* Include the zero'd element if it fits */ - if (len < HIST_STACKTRACE_DEPTH) - len++; - len *= sizeof(long); /* Find the dynamic section to copy the stack into. */