From nobody Wed Dec 17 10:01:03 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D77EC6FD18 for ; Fri, 31 Mar 2023 08:04:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231398AbjCaIEn (ORCPT ); Fri, 31 Mar 2023 04:04:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231421AbjCaIEh (ORCPT ); Fri, 31 Mar 2023 04:04:37 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 570DD1720 for ; Fri, 31 Mar 2023 01:04:33 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-54196bfcd5fso209577607b3.4 for ; Fri, 31 Mar 2023 01:04:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680249872; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=R+Qjq51pDUbYDvOfenKLafjiEmhn5a7zDgYtEMrV8t0=; b=JCzxGn0vLBBILXGon8CTbJN41YA02/mrrdsOVgARzwbvfXMwzAGwLxSH9+M50BumSp /OvCktSZgCyZd1nhnvrkA3fHlaxVW9ETZL/69wxpxLIyuFQ2z1yDZtJliq1zDZCKDPUe iI+0HQuNfbV7RFQk6/IhjBfM6UMp2WhKDecZfOS+dclsrFs9pIDErRQHay92yqJ3OaHt XjQ+8GyE3QqIV2jDRk5AA9j2X3p2rUXT4MhUPnTDKG4NRtjO+s2BwPhZBXb/i3UqOGFG iAowWhalAey2RROGiCwhEfn5dCRCP1kZVmnp/zz3QDZkZXd+a9LEHQwkbkrskYZnoGLL AQ/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680249872; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R+Qjq51pDUbYDvOfenKLafjiEmhn5a7zDgYtEMrV8t0=; b=7BxwV57tjbaszgz51kc5hnlCN/nNyLN7q0psYxNS+OXIn3xDAmphUL+R+8uYyZzkVs q8kYmtbRVXtxIACyFyVVjbGd97OdQSEy8sI8IIlofW+uMJUbL6manq/yEQRd/elf4q82 A68+/RKCziuD5dxKIYXfkXSQePg5x08FfHyxR4HwQcOtJW219tuSXhQf5YiLFkseDClJ ebqo6acm/JRPvA66yM1FDOFvDg1Dok7sgjhVe9wAYqbL9ITZeq+7YKETUNKNmb/RDxQE Lk0NP1N2F5ExCgr80LwT/urQoAlpnmQK45ZdVOWRH75eE5eIz0I+xpADJe+IocLXFq+c dEBQ== X-Gm-Message-State: AAQBX9emfzxVl1D9QGuXBdxyb5evAIhabPTCGEqbzjsZ3G+gz0UBl5dV i3jKw+U5WqTNuN6xg7m8iDnJNfH1+SzskQ== X-Google-Smtp-Source: AKy350bBTfQgztdQZnoQaD7z6eQeJVfLI9U5v1p78WuTwA9oCvHbRKeJaGz7hclz25aEgmZZmYxJG2dc2W/BWg== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a25:d1d8:0:b0:b6d:fc53:c5c0 with SMTP id i207-20020a25d1d8000000b00b6dfc53c5c0mr5674165ybg.1.1680249872636; Fri, 31 Mar 2023 01:04:32 -0700 (PDT) Date: Fri, 31 Mar 2023 16:04:10 +0800 In-Reply-To: <20230331080411.981038-1-davidgow@google.com> Mime-Version: 1.0 References: <20230331080411.981038-1-davidgow@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230331080411.981038-3-davidgow@google.com> Subject: [RFC PATCH v2 2/3] kunit: executor_test: Use kunit_add_action() From: David Gow To: Matti Vaittinen , Maxime Ripard , Brendan Higgins , Stephen Boyd , Shuah Khan , Daniel Latypov , Rae Moar , Benjamin Berg Cc: David Gow , Greg Kroah-Hartman , "Rafael J . Wysocki" , Heikki Krogerus , Jonathan Cameron , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now we have the kunit_add_action() function, we can use it to implement kfree_at_end() and free_subsuite_at_end() without the need for extra helper functions. Signed-off-by: David Gow --- lib/kunit/executor_test.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/kunit/executor_test.c b/lib/kunit/executor_test.c index 0cea31c27b23..e0b9d945c6e5 100644 --- a/lib/kunit/executor_test.c +++ b/lib/kunit/executor_test.c @@ -125,11 +125,6 @@ kunit_test_suites(&executor_test_suite); =20 /* Test helpers */ =20 -static void kfree_res_free(struct kunit_resource *res) -{ - kfree(res->data); -} - /* Use the resource API to register a call to kfree(to_free). * Since we never actually use the resource, it's safe to use on const dat= a. */ @@ -138,8 +133,11 @@ static void kfree_at_end(struct kunit *test, const voi= d *to_free) /* kfree() handles NULL already, but avoid allocating a no-op cleanup. */ if (IS_ERR_OR_NULL(to_free)) return; - kunit_alloc_resource(test, NULL, kfree_res_free, GFP_KERNEL, - (void *)to_free); + + kunit_add_action(test, + (kunit_defer_function_t)kfree, + (void *)to_free, + GFP_KERNEL); } =20 static struct kunit_suite *alloc_fake_suite(struct kunit *test, --=20 2.40.0.348.gf938b09366-goog