memblock tests: Add simulation of physical memory

Allocation functions that return virtual addresses (with an exception
of _raw variant) clear the allocated memory after reserving it. This
requires valid memory ranges in memblock.memory.

Introduce memory_block variable to store memory that can be registered
with memblock data structure. Move assert.h and size.h includes to common.h
to share them between the test files.

Signed-off-by: Karolina Drobnik <karolinadrobnik@gmail.com>
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Link: https://lore.kernel.org/r/dce115503c74a6936c44694b00014658a1bb6522.1646055639.git.karolinadrobnik@gmail.com

diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c
index d5035a3dcce8886bcb15abdc3fb3cdb54b6d2f7f..fbc1ce16030376ae3dadac39189bc3ab6083a219 100644 (file)
--- a/tools/testing/memblock/tests/basic_api.c
+++ b/tools/testing/memblock/tests/basic_api.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include <string.h>
 #include <linux/memblock.h>
-#include <linux/sizes.h>
 #include "basic_api.h"
 
 #define EXPECTED_MEMBLOCK_REGIONS                      128

diff --git a/tools/testing/memblock/tests/basic_api.h b/tools/testing/memblock/tests/basic_api.h
index 1ceecfca1f47c5f57085a5759249aa7b3577040a..1873faa54754bf7348f18a5e35de10cee9bea98a 100644 (file)
--- a/tools/testing/memblock/tests/basic_api.h
+++ b/tools/testing/memblock/tests/basic_api.h
@@ -2,7 +2,6 @@
 #ifndef _MEMBLOCK_BASIC_H
 #define _MEMBLOCK_BASIC_H
 
-#include <assert.h>
 #include "common.h"
 
 int memblock_basic_checks(void);

diff --git a/tools/testing/memblock/tests/common.c b/tools/testing/memblock/tests/common.c
index dd7e87c589fe342f71020ea716d00e7e152ebb6e..62d3191f7c9a5802ae65183af9f587012ebf7326 100644 (file)
--- a/tools/testing/memblock/tests/common.c
+++ b/tools/testing/memblock/tests/common.c
@@ -5,6 +5,8 @@
 #define INIT_MEMBLOCK_REGIONS                  128
 #define INIT_MEMBLOCK_RESERVED_REGIONS         INIT_MEMBLOCK_REGIONS
 
+static struct test_memory memory_block;
+
 void reset_memblock_regions(void)
 {
        memset(memblock.memory.regions, 0,
@@ -27,3 +29,20 @@ void reset_memblock_attributes(void)
        memblock.bottom_up      = false;
        memblock.current_limit  = MEMBLOCK_ALLOC_ANYWHERE;
 }
+
+void setup_memblock(void)
+{
+       reset_memblock_regions();
+       memblock_add((phys_addr_t)memory_block.base, MEM_SIZE);
+}
+
+void dummy_physical_memory_init(void)
+{
+       memory_block.base = malloc(MEM_SIZE);
+       assert(memory_block.base);
+}
+
+void dummy_physical_memory_cleanup(void)
+{
+       free(memory_block.base);
+}

diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock/tests/common.h
index b864c64fb60f5cb4df0ad2cf787549b4b772d878..619054d0321960bfbefefcd152be7765774b112d 100644 (file)
--- a/tools/testing/memblock/tests/common.h
+++ b/tools/testing/memblock/tests/common.h
@@ -2,8 +2,23 @@
 #ifndef _MEMBLOCK_TEST_H
 #define _MEMBLOCK_TEST_H
 
+#include <stdlib.h>
+#include <assert.h>
 #include <linux/types.h>
 #include <linux/memblock.h>
+#include <linux/sizes.h>
+
+#define MEM_SIZE SZ_16K
+
+/*
+ * Available memory registered with memblock needs to be valid for allocs
+ * test to run. This is a convenience wrapper for memory allocated in
+ * dummy_physical_memory_init() that is later registered with memblock
+ * in setup_memblock().
+ */
+struct test_memory {
+       void *base;
+};
 
 struct region {
        phys_addr_t base;
@@ -12,5 +27,8 @@ struct region {
 
 void reset_memblock_regions(void);
 void reset_memblock_attributes(void);
+void setup_memblock(void);
+void dummy_physical_memory_init(void);
+void dummy_physical_memory_cleanup(void);
 
 #endif