* [PATCH v3] selftest/vm: Fix ksm selftest to run with different NUMA topologies
@ 2021-09-14 10:14 Aneesh Kumar K.V
2021-09-14 13:44 ` Pasha Tatashin
0 siblings, 1 reply; 2+ messages in thread
From: Aneesh Kumar K.V @ 2021-09-14 10:14 UTC (permalink / raw)
To: linux-mm
Cc: akpm, Aneesh Kumar K.V, Zhansaya Bagdauletkyzy, Pavel Tatashin,
Tyler Hicks, Hugh Dickins, Shuah Khan
Platforms can have non-contiguous NUMA nodes like below
#numactl -H
available: 2 nodes (0,8)
.....
node distances:
node 0 8
0: 10 40
8: 40 10
#numactl -H
available: 1 nodes (1)
....
node distances:
node 1
1: 10
Hence update the test to not assume the presence of Node 0 and 1
and also use numa_num_configured_nodes() instead of numa_max_node
for finding whether to skip the test.
Cc: Zhansaya Bagdauletkyzy <zhansayabagdaulet@gmail.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Tyler Hicks <tyhicks@linux.microsoft.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Shuah Khan <shuah@kernel.org>
Fixes: 82e717ad3501 ("selftests: vm: add KSM merging across nodes test")
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
---
Changes from v2:
* Add Fixes: line
Changes from v1:
* Updates based on review feedback.
tools/testing/selftests/vm/ksm_tests.c | 29 +++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c
index b61dcdb44c5b..73132d852513 100644
--- a/tools/testing/selftests/vm/ksm_tests.c
+++ b/tools/testing/selftests/vm/ksm_tests.c
@@ -354,12 +354,34 @@ static int check_ksm_zero_page_merge(int mapping, int prot, long page_count, int
return KSFT_FAIL;
}
+static int get_next_mem_node(int node)
+{
+
+ long node_size;
+ int mem_node;
+ int i, max_node = numa_max_node();
+
+ for (i = node + 1; i <= max_node + node; i++) {
+ mem_node = i % (max_node + 1);
+ node_size = numa_node_size(mem_node, NULL);
+ if (node_size > 0)
+ break;
+ }
+ return mem_node;
+}
+
+static int get_first_mem_node(void)
+{
+ return get_next_mem_node(numa_max_node());
+}
+
static int check_ksm_numa_merge(int mapping, int prot, int timeout, bool merge_across_nodes,
size_t page_size)
{
void *numa1_map_ptr, *numa2_map_ptr;
struct timespec start_time;
int page_count = 2;
+ int first_node;
if (clock_gettime(CLOCK_MONOTONIC_RAW, &start_time)) {
perror("clock_gettime");
@@ -370,7 +392,7 @@ static int check_ksm_numa_merge(int mapping, int prot, int timeout, bool merge_a
perror("NUMA support not enabled");
return KSFT_SKIP;
}
- if (numa_max_node() < 1) {
+ if (numa_num_configured_nodes() <= 1) {
printf("At least 2 NUMA nodes must be available\n");
return KSFT_SKIP;
}
@@ -378,8 +400,9 @@ static int check_ksm_numa_merge(int mapping, int prot, int timeout, bool merge_a
return KSFT_FAIL;
/* allocate 2 pages in 2 different NUMA nodes and fill them with the same data */
- numa1_map_ptr = numa_alloc_onnode(page_size, 0);
- numa2_map_ptr = numa_alloc_onnode(page_size, 1);
+ first_node = get_first_mem_node();
+ numa1_map_ptr = numa_alloc_onnode(page_size, first_node);
+ numa2_map_ptr = numa_alloc_onnode(page_size, get_next_mem_node(first_node));
if (!numa1_map_ptr || !numa2_map_ptr) {
perror("numa_alloc_onnode");
return KSFT_FAIL;
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] selftest/vm: Fix ksm selftest to run with different NUMA topologies
2021-09-14 10:14 [PATCH v3] selftest/vm: Fix ksm selftest to run with different NUMA topologies Aneesh Kumar K.V
@ 2021-09-14 13:44 ` Pasha Tatashin
0 siblings, 0 replies; 2+ messages in thread
From: Pasha Tatashin @ 2021-09-14 13:44 UTC (permalink / raw)
To: Aneesh Kumar K.V
Cc: linux-mm, Andrew Morton, Zhansaya Bagdauletkyzy, Tyler Hicks,
Hugh Dickins, Shuah Khan
On Tue, Sep 14, 2021 at 6:14 AM Aneesh Kumar K.V
<aneesh.kumar@linux.ibm.com> wrote:
>
> Platforms can have non-contiguous NUMA nodes like below
>
> #numactl -H
> available: 2 nodes (0,8)
> .....
> node distances:
> node 0 8
> 0: 10 40
> 8: 40 10
>
> #numactl -H
> available: 1 nodes (1)
> ....
> node distances:
> node 1
> 1: 10
>
> Hence update the test to not assume the presence of Node 0 and 1
> and also use numa_num_configured_nodes() instead of numa_max_node
> for finding whether to skip the test.
>
> Cc: Zhansaya Bagdauletkyzy <zhansayabagdaulet@gmail.com>
> Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
> Cc: Tyler Hicks <tyhicks@linux.microsoft.com>
> Cc: Hugh Dickins <hughd@google.com>
> Cc: Shuah Khan <shuah@kernel.org>
> Fixes: 82e717ad3501 ("selftests: vm: add KSM merging across nodes test")
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> ---
> Changes from v2:
> * Add Fixes: line
>
> Changes from v1:
> * Updates based on review feedback.
>
> tools/testing/selftests/vm/ksm_tests.c | 29 +++++++++++++++++++++++---
> 1 file changed, 26 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c
> index b61dcdb44c5b..73132d852513 100644
> --- a/tools/testing/selftests/vm/ksm_tests.c
> +++ b/tools/testing/selftests/vm/ksm_tests.c
> @@ -354,12 +354,34 @@ static int check_ksm_zero_page_merge(int mapping, int prot, long page_count, int
> return KSFT_FAIL;
> }
>
> +static int get_next_mem_node(int node)
> +{
> +
> + long node_size;
> + int mem_node;
Please initialize mem_node, otherwise if numa_max_node() returns 0,
mem_node will be returned from this function uninitialized.
With this fixed, looks good:
Reviewed-by: Pasha Tatashin <pasha.tatashin@soleen.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-14 13:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-14 10:14 [PATCH v3] selftest/vm: Fix ksm selftest to run with different NUMA topologies Aneesh Kumar K.V
2021-09-14 13:44 ` Pasha Tatashin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.