From patchwork Wed Mar 29 19:45:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 76807 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp662701vqo; Wed, 29 Mar 2023 13:15:53 -0700 (PDT) X-Google-Smtp-Source: AKy350aSOPPr6KRBjgRugXFpdFEHZtGx6bvsDm01yCS1m2Kf+9Cin4s2Dvr4KVzc92QgriOILFmT X-Received: by 2002:a17:906:5288:b0:932:3d1b:b67a with SMTP id c8-20020a170906528800b009323d1bb67amr21078972ejm.41.1680120953552; Wed, 29 Mar 2023 13:15:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680120953; cv=none; d=google.com; s=arc-20160816; b=kTRmGCvFZfdjB0x4z8pZi/zEHIJYsHyJWVWDdf8hoREICebYoOFyO4qcr+fpIsmFWU F5LEUBnkBu5MrPctBdY27PJU+xKA7lrxylkY08mN8tb1QIsNVLA9AWXCsyqed4EJz5bk 5RTcXofz3gKMQruWrki8lPuUX7nOFN5CV3NQOotwMMDWqSKQxz2Jg7ZVhmaTGLi8s0MZ wJrt/x7z+Rh4ot6z4zX3T7AgFlHKWL/9Cn/UwlT7HOkZaLJt+9y3oYWm2P/V7rhh/Jfw +rN9euzLe4VzAeZnXrC8TvA2iPhDFn7mJLBbPPXjWhDhUjBgPO/R++9kKRuwtvERQtjk VSEA== 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=9WQyFyaAKr40/aAstVEU4/liSuzU/L3KXESgnDg3ra0=; b=yjjLRLpAm9WE/doxJoBWmjW7IH7ywx7bs/fmxPy4Uww2rSBcIdV0UoPyb7aB+xD6Ag W+TM9XnfvKM69QsaCXAXutlpEXvTRfize7mtUM5EWEu+EDiECj/4LyR6lu3v2Y5GAMYu NvV2lrPbObSrXvOyWI+j9Gu4Nx0HFSjTtvpjXYo2+CAvO+boNaUww+vtqYQ+ChhETNal XMYaux7Me46hV67BL2kymndZWrhHwPWSSZRSGSvZyhO+uk5gEq0ssvV1ZbHOvVGCoFX3 nT1CJ37TSD1Ns9N1LHmPAOFTl6QMxOvzdZifbbwMHseJzNl7YcYJWJi4bz3ScPtqCqxc bVLg== 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 z4-20020a170906240400b008d1b885791csi33620134eja.153.2023.03.29.13.15.28; Wed, 29 Mar 2023 13:15:53 -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 S231129AbjC2Tqj (ORCPT + 99 others); Wed, 29 Mar 2023 15:46:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230056AbjC2Tp4 (ORCPT ); Wed, 29 Mar 2023 15:45:56 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26F72126 for ; Wed, 29 Mar 2023 12:45:54 -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 ams.source.kernel.org (Postfix) with ESMTPS id 82DCDB82435 for ; Wed, 29 Mar 2023 19:45:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4964CC4339E; Wed, 29 Mar 2023 19:45:51 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1phbjy-002RhT-1H; Wed, 29 Mar 2023 15:45:50 -0400 Message-ID: <20230329194550.208773263@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 29 Mar 2023 15:45:22 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Florent Revest , Will Deacon Subject: [for-next][PATCH 06/25] lib/test_fprobe: Add a testcase for skipping exit_handler References: <20230329194516.146147554@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761734509223738342?= X-GMAIL-MSGID: =?utf-8?q?1761734509223738342?= From: "Masami Hiramatsu (Google)" Add a testcase for skipping exit_handler if entry_handler returns !0. Link: https://lkml.kernel.org/r/167526700658.433354.12922388040490848613.stgit@mhiramat.roam.corp.google.com Cc: Florent Revest Cc: Mark Rutland Cc: Will Deacon Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- lib/test_fprobe.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/test_fprobe.c b/lib/test_fprobe.c index 9fa2ac9eda83..0fe5273e960b 100644 --- a/lib/test_fprobe.c +++ b/lib/test_fprobe.c @@ -21,6 +21,7 @@ static u32 (*target_nest)(u32 value, u32 (*nest)(u32)); static unsigned long target_ip; static unsigned long target2_ip; static unsigned long target_nest_ip; +static int entry_return_value; static noinline u32 fprobe_selftest_target(u32 value) { @@ -52,7 +53,7 @@ static notrace int fp_entry_handler(struct fprobe *fp, unsigned long ip, } else KUNIT_EXPECT_NULL(current_test, data); - return 0; + return entry_return_value; } static notrace void fp_exit_handler(struct fprobe *fp, unsigned long ip, @@ -205,6 +206,28 @@ static void test_fprobe_nest(struct kunit *test) KUNIT_EXPECT_EQ(test, 0, unregister_fprobe(&fp)); } +static void test_fprobe_skip(struct kunit *test) +{ + struct fprobe fp = { + .entry_handler = fp_entry_handler, + .exit_handler = fp_exit_handler, + }; + + current_test = test; + KUNIT_EXPECT_EQ(test, 0, register_fprobe(&fp, "fprobe_selftest_target", NULL)); + + entry_return_value = 1; + entry_val = 0; + exit_val = 0; + target(rand1); + KUNIT_EXPECT_NE(test, 0, entry_val); + KUNIT_EXPECT_EQ(test, 0, exit_val); + KUNIT_EXPECT_EQ(test, 0, fp.nmissed); + entry_return_value = 0; + + KUNIT_EXPECT_EQ(test, 0, unregister_fprobe(&fp)); +} + static unsigned long get_ftrace_location(void *func) { unsigned long size, addr = (unsigned long)func; @@ -234,6 +257,7 @@ static struct kunit_case fprobe_testcases[] = { KUNIT_CASE(test_fprobe_syms), KUNIT_CASE(test_fprobe_data), KUNIT_CASE(test_fprobe_nest), + KUNIT_CASE(test_fprobe_skip), {} };