2024-06-04 22:01:55

by Chia-I Wu

Subject: [PATCH v2] resource: add a simple test for walk_iomem_res_desc()

This mainly tests that find_next_iomem_res() does not miss resources.

Signed-off-by: Chia-I Wu <[email protected]>

---
v2: update subject, use DEFINE_RES_NAMED and hardcoded offsets
---
kernel/resource_kunit.c | 67 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)

diff --git a/kernel/resource_kunit.c b/kernel/resource_kunit.c
index 58ab9f914602..c3a3f3bdf5d5 100644
--- a/kernel/resource_kunit.c
+++ b/kernel/resource_kunit.c
@@ -6,6 +6,7 @@
#include <kunit/test.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
+#include <linux/sizes.h>
#include <linux/string.h>

#define R0_START 0x0000
@@ -137,9 +138,75 @@ static void resource_test_intersection(struct kunit *test)
} while (++i < ARRAY_SIZE(results_for_intersection));
}

+static int resource_walk_count(struct resource *res, void *data)
+{
+ int *count = data;
+ (*count)++;
+ return 0;
+}
+
+static void resource_test_walk_iomem_res_desc(struct kunit *test)
+{
+ struct resource root = {
+ .name = "Resource Walk Test",
+ };
+ struct resource res[8];
+ int count;
+
+ KUNIT_ASSERT_EQ(test, 0,
+ allocate_resource(&iomem_resource, &root, SZ_1M,
+ 0, ~0, SZ_1M, NULL, NULL));
+
+ /* build the resource tree */
+
+ res[0] = DEFINE_RES_NAMED(root.start, SZ_1K, "SYSRAM 1",
+ IORESOURCE_SYSTEM_RAM);
+ res[1] = DEFINE_RES_NAMED(root.start + SZ_1K, SZ_1K, "OTHER", 0);
+
+ res[2] = DEFINE_RES_NAMED(root.start + SZ_1K * 3, SZ_1K, "NESTED", 0);
+ res[3] = DEFINE_RES_NAMED(root.start + SZ_1K * 3 + SZ_512, SZ_512,
+ "SYSRAM 2", IORESOURCE_SYSTEM_RAM);
+
+ res[4] = DEFINE_RES_NAMED(root.start + SZ_1K * 4, SZ_1K, "SYSRAM 3",
+ IORESOURCE_SYSTEM_RAM);
+
+ KUNIT_EXPECT_EQ(test, 0, request_resource(&root, &res[0]));
+ KUNIT_EXPECT_EQ(test, 0, request_resource(&root, &res[1]));
+ KUNIT_EXPECT_EQ(test, 0, request_resource(&root, &res[2]));
+ KUNIT_EXPECT_EQ(test, 0, request_resource(&res[2], &res[3]));
+ KUNIT_EXPECT_EQ(test, 0, request_resource(&root, &res[4]));
+
+ /* walk the entire region */
+ count = 0;
+ walk_iomem_res_desc(IORES_DESC_NONE, IORESOURCE_SYSTEM_RAM,
+ root.start, root.end, &count, resource_walk_count);
+ KUNIT_EXPECT_EQ(test, count, 3);
+
+ /* walk the region requested by res[1] */
+ count = 0;
+ walk_iomem_res_desc(IORES_DESC_NONE, IORESOURCE_SYSTEM_RAM,
+ res[1].start, res[1].end, &count, resource_walk_count);
+ KUNIT_EXPECT_EQ(test, count, 0);
+
+ /* walk the region requested by res[2] */
+ count = 0;
+ walk_iomem_res_desc(IORES_DESC_NONE, IORESOURCE_SYSTEM_RAM,
+ res[2].start, res[2].end, &count, resource_walk_count);
+ KUNIT_EXPECT_EQ(test, count, 1);
+
+ /* walk the region requested by res[4] */
+ count = 0;
+ walk_iomem_res_desc(IORES_DESC_NONE, IORESOURCE_SYSTEM_RAM,
+ res[4].start, res[4].end, &count, resource_walk_count);
+ KUNIT_EXPECT_EQ(test, count, 1);
+
+ release_resource(&root);
+}
+
static struct kunit_case resource_test_cases[] = {
KUNIT_CASE(resource_test_union),
KUNIT_CASE(resource_test_intersection),
+ KUNIT_CASE(resource_test_walk_iomem_res_desc),
{}
};

--
2.45.1.288.g0e0cd299f1-goog

2024-06-05 11:32:54

by Andy Shevchenko

Subject: Re: [PATCH v2] resource: add a simple test for walk_iomem_res_desc()

On Tue, Jun 04, 2024 at 03:01:14PM -0700, Chia-I Wu wrote:
> This mainly tests that find_next_iomem_res() does not miss resources.

...

It's better, but still hard to follow, see below what I meant

> + res[0] = DEFINE_RES_NAMED(root.start, SZ_1K, "SYSRAM 1",
> + IORESOURCE_SYSTEM_RAM);
> + res[1] = DEFINE_RES_NAMED(root.start + SZ_1K, SZ_1K, "OTHER", 0);
> +
> + res[2] = DEFINE_RES_NAMED(root.start + SZ_1K * 3, SZ_1K, "NESTED", 0);
> + res[3] = DEFINE_RES_NAMED(root.start + SZ_1K * 3 + SZ_512, SZ_512,
> + "SYSRAM 2", IORESOURCE_SYSTEM_RAM);
> +
> + res[4] = DEFINE_RES_NAMED(root.start + SZ_1K * 4, SZ_1K, "SYSRAM 3",
> + IORESOURCE_SYSTEM_RAM);

res[0] = DEFINE_RES_NAMED(root.start + 0x0000, 0x0400, "SYSRAM 1",
IORESOURCE_SYSTEM_RAM);
res[1] = DEFINE_RES_NAMED(root.start + 0x0400, 0x0400, "OTHER", 0);

res[2] = DEFINE_RES_NAMED(root.start + 0x0c00, 0x0400, "NESTED", 0);
res[3] = DEFINE_RES_NAMED(root.start + 0x0e00, 0x0200, "SYSRAM 2",
IORESOURCE_SYSTEM_RAM);

res[4] = DEFINE_RES_NAMED(root.start + 0x1000, 0x0400, "SYSRAM 3",
IORESOURCE_SYSTEM_RAM);

Also pay attention to indentation.

--
With Best Regards,
Andy Shevchenko