+ lib-tests-convert-test_min_heap-module-to-kunit.patch added to mm-nonmm-unstable branch

+ lib-tests-convert-test_min_heap-module-to-kunit.patch added to mm-nonmm-unstable branch

[Andrew Morton]

The patch titled
     Subject: lib/tests: convert test_min_heap module to KUnit
has been added to the -mm mm-nonmm-unstable branch.  Its filename is
     lib-tests-convert-test_min_heap-module-to-kunit.patch

This patch will shortly appear at
     https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/lib-tests-convert-test_min_heap-module-to-kunit.patch

This patch will later appear in the mm-nonmm-unstable branch at
    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next via various
branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there most days

------------------------------------------------------
From: Ryota Sakamoto <sakamo.ryota@gmail.com>
Subject: lib/tests: convert test_min_heap module to KUnit
Date: Sun, 21 Dec 2025 13:35:16 +0000

Move lib/test_min_heap.c to lib/tests/min_heap_kunit.c and convert it to
use KUnit.

This change switches the ad-hoc test code to standard KUnit test cases. 
The test data remains the same, but the verification logic is updated to
use KUNIT_EXPECT_* macros.

Also remove CONFIG_TEST_MIN_HEAP from arch/*/configs/* because it is no
longer used.  The new CONFIG_MIN_HEAP_KUNIT_TEST will be automatically
enabled by CONFIG_KUNIT_ALL_TESTS.

Link: https://lkml.kernel.org/r/20251221133516.321846-1-sakamo.ryota@gmail.com
Signed-off-by: Ryota Sakamoto <sakamo.ryota@gmail.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: David Gow <davidgow@google.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Kuan-Wei Chiu <visitorckw@gmail.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 MAINTAINERS                          |    2 
 arch/m68k/configs/amiga_defconfig    |    1 
 arch/m68k/configs/apollo_defconfig   |    1 
 arch/m68k/configs/atari_defconfig    |    1 
 arch/m68k/configs/bvme6000_defconfig |    1 
 arch/m68k/configs/hp300_defconfig    |    1 
 arch/m68k/configs/mac_defconfig      |    1 
 arch/m68k/configs/multi_defconfig    |    1 
 arch/m68k/configs/mvme147_defconfig  |    1 
 arch/m68k/configs/mvme16x_defconfig  |    1 
 arch/m68k/configs/q40_defconfig      |    1 
 arch/m68k/configs/sun3_defconfig     |    1 
 arch/m68k/configs/sun3x_defconfig    |    1 
 arch/powerpc/configs/ppc64_defconfig |    1 
 arch/s390/configs/debug_defconfig    |    2 
 lib/Kconfig.debug                    |   21 +-
 lib/Makefile                         |    1 
 lib/test_min_heap.c                  |  222 -------------------------
 lib/tests/Makefile                   |    1 
 lib/tests/min_heap_kunit.c           |  209 +++++++++++++++++++++++
 20 files changed, 223 insertions(+), 248 deletions(-)

--- a/arch/m68k/configs/amiga_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/amiga_defconfig
@@ -609,7 +609,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/apollo_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/apollo_defconfig
@@ -566,7 +566,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/atari_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/atari_defconfig
@@ -586,7 +586,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/bvme6000_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/bvme6000_defconfig
@@ -558,7 +558,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/hp300_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/hp300_defconfig
@@ -568,7 +568,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/mac_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/mac_defconfig
@@ -585,7 +585,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/multi_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/multi_defconfig
@@ -672,7 +672,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/mvme147_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/mvme147_defconfig
@@ -558,7 +558,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/mvme16x_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/mvme16x_defconfig
@@ -559,7 +559,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/q40_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/q40_defconfig
@@ -575,7 +575,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/sun3_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/sun3_defconfig
@@ -555,7 +555,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/m68k/configs/sun3x_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/m68k/configs/sun3x_defconfig
@@ -556,7 +556,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_TEST_DHRY=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_TEST_MULDIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/arch/powerpc/configs/ppc64_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/powerpc/configs/ppc64_defconfig
@@ -426,7 +426,6 @@ CONFIG_BOOTX_TEXT=y
 CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_LKDTM=m
-CONFIG_TEST_MIN_HEAP=m
 CONFIG_TEST_DIV64=m
 CONFIG_BACKTRACE_SELF_TEST=m
 CONFIG_TEST_REF_TRACKER=m
--- a/arch/s390/configs/debug_defconfig~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/arch/s390/configs/debug_defconfig
@@ -921,7 +921,7 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_CONFIGFS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_LKDTM=m
-CONFIG_TEST_MIN_HEAP=y
+CONFIG_MIN_HEAP_KUNIT_TEST=m
 CONFIG_KPROBES_SANITY_TEST=m
 CONFIG_RBTREE_TEST=y
 CONFIG_INTERVAL_TREE_TEST=m
--- a/lib/Kconfig.debug~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/lib/Kconfig.debug
@@ -2296,16 +2296,6 @@ config TEST_LIST_SORT
 
 	  If unsure, say N.
 
-config TEST_MIN_HEAP
-	tristate "Min heap test"
-	depends on DEBUG_KERNEL || m
-	help
-	  Enable this to turn on min heap function tests. This test is
-	  executed only once during system boot (so affects only boot time),
-	  or at module load time.
-
-	  If unsure, say N.
-
 config TEST_SORT
 	tristate "Array-based sort test" if !KUNIT_ALL_TESTS
 	depends on KUNIT
@@ -2933,6 +2923,17 @@ config MEMCPY_KUNIT_TEST
 
 	  If unsure, say N.
 
+config MIN_HEAP_KUNIT_TEST
+	tristate "Min heap test" if !KUNIT_ALL_TESTS
+	depends on KUNIT
+	default KUNIT_ALL_TESTS
+	help
+	  This option enables the KUnit test suite for the min heap library
+	  which provides functions for creating and managing min heaps.
+	  The test suite checks the functionality of the min heap library.
+
+	  If unsure, say N
+
 config IS_SIGNED_TYPE_KUNIT_TEST
 	tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS
 	depends on KUNIT
--- a/lib/Makefile~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/lib/Makefile
@@ -75,7 +75,6 @@ obj-$(CONFIG_TEST_UBSAN) += test_ubsan.o
 CFLAGS_test_ubsan.o += $(call cc-disable-warning, unused-but-set-variable)
 UBSAN_SANITIZE_test_ubsan.o := y
 obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o
-obj-$(CONFIG_TEST_MIN_HEAP) += test_min_heap.o
 obj-$(CONFIG_TEST_LKM) += test_module.o
 obj-$(CONFIG_TEST_VMALLOC) += test_vmalloc.o
 obj-$(CONFIG_TEST_RHASHTABLE) += test_rhashtable.o
diff --git a/lib/test_min_heap.c a/lib/test_min_heap.c
deleted file mode 100644
--- a/lib/test_min_heap.c
+++ /dev/null
@@ -1,222 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-#define pr_fmt(fmt) "min_heap_test: " fmt
-
-/*
- * Test cases for the min max heap.
- */
-
-#include <linux/log2.h>
-#include <linux/min_heap.h>
-#include <linux/module.h>
-#include <linux/printk.h>
-#include <linux/random.h>
-
-DEFINE_MIN_HEAP(int, min_heap_test);
-
-static __init bool less_than(const void *lhs, const void *rhs, void __always_unused *args)
-{
-	return *(int *)lhs < *(int *)rhs;
-}
-
-static __init bool greater_than(const void *lhs, const void *rhs, void __always_unused *args)
-{
-	return *(int *)lhs > *(int *)rhs;
-}
-
-static __init int pop_verify_heap(bool min_heap,
-				struct min_heap_test *heap,
-				const struct min_heap_callbacks *funcs)
-{
-	int *values = heap->data;
-	int err = 0;
-	int last;
-
-	last = values[0];
-	min_heap_pop_inline(heap, funcs, NULL);
-	while (heap->nr > 0) {
-		if (min_heap) {
-			if (last > values[0]) {
-				pr_err("error: expected %d <= %d\n", last,
-					values[0]);
-				err++;
-			}
-		} else {
-			if (last < values[0]) {
-				pr_err("error: expected %d >= %d\n", last,
-					values[0]);
-				err++;
-			}
-		}
-		last = values[0];
-		min_heap_pop_inline(heap, funcs, NULL);
-	}
-	return err;
-}
-
-static __init int test_heapify_all(bool min_heap)
-{
-	int values[] = { 3, 1, 2, 4, 0x8000000, 0x7FFFFFF, 0,
-			 -3, -1, -2, -4, 0x8000000, 0x7FFFFFF };
-	struct min_heap_test heap = {
-		.data = values,
-		.nr = ARRAY_SIZE(values),
-		.size =  ARRAY_SIZE(values),
-	};
-	struct min_heap_callbacks funcs = {
-		.less = min_heap ? less_than : greater_than,
-		.swp = NULL,
-	};
-	int i, err;
-
-	/* Test with known set of values. */
-	min_heapify_all_inline(&heap, &funcs, NULL);
-	err = pop_verify_heap(min_heap, &heap, &funcs);
-
-
-	/* Test with randomly generated values. */
-	heap.nr = ARRAY_SIZE(values);
-	for (i = 0; i < heap.nr; i++)
-		values[i] = get_random_u32();
-
-	min_heapify_all_inline(&heap, &funcs, NULL);
-	err += pop_verify_heap(min_heap, &heap, &funcs);
-
-	return err;
-}
-
-static __init int test_heap_push(bool min_heap)
-{
-	const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0,
-			     -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF };
-	int values[ARRAY_SIZE(data)];
-	struct min_heap_test heap = {
-		.data = values,
-		.nr = 0,
-		.size =  ARRAY_SIZE(values),
-	};
-	struct min_heap_callbacks funcs = {
-		.less = min_heap ? less_than : greater_than,
-		.swp = NULL,
-	};
-	int i, temp, err;
-
-	/* Test with known set of values copied from data. */
-	for (i = 0; i < ARRAY_SIZE(data); i++)
-		min_heap_push_inline(&heap, &data[i], &funcs, NULL);
-
-	err = pop_verify_heap(min_heap, &heap, &funcs);
-
-	/* Test with randomly generated values. */
-	while (heap.nr < heap.size) {
-		temp = get_random_u32();
-		min_heap_push_inline(&heap, &temp, &funcs, NULL);
-	}
-	err += pop_verify_heap(min_heap, &heap, &funcs);
-
-	return err;
-}
-
-static __init int test_heap_pop_push(bool min_heap)
-{
-	const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0,
-			     -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF };
-	int values[ARRAY_SIZE(data)];
-	struct min_heap_test heap = {
-		.data = values,
-		.nr = 0,
-		.size =  ARRAY_SIZE(values),
-	};
-	struct min_heap_callbacks funcs = {
-		.less = min_heap ? less_than : greater_than,
-		.swp = NULL,
-	};
-	int i, temp, err;
-
-	/* Fill values with data to pop and replace. */
-	temp = min_heap ? 0x80000000 : 0x7FFFFFFF;
-	for (i = 0; i < ARRAY_SIZE(data); i++)
-		min_heap_push_inline(&heap, &temp, &funcs, NULL);
-
-	/* Test with known set of values copied from data. */
-	for (i = 0; i < ARRAY_SIZE(data); i++)
-		min_heap_pop_push_inline(&heap, &data[i], &funcs, NULL);
-
-	err = pop_verify_heap(min_heap, &heap, &funcs);
-
-	heap.nr = 0;
-	for (i = 0; i < ARRAY_SIZE(data); i++)
-		min_heap_push_inline(&heap, &temp, &funcs, NULL);
-
-	/* Test with randomly generated values. */
-	for (i = 0; i < ARRAY_SIZE(data); i++) {
-		temp = get_random_u32();
-		min_heap_pop_push_inline(&heap, &temp, &funcs, NULL);
-	}
-	err += pop_verify_heap(min_heap, &heap, &funcs);
-
-	return err;
-}
-
-static __init int test_heap_del(bool min_heap)
-{
-	int values[] = { 3, 1, 2, 4, 0x8000000, 0x7FFFFFF, 0,
-			 -3, -1, -2, -4, 0x8000000, 0x7FFFFFF };
-	struct min_heap_test heap;
-
-	min_heap_init_inline(&heap, values, ARRAY_SIZE(values));
-	heap.nr = ARRAY_SIZE(values);
-	struct min_heap_callbacks funcs = {
-		.less = min_heap ? less_than : greater_than,
-		.swp = NULL,
-	};
-	int i, err;
-
-	/* Test with known set of values. */
-	min_heapify_all_inline(&heap, &funcs, NULL);
-	for (i = 0; i < ARRAY_SIZE(values) / 2; i++)
-		min_heap_del_inline(&heap, get_random_u32() % heap.nr, &funcs, NULL);
-	err = pop_verify_heap(min_heap, &heap, &funcs);
-
-
-	/* Test with randomly generated values. */
-	heap.nr = ARRAY_SIZE(values);
-	for (i = 0; i < heap.nr; i++)
-		values[i] = get_random_u32();
-	min_heapify_all_inline(&heap, &funcs, NULL);
-
-	for (i = 0; i < ARRAY_SIZE(values) / 2; i++)
-		min_heap_del_inline(&heap, get_random_u32() % heap.nr, &funcs, NULL);
-	err += pop_verify_heap(min_heap, &heap, &funcs);
-
-	return err;
-}
-
-static int __init test_min_heap_init(void)
-{
-	int err = 0;
-
-	err += test_heapify_all(true);
-	err += test_heapify_all(false);
-	err += test_heap_push(true);
-	err += test_heap_push(false);
-	err += test_heap_pop_push(true);
-	err += test_heap_pop_push(false);
-	err += test_heap_del(true);
-	err += test_heap_del(false);
-	if (err) {
-		pr_err("test failed with %d errors\n", err);
-		return -EINVAL;
-	}
-	pr_info("test passed\n");
-	return 0;
-}
-module_init(test_min_heap_init);
-
-static void __exit test_min_heap_exit(void)
-{
-	/* do nothing */
-}
-module_exit(test_min_heap_exit);
-
-MODULE_DESCRIPTION("Test cases for the min max heap");
-MODULE_LICENSE("GPL");
--- a/lib/tests/Makefile~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/lib/tests/Makefile
@@ -35,6 +35,7 @@ CFLAGS_longest_symbol_kunit.o += $(call
 obj-$(CONFIG_LONGEST_SYM_KUNIT_TEST) += longest_symbol_kunit.o
 
 obj-$(CONFIG_MEMCPY_KUNIT_TEST) += memcpy_kunit.o
+obj-$(CONFIG_MIN_HEAP_KUNIT_TEST) += min_heap_kunit.o
 CFLAGS_overflow_kunit.o = $(call cc-disable-warning, tautological-constant-out-of-range-compare)
 obj-$(CONFIG_OVERFLOW_KUNIT_TEST) += overflow_kunit.o
 obj-$(CONFIG_PRINTF_KUNIT_TEST) += printf_kunit.o
diff --git a/lib/tests/min_heap_kunit.c a/lib/tests/min_heap_kunit.c
new file mode 100664
--- /dev/null
+++ a/lib/tests/min_heap_kunit.c
@@ -0,0 +1,209 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Test cases for the min max heap.
+ */
+
+#include <kunit/test.h>
+#include <linux/min_heap.h>
+#include <linux/module.h>
+#include <linux/random.h>
+
+struct min_heap_test_case {
+	const char *str;
+	bool min_heap;
+};
+
+static struct min_heap_test_case min_heap_cases[] = {
+	{
+		.str = "min",
+		.min_heap = true,
+	},
+	{
+		.str = "max",
+		.min_heap = false,
+	},
+};
+
+KUNIT_ARRAY_PARAM_DESC(min_heap, min_heap_cases, str);
+
+DEFINE_MIN_HEAP(int, min_heap_test);
+
+static bool less_than(const void *lhs, const void *rhs, void __always_unused *args)
+{
+	return *(int *)lhs < *(int *)rhs;
+}
+
+static bool greater_than(const void *lhs, const void *rhs, void __always_unused *args)
+{
+	return *(int *)lhs > *(int *)rhs;
+}
+
+static void pop_verify_heap(struct kunit *test,
+			    bool min_heap,
+			    struct min_heap_test *heap,
+			    const struct min_heap_callbacks *funcs)
+{
+	int *values = heap->data;
+	int last;
+
+	last = values[0];
+	min_heap_pop_inline(heap, funcs, NULL);
+	while (heap->nr > 0) {
+		if (min_heap)
+			KUNIT_EXPECT_LE(test, last, values[0]);
+		else
+			KUNIT_EXPECT_GE(test, last, values[0]);
+		last = values[0];
+		min_heap_pop_inline(heap, funcs, NULL);
+	}
+}
+
+static void test_heapify_all(struct kunit *test)
+{
+	const struct min_heap_test_case *params = test->param_value;
+	int values[] = { 3, 1, 2, 4, 0x8000000, 0x7FFFFFF, 0,
+			 -3, -1, -2, -4, 0x8000000, 0x7FFFFFF };
+	struct min_heap_test heap = {
+		.data = values,
+		.nr = ARRAY_SIZE(values),
+		.size =  ARRAY_SIZE(values),
+	};
+	struct min_heap_callbacks funcs = {
+		.less = params->min_heap ? less_than : greater_than,
+		.swp = NULL,
+	};
+	int i;
+
+	/* Test with known set of values. */
+	min_heapify_all_inline(&heap, &funcs, NULL);
+	pop_verify_heap(test, params->min_heap, &heap, &funcs);
+
+	/* Test with randomly generated values. */
+	heap.nr = ARRAY_SIZE(values);
+	for (i = 0; i < heap.nr; i++)
+		values[i] = get_random_u32();
+
+	min_heapify_all_inline(&heap, &funcs, NULL);
+	pop_verify_heap(test, params->min_heap, &heap, &funcs);
+}
+
+static void test_heap_push(struct kunit *test)
+{
+	const struct min_heap_test_case *params = test->param_value;
+	const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0,
+			     -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF };
+	int values[ARRAY_SIZE(data)];
+	struct min_heap_test heap = {
+		.data = values,
+		.nr = 0,
+		.size =  ARRAY_SIZE(values),
+	};
+	struct min_heap_callbacks funcs = {
+		.less = params->min_heap ? less_than : greater_than,
+		.swp = NULL,
+	};
+	int i, temp;
+
+	/* Test with known set of values copied from data. */
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		min_heap_push_inline(&heap, &data[i], &funcs, NULL);
+
+	pop_verify_heap(test, params->min_heap, &heap, &funcs);
+
+	/* Test with randomly generated values. */
+	while (heap.nr < heap.size) {
+		temp = get_random_u32();
+		min_heap_push_inline(&heap, &temp, &funcs, NULL);
+	}
+	pop_verify_heap(test, params->min_heap, &heap, &funcs);
+}
+
+static void test_heap_pop_push(struct kunit *test)
+{
+	const struct min_heap_test_case *params = test->param_value;
+	const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0,
+			     -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF };
+	int values[ARRAY_SIZE(data)];
+	struct min_heap_test heap = {
+		.data = values,
+		.nr = 0,
+		.size =  ARRAY_SIZE(values),
+	};
+	struct min_heap_callbacks funcs = {
+		.less = params->min_heap ? less_than : greater_than,
+		.swp = NULL,
+	};
+	int i, temp;
+
+	/* Fill values with data to pop and replace. */
+	temp = params->min_heap ? 0x80000000 : 0x7FFFFFFF;
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		min_heap_push_inline(&heap, &temp, &funcs, NULL);
+
+	/* Test with known set of values copied from data. */
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		min_heap_pop_push_inline(&heap, &data[i], &funcs, NULL);
+
+	pop_verify_heap(test, params->min_heap, &heap, &funcs);
+
+	heap.nr = 0;
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		min_heap_push_inline(&heap, &temp, &funcs, NULL);
+
+	/* Test with randomly generated values. */
+	for (i = 0; i < ARRAY_SIZE(data); i++) {
+		temp = get_random_u32();
+		min_heap_pop_push_inline(&heap, &temp, &funcs, NULL);
+	}
+	pop_verify_heap(test, params->min_heap, &heap, &funcs);
+}
+
+static void test_heap_del(struct kunit *test)
+{
+	const struct min_heap_test_case *params = test->param_value;
+	int values[] = { 3, 1, 2, 4, 0x8000000, 0x7FFFFFF, 0,
+			 -3, -1, -2, -4, 0x8000000, 0x7FFFFFF };
+	struct min_heap_test heap;
+
+	min_heap_init_inline(&heap, values, ARRAY_SIZE(values));
+	heap.nr = ARRAY_SIZE(values);
+	struct min_heap_callbacks funcs = {
+		.less = params->min_heap ? less_than : greater_than,
+		.swp = NULL,
+	};
+	int i;
+
+	/* Test with known set of values. */
+	min_heapify_all_inline(&heap, &funcs, NULL);
+	for (i = 0; i < ARRAY_SIZE(values) / 2; i++)
+		min_heap_del_inline(&heap, get_random_u32() % heap.nr, &funcs, NULL);
+	pop_verify_heap(test, params->min_heap, &heap, &funcs);
+
+	/* Test with randomly generated values. */
+	heap.nr = ARRAY_SIZE(values);
+	for (i = 0; i < heap.nr; i++)
+		values[i] = get_random_u32();
+	min_heapify_all_inline(&heap, &funcs, NULL);
+
+	for (i = 0; i < ARRAY_SIZE(values) / 2; i++)
+		min_heap_del_inline(&heap, get_random_u32() % heap.nr, &funcs, NULL);
+	pop_verify_heap(test, params->min_heap, &heap, &funcs);
+}
+
+static struct kunit_case min_heap_test_cases[] = {
+	KUNIT_CASE_PARAM(test_heapify_all, min_heap_gen_params),
+	KUNIT_CASE_PARAM(test_heap_push, min_heap_gen_params),
+	KUNIT_CASE_PARAM(test_heap_pop_push, min_heap_gen_params),
+	KUNIT_CASE_PARAM(test_heap_del, min_heap_gen_params),
+	{},
+};
+
+static struct kunit_suite min_heap_test_suite = {
+	.name = "min_heap",
+	.test_cases = min_heap_test_cases,
+};
+
+kunit_test_suite(min_heap_test_suite);
+
+MODULE_DESCRIPTION("Test cases for the min max heap");
+MODULE_LICENSE("GPL");
--- a/MAINTAINERS~lib-tests-convert-test_min_heap-module-to-kunit
+++ a/MAINTAINERS
@@ -17448,7 +17448,7 @@ S:	Maintained
 F:	Documentation/core-api/min_heap.rst
 F:	include/linux/min_heap.h
 F:	lib/min_heap.c
-F:	lib/test_min_heap.c
+F:	lib/tests/min_heap_kunit.c
 
 MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
 M:	Sakari Ailus <sakari.ailus@linux.intel.com>
_

Patches currently in -mm which might be from sakamo.ryota@gmail.com are

lib-tests-convert-test_uuid-module-to-kunit.patch
lib-tests-convert-test_min_heap-module-to-kunit.patch