Commit 284d950d authored by Karolina Drobnik's avatar Karolina Drobnik Committed by Mike Rapoport
Browse files

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: default avatarKarolina Drobnik <karolinadrobnik@gmail.com>
Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Link: https://lore.kernel.org/r/dce115503c74a6936c44694b00014658a1bb6522.1646055639.git.karolinadrobnik@gmail.com
parent 2c3dacba

tools/testing/memblock/tests/basic_api.c

+0 −1
Original line number Diff line number Diff line 
// 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

tools/testing/memblock/tests/basic_api.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef _MEMBLOCK_BASIC_H

#define _MEMBLOCK_BASIC_H



#include <assert.h>

#include "common.h"



int memblock_basic_checks(void);

tools/testing/memblock/tests/common.c

+19 −0
Original line number Diff line number Diff line
@@ -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);

}

tools/testing/memblock/tests/common.h

+18 −0
Original line number Diff line number Diff line
@@ -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