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 27AA7C7115B for ; Sat, 21 Jun 2025 00:48:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 892816B0089; Fri, 20 Jun 2025 20:48:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 841AE6B008A; Fri, 20 Jun 2025 20:48:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 757AC6B008C; Fri, 20 Jun 2025 20:48:30 -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 5425F6B0089 for ; Fri, 20 Jun 2025 20:48:30 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E1E5DC16EC for ; Sat, 21 Jun 2025 00:48:29 +0000 (UTC) X-FDA: 83577571938.26.F309B03 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id EDA6AA0007 for ; Sat, 21 Jun 2025 00:48:27 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QKHZpPnV; spf=pass (imf15.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=1750466908; a=rsa-sha256; cv=none; b=KEvKaxVwToCvnF/fR7xHJV0W3rSpUtBTh6TPiZ5Khhnmv2YuY9N58ZVJzX4HYT7cez6KCN iVYBNRaSOQvumi2lB8GL8R4wOy+y7CapHDsewSW3mLufxFrA4r7KiqTDZBfuipX6mwnF5D J7b2fUtNRcGWcsaIP1/g71werEOB0Zo= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QKHZpPnV; spf=pass (imf15.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=1750466908; 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:dkim-signature; bh=FkU+gPOIhbeinrV8TQvkcE3b9DDKVV+TZ4jA0J9V37s=; b=7kKPvf+fZw92iAMXPUM3nkD7cjfjtk1Iy8jCN3otlmeDQxhUF8xkoJCMyyopj8h2hk8fil QafHIbkQ0HYa+gwvWotYGT3r8c4kHvTa50r3ruu5ggQS3DDesUY6kEoCIRAKZUhqxrUH9D 6diMQ+XtyuwBECoZUiJa1GHywtlo3DI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750466907; 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; bh=FkU+gPOIhbeinrV8TQvkcE3b9DDKVV+TZ4jA0J9V37s=; b=QKHZpPnV/uKWsLaHUJp7wbohnOt14HWbcf65wavpKlnZKk9PA3xxKDN9UDqvYFMn9qMqfP h4KPzNrYrKkkqwgWTg1J6tXNlVrL0wzzjwT5nvnNfOrk+XR8EasSlJsIB1/xfXYYPhSZVy 7QiR8Nd+ImZeHRX6MqA71wldx3yjTK8= Received: from mx-prod-mc-03.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-610-PSBpcU_WONG57eYCaXboZg-1; Fri, 20 Jun 2025 20:48:23 -0400 X-MC-Unique: PSBpcU_WONG57eYCaXboZg-1 X-Mimecast-MFC-AGG-ID: PSBpcU_WONG57eYCaXboZg_1750466902 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0186E19560AD; Sat, 21 Jun 2025 00:48:21 +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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 05352180045B; Sat, 21 Jun 2025 00:48:13 +0000 (UTC) From: Li Wang To: akpm@linux-foundation.org, 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] ksm_tests: Skip hugepage test when Transparent Hugepages are disabled Date: Sat, 21 Jun 2025 08:48:08 +0800 Message-ID: <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.93 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: EDA6AA0007 X-Stat-Signature: yqowgnebs79pzhfmy3zrcy4wmdwazkfh X-Rspam-User: X-HE-Tag: 1750466907-68611 X-HE-Meta: U2FsdGVkX1/LQUIdKDY4BkYNTTGonINJZobP3FGCC9dMlDpRNadZ/I/b+DnypAEIrX4A9sJUzsT39o2xohG89mBBBR8EBd2f3ZnFWC73WXuGFjNCDdD36Y9TXFVSdZrGbhDqcGoq7f1rsWz9dmg7sj/g4QgujBqz7Qo9kNqWquhq95OzgkS9VIE5WESDjF+dVODSXQo0kKVPN9h1tIm0zufGNZwAxgRIFiiTNaVZ+Ecqq1vIlxfr9VBpjmpQGAxT5C5wQ5ZVMzrrRpgYz4qYf8WUZDIXsU/cpDSoiIUtMIuHzKavHuvJegSAetjpliAEYU60zVea9ieUmb1nEUL64YO42dcb/zvD/bxIanxGhFGUrGzdX151zx5+s6GkA5gWcLICvGKRJq7LqVrWOhCM6gg3sx3YVoMlkzXPaNQRr5lNJZt7NcRqXdOb8nnT8HTCpKswPhj1dET2vSeC1R8Uhi7TUeuyFDT5QJaAwowQl2k79bO7h0STvG+fjItrVB1sIgT5M+Nus20jLT7i5cHYcr3HVj4OhswQOemFz7X4v5hxUhVQRv6wzoFOAdA1ssyNrs5t4BIJsS1P0/VNENMmuYjukegAfaSwA7AmdlmTnOd72rlIq4vhrYVUU5FazbX13VIacj1EZ7uowZtDh2nHx8ug/VvDjbMLRvdL6xZWygj4+BfZlPiOKnD/VYpJxGyR/mjEbwZOOzUtgSm19sz93K22tegk34zW3NJO+yCjrPaIzmaw6NvKZM+dAVO2EPRXs5dMy/2uYaSESAIdGUrIcL4urlRAqB50TwcAh9IBFEHaNmFsEK4+hVnLiTqgh21BVbWXTQFAMT9t2R7+2rB7SfeFxJCso7nsNJ9sli4fToYWPaUa0OxbfT760JjPNK2CFxhnChjMpWHlXAjRlpWPxQoMGAmK/q/Y822VB996HTJVr7AVIiShKKy+nBK+JJeZ4WCpx1gcNQ1I6Thl89F ZQiC5oRz goYmJvhTWyoQRmAc5vJ1MA/Ao1O9egtpu4uXrLKPMT9rvCASWATJOXvQ1AK/HC5rAid8kW1e3+5olWscYYjQk88KwrN1L2XrqwuTJ1nAasJoQzHHSJBAkEmL1tXC2fguFah1PNzQTCEZ9QiqD6wfavlNxwC0jYXm9EoW2i4uDODB487+fExp5r4MjebjAm39NSkKmtVyg7sXn1A0UIcHoRy6M5DCLNnirQu7a8g7X0U0+77sozUkxvESX771HuAL1P0znBe6mCdaefcyTWEPK61fH1hiNmX+1jnhw+9nUpijD0IemzQHY99a24U4EiGE05ezE+cZ6otm5owKEmLsQ139XEsayGQMV9Tdgk53HO/WMOTI3bCpZ8R0xh2uyp35pm44bEmKDqH+zl6j12I3kyMmZCCl4vZtd1OOf/rKOK+t9MoA0ZFBY4c5iHBMhPibBQ8e4IG9FnQ4KKrjhf9KMkQmzo8sWhukBjZxAzIiK5wIn3fnULqGHi7s+RaKmW2ZRNxw8oVd5f5TMPq4JakUYHtV3jmkxqCysXQrDoAr6N8G4QEbbD/EIyHGZqBfBOOBv3B4jQPMxOZ2j6R0+vq53WCYjSQ== 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 --- 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 dcdd5bb20f3d..1fb2263faa8d 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) @@ -555,6 +556,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..72d8ded87756 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()) { + printf("Skipping test: Transparent Hugepages not available\n"); + return KSFT_SKIP; + } + + 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