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 8CBBDC61CE7 for ; Wed, 11 Jun 2025 09:58:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C01E6B008A; Wed, 11 Jun 2025 05:58:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 297B56B008C; Wed, 11 Jun 2025 05:58:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1AE956B0092; Wed, 11 Jun 2025 05:58:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id F05D66B008A for ; Wed, 11 Jun 2025 05:58:41 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AA595C0728 for ; Wed, 11 Jun 2025 09:58:41 +0000 (UTC) X-FDA: 83542670442.04.C8142CC Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf27.hostedemail.com (Postfix) with ESMTP id DD3CB40007 for ; Wed, 11 Jun 2025 09:58:38 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; spf=pass (imf27.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=1749635919; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=Vzt2GrR9BsB1XkTMCO58Hv1QIMfxv1Az1KoOmQPDD/M=; b=eggn/dR/MvGTA7jQulGD0JTTh9Ob/yB2UOpSqf/dYPFxjHjIczMnrALDHvW1rynXMBY7Kb wI8gXv7kdy0CdbAnItTyZHCUu2LaIwHMKsqgmz66TIDqQpxpIgh5VjuiAsWDRay/wHRUjP l6/gk6hjA3UytubPCzoLz2pBlINIfGA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749635919; a=rsa-sha256; cv=none; b=S58Oi6+OodwfoYHkAooEwt3HEuRxMPymrABp6ZQIiQHDshxpS4zUeZvldC4pAmPzwiePP1 f6UFdfSBrDIucUe1x1YmD1HBn6Dv7+ebLdLXEVLsUdeh86pWSJNY0p4maJJbFu4K8J4t+N 2UFpAe9rpXrP5tdSJSTop1mO61z27sU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of pulehui@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=pulehui@huaweicloud.com; dmarc=none Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4bHLhV3yrYzYQvbm for ; Wed, 11 Jun 2025 17:58:34 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 87A111A0E27 for ; Wed, 11 Jun 2025 17:58:33 +0800 (CST) Received: from ultra.huawei.com (unknown [10.90.53.71]) by APP4 (Coremail) with SMTP id gCh0CgDnSF1IU0lovSS5PA--.41225S2; Wed, 11 Jun 2025 17:58:33 +0800 (CST) From: Pu Lehui To: akpm@linux-foundation.org, shuah@kernel.org, lorenzo.stoakes@oracle.com Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, pulehui@huawei.com Subject: [PATCH v2] selftests/mm: Use generic read_sysfs in thuge-gen test Date: Wed, 11 Jun 2025 10:01:06 +0000 Message-Id: <20250611100106.1331197-1-pulehui@huaweicloud.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgDnSF1IU0lovSS5PA--.41225S2 X-Coremail-Antispam: 1UD129KBjvJXoW7WFWfJrWkWF47Gw4xCw47XFb_yoW8tw17pF s3G34j9w4xtr98G34UXFs09ry5Ar4Dt3y0y3yxA34ruF18JF9IgrZ7AasrJ3WkArZ7Wayf Aay3Grsakr1UXaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyKb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I 0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40E x7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x 0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2AFwI0_JF0_Jw1l42xK82IYc2Ij 64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x 8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE 2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42 xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF 7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUwxhLUUUUU X-CM-SenderInfo: psxovxtxl6x35dzhxuhorxvhhfrp/ X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: DD3CB40007 X-Stat-Signature: ub7yx9bi3eyjpcxzmb1rqgwrbgpj5zbc X-HE-Tag: 1749635918-188729 X-HE-Meta: U2FsdGVkX1/I8oytH3vdz90T802xA4GbM5ndGnzYdAaQNAmUaNwgJkn/l3PjT3W00qQZMZAGADcD1EXlfdi9VAuDjg1BRMpjniw0G2mbn9Wy3rlobDL8O3mAvQAWYf6GWIqwIlSufMG4VOzl76eBNG7cGxQh5pbTvqFiemfOE5+QfVDpCpM3jP28rdJ7g1kXXzf1WwAQNRsozYEJe/DXRfNvSMQfF1ekJOA1fO2hqedMEjTfWvq9SJg494JjX/58roxKEv1YCtIbxmsJvXh3WNiasSkeIPsF5eQn0QBxkyAO8QOxvxNvFtq6U11zLMR9VSunvwZdD2mtHyEsi+dN7EVEqMtWqw+cd0YLGFb3qmYqD7ZmZww4T0IjaPztis4ySgO2ii/B9NBOSnIXzbxBuH9uJDQNb47IK589myyIfy2rn0gsfpUeJG3Q8OhACgpmb5EqPhm/Mh6ueOyb/b5S3SgYz+9ZmLW3qoCjBCf+TnDACaYwUY1/vrEuo6G4+ObmMOZ1vbgLx2FMyUby820PmssnlaiZq6+u5NU/sWG57y6rPlFas3NKxcaXZkVqXv01VCB2gOOpbLzisDFVU0IFdSxEvXOsGA/DncwwN+58+fxkvLVdUDUaGyvVd9NEgg39ZGF+l+I7FrOzg0Ta4lQapkLP1QINC3y+VSixmi540p7cFHmbuuknl9F4CVxIIUnBrPeo668S79WTDtnpMAfo7k/36jLy/bS/MLebzMOOpgF52n3+iCHvIUFONGSeZ7/VAGwy3gcnFZI40FC0DGcoAbKJW5BU8hsiFcH3+3CY0NlBExL+90bM/lO8iMa45QdXatnpoVFSadQi8u2gxRKs19P3rcsFdKpC8+psDiTLFD5NgYWOzkKBUApfkog0c43UR1OMx/fztYXE7oLre2K92PdcghIOd9z1pC5ZYtdTqHfnULhqZRg72hydFhZ5Lu71ZLkHcds3XeBRtRCFUYV Tc455aIP kHkyO7nyUIR08PeykvjUSjYfq+eJNM4J58YzED2lRRb1VGSWXdxujug4pAP5WP3QqKMK2aPb5wJw4E9N7zsvJmwXXYAce918FJE9JUkb5zWLCsgnX8r3a5JGPWHYGdwJ2eTQeIICGkfBoTW4s4DrBgOjWdPi1H7lIVnqohTgNx16zotgK5B0qcXzW4oHaRNytCBUOsq4mmaPCBf4= 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: 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 Reviewed-by: Lorenzo Stoakes --- v2: - Explicit warning when ps != getpagesize(). (Lorenzo) tools/testing/selftests/mm/thuge-gen.c | 38 +++++++------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c index 95b6f043a3cb..8e2b08dc5762 100644 --- a/tools/testing/selftests/mm/thuge-gen.c +++ b/tools/testing/selftests/mm/thuge-gen.c @@ -77,40 +77,20 @@ 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); + if (read_sysfs(buf, &val) && ps != getpagesize()) + ksft_print_msg("missing %s\n", buf); - 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 +153,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 +176,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