From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 206FF321F2D; Tue, 30 Jun 2026 09:35:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782812106; cv=none; b=UB4sMszRlFxhkg3+XAENjzWClgPKbB8wwe352Yt/T03nOebhbhjKVfHQFKFOsuHhcfCFQkUbJLUtqyn7PNNPdiXH6dvSgCEenIgxUO6cQvnRAn+fa2XIzdfUrU9aXKG0ZB+8VOgoojX91MYz2f79seqq5h7p4PLhR2kYxQA0E/k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782812106; c=relaxed/simple; bh=We9c6SxrjA22NQC2kcEEfJTC//4uGKnG73wdGebZIJs=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=Z6aYFHPu5MiOtWtW3BR0672rj8MBR8TYSjn+iW/lIENeD9Sfd+zhZS1y+aJXwPcqBsK6VJzv0SrdTWf/hKgl3/kTVnOtLxifVtqCniaJkh4+wTGcpMB0GKzEvdtbUEKuZ1rimdNt6FsK3uHXXKq1EyOTXD61cXOoyKIWc0y+Yb4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=cebxASRR; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="cebxASRR" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65U5mKCC1075952; Tue, 30 Jun 2026 09:34:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=FenPuD P/WxCTQU7UzdjqpiqHT2NmDzjGMLRxQu2kEzM=; b=cebxASRR3hxKiQx5DNfFDj t+BhIzIMZO7GeRJtarPlx77XZtqvZuacbpOyMq6lUjTW+Qf2wReh5qcNAmp7uOwN dc2PaiI0RyNTAG0AynK0qyQluSYjcwPpAbx+ubRIQGF/Pv6zKpqHSGTB373xuM5H MtpjnBrErqMxVxYM4zGlNpqzwZN0Irwn+CUfmiYneGlr6Xy38sZ2MterTvWKeG0i FYOSMVKxAI97EENEbXAtbRGnwingnWeKvrJsCACA5qHIkTFyOUegO3cJcasR0vrp P0MvZpLuXsBLFTbObnFzsk34Y7cm3ECVkku8npjJBi0r5tXE7jpi28PBvyJLFLnA == Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4f26q9wp0w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jun 2026 09:34:42 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 65U9Ybxf009711; Tue, 30 Jun 2026 09:34:41 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4f2tbh9dpb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jun 2026 09:34:41 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 65U9YfPA14877204 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Jun 2026 09:34:41 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2F3135805D; Tue, 30 Jun 2026 09:34:41 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0BBA05805A; Tue, 30 Jun 2026 09:34:35 +0000 (GMT) Received: from [9.39.22.200] (unknown [9.39.22.200]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 30 Jun 2026 09:34:34 +0000 (GMT) Message-ID: Date: Tue, 30 Jun 2026 15:04:32 +0530 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Sayali Patil Subject: Re: [PATCH 2/2] selftests/mm: fix ksm NUMA merge test for systems with memoryless NUMA nodes To: "David Hildenbrand (Arm)" , Andrew Morton , Shuah Khan , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Ritesh Harjani Cc: Zi Yan , Michal Hocko , Oscar Salvador , Lorenzo Stoakes , Dev Jain , Liam.Howlett@oracle.com, linuxppc-dev@lists.ozlabs.org, Miaohe Lin , Venkat Rao Bagalkote References: <8540b58ef1fdbc2e5cb2f9fe28a2d2a54a5bc6a8.1782365671.git.sayalip@linux.ibm.com> <8663e05b-0e54-4c1a-a7d1-94e49f2ca178@kernel.org> Content-Language: en-IN In-Reply-To: <8663e05b-0e54-4c1a-a7d1-94e49f2ca178@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjMwMDA4MyBTYWx0ZWRfX1KZLq28ZpPUp iaPtkFprvQfLvPVnEOIhc7t6JRk1/3w+9ltv2FysZZu7hPtK+P5jhnekugkad7snIpolRe7zjCY dDDN5j4qkLhjFB86d21QE8CWhW0FCBJ/CWRJWik2SzSyj0KR+3H9dzl8zOIDo+P7PR9t0ZK3Ec0 UQ+JrvjOXB29OiRmGYK8GTmg8jnhcFbAyTuxYHj1yRNv8BDDcpvIeO7yLdnvraGZyBs116mGjkB Aj22HKAO/+7kNHr0KPNYSc490Gc57+7KflsDnz3eZz99FY/SzRhRe0WuRJywFuTrevdof+vJUYN yOSo1eqLHs6/LjhyZ0Hg2gaNBHr3A8t6VR7dzOvmW2jSeu8NtaqjB+9pGlJYT1BhA0nfbF7x3rp CYsa/5aUu4tKPNfbvkDp0IU4p9ANjGCb2LWa9fcDvf4lse9ag+Ilcj1q8bo9KTjan4XxnJa1SfE cpf9C3aIMcGQ19vToEQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjMwMDA4MyBTYWx0ZWRfX66AGScQ+2mJ5 S1/AdZZQAGOCBhI9nPSiDAvSY6N2oa3Hf2F1+S0hPHsecvFyBkAqb8Z8hKccCeaIFpFIDoFosFz Ltqnn0mAR4Dy7/kW4vEKstD/pNjX3WM= X-Proofpoint-GUID: RvQEWbbQd5VsrPDQ1YYdV4ORmXVRvDgL X-Proofpoint-ORIG-GUID: xxAhTBi4VCx0rALIorlHuqnNvfsmQMYi X-Authority-Analysis: v=2.4 cv=WZ88rUhX c=1 sm=1 tr=0 ts=6a438db2 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=4BRzb6RNsxKkEMCgDAAA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-30_02,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 phishscore=0 clxscore=1015 bulkscore=0 impostorscore=0 priorityscore=1501 lowpriorityscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606300083 On 26/06/26 21:25, David Hildenbrand (Arm) wrote: >> >> +static int count_mem_nodes(void) >> +{ >> + int node, count = 0; >> + >> + for (node = 0; node <= numa_max_node(); node++) { >> + if (numa_node_size(node, NULL) > 0) >> + count++; >> + } >> + >> + return count; >> +} >> + > > Can we instead build upon our existing helpers get_first_mem_node() + > get_next_mem_node() ? > > From 432774fb50237519c1c041e402fddfdf4b35aa2c Mon Sep 17 00:00:00 2001 > From: "David Hildenbrand (Arm)" > Date: Fri, 26 Jun 2026 17:52:21 +0200 > Subject: [PATCH] tmp > > Signed-off-by: David Hildenbrand (Arm) > --- > tools/testing/selftests/mm/ksm_tests.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/tools/testing/selftests/mm/ksm_tests.c b/tools/testing/selftests/mm/ksm_tests.c > index a050f4840cfa3..2ebbb544c6711 100644 > --- a/tools/testing/selftests/mm/ksm_tests.c > +++ b/tools/testing/selftests/mm/ksm_tests.c > @@ -440,9 +440,9 @@ static int get_next_mem_node(int node) > mem_node = i % (max_node + 1); > node_size = numa_node_size(mem_node, NULL); > if (node_size > 0) > - break; > + return mem_node; > } > - return mem_node; > + return -ENODEV; > } > > static int get_first_mem_node(void) > @@ -455,8 +455,8 @@ static int check_ksm_numa_merge(int merge_type, int mapping, int prot, int timeo > { > void *numa1_map_ptr, *numa2_map_ptr; > struct timespec start_time; > + int first_node, second_node; > int page_count = 2; > - int first_node; > > if (clock_gettime(CLOCK_MONOTONIC_RAW, &start_time)) { > ksft_perror("clock_gettime"); > @@ -467,17 +467,19 @@ static int check_ksm_numa_merge(int merge_type, int mapping, int prot, int timeo > ksft_print_msg("NUMA support not enabled\n"); > return KSFT_SKIP; > } > - if (numa_num_configured_nodes() <= 1) { > - ksft_print_msg("At least 2 NUMA nodes must be available\n"); > + first_node = get_first_mem_node(); > + second_node = get_next_mem_node(first_node); > + > + if (second_node < 0) { > + ksft_print_msg("At least 2 NUMA nodes with memory must be available\n"); > return KSFT_SKIP; > } > if (ksm_write_sysfs(KSM_FP("merge_across_nodes"), merge_across_nodes)) > return KSFT_FAIL; > > /* allocate 2 pages in 2 different NUMA nodes and fill them with the same data */ > - 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)); > + numa2_map_ptr = numa_alloc_onnode(page_size, second_node); > if (!numa1_map_ptr || !numa2_map_ptr) { > ksft_perror("numa_alloc_onnode"); > return KSFT_FAIL; Hi David, Thanks for review! Yes, I updated the implementation in v2 to use the existing get_first_mem_node() + get_next_mem_node() helper as suggested. V2:https://lore.kernel.org/all/878cbc1dd24921d55049932dcd5fd6ee517557ca.1782811071.git.sayalip@linux.ibm.com/