Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2114281pxp; Fri, 18 Mar 2022 03:40:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtWHvh6msz81U4wlTRNl9oZ0DWb6Cq+ShrOFSd77oAY708RtLVDgJhg7eLIzJ81/eR/Q1w X-Received: by 2002:aa7:cc02:0:b0:411:487e:36fe with SMTP id q2-20020aa7cc02000000b00411487e36femr8715212edt.338.1647600002863; Fri, 18 Mar 2022 03:40:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647600002; cv=none; d=google.com; s=arc-20160816; b=ITodXuPhxTrEBvmzbC+yzTr8G23fObv6WYnjd9jpmMcUssibIf79aTvdBLnhlKPwEv qRwptcH1XAkDSYvfRWIVZ7bd60tYhQIMghg8MGYE+MatS5Y7SqOGSXHcVcsWRXfgPYgi Qk1M9eD8Q+K6qsxUM5kPsoCOxh9l8oQbk3Lg2J5m328BBceJa6IdwCQVJD1FhAzCtxsn BD1AnCJioB02MMbotQQRwFoVffPc9lz9VWd0YxTUW9eRc1XIsJHpXExF1RIzGGOD8EJL fE3qDPs5VchKh38cXaTNgiKPQ0vM/mkeuAt7+z9l5k/51CxYRsYytIZwXQvgYWzzMEKE yKhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=mPa+N3L2y3VpMLYvKGR04UJEK5knMdloLonQKnMZnCM=; b=uHhQdvIuH5ZrpXRBsvMLTbetUbs7HFFuBPUyjqlwzuSnbz6DkO4wzDakcDFH0Y4z32 MNlOZCNjl/T42Z7/BcwGH9wdbvD3qf8tLdao81x5ZSPh6bqeZRva4hxUVVEUGQD/pTOf ote22t+KUN7WJBrbw1HaxEK1/WgdphMkMQcNzBFlBssZzqLU3KaBDP9EkxXBwopxEzHn yVsYE6tQPZz99O1HdGHrNjG/L6DnmxTh/JPSsqDwch5X4j318RPlLOZ1ZO1BFWQ/X84w 0V1jTmiDeCaLB7unW+wZylI5e14StZ4hyOmP28ZvjZ6x1q2/3Ld0IgLF4F+/WC4pL8yo 0zaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=b8t1MTiw; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j3-20020a508a83000000b00418c2b5bd3csi3303066edj.30.2022.03.18.03.39.37; Fri, 18 Mar 2022 03:40:02 -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=@google.com header.s=20210112 header.b=b8t1MTiw; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231750AbiCRCPB (ORCPT + 99 others); Thu, 17 Mar 2022 22:15:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231739AbiCRCO5 (ORCPT ); Thu, 17 Mar 2022 22:14:57 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9390614FFCE for ; Thu, 17 Mar 2022 19:13:38 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id x9-20020a5b0809000000b00631d9edfb96so5785560ybp.22 for ; Thu, 17 Mar 2022 19:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=mPa+N3L2y3VpMLYvKGR04UJEK5knMdloLonQKnMZnCM=; b=b8t1MTiw2eHXOlvtgtcnQrF06MYxklfxRCFYyKHU7JoA1XGJClI+Ocx4Whixxnq/a6 syNqOUg8tVgmTPakDxrfRQidH2gNJyc3utlG8lIBQ96boigK1tp3wRL9lde4WsjK6uKp WditUPnQJQlkzcMyJ/72g6TM8bjkd00Cd/5XSt9vIv4pxjl4GcJPORcGXCL3IfFO0tDz jB1lFpnkxn5P9lQH+Ms7v7YPB1+GxU8R0AWMX0T7lbLkjuD3Daio/AFiB6GnxcPIq1z8 E3NSJFnioELXIYtsGZ1gYKIhl3nlexl6QvkbY5F0Voi+s8D21V0Fp++PbRavyTNDs5Iv 2e8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mPa+N3L2y3VpMLYvKGR04UJEK5knMdloLonQKnMZnCM=; b=0mxBOrw91F4q7tGs0IDlPqSBol0rWL6Tdk7WgY7CVyz02eKeYu1AHoDv5pUiSTaTRo a+k1CX1cDzI6R3Zc7c75rRE/p/Cc8/9OWtnIk6NN748oF1sk+QZKzlOdLgnKYZph24bJ LcdVKm9uFbl5Fo0j1u3rVpLzd4GLh7D9x+6E2e00IJT01FQYuiJwkIPEFiDCIiTcXy8D FpwvRHEbhB0p7MQv+dCw+nk0dz8MuaRQwuimd9BENo0uIzkZGt414inojdhZ0P6rBdAH TopJ6ZfluL2L9QtleCEqiaaiBLEKF+r55tI7y0B8xUVASQne8AyG/7TmWP43RMcHBagE kf5Q== X-Gm-Message-State: AOAM532NnluNpY2QvLKLq/lCCuigGB6K/T2n6X0w8ras8VQ3PY2Dw0kT 9U/w9/PU+JRZDoBelaawHyUMfCjtfzOw3A== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a25:664f:0:b0:629:2387:cd3c with SMTP id z15-20020a25664f000000b006292387cd3cmr8235091ybm.593.1647569617787; Thu, 17 Mar 2022 19:13:37 -0700 (PDT) Date: Fri, 18 Mar 2022 10:13:13 +0800 In-Reply-To: <20220318021314.3225240-1-davidgow@google.com> Message-Id: <20220318021314.3225240-2-davidgow@google.com> Mime-Version: 1.0 References: <20220318021314.3225240-1-davidgow@google.com> X-Mailer: git-send-email 2.35.1.894.gb6a874cedc-goog Subject: [RFC PATCH 1/2] kunit: Expose 'static stub' API to redirect functions From: David Gow To: Brendan Higgins , Daniel Latypov , Kees Cook , Shuah Khan Cc: David Gow , Steven Rostedt , kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL 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 Add a simple way of redirecting calls to functions by including a special prologue in the "real" function which checks to see if the replacement function should be called (and, if so, calls it). To redirect calls to a function, make the first (non-declaration) line of the function: KUNIT_STATIC_STUB_REDIRECT(function_name, [function arguments]); (This will compile away to nothing if KUnit is not enabled, otherwise it will check if a redirection is active, call the replacement function, and return.) Calls to the real function can be redirected to a replacement using: kunit_activate_static_stub(test, real_fn, replacement_fn); The redirection will only affect calls made from within the kthread of the current test, and will be automatically disabled when the test completes. It can also be manually disabled with kunit_deactivate_static_stub(). The 'example' KUnit test suite has a more complete example. This is intended to be an alternative to ftrace-based stubbing (see the next patch), with different tradeoffs. In particular: - 'static stubs' work on all architectures, and don't have any dependencies. - There's no separate Kconfig option to enable them, they always exist. - They must be explicitly opted-into by the function being replaced (which can be good or bad depending on your POV) - They have a greater performance penalty when not in active use (as every call to the real function must check to see if the stub is enabled) - They could more easily be extended to pass additional context to replacement functions. Co-developed-by: Daniel Latypov Signed-off-by: Daniel Latypov Signed-off-by: David Gow --- include/kunit/static_stub.h | 106 ++++++++++++++++++++++++++++ lib/kunit/Makefile | 1 + lib/kunit/kunit-example-test.c | 39 ++++++++++ lib/kunit/static_stub.c | 125 +++++++++++++++++++++++++++++++++ 4 files changed, 271 insertions(+) create mode 100644 include/kunit/static_stub.h create mode 100644 lib/kunit/static_stub.c diff --git a/include/kunit/static_stub.h b/include/kunit/static_stub.h new file mode 100644 index 000000000000..020e0e9110f2 --- /dev/null +++ b/include/kunit/static_stub.h @@ -0,0 +1,106 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * KUnit function redirection (static stubbing) API. + * + * Copyright (C) 2022, Google LLC. + * Author: David Gow + */ +#ifndef _KUNIT_STATIC_STUB_H +#define _KUNIT_STATIC_STUB_H + +#if !IS_REACHABLE(CONFIG_KUNIT) + +/* If CONFIG_KUNIT is not enabled, these stubs quietly disappear. */ +#define KUNIT_TRIGGER_STATIC_STUB(real_fn_name, args...) do {} while (0) + +#else + +#include + +#include /* for {un,}likely() */ +#include /* for task_struct */ + +/* Returns the address of the replacement function. */ +void *__kunit_get_static_stub_address(struct kunit *test, void *real_fn_addr); + +/** + * KUNIT_STATIC_STUB_REDIRECT() - call a replacement 'static stub' if one exists + * @real_fn_name: The name of this function (as an identifier, not a string) + * @args: All of the arguments passed to this function + * + * This is a function prologue which is used to allow calls to the current + * function to be redirected by a KUnit test. KUnit tests can call + * kunit_activate_static_stub() to pass a replacement function in. The + * replacement function will be called by KUNIT_TRIGGER_STATIC_STUB(), which + * will then return from the function. If the caller is not in a KUnit context, + * the function will continue execution as normal. + * + * Example: + * + * .. code-block:: c + * int real_func(int n) + * { + * KUNIT_STATIC_STUB_REDIRECT(real_func, n); + * return 0; + * } + * + * void replacement_func(int n) + * { + * return 42; + * } + * + * void example_test(struct kunit *test) + * { + * kunit_activate_static_stub(test, real_func, replacement_func); + * KUNIT_EXPECT_EQ(test, real_func(1), 42); + * } + * + */ +#define KUNIT_STATIC_STUB_REDIRECT(real_fn_name, args...) \ +do { \ + typeof(&real_fn_name) replacement; \ + struct kunit *current_test = current->kunit_test; \ + \ + if (likely(!current_test)) \ + break; \ + \ + KUNIT_ASSERT_STREQ_MSG(current_test, __func__, #real_fn_name, \ + "Static stub function name mismatch"); \ + \ + replacement = __kunit_get_static_stub_address(current_test, \ + &real_fn_name); \ + \ + if (unlikely(replacement)) \ + return replacement(args); \ +} while (0) + +/* Helper function for kunit_activate_static_stub(). The macro does + * typechecking, so use it instead. + */ +void __kunit_activate_static_stub(struct kunit *test, + void *real_fn_addr, + void *replacement_addr); + +/** + * kunit_activate_static_stub() - replace a function using static stubs. + * @test: A pointer to the 'struct kunit' test context for the current test. + * @real_fn_addr: The address of the function to replace. + * @replacement_addr: The address of the function to replace it with. + * + * When activated, calls to real_fn_addr from within this test (even if called + * indirectly) will instead call replacement_addr. The function pointed to by + * real_fn_addr must begin with the static stub prologue in + * KUNIT_TRIGGER_STATIC_STUB() for this to work. real_fn_addr and + * replacement_addr must have the same type. + * + * The redirection can be disabled again with kunit_deactivate_static_stub(). + */ +#define kunit_activate_static_stub(test, real_fn_addr, replacement_addr) do { \ + typecheck(typeof(real_fn_addr), replacement_addr); \ + __kunit_activate_static_stub(test, real_fn_addr, replacement_addr); \ +} while (0) + +void kunit_deactivate_static_stub(struct kunit *test, void *real_fn_addr); + +#endif +#endif diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile index c49f4ffb6273..f9e929700782 100644 --- a/lib/kunit/Makefile +++ b/lib/kunit/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_KUNIT) += kunit.o kunit-objs += test.o \ + static_stub.o \ string-stream.o \ assert.o \ try-catch.o \ diff --git a/lib/kunit/kunit-example-test.c b/lib/kunit/kunit-example-test.c index 51099b0ca29c..670c21e74446 100644 --- a/lib/kunit/kunit-example-test.c +++ b/lib/kunit/kunit-example-test.c @@ -7,6 +7,7 @@ */ #include +#include /* * This is the most fundamental element of KUnit, the test case. A test case @@ -69,6 +70,43 @@ static void example_mark_skipped_test(struct kunit *test) /* This line should run */ kunit_info(test, "You should see this line."); } + +/* This is a function we'll replace with static stubs. */ +static int add_one(int i) +{ + /* This will trigger the stub if active. */ + KUNIT_STATIC_STUB_REDIRECT(add_one, i); + + return i + 1; +} + +/* This is used as a replacement for the above function. */ +static int subtract_one(int i) +{ + /* We don't need to trigger the stub from the replacement. */ + + return i - 1; +} + +/* + * This test shows the use of static stubs. + */ +static void example_static_stub_test(struct kunit *test) +{ + /* By default, function is not stubbed. */ + KUNIT_EXPECT_EQ(test, add_one(1), 2); + + /* Replace add_one() with subtract_one(). */ + kunit_activate_static_stub(test, add_one, subtract_one); + + /* add_one() is now replaced. */ + KUNIT_EXPECT_EQ(test, add_one(1), 0); + + /* Return add_one() to normal. */ + kunit_deactivate_static_stub(test, add_one); + KUNIT_EXPECT_EQ(test, add_one(1), 2); +} + /* * Here we make a list of all the test cases we want to add to the test suite * below. @@ -83,6 +121,7 @@ static struct kunit_case example_test_cases[] = { KUNIT_CASE(example_simple_test), KUNIT_CASE(example_skip_test), KUNIT_CASE(example_mark_skipped_test), + KUNIT_CASE(example_static_stub_test), {} }; diff --git a/lib/kunit/static_stub.c b/lib/kunit/static_stub.c new file mode 100644 index 000000000000..b06b88f82dd7 --- /dev/null +++ b/lib/kunit/static_stub.c @@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * KUnit function redirection (static stubbing) API. + * + * Copyright (C) 2022, Google LLC. + * Author: David Gow + */ + +#include +#include + + +/* Context for a static stub. This is stored in the resource data. */ +struct kunit_static_stub_ctx { + void *real_fn_addr; + void *replacement_addr; +}; + +static void __kunit_static_stub_resource_free(struct kunit_resource *res) +{ + kfree(res->data); +} + +/* Matching function for kunit_find_resource(). match_data is real_fn_addr. */ +static bool __kunit_static_stub_resource_match(struct kunit *test, + struct kunit_resource *res, + void *match_real_fn_addr) +{ + /* This pointer is only valid if res is a static stub resource. */ + struct kunit_static_stub_ctx *ctx = res->data; + + /* Make sure the resource is a static stub resource. */ + if (res->free != &__kunit_static_stub_resource_free) + return false; + + return ctx->real_fn_addr == match_real_fn_addr; +} + +/* Returns the address of the replacement function. */ +void *__kunit_get_static_stub_address(struct kunit *test, void *real_fn_addr) +{ + struct kunit_resource *res; + struct kunit_static_stub_ctx *ctx; + void *replacement_addr; + + res = kunit_find_resource(test, + __kunit_static_stub_resource_match, + real_fn_addr); + + if (!res) + return NULL; + + ctx = res->data; + replacement_addr = ctx->replacement_addr; + kunit_put_resource(res); + return replacement_addr; +} +EXPORT_SYMBOL_GPL(__kunit_get_static_stub_address); + +void kunit_deactivate_static_stub(struct kunit *test, void *real_fn_addr) +{ + struct kunit_resource *res; + + KUNIT_ASSERT_PTR_NE_MSG(test, real_fn_addr, NULL, + "Tried to deactivate a NULL stub."); + + /* Look up the existing stub for this function. */ + res = kunit_find_resource(test, + __kunit_static_stub_resource_match, + real_fn_addr); + + /* Error out if the stub doesn't exist. */ + KUNIT_ASSERT_PTR_NE_MSG(test, res, NULL, + "Tried to deactivate a nonexistent stub."); + + /* Free the stub. We 'put' twice, as we got a reference + * from kunit_find_resource() + */ + kunit_remove_resource(test, res); + kunit_put_resource(res); +} +EXPORT_SYMBOL_GPL(kunit_deactivate_static_stub); + +/* Helper function for kunit_activate_static_stub(). The macro does + * typechecking, so use it instead. + */ +void __kunit_activate_static_stub(struct kunit *test, + void *real_fn_addr, + void *replacement_addr) +{ + struct kunit_static_stub_ctx *ctx; + struct kunit_resource *res; + + KUNIT_ASSERT_PTR_NE_MSG(test, real_fn_addr, NULL, + "Tried to activate a stub for function NULL"); + + /* If the replacement address is NULL, deactivate the stub. */ + if (!replacement_addr) { + kunit_deactivate_static_stub(test, replacement_addr); + return; + } + + /* Look up any existing stubs for this function, and replace them. */ + res = kunit_find_resource(test, + __kunit_static_stub_resource_match, + real_fn_addr); + if (res) { + ctx = res->data; + ctx->replacement_addr = replacement_addr; + + /* We got an extra reference from find_resource(), so put it. */ + kunit_put_resource(res); + } else { + ctx = kmalloc(sizeof(*ctx), GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ctx->real_fn_addr = real_fn_addr; + ctx->replacement_addr = replacement_addr; + res = kunit_alloc_resource(test, NULL, + &__kunit_static_stub_resource_free, + GFP_KERNEL, ctx); + } +} +EXPORT_SYMBOL_GPL(__kunit_activate_static_stub); + + -- 2.35.1.894.gb6a874cedc-goog