From patchwork Wed Feb 8 01:56:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 54138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3197564wrn; Tue, 7 Feb 2023 18:02:12 -0800 (PST) X-Google-Smtp-Source: AK7set9Yfnuli1Vvghm5G4bdLJlCtvySSxGmTw1Z1JB/f5H7x6sEmFAH7/dAGrPdo2pZn6dfnjGp X-Received: by 2002:a17:906:478e:b0:8aa:9abe:8edd with SMTP id cw14-20020a170906478e00b008aa9abe8eddmr4618209ejc.66.1675821731884; Tue, 07 Feb 2023 18:02:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675821731; cv=none; d=google.com; s=arc-20160816; b=rm/6/OTzZSD0vZJvFICSVa504y4moCCEvbAGUh2rynR4LbJlqljtfxz7YhF2WLcWTl 3tnjFd42kM/zGXijKbpeN6It2PnsDj/H5rWXJSAwJbIPm/Be6FioDgW/aLanMvni72WB +Z/x0RrCpIKo/l9EO829IsxzNdLA4NtPztuFLZgqLZ39m1Dktg4eytMdIYW8s1lwdhOo OX2HmtGP8Qf/miGPHH4LgU6Q7vHXuolx4+5vFUeBPvx+G+OmH3QkE0teBhkDwh9kEIye h5NGKo89L9x+hQDqm8CA7drAmn4XqrK4Dl9LlD2MPZU2XWYckzbggaonFQ2aliSWw5Gb GGGw== 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=1IZinmJlHLEwqObhQLjtxL7Zip3ft2j1X0M20L6TTOk=; b=Mz0VmMI0CrXjBhy/s0gd5U+bFcYHzG/PUz40eL5umsFwzIa/UZUuhky5qlCstgn2Zb jAvE3CMl4fsiwu3eVjqoLlpNbyHlrrUmdkq+h7QDnH8wWars8XEZQJPN0R3y6jxp6mtO NT0w3JdQd0xtTuHyhiQ1MVRrBrun+yoewU36flk5loQVRpbce2GyerCo+ep13UwArq0M tDQqUkWsjxoH+D6O+OT172Y2y0FKJpC3CuE4azeFrMxAKLsA0JBIOcKg36ld7KQcdHlK Il5DG/N02WuSJIe+u877tLiFTxyJhf1IcnT9baboB+necpne1WIEyji4li9AOcWgvwGh 09lw== 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 y6-20020a170906518600b008aabf1910bdsi2678757ejk.226.2023.02.07.18.01.49; Tue, 07 Feb 2023 18:02:11 -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 S230243AbjBHB6G (ORCPT + 99 others); Tue, 7 Feb 2023 20:58:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229851AbjBHB5h (ORCPT ); Tue, 7 Feb 2023 20:57:37 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C2A33F28C for ; Tue, 7 Feb 2023 17:57:35 -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 ams.source.kernel.org (Postfix) with ESMTPS id 24BCEB81B9B for ; Wed, 8 Feb 2023 01:57:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF49CC433A0; Wed, 8 Feb 2023 01:57:32 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pPZiF-006dPq-2l; Tue, 07 Feb 2023 20:57:31 -0500 Message-ID: <20230208015731.669243610@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 07 Feb 2023 20:56:40 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Tom Zanussi , kernel test robot Subject: [for-next][PATCH 07/11] tracing: Fix trace_event_raw_event_synth() if else statement References: <20230208015633.791198913@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?1757226448289930832?= X-GMAIL-MSGID: =?utf-8?q?1757226448289930832?= From: "Steven Rostedt (Google)" The test to check if the field is a stack is to be done if it is not a string. But the code had: } if (event->fields[i]->is_stack) { and not } else if (event->fields[i]->is_stack) { which would cause it to always be tested. Worse yet, this also included an "else" statement that was only to be called if the field was not a string and a stack, but this code allows it to be called if it was a string (and not a stack). Also fixed some whitespace issues. Link: https://lore.kernel.org/all/202301302110.mEtNwkBD-lkp@intel.com/ Link: https://lore.kernel.org/linux-trace-kernel/20230131095237.63e3ca8d@gandalf.local.home Cc: Tom Zanussi Fixes: 00cf3d672a9d ("tracing: Allow synthetic events to pass around stacktraces") Reported-by: kernel test robot Signed-off-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) --- kernel/trace/trace_events_synth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index adb630633f31..306c89e0ce55 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -564,8 +564,8 @@ static notrace void trace_event_raw_event_synth(void *__data, event->fields[i]->is_dynamic, data_size, &n_u64); data_size += len; /* only dynamic string increments */ - } if (event->fields[i]->is_stack) { - long *stack = (long *)(long)var_ref_vals[val_idx]; + } else if (event->fields[i]->is_stack) { + long *stack = (long *)(long)var_ref_vals[val_idx]; len = trace_stack(entry, event, stack, data_size, &n_u64);