From patchwork Wed May 17 11:00:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 95163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1042927vqo; Wed, 17 May 2023 04:04:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ozMPJIzgTQ9YKMom05EGmoWw1Mpa8lKwnnSQjD4PjDcuo1hS6+OGondcV2sz5DdcTOplU X-Received: by 2002:aa7:888e:0:b0:645:454c:286d with SMTP id z14-20020aa7888e000000b00645454c286dmr494903pfe.3.1684321462820; Wed, 17 May 2023 04:04:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684321462; cv=none; d=google.com; s=arc-20160816; b=xM71YFP1ENKz03HCUHPuJBEQ37FNVxZJe5py22GGYNGlghr7lRzpzny0E5xHNJ0+b8 OsaKI8hLZqe2TlDK2TvDKEb5+J4JclJGws0KGi96SDy574Z82fbEid6V5Ag9uR/vCFEe 5D1AuGHmxPjFZ6VAFj3efVp7VQJPPSE/Xy0QXbm6zWIXUezuvX5iepqNyHPkTyUFSgDI uEakSJXT1UfC3e5a+ngudi1kSvjW5R5L1TUdMdHrbmpyNKjTiN8txNK3FEQkyhV9wL5s +1vPHC8HuAzbfJubCt00vycU6SEykIp3xgxrfXRVkfdlqqTuBFj2yN/aPNOli+NkaOhF WU2g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GwDD7PJhRqYOqNzgF44GjI15ZVQy2NczITC3UDTHc7k=; b=xyueM6wNvNzg0japrNXVMaSZvlEL8syAk6Vo5G3GUF17CTz1qEgW6DQQl6hldUEfxb ILNu7rr00oC68bGTLBEQdFGMbCm4y1Vg3PruCQgpIGggPrENbOUpT3NRN8HZhshyR8BF VbfQMspHn4kQjFt/aumqZ/rChwGcUhKUMYA9Z59Lgm2pBQ95+a3Qh6nty3m77ShnzREl LiQg3cmIy7RcHOx3xCRjTPIiGGIBV6sEYLVNjlOtWZwtp6h/0uVHWEFpwu7p7mpZaxCA luz7u54hfagHxNzsZUfsSpi1gG8hXOLxV917qLNOoud/pSm0u4R70fHhK/64TreIksrD triw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JBzSpf+m; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f27-20020aa7969b000000b0064378fd1d54si21985264pfk.258.2023.05.17.04.04.08; Wed, 17 May 2023 04:04:22 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JBzSpf+m; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231201AbjEQLBZ (ORCPT + 99 others); Wed, 17 May 2023 07:01:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231216AbjEQLAt (ORCPT ); Wed, 17 May 2023 07:00:49 -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 3D8DB7295; Wed, 17 May 2023 04:00:25 -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 6861864530; Wed, 17 May 2023 11:00:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F570C433D2; Wed, 17 May 2023 11:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684321223; bh=7N63SHhcXx7WqwzN3FqUdK3grXrDU/KRHf08Jlwt/V0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JBzSpf+mrVFsO1SiXtwBnaCtkleCrgBWHNG78aoV+kYitwfhbvZLURJ5HXMC85EVy tdK59wcaH7Xcf3mJ4N8nBAa3hAaYOfjjBELFVecx+3I0/dR+NcgJiA8Oykvc481BWv zvtNDPq6GSXEbWX2EiGk5QGb0vzMstYrT1ZBQw63Z9VPZ0DKjBB+SkTvFWlpMQE/He Bsvkwz1b1oxEMuZx5fC0RtIW4+Buol+DI0aFTQGqQnUYi1k3dr+wPjWV1CL5w7M/BZ 6GUxWqX6HTjULW833VZDb1Odc+85tRCrG6e0QCDk9IxebAeVtEZRyE6a1XRvK/dQYB v3se1IMIp8rew== From: "Masami Hiramatsu (Google)" To: linux-trace-kernel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Steven Rostedt , mhiramat@kernel.org, Florent Revest , Mark Rutland , Will Deacon , Mathieu Desnoyers , Martin KaFai Lau , bpf@vger.kernel.org Subject: [PATCH v11 10/11] selftests/ftrace: Add BTF arguments test cases Date: Wed, 17 May 2023 20:00:19 +0900 Message-ID: <168432121988.1351929.9585538955840998933.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <168432112492.1351929.9265172785506392923.stgit@mhiramat.roam.corp.google.com> References: <168432112492.1351929.9265172785506392923.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766139062621584011?= X-GMAIL-MSGID: =?utf-8?q?1766139062621584011?= From: Masami Hiramatsu (Google) Add test cases to check the BTF arguments correctly supported. Signed-off-by: Masami Hiramatsu (Google) --- Changes in v11: - Change $args to $arg* Changes in v10: - Change $$args to $args - Add new error patterns - Fix non BTF case Changes in v7: - Add BTF void retval test case --- .../ftrace/test.d/dynevent/add_remove_btfarg.tc | 54 ++++++++++++++++++++ .../ftrace/test.d/dynevent/fprobe_syntax_errors.tc | 14 +++++ .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 14 +++++ 3 files changed, 82 insertions(+) create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc b/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc new file mode 100644 index 000000000000..d2043346548d --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc @@ -0,0 +1,54 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Generic dynamic event - add/remove probes with BTF arguments +# requires: dynamic_events "":README + +KPROBES= +FPROBES= + +if grep -qF "p[:[/][]] []" README ; then + KPROBES=yes +fi +if grep -qF "f[:[/][]] [%return] []" README ; then + FPROBES=yes +fi + +if [ -z "$KPROBES" -a "$FPROBES" ] ; then + exit_unsupported +fi + +echo 0 > events/enable +echo > dynamic_events + +TP=kfree + +if [ "$FPROBES" ] ; then +echo "f:fpevent $TP object" >> dynamic_events +echo "t:tpevent $TP ptr" >> dynamic_events + +grep -q "fpevent.*object=object" dynamic_events +grep -q "tpevent.*ptr=ptr" dynamic_events + +echo > dynamic_events + +echo "f:fpevent $TP "'$arg*' >> dynamic_events +echo "t:tpevent $TP "'$arg*' >> dynamic_events + +grep -q "fpevent.*object=object" dynamic_events +grep -q "tpevent.*ptr=ptr" dynamic_events +! grep -q "tpevent.*_data" dynamic_events +fi + +echo > dynamic_events + +if [ "$KPROBES" ] ; then +echo "p:kpevent $TP object" >> dynamic_events +grep -q "kpevent.*object=object" dynamic_events + +echo > dynamic_events + +echo "p:kpevent $TP "'$arg*' >> dynamic_events +grep -q "kpevent.*object=object" dynamic_events +fi + +clear_trace diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc index 549daa162d84..de2abc4b95bd 100644 --- a/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc +++ b/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc @@ -85,4 +85,18 @@ fi # %return suffix errors check_error 'f vfs_read^%hoge' # BAD_ADDR_SUFFIX +# BTF arguments errors +if grep -q "" README; then +check_error 'f vfs_read args=^$arg*' # BAD_VAR_ARGS +check_error 'f vfs_read +0(^$arg*)' # BAD_VAR_ARGS +check_error 'f vfs_read $arg* ^$arg*' # DOUBLE_ARGS +check_error 'f vfs_read%return ^$arg*' # NOFENTRY_ARGS +check_error 'f vfs_read ^hoge' # NO_BTFARG +check_error 'f kfree ^$arg10' # NO_BTFARG (exceed the number of parameters) +check_error 'f kfree%return ^$retval' # NO_RETVAL +else +check_error 'f vfs_read ^$arg*' # NOSUP_BTFARG +check_error 't kfree ^$arg*' # NOSUP_BTFARG +fi + exit 0 diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc index 97c08867490a..65fbb26fd58c 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc @@ -103,4 +103,18 @@ check_error 'p vfs_read^%hoge' # BAD_ADDR_SUFFIX check_error 'p ^vfs_read+10%return' # BAD_RETPROBE fi +# BTF arguments errors +if grep -q "" README; then +check_error 'p vfs_read args=^$arg*' # BAD_VAR_ARGS +check_error 'p vfs_read +0(^$arg*)' # BAD_VAR_ARGS +check_error 'p vfs_read $arg* ^$arg*' # DOUBLE_ARGS +check_error 'r vfs_read ^$arg*' # NOFENTRY_ARGS +check_error 'p vfs_read+8 ^$arg*' # NOFENTRY_ARGS +check_error 'p vfs_read ^hoge' # NO_BTFARG +check_error 'p kfree ^$arg10' # NO_BTFARG (exceed the number of parameters) +check_error 'r kfree ^$retval' # NO_RETVAL +else +check_error 'p vfs_read ^$arg*' # NOSUP_BTFARG +fi + exit 0