From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7899C61CE7 for ; Wed, 11 Jun 2025 09:40:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A0596B0088; Wed, 11 Jun 2025 05:40:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 050A56B0089; Wed, 11 Jun 2025 05:40:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA9546B008A; Wed, 11 Jun 2025 05:40:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CA5A86B0088 for ; Wed, 11 Jun 2025 05:40:16 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3E1261405B3 for ; Wed, 11 Jun 2025 09:40:16 +0000 (UTC) X-FDA: 83542624032.02.44A4D9A Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf10.hostedemail.com (Postfix) with ESMTP id 57AD2C0014 for ; Wed, 11 Jun 2025 09:40:11 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of pulehui@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=pulehui@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749634814; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kcd3gXE2DZr3JX51sHJpcwrVN7391yBrtIGwbTENFrY=; b=cPSN0iaXhzv0UVEAAcUB4hCWBlxb4P9Cj2L0lHYEaR5oNjvgJBObBdFB1+RO82XpIkP8np OC9adWnyhZiFJMDvCMtrleGN//A8LwsfVHGthX3ed7VoMBoQp3+EgOELwCZ5aei9/9LarC lFXfz+j9x4Y9FkPvTzkhId5nL/krF5Y= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of pulehui@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=pulehui@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749634814; a=rsa-sha256; cv=none; b=rMh4tsUmHTJ6+VunGBqWbiTNXnN/jWVwzGl5FkM3Xt+jmW4P04xvLAiZ8n8vmSlDS8Xyzx iFaCKmTfpoK47erVDNrfRVQ+c0hQsZ6PSYLsDrJJSsVqdj4A3bEH6zLT+58OnWE564tgM1 5tau1rnt260M+lKEoEHWR7V7/S3t3Ns= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4bHLHF1xwCzYQvq4 for ; Wed, 11 Jun 2025 17:40:09 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 44F5B1A147F for ; Wed, 11 Jun 2025 17:40:08 +0800 (CST) Received: from [10.67.109.184] (unknown [10.67.109.184]) by APP2 (Coremail) with SMTP id Syh0CgC3v2L2TkloS0I6PA--.12284S2; Wed, 11 Jun 2025 17:40:08 +0800 (CST) Message-ID: <097fa60d-cb5c-4f0b-a2b1-db22b26cc49b@huaweicloud.com> Date: Wed, 11 Jun 2025 17:40:06 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] selftests/mm: Use generic read_sysfs in thuge-gen test Content-Language: en-US To: Lorenzo Stoakes Cc: akpm@linux-foundation.org, shuah@kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, pulehui@huawei.com References: <20250611084011.1047132-1-pulehui@huaweicloud.com> From: Pu Lehui In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-CM-TRANSID:Syh0CgC3v2L2TkloS0I6PA--.12284S2 X-Coremail-Antispam: 1UD129KBjvJXoWxXFy8Gw45Xr1Uur1rZrWrKrg_yoW5KryxpF s3ta4jkF4IqryUCryUXFs09ryYyr4Dtay8A3yxA345Zr15JF9agrWIk34UJ3WkurZ7Wr4S v3y3Grsavr1DXaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUylb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I 0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40E x7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x 0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41lc7CjxVAaw2AFwI0_JF0_Jw1l42xK82IYc2Ij64vI r41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8Gjc xK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0 cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8V AvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E 14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUwxhLUUUUU X-CM-SenderInfo: psxovxtxl6x35dzhxuhorxvhhfrp/ X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 57AD2C0014 X-Stat-Signature: ddi1jeyw5nwthdrtufrcfkmrc14snag1 X-Rspam-User: X-HE-Tag: 1749634811-436242 X-HE-Meta: U2FsdGVkX1+FRIbkmPvph/IresnFUwpcHFAMyYUU02VM4lKPDdhDWQwCaDHOGgLm6PIzaMjsnqetZdZlq/ueiL7QYcyXFZqVWOTC5LLmZBA1lW/2W+XelRaxnkx6ClYY7WuRbqr9ljFphHRkXKR/KpvwYs1Q6/BgKEIkUTeMrxjUj5YLs51Bk8DnVsTQSQqqAQ/p+zhVMH3K2JQcUVVEv4V9aEhdXQliWElxIqGZa/3FfmQXnS3XQ8uJEvfsUM+vXXlaJV3BVqD7at0iEbSNpFqocVqxekcmoLEAfUNMMeNtt8lmZtNizjV07Nqnp35geIxyeDpBuAYFGzyMhi9B+4co3ApY4p88SC8iVO13O9Kyi8TMCSzVJ1GnUphggbloADKFrXdhuV8k/lQpx3UwBRjp1BdKUECTWhK8l2D1o2FjGfv324pbgR3PX4sDSt9aoy/frN/6C9Rob65Wn3UfhmvmbFfMj7757uXzkkHuRvm4YJJJWgGd0R96tJXBFsLcSu6M5FUSkubzMbfGe0V5HSmce9+MX43DRgTf1PngC6dYOb44LLh4o6x8xVW7XDI7kCWTMYDVxxDXKQ8qCblVGS3TZ4YIOHyKKH7RW1e2bvSzz7cipEXTjTT5iLf5JZPdpyYe7T8Lkj/MMOHy4A+jSamd6gYSul9YZxdbFJgTPoMgKKNKf9q3bQqMT2bBiHXnWr558Lb4gQrgU/bWMJt+C+lTAVfcbGF5XhbocPwfiosrnMtxSlIUYvtNKhm2m+sRKOVVm7WHx4FvpqEFTTxrxzQpDEjL0kM2wIt3T2P4n+kbteStnu9Qs4KtclO/np8Z/4a25vpE+LaBFbwa5p11OsjKR85gYkBocdgIJeh/u/+S6vk6kyG8PwKXy8PSS8fifXAbpsLV5lcjbkcf79FrAA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 2025/6/11 17:18, Lorenzo Stoakes wrote: > On Wed, Jun 11, 2025 at 08:40:11AM +0000, Pu Lehui wrote: >> From: Pu Lehui >> >> As generic read_sysfs is available in vm_utils, let's >> use is in thuge-gen test. >> >> Signed-off-by: Pu Lehui > > It generally looks good, just one point about a warning below to address. > >> --- >> tools/testing/selftests/mm/thuge-gen.c | 37 +++++++------------------- >> 1 file changed, 9 insertions(+), 28 deletions(-) >> >> diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c >> index 95b6f043a3cb..e11dfbfa661b 100644 >> --- a/tools/testing/selftests/mm/thuge-gen.c >> +++ b/tools/testing/selftests/mm/thuge-gen.c >> @@ -77,40 +77,19 @@ void show(unsigned long ps) >> system(buf); >> } >> >> -unsigned long thuge_read_sysfs(int warn, char *fmt, ...) >> +unsigned long read_free(unsigned long ps) >> { >> - char *line = NULL; >> - size_t linelen = 0; >> - char buf[100]; >> - FILE *f; >> - va_list ap; >> unsigned long val = 0; >> + char buf[100]; >> >> - va_start(ap, fmt); >> - vsnprintf(buf, sizeof buf, fmt, ap); >> - va_end(ap); >> + snprintf(buf, sizeof(buf), >> + "/sys/kernel/mm/hugepages/hugepages-%lukB/free_hugepages", >> + ps >> 10); >> + read_sysfs(buf, &val); > > We're losing all of the 'warn' logic here so if we can't find > /sys/kernel/mm/hugepages/hugepages-%lukB/free_hugepages when ps != getpagesize() > we no longer print a message about it. Hi Lorenzo, Thanks for review. Right, we should explicit that warning when ps != getpagesize(). How about the following modify? diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c index e11dfbfa661b..8e2b08dc5762 100644 --- a/tools/testing/selftests/mm/thuge-gen.c +++ b/tools/testing/selftests/mm/thuge-gen.c @@ -85,7 +85,8 @@ unsigned long read_free(unsigned long ps) snprintf(buf, sizeof(buf), "/sys/kernel/mm/hugepages/hugepages-%lukB/free_hugepages", ps >> 10); - read_sysfs(buf, &val); + if (read_sysfs(buf, &val) && ps != getpagesize()) + ksft_print_msg("missing %s\n", buf); return val; } > > Should we reinstate that? > > Other than this, we're ignoring errors, which by default means we return 0, but > this is what we were doing anyway. It's only this case I think that matters. > >> >> - f = fopen(buf, "r"); >> - if (!f) { >> - if (warn) >> - ksft_print_msg("missing %s\n", buf); >> - return 0; >> - } >> - if (getline(&line, &linelen, f) > 0) { >> - sscanf(line, "%lu", &val); >> - } >> - fclose(f); >> - free(line); >> return val; >> } >> >> -unsigned long read_free(unsigned long ps) >> -{ >> - return thuge_read_sysfs(ps != getpagesize(), >> - "/sys/kernel/mm/hugepages/hugepages-%lukB/free_hugepages", >> - ps >> 10); >> -} >> - >> void test_mmap(unsigned long size, unsigned flags) >> { >> char *map; >> @@ -173,6 +152,7 @@ void test_shmget(unsigned long size, unsigned flags) >> void find_pagesizes(void) >> { >> unsigned long largest = getpagesize(); >> + unsigned long shmmax_val = 0; >> int i; >> glob_t g; >> >> @@ -195,7 +175,8 @@ void find_pagesizes(void) >> } >> globfree(&g); >> >> - if (thuge_read_sysfs(0, "/proc/sys/kernel/shmmax") < NUM_PAGES * largest) >> + read_sysfs("/proc/sys/kernel/shmmax", &shmmax_val); >> + if (shmmax_val < NUM_PAGES * largest) >> ksft_exit_fail_msg("Please do echo %lu > /proc/sys/kernel/shmmax", >> largest * NUM_PAGES); >> >> -- >> 2.34.1 >>