From patchwork Mon Jul 31 23:16:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 128911 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2334460vqg; Mon, 31 Jul 2023 16:51:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlF5DrsnC9o3kb0KuduFvtvpZ/1FGrWXDaUIe2eHv3WC6P5A3RXGWtrbe5wvZry5uYavezvr X-Received: by 2002:a17:907:2e0d:b0:991:c566:979 with SMTP id ig13-20020a1709072e0d00b00991c5660979mr931917ejc.36.1690847465163; Mon, 31 Jul 2023 16:51:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690847465; cv=none; d=google.com; s=arc-20160816; b=mF9zRZRmjIDfHygyVPExtp/X7NI1bnMHLtTNGfjHbZyOtmx7MQDbYWqqLOCCfMm5Oa 5AD8G6H00S+XddVqsPTPzLBxbKCwknew89oA8Eg3qMJ3uLrQw7IJ3IX/JYxiLdf7yMjs em5VZJZY8DoaQumu8068GFZwgIxatPXC1nJaN9ihwf8W/I/MC/ZbI58OJWj16dVth59n mIsCYob5GuqDRpU/Y+nnw2GE+V6HS/DnE1RKg3yohhk1vZjYhJdBYXczpCK77slnCHGK 6P+18Dfu+wNIAxnSImaK9AGfGH4ssnzj7aTxODy1EMzWMmnZkrcl0uSb8J9KOUvY+ixe 1aOw== 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=VY3o0sL9hyM3Ndn66edoZIKsyfP9imnpqEuz7xVRsJg=; fh=nwpXA2GCzSqACqQnRlsAjxxuqv6Q8L0ex17S5eAmnL0=; b=EJue3HdazYQrjxUqXhQnifgXV+DyIjvM+c0t7qDQyx1Bt9ayViF9pooIG8E3oUZtmF 9/lJ36sBzX+0OurZMEBsKboXkzLCXcsWYx5JUUshxhjt7/yLDo98QNfW1kAoyE2TPf7z YC7HwmM5N575dk20Ox52bXXz3/ZiMUaBYKQSc5uHPljCv863kzIaP5Ww/UaVQPbqb3TV SczLOqKFl74UnOPG6DQ/TQTKbTRWANPjM/+syucS0RAtBoKpkIWClEL0piwuOYv4H3N/ EOgxmYLiDNDRfurz3oyRCkwPkEpZHaPvpRujKbzGUU9F/E6C0jL9s0V/HuoHhSZw5LQ2 YOtw== 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 g16-20020a17090613d000b0099b4b6db8a4si1047446ejc.868.2023.07.31.16.50.42; Mon, 31 Jul 2023 16:51:05 -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 S232019AbjGaXR4 (ORCPT + 99 others); Mon, 31 Jul 2023 19:17:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231925AbjGaXRe (ORCPT ); Mon, 31 Jul 2023 19:17:34 -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 3B7D51728 for ; Mon, 31 Jul 2023 16:17:17 -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 5780B61374 for ; Mon, 31 Jul 2023 23:17:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34CE3C433C9; Mon, 31 Jul 2023 23:17:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qQc8S-003fS8-0P; Mon, 31 Jul 2023 19:17:08 -0400 Message-ID: <20230731231707.942193155@goodmis.org> User-Agent: quilt/0.66 Date: Mon, 31 Jul 2023 19:16:49 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher , Ching-lin Yu Subject: [for-next][PATCH 15/15] test: ftrace: Fix kprobe test for eventfs References: <20230731231634.031452225@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,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: INBOX X-GMAIL-THRID: 1772982071691140713 X-GMAIL-MSGID: 1772982071691140713 From: Ajay Kaher kprobe_args_char.tc, kprobe_args_string.tc has validation check for tracefs_create_dir, for eventfs it should be eventfs_create_dir. Link: https://lkml.kernel.org/r/1690568452-46553-11-git-send-email-akaher@vmware.com Signed-off-by: Ajay Kaher Co-developed-by: Steven Rostedt (VMware) Signed-off-by: Steven Rostedt (VMware) Tested-by: Ching-lin Yu Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- .../selftests/ftrace/test.d/kprobe/kprobe_args_char.tc | 9 +++++++-- .../selftests/ftrace/test.d/kprobe/kprobe_args_string.tc | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc index 285b4770efad..ff7499eb98d6 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc @@ -34,14 +34,19 @@ mips*) esac : "Test get argument (1)" -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):char" > kprobe_events +if grep -q eventfs_add_dir available_filter_functions; then + DIR_NAME="eventfs_add_dir" +else + DIR_NAME="tracefs_create_dir" +fi +echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):char" > kprobe_events echo 1 > events/kprobes/testprobe/enable echo "p:test $FUNCTION_FORK" >> kprobe_events grep -qe "testprobe.* arg1='t'" trace echo 0 > events/kprobes/testprobe/enable : "Test get argument (2)" -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):char arg2=+0(${ARG1}):char[4]" > kprobe_events +echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):char arg2=+0(${ARG1}):char[4]" > kprobe_events echo 1 > events/kprobes/testprobe/enable echo "p:test $FUNCTION_FORK" >> kprobe_events grep -qe "testprobe.* arg1='t' arg2={'t','e','s','t'}" trace diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc index a4f8e7c53c1f..a202b2ea4baf 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc @@ -37,14 +37,19 @@ loongarch*) esac : "Test get argument (1)" -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string" > kprobe_events +if grep -q eventfs_add_dir available_filter_functions; then + DIR_NAME="eventfs_add_dir" +else + DIR_NAME="tracefs_create_dir" +fi +echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):string" > kprobe_events echo 1 > events/kprobes/testprobe/enable echo "p:test $FUNCTION_FORK" >> kprobe_events grep -qe "testprobe.* arg1=\"test\"" trace echo 0 > events/kprobes/testprobe/enable : "Test get argument (2)" -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events +echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events echo 1 > events/kprobes/testprobe/enable echo "p:test $FUNCTION_FORK" >> kprobe_events grep -qe "testprobe.* arg1=\"test\" arg2=\"test\"" trace