From patchwork Mon Dec 18 16:10:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 180545 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1351013dyi; Mon, 18 Dec 2023 08:12:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHLgTKL3C6t9ojg6SAei0nIqnsXrHzcliSzoih8ByhP3jSvWWg8iB9YmgGP0l6u7rwZu0MJ X-Received: by 2002:a81:df0b:0:b0:5d7:8171:1844 with SMTP id c11-20020a81df0b000000b005d781711844mr7872528ywn.14.1702915924130; Mon, 18 Dec 2023 08:12:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702915924; cv=none; d=google.com; s=arc-20160816; b=xOH2Q7W7hWqy6ECaYBJ8VxE6kWSkf20tarpyVQaNpO3MnvDXF3y+PBFwgjUF+Z+swD dZNaHHqXPqOK7lfF++mZFMEm/QueOLUP8nMQowXxdx6qgExrpa1gE1EQIEblCr59lMDs HZfKkJjbdTiY0CeMFEOpoKRBID+GJlna5NGzBjD1Kq+ry2CKMHvlQqxbQ2OXD0Panjwl 8X55oJ0wkoudSSaMbSKGEZLYEeONPdbcdF5o5boGYfAg6PaHjSq9FYFFOGqXA+9FAHch DYlA0sunyIfjNrFSH1d0wqqTw3oZIhicH/Fkp/coeNQ7BGTUZX+FRXWkg+DPNOqvRt8p vv1Q== 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=gbNctB2mRNzq3Pbgg5YVQIDeiep/qhQhWnEl0nJs1xk=; fh=jtkMVljxaSSnm+wRWxFZHf/UR4p8LFQ8rZaEaUeBMWE=; b=qRkUU7fPGqoYvZ74IKdprvYbvq10xOB0PyCHeKoQ0iqDjZw3qn09ndu14dS0veDZD6 NI69sUYWva1cBuG91g8qcAqbp9OlBq0LUx0be6Pv3b1Zve4mkrjvCQRcQ8Dc02g/kIYQ RET8R9OYserX7hsnUZD4Q7m/B1WJMvYPClcSPuALub+EZS+sQG1Y4oxRMvA6qwbVF9yX vKH1YlNCeNmL47k5A+65VeVFzZDwJ9NUqWkshS4r0MeWwCUaWsGYHlY9/v0OSCG0KgSL B2OlCGYZuhqnp/AIXIAS//KDOJobP6ClilAiNsQ9d2vBD44ROtmogLwK3KD7dkR7FVIr Nqjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="BCMFszr/"; spf=pass (google.com: domain of linux-kernel+bounces-4041-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4041-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id x6-20020a81e706000000b005e70cb29da3si573536ywl.303.2023.12.18.08.12.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 08:12:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-4041-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="BCMFszr/"; spf=pass (google.com: domain of linux-kernel+bounces-4041-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4041-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id D311E1C25AF7 for ; Mon, 18 Dec 2023 16:12:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9822942390; Mon, 18 Dec 2023 16:11:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="BCMFszr/" 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 56B3A4FF63; Mon, 18 Dec 2023 16:11:05 +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 3BI6fl3b012777; Mon, 18 Dec 2023 10:10:51 -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=gbNctB2mRNzq3Pbgg5YVQIDeiep/qhQhWnEl0nJs1xk=; b= BCMFszr/obkQK/zI0XJhnmuClqxlqa//cHEHYvGHlsSmsvgKU65tsSDWw7RTqxyD jLr7+nPu88/qJSVP5qCvWF2/Pz7DXZp+4L3gnEo5MDaEcN5lKIWAgoKlZz4ieAOz uB1vcUdNWijpRQj3LauQT8q9O6Uq4ZPNnmuYFhtuz12G9NVrIOxpaRwz0MlB6QBu ox/u4Ij1o1nTp9U0+wewm9Kjjn4PC3qW+yBWof/7/+hKq25Si3Sg8EUS0pIjDiG1 f+qLk1NouJKnQT3VtBc4Sma3EhCGYZ5J32rWZVyuMdaaebEV0mn3we+RQJRgCHPv SAbRt9jHSY8HPDByvNf4Bg== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3v1a622x3c-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 Dec 2023 10:10:50 -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; Mon, 18 Dec 2023 16:10:47 +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; Mon, 18 Dec 2023 16:10:47 +0000 Received: from work-debian.ad.cirrus.com (EDINJ39Q8D3.ad.cirrus.com [198.61.65.115]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 4B134468; Mon, 18 Dec 2023 16:10:47 +0000 (UTC) From: Richard Fitzgerald To: , , CC: , , , , "Richard Fitzgerald" Subject: [PATCH 2/2] kunit: Add example of kunit_activate_static_stub() with pointer-to-function Date: Mon, 18 Dec 2023 16:10:44 +0000 Message-ID: <20231218161044.215640-2-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231218161044.215640-1-rf@opensource.cirrus.com> References: <20231218161044.215640-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: a7iBXy3XN-Euja9VHinxNhnGyz7VVQ4U X-Proofpoint-ORIG-GUID: a7iBXy3XN-Euja9VHinxNhnGyz7VVQ4U X-Proofpoint-Spam-Reason: safe X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785636768230643176 X-GMAIL-MSGID: 1785636768230643176 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 --- lib/kunit/kunit-example-test.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/lib/kunit/kunit-example-test.c b/lib/kunit/kunit-example-test.c index d2f7a3c62c18..9e57f341dc37 100644 --- a/lib/kunit/kunit-example-test.c +++ b/lib/kunit/kunit-example-test.c @@ -168,6 +168,8 @@ static int subtract_one(int i) return i - 1; } +static int (* const add_one_fn_ptr)(int i) = add_one; + /* * This test shows the use of static stubs. */ @@ -187,6 +189,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[] = { @@ -245,6 +271,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_PARAM(example_params_test, example_gen_params), KUNIT_CASE_SLOW(example_slow_test), {}