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 7E035C61CE7 for ; Wed, 11 Jun 2025 08:37:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B18F6B0092; Wed, 11 Jun 2025 04:37:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 161AE6B0093; Wed, 11 Jun 2025 04:37:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 078AC6B0095; Wed, 11 Jun 2025 04:37:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id DC2D86B0092 for ; Wed, 11 Jun 2025 04:37:45 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8E3EA1404A5 for ; Wed, 11 Jun 2025 08:37:45 +0000 (UTC) X-FDA: 83542466490.15.854DB48 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf03.hostedemail.com (Postfix) with ESMTP id 5DC8820006 for ; Wed, 11 Jun 2025 08:37:40 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf03.hostedemail.com: domain of pulehui@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=pulehui@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749631063; 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=yteVdf9ReAoqKiNr/2ObE67tac7PGcVbU8fG3qOpxQQ=; b=4BDk90X7pBSS6OL+Z+ThtqsA3C4TbldOw3qTV+iOgE+3mjkRhsI8hvAj1YzkgaRkDnnYbb fi4Z3zrsuWHX0s9NmyO6i7ptlqNJF9kVSUDt7Ma4hXWlnOIHWT4it16wLZokUtXVttYuEB 1pTQuxsvK2nhLjM2mM2T2lcFmKHtUwA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf03.hostedemail.com: domain of pulehui@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=pulehui@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749631063; a=rsa-sha256; cv=none; b=3aHeXYUkfIQCNeRBat4UXFlDNaU3ZsQ2nD0kg5ZHcEsjkxxeHjjHVT9zZ9jfvVEsp48vRL 78ibw/+pvVUKCJWf8UTCPRYJzWhiRNaDaa3E+35pks1jFykGjoHZvy6gwL/FvSmQwtZEt1 sSlBfwhX08etzUHPz+yzeYTH/oSrIoA= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4bHJv76tHmzKHN2M for ; Wed, 11 Jun 2025 16:37:39 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 512F11A084F for ; Wed, 11 Jun 2025 16:37:38 +0800 (CST) Received: from ultra.huawei.com (unknown [10.90.53.71]) by APP2 (Coremail) with SMTP id Syh0CgDHhGdRQEloV8o1PA--.29312S2; Wed, 11 Jun 2025 16:37:38 +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] selftests/mm: Use generic read_sysfs in thuge-gen test Date: Wed, 11 Jun 2025 08:40:11 +0000 Message-Id: <20250611084011.1047132-1-pulehui@huaweicloud.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:Syh0CgDHhGdRQEloV8o1PA--.29312S2 X-Coremail-Antispam: 1UD129KBjvJXoW7WFWDCr4rXr1rWw48GFWDXFb_yoW8ury5pF s3K34j93yxKr98GryUXFs8Wry5Ar4Dt3y0y397A34rZw1UJr9IgrZ7ZasrJa1kurZ7Wayf Aay3Grsakr1UJaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyKb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkF7I0En4kS14v26r126r1DMxAIw28IcxkI 7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxV Cjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY 6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6x AIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY 1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUwxhLUUUUU X-CM-SenderInfo: psxovxtxl6x35dzhxuhorxvhhfrp/ X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 5DC8820006 X-Stat-Signature: uup5ojjzuns4e7bwdrbhmxmguoqmjm4c X-Rspam-User: X-HE-Tag: 1749631060-687396 X-HE-Meta: U2FsdGVkX19osmsJbjMVrwcFAP5WzOC0iBoaWDHziVLvcMfoO85iF+B8M1NISIZ6SDCvN7pBLLJ93fs/3kbs4WzA33VbCIdSDb0HNR/8Hnz/UcM+nx5PpnHDdqmvOeSWgSx6g39EPE+iFQhuLDcrCK4/OCizIbCU3k/OqTQhCdv8xAaBuuRg6QNDcLB/3HHioedHxFwXs1n7CYn7FK/7hQLh5QQplKUUHo3cuMgLqjBixkpE4XCBrc+M/wFZf2L14ral4Vzmt0uF8ZyphkdtYmy+yGvCLd4XJkCv6VUiHDNT2Ki6YPlKxAM85HR8KiCkRRgmL05hcjQI66vM7wiLy1k0aNWuKN2lF6W6gXQDo5dQxYWrqTzJp2DNjEQXrh9ZQxODBBQclGz/wY7jRtCTZDUOmXmFgNyOX08zxl4R0dGeDVtKeVQcUg0rBAm5hPGavGwOlMbdXZh+w6WGtn6mA76iY9LZ33mAaOuFS09rDBrT3rrqZ4t+As94c0cQ3a1xkqAeQwFPlSJq4PT2alTiDUxTMTVCh0F4yWG9oMhlNTDiyQCenYNn7fth06Fr03NFAqdefmL8vEs3iMXnTeDT/DnHpTLKD+BtzI2Qw2FaHy+cwibEV4swbUxJptqtlPnYMBY0oXNtiF+q4VqJVPL3c0SLrdu7Ial4f/MBp+xP+2lut6k0lEh1rV6CITZBO33yEJLVAaYnaEeTxzQo0+pIwVNb4xYK1pPjg8BZ75l9OAUo4WYjWA13lYBNXcG4PrqsUyyXKIqeY0hSTUa4IlmkfGq0vnW65nsyq+EPlngwDEqoZnA8977biTuLExmyCE0c/k5cYNGLhuVeQ3NRr68A/lC4tCcvC5+lwe8PlwIvv1fJCafupGjUWpbdcmVMrNHZH3HrKIG+f8jzHoxGzTPshUsx5xF/CaC1dDuiCxFZAQys/gkUMimopaa440+CxVTRQkAaSgmSEGU3A8GX12f x0HQakMv LQ7TLK4yG8RPMxzuljVWEIUwrPplFWB8eBCWN4AJnDg8bj0u0Zx6xRNMr9GpsHPGObX0ZSkWx1ngmNrMfO5iQ6v1UnMmpovD0smbAhe01DnAM5+ckz0PT8NHbRi2ssqEdvGVlIyFk5OMNm1mgmAre15YVXdNuh11q0+9CYbKTXdqRZAZ46hAc3BkGQw== 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 --- 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); - 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