Commit 57e3cded authored by David Gow's avatar David Gow Committed by Shuah Khan
Browse files

kunit: kmalloc_array: Use kunit_add_action() 



The kunit_add_action() function is much simpler and cleaner to use that
the full KUnit resource API for simple things like the
kunit_kmalloc_array() functionality.

Replacing it allows us to get rid of a number of helper functions, and
leaves us with no uses of kunit_alloc_resource(), which has some
usability problems and is going to have its behaviour modified in an
upcoming patch.

Note that we need to use kunit_defer_trigger_all() to implement
kunit_kfree().

Reviewed-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Reviewed-by: default avatarMaxime Ripard <maxime@cerno.tech>
Tested-by: default avatarMaxime Ripard <maxime@cerno.tech>
Signed-off-by: default avatarDavid Gow <davidgow@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 00e63f8a

include/kunit/test.h

+8 −2
Original line number Diff line number Diff line
@@ -324,8 +324,11 @@ enum kunit_status kunit_suite_has_succeeded(struct kunit_suite *suite); 
 * @gfp: flags passed to underlying kmalloc().

 *

 * Just like `kmalloc_array(...)`, except the allocation is managed by the test case

 * and is automatically cleaned up after the test case concludes. See &struct

 * kunit_resource for more information.

 * and is automatically cleaned up after the test case concludes. See kunit_add_action()

 * for more information.

 *

 * Note that some internal context data is also allocated with GFP_KERNEL,

 * regardless of the gfp passed in.

 */

void *kunit_kmalloc_array(struct kunit *test, size_t n, size_t size, gfp_t gfp);
@@ -336,6 +339,9 @@ void *kunit_kmalloc_array(struct kunit *test, size_t n, size_t size, gfp_t gfp); 
 * @gfp: flags passed to underlying kmalloc().

 *

 * See kmalloc() and kunit_kmalloc_array() for more information.

 *

 * Note that some internal context data is also allocated with GFP_KERNEL,

 * regardless of the gfp passed in.

 */

static inline void *kunit_kmalloc(struct kunit *test, size_t size, gfp_t gfp)

{

lib/kunit/test.c

+9 −39
Original line number Diff line number Diff line
@@ -752,58 +752,28 @@ static struct notifier_block kunit_mod_nb = { 
};

#endif



struct kunit_kmalloc_array_params {

	size_t n;

	size_t size;

	gfp_t gfp;

};



static int kunit_kmalloc_array_init(struct kunit_resource *res, void *context)

void *kunit_kmalloc_array(struct kunit *test, size_t n, size_t size, gfp_t gfp)

{

	struct kunit_kmalloc_array_params *params = context;

	void *data;



	res->data = kmalloc_array(params->n, params->size, params->gfp);

	if (!res->data)

		return -ENOMEM;

	data = kmalloc_array(n, size, gfp);



	return 0;

}



static void kunit_kmalloc_array_free(struct kunit_resource *res)

{

	kfree(res->data);

}

	if (!data)

		return NULL;



void *kunit_kmalloc_array(struct kunit *test, size_t n, size_t size, gfp_t gfp)

{

	struct kunit_kmalloc_array_params params = {

		.size = size,

		.n = n,

		.gfp = gfp

	};

	if (kunit_add_action_or_reset(test, (kunit_action_t *)kfree, data) != 0)

		return NULL;



	return kunit_alloc_resource(test,

				    kunit_kmalloc_array_init,

				    kunit_kmalloc_array_free,

				    gfp,

				    &params);

	return data;

}

EXPORT_SYMBOL_GPL(kunit_kmalloc_array);



static inline bool kunit_kfree_match(struct kunit *test,

				     struct kunit_resource *res, void *match_data)

{

	/* Only match resources allocated with kunit_kmalloc() and friends. */

	return res->free == kunit_kmalloc_array_free && res->data == match_data;

}



void kunit_kfree(struct kunit *test, const void *ptr)

{

	if (!ptr)

		return;



	if (kunit_destroy_resource(test, kunit_kfree_match, (void *)ptr))

		KUNIT_FAIL(test, "kunit_kfree: %px already freed or not allocated by kunit", ptr);

	kunit_release_action(test, (kunit_action_t *)kfree, (void *)ptr);

}

EXPORT_SYMBOL_GPL(kunit_kfree);