Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp917625pxk; Thu, 10 Sep 2020 01:59:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVYIOkJ0JJ5ILIKVEPm81LkRrndfePz2ptBpE6VFHn0tH3kafBi959Op9+Yy7CC1MSFmsM X-Received: by 2002:a17:906:e50:: with SMTP id q16mr8112949eji.544.1599728389404; Thu, 10 Sep 2020 01:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599728389; cv=none; d=google.com; s=arc-20160816; b=XmROARXZvJQho9G7LS2yIZPqgJmbLz8oVmIwXiHe/hyeWRbr/vD1wXUSZQA5qxiT43 A3c4MqPW3J3GkBVMFbkRHXcHpnZPt3gapSkBWkVOfUDDy+1Rf1RY1pczSDOjBC9VGx/M r77ebemYZtIkhaW3Crk6d2Q/O2Z3q73Tz8MFkwFvpbwryQ+PSkeAAyGm707aXmFvdczo 7yGBlDi5IBk1Q8HdKhjB3xFNr0QB37ncnyQvsgHqRHpef+27NhWGSPB8gzvzq38eeJN2 v/RJ3wOlHxrxWlimWEo4Ci3vdNhRPtt4Kzn3J77x7Pkn2gNVXeum7l7+3/FOnwvVUb02 7FJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iQqoXL7O0ozlW2rGdnxIxqxaIkhnYkS3AKZv2WhiMaw=; b=BszD1VzeIWkxg9CUG3ClMkspuAxKCkYR2wrUENSixGBYgDRe+DE/TKftrZWvv1F8Fj vWxST31R62qU9Tr82zFyggi2trhPmHoMP/dI6FxQS2Q6PIst6Z8A/tkMQ7CFUlSugXJB +g8PzMx6pCdhnokR0LbAZfMN8tmVyxgFI1dhUg0kEXH5L8kiHKxS+ROi0vwo0XlJ+BNj zyDYsRYBSrr4P2jEM7esUMCZyPPHPVsnIvTCUswHuAZwBmGAzxfmIMM6GFLOSSWw3MFo JlXnNEoeDFLMnHiBExogRcp7Biz3la67inKfmevLv2R3RkErHfB+dQrbpoHRptkhnhsf 1d2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=M15lyRNu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s22si3060227edc.481.2020.09.10.01.59.26; Thu, 10 Sep 2020 01:59:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=M15lyRNu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1730487AbgIJI6Y (ORCPT + 99 others); Thu, 10 Sep 2020 04:58:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:37444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730437AbgIJI40 (ORCPT ); Thu, 10 Sep 2020 04:56:26 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C4C6920C09; Thu, 10 Sep 2020 08:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599728180; bh=0PJbxvzO5I5gMwLMCGZyMr4dYyj6eWzJKi8tvIfw5go=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M15lyRNu+GUJ399GEB6RWtOfd2Huf3GoD7Y4J6wNiX2mVL8R2UaJR4CqkplFi01Op b5MtW+7sNCMFtZA4N8jYufN5ROy2atU09kOCsaG7+nYogQgRWRMMhpm++Y/9JPfwaL p/AXm+Z45K/Hv+r7kVizMjmJBqMy9s4fvleql/BA= From: Masami Hiramatsu To: Steven Rostedt , Jonathan Corbet , Shuah Khan Cc: mhiramat@kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Randy Dunlap , Ingo Molnar , linux-kselftest@vger.kernel.org Subject: [PATCH v3 8/8] selftests/ftrace: Add %return suffix tests Date: Thu, 10 Sep 2020 17:56:16 +0900 Message-Id: <159972817653.428528.9180599115849301184.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <159972809455.428528.4737752126800169128.stgit@devnote2> References: <159972809455.428528.4737752126800169128.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add kprobe %return suffix testcase and syntax error tests for %return suffix. Signed-off-by: Masami Hiramatsu --- .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 6 ++++++ .../test.d/kprobe/kretprobe_return_suffix.tc | 21 ++++++++++++++++++++ .../ftrace/test.d/kprobe/uprobe_syntax_errors.tc | 6 ++++++ 3 files changed, 33 insertions(+) create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_return_suffix.tc 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 b4d834675e59..56b3f36c722b 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 @@ -97,4 +97,10 @@ check_error 'p:kprobes/testevent _do_fork ^abcd=\"foo"' # DIFF_ARG_TYPE check_error '^p:kprobes/testevent _do_fork abcd=\1' # SAME_PROBE fi +# %return suffix errors +if grep -q "place (kretprobe): .*%return.*" README; then +check_error 'p vfs_read^%hoge' # BAD_ADDR_SUFFIX +check_error 'p ^vfs_read+10%return' # BAD_RETPROBE +fi + exit 0 diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_return_suffix.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_return_suffix.tc new file mode 100644 index 000000000000..f07bd15cc033 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_return_suffix.tc @@ -0,0 +1,21 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Kretprobe %%return suffix test +# requires: kprobe_events '[+]%return':README + +# Test for kretprobe by "r" +echo 'r:myprobeaccept vfs_read' > kprobe_events +RESULT1=`cat kprobe_events` + +# Test for kretprobe by "%return" +echo 'p:myprobeaccept vfs_read%return' > kprobe_events +RESULT2=`cat kprobe_events` + +if [ "$RESULT1" != "$RESULT2" ]; then + echo "Error: %return suffix didn't make a return probe." + echo "r-command: $RESULT1" + echo "%return: $RESULT2" + exit_fail +fi + +echo > kprobe_events diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/uprobe_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/kprobe/uprobe_syntax_errors.tc index 7b5b60c3c5a2..f5e3f9e4a01f 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/uprobe_syntax_errors.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/uprobe_syntax_errors.tc @@ -17,4 +17,10 @@ check_error 'p /bin/sh:10(10)^a' # BAD_REFCNT_SUFFIX check_error 'p /bin/sh:10 ^@+ab' # BAD_FILE_OFFS check_error 'p /bin/sh:10 ^@symbol' # SYM_ON_UPROBE +# %return suffix error +if grep -q "place (uprobe): .*%return.*" README; then +check_error 'p /bin/sh:10^%hoge' # BAD_ADDR_SUFFIX +check_error 'p /bin/sh:10(10)^%return' # BAD_REFCNT_SUFFIX +fi + exit 0