From patchwork Thu May 18 05:26:22 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: 95655 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp258452vqo; Wed, 17 May 2023 22:41:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Nw7zFdlllR70nRHGoyr24sQxTlgcwy5sSQRrJjKH4DYuVw43yOH+g6tMRjiI+Cp3Z8f5i X-Received: by 2002:a17:90a:a506:b0:250:61cf:a2c9 with SMTP id a6-20020a17090aa50600b0025061cfa2c9mr1283212pjq.33.1684388477590; Wed, 17 May 2023 22:41:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684388477; cv=none; d=google.com; s=arc-20160816; b=Az3fhD1qgUQZ0mcE/GiCxoMkZPd7saE5vqNOPzZJyEo4rkaL0nUAFpgjZYi47qyTES Dw2E70VCU+RQ8mW2vKNxLqH0UjXYOiqokWUU44qdfRjGRxE4Xm959rOosgdyThYETkgZ /V8xO4FOLSqU72ziiw/DiB4SViDymZ+00vx1ZoIx2Af1zWAgM4f6R+pxmo1xenWISx4Y nMwhn7hvfx5/FK0+ukpq9C1ghitk6oasD4pViCAELa5vhAuQMZ7MIepgYOfzANPCSf64 4rpv4vHknWMTblBQCqI3TAM9+G2rA4Nf62CGf71huBmKRaf5XcstfPsGQwtxozti1n8S Cg7g== 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=MNLXworr2hVXuHupXqA2Az0vFMFnPIQFs9oCO2hhIZA=; b=DmrIkjHDiKo4avhsvx4MNryRwN/pqOwUTosRSfxYdh4QZsTQVKwOLVFvjwMPnDtQr8 y+zR5HoAOjrLPku0MYbGK03ivJsvKb4oX2hG81Kf3U6pgh6KSZjT7jqKHLL8oWo88AuF vnahy/SZ2OrIrEaWXcvSi1a3NM7FmxG1enVBzqsMnGzud0EpG0clOxHp34k2hOhpPIEt sIHyCbfuboruLD5xtqFGnMO5XmK4muSM/p1UDk4DOy567m8e6KeCHuGyZLLDEFCd+UYc OyHwLyiy/qLojJi+VdsO4yESU0/aZZfUyQMeJnYzFfvRQanI5B7pdA8KTa+VPdcoQzmd mK+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rISHn17j; 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 e5-20020a633705000000b004faf33e2755si593850pga.349.2023.05.17.22.41.03; Wed, 17 May 2023 22:41:17 -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=rISHn17j; 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 S229966AbjERF1T (ORCPT + 99 others); Thu, 18 May 2023 01:27:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbjERF1P (ORCPT ); Thu, 18 May 2023 01:27:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3838130FE; Wed, 17 May 2023 22:26:41 -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 0F1F764BB8; Thu, 18 May 2023 05:26:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89634C433EF; Thu, 18 May 2023 05:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684387586; bh=WJ6N6MyKxI4LZfN4V0rKvxGhhdskUteODidgGjvX5ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rISHn17j8SHwXDcizyPewpD1DDuBGj7wRi7Uheg+HlECy4aXyrOEKE5ErEcyaKAz6 AjgEVINJJWWdQCXDwRchTH90O+NxCoqUpeRRlveY8r8+4i0RfiBIjN7tiCa+IxpZe4 3uKNDJf/XYWlH7iUfujl4pYqyUi8ykrwUeQZ/UoHDO9mZTdKk5MSeAZv6bTB6Y1ZzR VbnxFBqJqIASz0UM6sNCm6wRZgEqI1RjxtD8Q7GRPx1Bhg4ip9/wcpziT4jSj70pEl S1Oa/q6enWYWfurSLJs6FInBdm0Nauad17WntkTo8+1sWcqtJivAdav31lia15yWct 0ErMezjtqrmcA== 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, Bagas Sanjaya Subject: [PATCH v12 10/11] selftests/ftrace: Add BTF arguments test cases Date: Thu, 18 May 2023 14:26:22 +0900 Message-ID: <168438758204.1517340.6948648432407802640.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <168438749373.1517340.14083401972478496211.stgit@mhiramat.roam.corp.google.com> References: <168438749373.1517340.14083401972478496211.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1766209332560058012?= X-GMAIL-MSGID: =?utf-8?q?1766209332560058012?= 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 d98e37c3ddc5..d94f55895e2f 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