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 305D7C7115B for ; Tue, 24 Jun 2025 03:28:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BE8C6B00B4; Mon, 23 Jun 2025 23:28:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 86F426B00B5; Mon, 23 Jun 2025 23:28:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 710636B00B7; Mon, 23 Jun 2025 23:28:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 59CB46B00B4 for ; Mon, 23 Jun 2025 23:28:10 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D00DBC1649 for ; Tue, 24 Jun 2025 03:28:09 +0000 (UTC) X-FDA: 83588860698.21.7071C7F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 09B8C140003 for ; Tue, 24 Jun 2025 03:28:07 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZsvH87x1; spf=pass (imf09.hostedemail.com: domain of liwang@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=liwang@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750735688; 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:in-reply-to:references:references:dkim-signature; bh=lduNiml1XRAu/rYd6hqPFR/Za2w+2GO7RpqGcJJcN78=; b=OEQ+2rqu8XNzNRPMqshAkVsw2fmXJDByx96fnKy6KyAXvC2bnW3iGLKwfngEm8n5neyZxP tPS4jFZThMUlGzIsdQ3lFci6cVMXyE3J0Ab5oiHlItYkacOFMbyue5qmJ7NcbXQMX1hCA3 MdrYntSm/+zrLK1zo08HYCqMod0CPX8= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZsvH87x1; spf=pass (imf09.hostedemail.com: domain of liwang@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=liwang@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750735688; a=rsa-sha256; cv=none; b=I5oNb0C7IyRZUkMileVffQVZKC1bfcp0geANx68iLDxa0uqrHmIqQNSzxc8WD00dWbCNrV gcpKQzYN0VSMpPYHY1Vxy43a8L9mWtdUhdH/O0CYS1Mvm5O64wk5vY9RXNtFHmEvJezlOl td/auPPmx6i9yIOdt2iBEcQzjgqK0Sg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750735687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lduNiml1XRAu/rYd6hqPFR/Za2w+2GO7RpqGcJJcN78=; b=ZsvH87x1YNPdcye8RtIwx45TdNzXLzCjNeILEtp4ZUKJjmSxs0J7Vp1Nw4OrzO2VLkngKh v0dpUa9R4xRHZBSxKJOfaYMIeYmNbzrBVHBMkTGgvaLS4AoAB/+i2coZ0GiOC7MQcMz3Ba wswIBWuTaQ6S6bfzBd3DaaM3nuOBmnk= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-450-gOKxKQ0AOnSDb6OSJkqpmw-1; Mon, 23 Jun 2025 23:28:03 -0400 X-MC-Unique: gOKxKQ0AOnSDb6OSJkqpmw-1 X-Mimecast-MFC-AGG-ID: gOKxKQ0AOnSDb6OSJkqpmw_1750735681 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2249B19560A3; Tue, 24 Jun 2025 03:28:01 +0000 (UTC) Received: from dell-per7425-02.rhts.eng.pek2.redhat.com (dell-per7425-02.rhts.eng.pek2.redhat.com [10.73.116.18]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EA73830001A1; Tue, 24 Jun 2025 03:27:53 +0000 (UTC) From: Li Wang To: akpm@linux-foundation.org, lorenzo.stoakes@oracle.com, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Aruna Ramakrishna , Bagas Sanjaya , Catalin Marinas , Dave Hansen , David Hildenbrand , Joey Gouly , Johannes Weiner , Keith Lucas , Ryan Roberts , Shuah Khan Subject: [PATCH v2] ksm_tests: Skip hugepage test when Transparent Hugepages are disabled Date: Tue, 24 Jun 2025 11:27:48 +0800 Message-ID: <20250624032748.393836-1-liwang@redhat.com> In-Reply-To: <20250621004808.368878-1-liwang@redhat.com> References: <20250621004808.368878-1-liwang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam11 X-Rspam-User: X-Rspamd-Queue-Id: 09B8C140003 X-Stat-Signature: sx5dnk5x8hbm3hsdb3hq8gyohjpofbgj X-HE-Tag: 1750735687-535974 X-HE-Meta: U2FsdGVkX1/W8IA0crU1wLLVZQQhMNePWjWfBUl7NvIjj3A/rVMUjokzDGpMqN/1pzJdVu4z3qYgdAWDJBUEEqwq18yyG/OXgcxahr6FgOzXhpAgN6aGz4c1PwzXZJ3Itt0XvIzdyI5oh3RxHUlGYBdFdyoktXBQBUS1YpgFX6BhciUbxUMmr2wbPc1MKJXTphgtLVYvkKXgtUNo2Ayes2kMxAZYYYw36Zz49fekIWTQPD26FuwFU3sTJiXeQWckOk1+YTkW/et/xeRR0RROcxQyQAGxYbv/vk6suippYEKurrGqCu/UrwnqvslX9Ei+BZ+0E5lxmYC9AZbdLkQtwv8Z05zCBQBLrqunptTMslpjb+5ga2ej6wCPdsA0qAF71W4Xxr4stO26SKPhmiVuH7dqxdfZtkbr+PjiTOOBVG8IL+O0+nnC0dctB6lhJrfEQnmar9hPfZjiTEDkXaUbUanPTSyXM5Rh7I0eyjACayNkp3xa1cos758FGDvrKihXb9cH+Lznh2kiB/3AR13RWis0GTNqnw5BSp6uFLzC2N7NtkXxbWlZZKq0EgW86YUIOgUXFL1gIjCZtRUBytcwFW7qJJRylALo3OoOOloPb9OPxoPJeib9gDvC9LbESvHm32xnwedblrAQoF/G+/9DjeaRwBnP32pzIxwFioH9HB6aTLA4l0oyLgmhDGy1lvpBiqcA8oTfo7J2f9L6iafJuh4c69nTsbym/12GS1Xrvs6c6wpzqfyJUlExYFNXJK2CUh+LudqXUFrs7GnUuOdjqg3fZYxqkA7YKtibImyhPnV86GWv2jY5dEvL5MKyu0XFANj5PRJ2A4OC5g0iZ9eaNHAq3l+BKIfFoIX8OaVcj3Eac0IrK1nlelOADDB0Ibu+cNkKObbXBgJREoVv1Yjspt4XW9eat3MCtTzHlJOGDz0YowqbX6u41cy2MKVRQ3Tke7JORj5q3tdYdWLKTA8 s6pvsfLx TcEshQ2pTGoZonnsTWEipyvCtmHBcx5rt3AjGdIPv8bk0pPSap57WJzOX35GSnqIIvhF7UGO+0NxUPRwscS4kJmSm/bNMaURLATY3ACgHgeSqrgQw1tsEfssrbJZ1t244cj1xsnLdTytZe59QNzr9vj8ynMAkXVoy/uasenFQEmwroct802MhS6Ue2RmIhbUuM5YLQ0aWLcUon2Lt0SatwZIFw6AymZHSy8NlK69xA/bBL68XdCTLNMy9c6U7zAbr+49Azv21d6o4FvLhua5xRaEPjwZKEU3bN5JtgXu4SQGEal1Bt60KrJu1YAjAbY9RHYBf7XwU8c6x13yNrA4ET+tKqva8D7qZFaG7Er0kFjLx8LT9YAJGrFRULqr1vnZuLXeBFfHhnudnUWGgO2zrXXRM3qRZ46IBHJ8pxQLH4ha++hDTr1E6ltj/GlWcT3XWtRiSXyxCC1ZTFy4OiTLgDfk9OVf7CjQPROcSoRSqzeoO3YgvA/1wbo9Yn4w8DM7XFQ+Oq9bzYlYq9FjQRHcGcQM04BPJ116rSQPXg5zGT9tHCar8Ec3WyzJ4mwVxnjBOWIGbpmonNrfPD7/fCtLDFkmoXQ== 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: Some systems (e.g. minimal or real-time kernels) may not enable Transparent Hugepages (THP), causing MADV_HUGEPAGE to return EINVAL. This patch introduces a runtime check using the existing THP sysfs interface and skips the hugepage merging test (`-H`) when THP is not available. To avoid those failures: # ----------------------------- # running ./ksm_tests -H -s 100 # ----------------------------- # ksm_tests: MADV_HUGEPAGE: Invalid argument # [FAIL] not ok 1 ksm_tests -H -s 100 # exit=2 # -------------------- # running ./khugepaged # -------------------- # Reading PMD pagesize failed# [FAIL] not ok 1 khugepaged # exit=1 # -------------------- # running ./soft-dirty # -------------------- # TAP version 13 # 1..15 # ok 1 Test test_simple # ok 2 Test test_vma_reuse dirty bit of allocated page # ok 3 Test test_vma_reuse dirty bit of reused address page # Bail out! Reading PMD pagesize failed# Planned tests != run tests (15 != 3) # # Totals: pass:3 fail:0 xfail:0 xpass:0 skip:0 error:0 # [FAIL] not ok 1 soft-dirty # exit=1 # SUMMARY: PASS=0 SKIP=0 FAIL=1 # ------------------- # running ./migration # ------------------- # TAP version 13 # 1..3 # # Starting 3 tests from 1 test cases. # # RUN migration.private_anon ... # # OK migration.private_anon # ok 1 migration.private_anon # # RUN migration.shared_anon ... # # OK migration.shared_anon # ok 2 migration.shared_anon # # RUN migration.private_anon_thp ... # # migration.c:196:private_anon_thp:Expected madvise(ptr, TWOMEG, MADV_HUGEPAGE) (-1) == 0 (0) # # private_anon_thp: Test terminated by assertion # # FAIL migration.private_anon_thp # not ok 3 migration.private_anon_thp # # FAILED: 2 / 3 tests passed. # # Totals: pass:2 fail:1 xfail:0 xpass:0 skip:0 error:0 # [FAIL] not ok 1 migration # exit=1 Signed-off-by: Li Wang Cc: Aruna Ramakrishna Cc: Bagas Sanjaya Cc: Catalin Marinas Cc: Dave Hansen Cc: David Hildenbrand Cc: Joey Gouly Cc: Johannes Weiner Cc: Keith Lucas Cc: Ryan Roberts Cc: Shuah Khan Cc: Lorenzo Stoakes --- Notes: v1 --> v2: * replaces printf() + return KSFT_SKIP with a standardized ksft_test_result_skip() call and return in soft-dirty.c to avoid test build issue. tools/testing/selftests/mm/khugepaged.c | 5 +++++ tools/testing/selftests/mm/ksm_tests.c | 6 ++++++ tools/testing/selftests/mm/migration.c | 8 ++++++++ tools/testing/selftests/mm/soft-dirty.c | 9 ++++++++- tools/testing/selftests/mm/thp_settings.c | 11 +++++++++++ tools/testing/selftests/mm/thp_settings.h | 2 ++ 6 files changed, 40 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c index 8a4d34cce36b..6822eb7ea58e 100644 --- a/tools/testing/selftests/mm/khugepaged.c +++ b/tools/testing/selftests/mm/khugepaged.c @@ -1190,6 +1190,11 @@ int main(int argc, char **argv) .read_ahead_kb = 0, }; + if (!thp_is_enabled()) { + printf("Transparent Hugepages not available\n"); + return KSFT_SKIP; + } + parse_test_type(argc, argv); setbuf(stdout, NULL); diff --git a/tools/testing/selftests/mm/ksm_tests.c b/tools/testing/selftests/mm/ksm_tests.c index e80deac1436b..b77462b5c240 100644 --- a/tools/testing/selftests/mm/ksm_tests.c +++ b/tools/testing/selftests/mm/ksm_tests.c @@ -15,6 +15,7 @@ #include "../kselftest.h" #include #include "vm_util.h" +#include "thp_settings.h" #define KSM_SYSFS_PATH "/sys/kernel/mm/ksm/" #define KSM_FP(s) (KSM_SYSFS_PATH s) @@ -527,6 +528,11 @@ static int ksm_merge_hugepages_time(int merge_type, int mapping, int prot, unsigned long scan_time_ns; int pagemap_fd, n_normal_pages, n_huge_pages; + if (!thp_is_enabled()) { + printf("Transparent Hugepages not available\n"); + return KSFT_SKIP; + } + map_size *= MB; size_t len = map_size; diff --git a/tools/testing/selftests/mm/migration.c b/tools/testing/selftests/mm/migration.c index 1e3a595fbf01..a306f8bab087 100644 --- a/tools/testing/selftests/mm/migration.c +++ b/tools/testing/selftests/mm/migration.c @@ -5,6 +5,8 @@ */ #include "../kselftest_harness.h" +#include "thp_settings.h" + #include #include #include @@ -185,6 +187,9 @@ TEST_F_TIMEOUT(migration, private_anon_thp, 2*RUNTIME) uint64_t *ptr; int i; + if (!thp_is_enabled()) + SKIP(return, "Transparent Hugepages not available"); + if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) SKIP(return, "Not enough threads or NUMA nodes available"); @@ -214,6 +219,9 @@ TEST_F_TIMEOUT(migration, shared_anon_thp, 2*RUNTIME) uint64_t *ptr; int i; + if (!thp_is_enabled()) + SKIP(return, "Transparent Hugepages not available"); + if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) SKIP(return, "Not enough threads or NUMA nodes available"); diff --git a/tools/testing/selftests/mm/soft-dirty.c b/tools/testing/selftests/mm/soft-dirty.c index 8e1462ce0532..8a3f2b4b2186 100644 --- a/tools/testing/selftests/mm/soft-dirty.c +++ b/tools/testing/selftests/mm/soft-dirty.c @@ -6,8 +6,10 @@ #include #include #include + #include "../kselftest.h" #include "vm_util.h" +#include "thp_settings.h" #define PAGEMAP_FILE_PATH "/proc/self/pagemap" #define TEST_ITERATIONS 10000 @@ -78,8 +80,13 @@ static void test_hugepage(int pagemap_fd, int pagesize) { char *map; int i, ret; - size_t hpage_len = read_pmd_pagesize(); + if (!thp_is_enabled()) { + ksft_test_result_skip("Transparent Hugepages not available\n"); + return; + } + + size_t hpage_len = read_pmd_pagesize(); if (!hpage_len) ksft_exit_fail_msg("Reading PMD pagesize failed"); diff --git a/tools/testing/selftests/mm/thp_settings.c b/tools/testing/selftests/mm/thp_settings.c index ad872af1c81a..bad60ac52874 100644 --- a/tools/testing/selftests/mm/thp_settings.c +++ b/tools/testing/selftests/mm/thp_settings.c @@ -381,3 +381,14 @@ unsigned long thp_shmem_supported_orders(void) { return __thp_supported_orders(true); } + +bool thp_is_enabled(void) +{ + if (access(THP_SYSFS, F_OK) != 0) + return false; + + int mode = thp_read_string("enabled", thp_enabled_strings); + + /* THP is considered enabled if it's either "always" or "madvise" */ + return mode == 1 || mode == 3; +} diff --git a/tools/testing/selftests/mm/thp_settings.h b/tools/testing/selftests/mm/thp_settings.h index fc131d23d593..6c07f70beee9 100644 --- a/tools/testing/selftests/mm/thp_settings.h +++ b/tools/testing/selftests/mm/thp_settings.h @@ -84,4 +84,6 @@ void thp_set_read_ahead_path(char *path); unsigned long thp_supported_orders(void); unsigned long thp_shmem_supported_orders(void); +bool thp_is_enabled(void); + #endif /* __THP_SETTINGS_H__ */ -- 2.49.0