From patchwork Thu Dec 21 10:38:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 182149 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp320143dyi; Thu, 21 Dec 2023 02:41:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IGFneQG89JBSQfUzqXayG3CJpJIL+6CKXuuXKgtkg1ma6+4/qJNZWThPGQginjtBu6mFGqk X-Received: by 2002:a17:906:1010:b0:a23:5501:1f61 with SMTP id 16-20020a170906101000b00a2355011f61mr1671332ejm.243.1703155272799; Thu, 21 Dec 2023 02:41:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703155272; cv=none; d=google.com; s=arc-20160816; b=0kQNYdPndggA6J8yZ4Ume9heOKDfE8zrjfGkkHgx+GswfopBkYi7XJWbPwALo2YCDr 6BXpZnUMkP+ljh+AC2o0Yy3glacmfWIrch+I23nY6jnzIwlFUlFfBQsuF1dGdDSxi7Wh 2AElr0gkHUCId46yqHzxXI+biUCABwfMWCuPzBvTcR+8LOFhZrWhb/IULblLvtH7gFUa 1JUxvG9iQhTnJ/DuqFqWLQKqO47pBEIzPprkQiyEFkqj4mC3MCxUVU/m2ZxIqgAEF3MZ 0COMPzaJcfxFP32gGVUtDGL7t/OIJl0QXlP7AmNm2Ixl8PkqtfBMBD7hnqs+P9FhxBf4 YtGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=rNoek7i2hFRCbF498o2jHOYXWryLj1e8+AacX3XSeLs=; fh=jtkMVljxaSSnm+wRWxFZHf/UR4p8LFQ8rZaEaUeBMWE=; b=rURbo7odgAxY2m61tE4jBn3S7qmGham2Zz6xRFaJXA51TK9j+sq7oymJQa3WRPK3u1 /StM3E3KundV8TcT9+MvYJBITr31co6oqBSr7lSyzmaJHlV8cPe/f90x6tqEw35VHbwF EYv6wU6508MNxDNhjF7WgEdl1NaqaV4Q7i4ML/6AwNXlFTkH6+Zmahgst1Mo5SNv8WtJ Plii9CYUEwfsYK1ZRAGLfsvDSYcFzxx4rm3pp2syneQZLJwArEzLv1/bHMno+Lw9GY1Q 9tBGk6LfXEn5vVsf+tRLPZR5iOdmbNdnigKTEOtebSbSga8ruKTJkdzRntrCcuyCOeXc vK9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=PijBGgiT; spf=pass (google.com: domain of linux-kernel+bounces-8217-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8217-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ge12-20020a170907908c00b00a2340d8392dsi700780ejb.106.2023.12.21.02.41.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 02:41:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8217-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=PijBGgiT; spf=pass (google.com: domain of linux-kernel+bounces-8217-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8217-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 3F10B1F218DE for ; Thu, 21 Dec 2023 10:41:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D7906BB37; Thu, 21 Dec 2023 10:39:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="PijBGgiT" X-Original-To: linux-kernel@vger.kernel.org Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E75C36A018; Thu, 21 Dec 2023 10:39:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3BL6AEek014182; Thu, 21 Dec 2023 04:39:03 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=rNoek7i2hFRCbF498o2jHOYXWryLj1e8+AacX3XSeLs=; b= PijBGgiTMMk/lKX+rDChXaawdFoWoo/wCCtCY6Q/h9oR7gOQrvrtJhraKZlB9scW hXpzsTUuAFTo5OHnFkqh3kjWwDKjkc7Ng4eomcFkOUmxL3EShbArXvJqMNmuX4uJ g17acFQgTFYBGfqdxCwVbLCyGsBnielHLpTHoGGqgrUe8Aw+mZqgs69nPRJSRVLO Omq+4c/F0BTkkyBOWWAri0vWAqCn39bpGN9mTh+zDklzzSHiiUr85nAB1SSla8cx h5uOcbufgZjkrd8z5sGrzRotFd+kdhRXy48GdyYr7Ou5Y9YsYP4nYL1CClxPioOg L4qj0Svz6tLLWaPzmaJc3w== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3v1a627625-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 21 Dec 2023 04:39:02 -0600 (CST) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Thu, 21 Dec 2023 10:39:00 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.40 via Frontend Transport; Thu, 21 Dec 2023 10:39:00 +0000 Received: from work-debian.ad.cirrus.com (unknown [198.61.64.187]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 3EC9311CC; Thu, 21 Dec 2023 10:39:00 +0000 (UTC) From: Richard Fitzgerald To: , , CC: , , , , "Richard Fitzgerald" Subject: [PATCH v2 2/2] kunit: Add example of kunit_activate_static_stub() with pointer-to-function Date: Thu, 21 Dec 2023 10:38:57 +0000 Message-ID: <20231221103858.46010-2-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231221103858.46010-1-rf@opensource.cirrus.com> References: <20231221103858.46010-1-rf@opensource.cirrus.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: 90crQN90oj-4uhzrdwETgjBfHpjxCXbE X-Proofpoint-ORIG-GUID: 90crQN90oj-4uhzrdwETgjBfHpjxCXbE X-Proofpoint-Spam-Reason: safe X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785887743347556354 X-GMAIL-MSGID: 1785887743347556354 Adds a variant of example_static_stub_test() that shows use of a pointer-to-function with kunit_activate_static_stub(). A const pointer to the add_one() function is declared. This pointer-to-function is passed to kunit_activate_static_stub() and kunit_deactivate_static_stub() instead of passing add_one directly. Signed-off-by: Richard Fitzgerald Reviewed-by: David Gow --- V2: Added comment for add_one_fn_ptr. --- lib/kunit/kunit-example-test.c | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/kunit/kunit-example-test.c b/lib/kunit/kunit-example-test.c index 359dbee10201..798924f7cc86 100644 --- a/lib/kunit/kunit-example-test.c +++ b/lib/kunit/kunit-example-test.c @@ -168,6 +168,16 @@ static int subtract_one(int i) return i - 1; } +/* + * If the function to be replaced is static within a module it is + * useful to export a pointer to that function instead of having + * to change the static function to a non-static exported function. + * + * This pointer simulates a module exporting a pointer to a static + * function. + */ +static int (* const add_one_fn_ptr)(int i) = add_one; + /* * This test shows the use of static stubs. */ @@ -187,6 +197,30 @@ static void example_static_stub_test(struct kunit *test) KUNIT_EXPECT_EQ(test, add_one(1), 2); } +/* + * This test shows the use of static stubs when the function being + * replaced is provided as a pointer-to-function instead of the + * actual function. This is useful for providing access to static + * functions in a module by exporting a pointer to that function + * instead of having to change the static function to a non-static + * exported function. + */ +static void example_static_stub_using_fn_ptr_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_fn_ptr, 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_fn_ptr); + KUNIT_EXPECT_EQ(test, add_one(1), 2); +} + static const struct example_param { int value; } example_params_array[] = { @@ -259,6 +293,7 @@ static struct kunit_case example_test_cases[] = { KUNIT_CASE(example_mark_skipped_test), KUNIT_CASE(example_all_expect_macros_test), KUNIT_CASE(example_static_stub_test), + KUNIT_CASE(example_static_stub_using_fn_ptr_test), KUNIT_CASE(example_priv_test), KUNIT_CASE_PARAM(example_params_test, example_gen_params), KUNIT_CASE_SLOW(example_slow_test),