Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp2412529pxb; Fri, 25 Mar 2022 17:36:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlfGVYvEJiNRduveIe4YjXJ95GO/TSJ0BRFCJA/XtRPYrXEvkFcfUvDrZL9tQrMLunKWxe X-Received: by 2002:a17:90b:1b52:b0:1c6:b689:813d with SMTP id nv18-20020a17090b1b5200b001c6b689813dmr15577927pjb.186.1648254993344; Fri, 25 Mar 2022 17:36:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648254993; cv=none; d=google.com; s=arc-20160816; b=EKJz1ENMswsFK4KFTr79qOfPSVYQoGN08jzQVnD+dDBQon2hsfkrNZnaC4dWj27diF ii+ClVVDwXEMMMgmr2QuY/wv4iPxIfxyGjjcFmSHomn1KPKHvWLkRaY5XzEvndcNZtx5 ryuooa4/NlIUE0Wbvu0SBz51usXS6nfbsKmFi7O4xTrmMA/Cg37bFRdqHkicGTgv1+LI OCXjZ2nl3Mf0MXZ4UoGPvsXO2sDPbhnIqTPz/7R5Aqh0RjIrOzCdsnBnM9lA9D1ngp7D 69Nz30cpm9ze7wSRiuSo7rqi3cyqAITeL1VN3995KUyE3RXb98D3PZ2QFpnc/VfN9ZuF QS+Q== 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=hgvJZIq6FS59H45AI6EmsqKDugmfm6LlItsBv/JFTKg=; b=eqTy3Vqs8efmFwRbWYguigOlrKBlKpDBYmfa661KEg8IS0eZo8nU8SzCgoeff+E/XL ybX2PU/ZQTJyNkfFCQ2fmdBokpc8aNicOsSanGif6VC1DSmubRWWVP0f0gV75joJEG9R 9FYofXJzxaYmZp3ywYsmlQKncCO87E0OTPtv1wU7yvQjoHvrUaeh0/0IHvPrOFKgHGFn Q6/+KsHCERpNZIoRXKkdq+a/steGz2iWnptoXmwn17ogYby7CQoRe5CZT0RXQ03cu3yz iLdZ3yItOuTtsS/agGcabQjUw4MCaeyXSwiH/BJNSnnZ5GcSLfVAd4qxkFbO1K9P+H6C DJ9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=XRzUUSHf; 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 u18-20020a170903125200b001549d3bcb48si4000584plh.582.2022.03.25.17.36.19; Fri, 25 Mar 2022 17:36:33 -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=XRzUUSHf; 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 S230345AbiCZAWJ (ORCPT + 99 others); Fri, 25 Mar 2022 20:22:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230304AbiCZAWG (ORCPT ); Fri, 25 Mar 2022 20:22:06 -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 1207025588 for ; Fri, 25 Mar 2022 17:20:27 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2d07ae11467so72287777b3.12 for ; Fri, 25 Mar 2022 17:20:27 -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=hgvJZIq6FS59H45AI6EmsqKDugmfm6LlItsBv/JFTKg=; b=XRzUUSHf+YAUSaDgRQ8JutoOAursgJZYWQT4fnYk4+S+oLW3OXnK9W1SacJXTpbkM8 eyttJtrYR852bSmDHY7K8PGwiKVwvc4h6c4ZSz2vXFGzrAuTPwYZmvNnoHFwy3c4FsnR dTbihGKz19CI+i/GwE5Th9UmE4xvygS3MWbW9PRbX5BvA3kVOS4+6aHzOVmvVwoFQK1P Pk44XQqD0/32V+HfErRigUaf23EfFeQTOTDXv7IxOOUJKArrtR+9gTYNpPKJtF8FlkMc rgF8AW9hbZnmS0c9RevuV7HnhE0Txsi0c90sD7KXDMr9ttDUQgmcxtYpVAv3W4mWHbZs jJeA== 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=hgvJZIq6FS59H45AI6EmsqKDugmfm6LlItsBv/JFTKg=; b=nBcsgFAswNV6dXi+8VpEoxG1ELYD4M3J3R6oi+J787GvnKrj4FqjslJ/Ao04aXl4Ax Yc/duvtxzeiBG9qnZY0wGHIJRTdtW90rnOz/fvVcBxRu97W/Rn+FMaWWcW9/7zEbivnh Uej8/3EaaVUlcXU4j4FCF0dIfbgX+yhJeJjjPavGcJW+k24VBC2TNRab78IeQnp/MQTL IxkygAmy0AjF58T3CEBwLlqXMFPhPOFq0/ITseIfJ/d1Ldg10y8dfUwv9hLTd8j2Wn9W sOFU8DDR3mBdMKBHLTae3fB6R+wF0dP2Zq38eR8X7e0YMqby7nDPSHEiH42zjW55Y81K ay8A== X-Gm-Message-State: AOAM530Q+kBuYv4uT29WP3VWuTgE0umwQYZfuQWvuuZxBAWQI3Cz5OgQ EUOYFhs0GbG8xPhzI/jfAsS+APMWGnuGWA== X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:be84:4a49:e731:f1fa]) (user=dlatypov job=sendgmr) by 2002:a05:6902:114b:b0:634:6f24:afc2 with SMTP id p11-20020a056902114b00b006346f24afc2mr13264298ybu.229.1648254026339; Fri, 25 Mar 2022 17:20:26 -0700 (PDT) Date: Fri, 25 Mar 2022 17:20:13 -0700 In-Reply-To: <20220326002013.483394-1-dlatypov@google.com> Message-Id: <20220326002013.483394-2-dlatypov@google.com> Mime-Version: 1.0 References: <20220326002013.483394-1-dlatypov@google.com> X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog Subject: [PATCH v2 2/2] kunit: split resource API impl from test.c into new resource.c From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Daniel Latypov 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=ham 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 We've split out the declarations from include/kunit/test.h into resource.h. This patch splits out the definitions as well for consistency. A side effect of this is git blame won't properly track history by default, users need to run $ git blame -L ,1 -C13 lib/kunit/resource.c Signed-off-by: Daniel Latypov --- lib/kunit/Makefile | 1 + lib/kunit/resource.c | 126 +++++++++++++++++++++++++++++++++++++++++++ lib/kunit/test.c | 116 +-------------------------------------- 3 files changed, 128 insertions(+), 115 deletions(-) create mode 100644 lib/kunit/resource.c diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile index c49f4ffb6273..29aff6562b42 100644 --- a/lib/kunit/Makefile +++ b/lib/kunit/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_KUNIT) += kunit.o kunit-objs += test.o \ + resource.o \ string-stream.o \ assert.o \ try-catch.o \ diff --git a/lib/kunit/resource.c b/lib/kunit/resource.c new file mode 100644 index 000000000000..b8bced246217 --- /dev/null +++ b/lib/kunit/resource.c @@ -0,0 +1,126 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * KUnit resource API for test managed resources (allocations, etc.). + * + * Copyright (C) 2022, Google LLC. + * Author: Daniel Latypov + */ + +#include +#include +#include + +/* + * Used for static resources and when a kunit_resource * has been created by + * kunit_alloc_resource(). When an init function is supplied, @data is passed + * into the init function; otherwise, we simply set the resource data field to + * the data value passed in. + */ +int kunit_add_resource(struct kunit *test, + kunit_resource_init_t init, + kunit_resource_free_t free, + struct kunit_resource *res, + void *data) +{ + int ret = 0; + unsigned long flags; + + res->free = free; + kref_init(&res->refcount); + + if (init) { + ret = init(res, data); + if (ret) + return ret; + } else { + res->data = data; + } + + spin_lock_irqsave(&test->lock, flags); + list_add_tail(&res->node, &test->resources); + /* refcount for list is established by kref_init() */ + spin_unlock_irqrestore(&test->lock, flags); + + return ret; +} +EXPORT_SYMBOL_GPL(kunit_add_resource); + +int kunit_add_named_resource(struct kunit *test, + kunit_resource_init_t init, + kunit_resource_free_t free, + struct kunit_resource *res, + const char *name, + void *data) +{ + struct kunit_resource *existing; + + if (!name) + return -EINVAL; + + existing = kunit_find_named_resource(test, name); + if (existing) { + kunit_put_resource(existing); + return -EEXIST; + } + + res->name = name; + + return kunit_add_resource(test, init, free, res, data); +} +EXPORT_SYMBOL_GPL(kunit_add_named_resource); + +struct kunit_resource *kunit_alloc_and_get_resource(struct kunit *test, + kunit_resource_init_t init, + kunit_resource_free_t free, + gfp_t internal_gfp, + void *data) +{ + struct kunit_resource *res; + int ret; + + res = kzalloc(sizeof(*res), internal_gfp); + if (!res) + return NULL; + + ret = kunit_add_resource(test, init, free, res, data); + if (!ret) { + /* + * bump refcount for get; kunit_resource_put() should be called + * when done. + */ + kunit_get_resource(res); + return res; + } + return NULL; +} +EXPORT_SYMBOL_GPL(kunit_alloc_and_get_resource); + +void kunit_remove_resource(struct kunit *test, struct kunit_resource *res) +{ + unsigned long flags; + + spin_lock_irqsave(&test->lock, flags); + list_del(&res->node); + spin_unlock_irqrestore(&test->lock, flags); + kunit_put_resource(res); +} +EXPORT_SYMBOL_GPL(kunit_remove_resource); + +int kunit_destroy_resource(struct kunit *test, kunit_resource_match_t match, + void *match_data) +{ + struct kunit_resource *res = kunit_find_resource(test, match, + match_data); + + if (!res) + return -ENOENT; + + kunit_remove_resource(test, res); + + /* We have a reference also via _find(); drop it. */ + kunit_put_resource(res); + + return 0; +} +EXPORT_SYMBOL_GPL(kunit_destroy_resource); + diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 3bca3bf5c15b..0f66c13d126e 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -6,10 +6,10 @@ * Author: Brendan Higgins */ +#include #include #include #include -#include #include #include #include @@ -592,120 +592,6 @@ void __kunit_test_suites_exit(struct kunit_suite **suites) } EXPORT_SYMBOL_GPL(__kunit_test_suites_exit); -/* - * Used for static resources and when a kunit_resource * has been created by - * kunit_alloc_resource(). When an init function is supplied, @data is passed - * into the init function; otherwise, we simply set the resource data field to - * the data value passed in. - */ -int kunit_add_resource(struct kunit *test, - kunit_resource_init_t init, - kunit_resource_free_t free, - struct kunit_resource *res, - void *data) -{ - int ret = 0; - unsigned long flags; - - res->free = free; - kref_init(&res->refcount); - - if (init) { - ret = init(res, data); - if (ret) - return ret; - } else { - res->data = data; - } - - spin_lock_irqsave(&test->lock, flags); - list_add_tail(&res->node, &test->resources); - /* refcount for list is established by kref_init() */ - spin_unlock_irqrestore(&test->lock, flags); - - return ret; -} -EXPORT_SYMBOL_GPL(kunit_add_resource); - -int kunit_add_named_resource(struct kunit *test, - kunit_resource_init_t init, - kunit_resource_free_t free, - struct kunit_resource *res, - const char *name, - void *data) -{ - struct kunit_resource *existing; - - if (!name) - return -EINVAL; - - existing = kunit_find_named_resource(test, name); - if (existing) { - kunit_put_resource(existing); - return -EEXIST; - } - - res->name = name; - - return kunit_add_resource(test, init, free, res, data); -} -EXPORT_SYMBOL_GPL(kunit_add_named_resource); - -struct kunit_resource *kunit_alloc_and_get_resource(struct kunit *test, - kunit_resource_init_t init, - kunit_resource_free_t free, - gfp_t internal_gfp, - void *data) -{ - struct kunit_resource *res; - int ret; - - res = kzalloc(sizeof(*res), internal_gfp); - if (!res) - return NULL; - - ret = kunit_add_resource(test, init, free, res, data); - if (!ret) { - /* - * bump refcount for get; kunit_resource_put() should be called - * when done. - */ - kunit_get_resource(res); - return res; - } - return NULL; -} -EXPORT_SYMBOL_GPL(kunit_alloc_and_get_resource); - -void kunit_remove_resource(struct kunit *test, struct kunit_resource *res) -{ - unsigned long flags; - - spin_lock_irqsave(&test->lock, flags); - list_del(&res->node); - spin_unlock_irqrestore(&test->lock, flags); - kunit_put_resource(res); -} -EXPORT_SYMBOL_GPL(kunit_remove_resource); - -int kunit_destroy_resource(struct kunit *test, kunit_resource_match_t match, - void *match_data) -{ - struct kunit_resource *res = kunit_find_resource(test, match, - match_data); - - if (!res) - return -ENOENT; - - kunit_remove_resource(test, res); - - /* We have a reference also via _find(); drop it. */ - kunit_put_resource(res); - - return 0; -} -EXPORT_SYMBOL_GPL(kunit_destroy_resource); - struct kunit_kmalloc_array_params { size_t n; size_t size; -- 2.35.1.1021.g381101b075-goog