From patchwork Wed May 24 02:54:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 98255 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2562244vqo; Tue, 23 May 2023 20:09:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7a0PmzRZMwBmhlbOf7liR2J1NcEVkEdz9DWpd/Y4rTFSMMkIJrnDTY3r8Dy7kxG7pI6S5d X-Received: by 2002:a05:6a20:3ca7:b0:101:47d8:ff80 with SMTP id b39-20020a056a203ca700b0010147d8ff80mr18788231pzj.41.1684897742629; Tue, 23 May 2023 20:09:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684897742; cv=none; d=google.com; s=arc-20160816; b=l6tmQKuhLpI0ZqrgXc1cpTt/UlfY1pNiytx6LLwb3vtJInZUqpiZnhworEOaKiNIZ0 NovJUlUH/9BvfJWEcBX7wK+84fZ2YTnW9yCBQkFyg3UJw+R1oe/u6JfMKdtgt6VFAIcV 7bfnQmrsPFyAy0Z9OgsPxU02LD2cVxizzkYqXR7Ym2P0CqMn96qVH1H9taZ9cBuyQ8ne UAadNf/GQXKLVzTpqYLWVxmlmUgBgd6zifsj1mI5h0To1H385BKJ2NZ0iTLU2zc0CkYk F6W9Njxju6Qb5JcQffxI6HiN+RV6BegQ/cCNBvtPBrWgnu9050In5d0w6SNzwlGbEmMz tvFQ== 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=gBmgM5OyXJ9ew02mm6As8voVq8MySOFvUyBgcFhAT1U=; b=08af3o/ooysNL14ocjJudswl26QZWFdAyYI05a4Js+sZEftTMZl3LCrRMLjHsCwivf w3fuPIpsmut4agPhxZ2/uVXJi04axcOaEZhHYcGXroEMF620WHM0R9xLV1Vx1G2OblE/ gV+dsb0NsctuJDJekaTmqExu8n20+UmUfiXLCxVFJTBUPqQ0SWSm9TP2TTMZnQcdy7xH ZE45HMXqP1+fRw7vYacqptS0dax02BG/2/SWepuODIpTs9TVf0MXjDGHlEWamJVAD82S OwhumICDCva2Oq5lB/9LU7IVvONg1Fx8YT3AbuS48A0FhAYPBcBwiy9/WnrlQbm+P+NL HXww== 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 b20-20020a637154000000b0051b7b83d6b1si215402pgn.241.2023.05.23.20.08.49; Tue, 23 May 2023 20:09:02 -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 S233965AbjEXCyw (ORCPT + 99 others); Tue, 23 May 2023 22:54:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239215AbjEXCyu (ORCPT ); Tue, 23 May 2023 22:54:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 801C2E9; Tue, 23 May 2023 19:54:49 -0700 (PDT) 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 0812F63615; Wed, 24 May 2023 02:54:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3513C433D2; Wed, 24 May 2023 02:54:38 +0000 (UTC) Date: Tue, 23 May 2023 22:54:29 -0400 From: Steven Rostedt To: LKML , Linux trace kernel Cc: Masami Hiramatsu , Tom Zanussi , Mark Rutland , Shuah Khan , Shuah Khan , linux-kselftest@vger.kernel.org Subject: [PATCH] tracing/selftests: Update synthetic event selftest to use common_stacktrace Message-ID: <20230523225402.55951f2f@rorschach.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, T_SCC_BODY_TEXT_LINE 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?1766743335178427686?= X-GMAIL-MSGID: =?utf-8?q?1766743335178427686?= From: "Steven Rostedt (Google)" With the rename of the stacktrace field to common_stacktrace, update the selftests to reflect this change. Copy the current selftest to test the backward compatibility "stacktrace" keyword. Also the "requires" of that test was incorrect, so it would never actually ran before. That is fixed now. Signed-off-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) --- .../trigger-synthetic-event-stack-legacy.tc | 24 +++++++++++++++++++ .../trigger-synthetic-event-stack.tc | 5 ++-- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack-legacy.tc diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack-legacy.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack-legacy.tc new file mode 100644 index 000000000000..d0cd91a93069 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack-legacy.tc @@ -0,0 +1,24 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: event trigger - test inter-event histogram trigger trace action with dynamic string param (legacy stack) +# requires: set_event synthetic_events events/sched/sched_process_exec/hist "long[] stack' >> synthetic_events":README + +fail() { #msg + echo $1 + exit_fail +} + +echo "Test create synthetic event with stack" + +# Test the old stacktrace keyword (for backward compatibility) +echo 's:wake_lat pid_t pid; u64 delta; unsigned long[] stack;' > dynamic_events +echo 'hist:keys=next_pid:ts=common_timestamp.usecs,st=stacktrace if prev_state == 1||prev_state == 2' >> events/sched/sched_switch/trigger +echo 'hist:keys=prev_pid:delta=common_timestamp.usecs-$ts,s=$st:onmax($delta).trace(wake_lat,prev_pid,$delta,$s)' >> events/sched/sched_switch/trigger +echo 1 > events/synthetic/wake_lat/enable +sleep 1 + +if ! grep -q "=>.*sched" trace; then + fail "Failed to create synthetic event with stack" +fi + +exit 0 diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc index 755dbe94ccf4..8f1cc9a86a06 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test inter-event histogram trigger trace action with dynamic string param -# requires: set_event synthetic_events events/sched/sched_process_exec/hist "long[]' >> synthetic_events":README +# requires: set_event synthetic_events events/sched/sched_process_exec/hist "can be any field, or the special string 'common_stacktrace'":README fail() { #msg echo $1 @@ -10,9 +10,8 @@ fail() { #msg echo "Test create synthetic event with stack" - echo 's:wake_lat pid_t pid; u64 delta; unsigned long[] stack;' > dynamic_events -echo 'hist:keys=next_pid:ts=common_timestamp.usecs,st=stacktrace if prev_state == 1||prev_state == 2' >> events/sched/sched_switch/trigger +echo 'hist:keys=next_pid:ts=common_timestamp.usecs,st=common_stacktrace if prev_state == 1||prev_state == 2' >> events/sched/sched_switch/trigger echo 'hist:keys=prev_pid:delta=common_timestamp.usecs-$ts,s=$st:onmax($delta).trace(wake_lat,prev_pid,$delta,$s)' >> events/sched/sched_switch/trigger echo 1 > events/synthetic/wake_lat/enable sleep 1