ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'memblock-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Browse Source 
Pull memblock updates from Mike Rapoport:

 - add test for memblock_alloc_node()

 - minor coding style fixes

 - add flags and nid info in memblock debugfs

* tag 'memblock-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: Update nid info in memblock debugfs
  memblock: Add flags and nid info in memblock debugfs
  Fix some coding style errors in memblock.c
  Add tests for memblock_alloc_node()
This commit is contained in:
Linus Torvalds
2023-06-29 23:21:20 -07:00
parent ea3f827287 de649e7f5e
commit 075e333591
2 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tools/testing/memblock/tests/alloc_nid_api.c
View File

@@ -2494,6 +2494,35 @@ static int alloc_nid_numa_split_all_reserved_generic_check(void)
return 0;
}
/*
* A simple test that tries to allocate a memory region through the
* memblock_alloc_node() on a NUMA node with id `nid`. Expected to have the
* correct NUMA node set for the new region.
*/
static int alloc_node_on_correct_nid(void)
{
int nid_req = 2;
void *allocated_ptr = NULL;
#ifdef CONFIG_NUMA
struct memblock_region *req_node = &memblock.memory.regions[nid_req];
#endif
phys_addr_t size = SZ_512;
PREFIX_PUSH();
setup_numa_memblock(node_fractions);
allocated_ptr = memblock_alloc_node(size, SMP_CACHE_BYTES, nid_req);
ASSERT_NE(allocated_ptr, NULL);
#ifdef CONFIG_NUMA
ASSERT_EQ(nid_req, req_node->nid);
#endif
test_pass_pop();
return 0;
}
/* Test case wrappers for NUMA tests */
static int alloc_nid_numa_simple_check(void)
{
@@ -2632,6 +2661,15 @@ static int alloc_nid_numa_split_all_reserved_check(void)
return 0;
}
static int alloc_node_numa_on_correct_nid(void)
{
test_print("\tRunning %s...\n", __func__);
run_top_down(alloc_node_on_correct_nid);
run_bottom_up(alloc_node_on_correct_nid);
return 0;
}
int __memblock_alloc_nid_numa_checks(void)
{
test_print("Running %s NUMA tests...\n",
@@ -2652,6 +2690,8 @@ int __memblock_alloc_nid_numa_checks(void)
alloc_nid_numa_reserved_full_merge_check();
alloc_nid_numa_split_all_reserved_check();
alloc_node_numa_on_correct_nid();
return 0;
}