mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-08-16 14:45:36 +00:00

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 It's true that CONFIG_TRANSPARENT_HUGEPAGE=y is explicitly enabled in tools/testing/selftests/mm/config, so ideally the runtime environment should also support THP. However, in practice, we've found that on some systems: - THP is disabled at boot time (transparent_hugepage=never) - Or manually disabled via sysfs - Or unavailable in RT kernels, containers, or minimal CI environments In these cases, the test will fail with EINVAL on madvise(MADV_HUGEPAGE), even though the kernel config is correct. To make the test suite more robust and avoid false negatives, this patch adds a runtime check for /sys/kernel/mm/transparent_hugepage/enabled. If THP is not available, the hugepage test (-H) is skipped with a clear message. Link: https://lkml.kernel.org/r/20250624032748.393836-1-liwang@redhat.com Signed-off-by: Li Wang <liwang@redhat.com> Cc: Aruna Ramakrishna <aruna.ramakrishna@oracle.com> Cc: Bagas Sanjaya <bagasdotme@gmail.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: Joey Gouly <joey.gouly@arm.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Keith Lucas <keith.lucas@oracle.com> Cc: Ryan Roberts <ryan.roberts@arm.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
221 lines
5.6 KiB
C
221 lines
5.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdbool.h>
|
|
#include <fcntl.h>
|
|
#include <stdint.h>
|
|
#include <malloc.h>
|
|
#include <sys/mman.h>
|
|
|
|
#include "../kselftest.h"
|
|
#include "vm_util.h"
|
|
#include "thp_settings.h"
|
|
|
|
#define PAGEMAP_FILE_PATH "/proc/self/pagemap"
|
|
#define TEST_ITERATIONS 10000
|
|
|
|
static void test_simple(int pagemap_fd, int pagesize)
|
|
{
|
|
int i;
|
|
char *map;
|
|
|
|
map = aligned_alloc(pagesize, pagesize);
|
|
if (!map)
|
|
ksft_exit_fail_msg("mmap failed\n");
|
|
|
|
clear_softdirty();
|
|
|
|
for (i = 0 ; i < TEST_ITERATIONS; i++) {
|
|
if (pagemap_is_softdirty(pagemap_fd, map) == 1) {
|
|
ksft_print_msg("dirty bit was 1, but should be 0 (i=%d)\n", i);
|
|
break;
|
|
}
|
|
|
|
clear_softdirty();
|
|
// Write something to the page to get the dirty bit enabled on the page
|
|
map[0]++;
|
|
|
|
if (pagemap_is_softdirty(pagemap_fd, map) == 0) {
|
|
ksft_print_msg("dirty bit was 0, but should be 1 (i=%d)\n", i);
|
|
break;
|
|
}
|
|
|
|
clear_softdirty();
|
|
}
|
|
free(map);
|
|
|
|
ksft_test_result(i == TEST_ITERATIONS, "Test %s\n", __func__);
|
|
}
|
|
|
|
static void test_vma_reuse(int pagemap_fd, int pagesize)
|
|
{
|
|
char *map, *map2;
|
|
|
|
map = mmap(NULL, pagesize, (PROT_READ | PROT_WRITE), (MAP_PRIVATE | MAP_ANON), -1, 0);
|
|
if (map == MAP_FAILED)
|
|
ksft_exit_fail_msg("mmap failed");
|
|
|
|
// The kernel always marks new regions as soft dirty
|
|
ksft_test_result(pagemap_is_softdirty(pagemap_fd, map) == 1,
|
|
"Test %s dirty bit of allocated page\n", __func__);
|
|
|
|
clear_softdirty();
|
|
munmap(map, pagesize);
|
|
|
|
map2 = mmap(NULL, pagesize, (PROT_READ | PROT_WRITE), (MAP_PRIVATE | MAP_ANON), -1, 0);
|
|
if (map2 == MAP_FAILED)
|
|
ksft_exit_fail_msg("mmap failed");
|
|
|
|
// Dirty bit is set for new regions even if they are reused
|
|
if (map == map2)
|
|
ksft_test_result(pagemap_is_softdirty(pagemap_fd, map2) == 1,
|
|
"Test %s dirty bit of reused address page\n", __func__);
|
|
else
|
|
ksft_test_result_skip("Test %s dirty bit of reused address page\n", __func__);
|
|
|
|
munmap(map2, pagesize);
|
|
}
|
|
|
|
static void test_hugepage(int pagemap_fd, int pagesize)
|
|
{
|
|
char *map;
|
|
int i, ret;
|
|
|
|
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");
|
|
|
|
map = memalign(hpage_len, hpage_len);
|
|
if (!map)
|
|
ksft_exit_fail_msg("memalign failed\n");
|
|
|
|
ret = madvise(map, hpage_len, MADV_HUGEPAGE);
|
|
if (ret)
|
|
ksft_exit_fail_msg("madvise failed %d\n", ret);
|
|
|
|
for (i = 0; i < hpage_len; i++)
|
|
map[i] = (char)i;
|
|
|
|
if (check_huge_anon(map, 1, hpage_len)) {
|
|
ksft_test_result_pass("Test %s huge page allocation\n", __func__);
|
|
|
|
clear_softdirty();
|
|
for (i = 0 ; i < TEST_ITERATIONS ; i++) {
|
|
if (pagemap_is_softdirty(pagemap_fd, map) == 1) {
|
|
ksft_print_msg("dirty bit was 1, but should be 0 (i=%d)\n", i);
|
|
break;
|
|
}
|
|
|
|
clear_softdirty();
|
|
// Write something to the page to get the dirty bit enabled on the page
|
|
map[0]++;
|
|
|
|
if (pagemap_is_softdirty(pagemap_fd, map) == 0) {
|
|
ksft_print_msg("dirty bit was 0, but should be 1 (i=%d)\n", i);
|
|
break;
|
|
}
|
|
clear_softdirty();
|
|
}
|
|
|
|
ksft_test_result(i == TEST_ITERATIONS, "Test %s huge page dirty bit\n", __func__);
|
|
} else {
|
|
// hugepage allocation failed. skip these tests
|
|
ksft_test_result_skip("Test %s huge page allocation\n", __func__);
|
|
ksft_test_result_skip("Test %s huge page dirty bit\n", __func__);
|
|
}
|
|
free(map);
|
|
}
|
|
|
|
static void test_mprotect(int pagemap_fd, int pagesize, bool anon)
|
|
{
|
|
const char *type[] = {"file", "anon"};
|
|
const char *fname = "./soft-dirty-test-file";
|
|
int test_fd = 0;
|
|
char *map;
|
|
|
|
if (anon) {
|
|
map = mmap(NULL, pagesize, PROT_READ|PROT_WRITE,
|
|
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
|
|
if (!map)
|
|
ksft_exit_fail_msg("anon mmap failed\n");
|
|
} else {
|
|
test_fd = open(fname, O_RDWR | O_CREAT, 0664);
|
|
if (test_fd < 0) {
|
|
ksft_test_result_skip("Test %s open() file failed\n", __func__);
|
|
return;
|
|
}
|
|
unlink(fname);
|
|
ftruncate(test_fd, pagesize);
|
|
map = mmap(NULL, pagesize, PROT_READ|PROT_WRITE,
|
|
MAP_SHARED, test_fd, 0);
|
|
if (!map)
|
|
ksft_exit_fail_msg("file mmap failed\n");
|
|
}
|
|
|
|
*map = 1;
|
|
ksft_test_result(pagemap_is_softdirty(pagemap_fd, map) == 1,
|
|
"Test %s-%s dirty bit of new written page\n",
|
|
__func__, type[anon]);
|
|
clear_softdirty();
|
|
ksft_test_result(pagemap_is_softdirty(pagemap_fd, map) == 0,
|
|
"Test %s-%s soft-dirty clear after clear_refs\n",
|
|
__func__, type[anon]);
|
|
mprotect(map, pagesize, PROT_READ);
|
|
ksft_test_result(pagemap_is_softdirty(pagemap_fd, map) == 0,
|
|
"Test %s-%s soft-dirty clear after marking RO\n",
|
|
__func__, type[anon]);
|
|
mprotect(map, pagesize, PROT_READ|PROT_WRITE);
|
|
ksft_test_result(pagemap_is_softdirty(pagemap_fd, map) == 0,
|
|
"Test %s-%s soft-dirty clear after marking RW\n",
|
|
__func__, type[anon]);
|
|
*map = 2;
|
|
ksft_test_result(pagemap_is_softdirty(pagemap_fd, map) == 1,
|
|
"Test %s-%s soft-dirty after rewritten\n",
|
|
__func__, type[anon]);
|
|
|
|
munmap(map, pagesize);
|
|
|
|
if (!anon)
|
|
close(test_fd);
|
|
}
|
|
|
|
static void test_mprotect_anon(int pagemap_fd, int pagesize)
|
|
{
|
|
test_mprotect(pagemap_fd, pagesize, true);
|
|
}
|
|
|
|
static void test_mprotect_file(int pagemap_fd, int pagesize)
|
|
{
|
|
test_mprotect(pagemap_fd, pagesize, false);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int pagemap_fd;
|
|
int pagesize;
|
|
|
|
ksft_print_header();
|
|
ksft_set_plan(15);
|
|
|
|
pagemap_fd = open(PAGEMAP_FILE_PATH, O_RDONLY);
|
|
if (pagemap_fd < 0)
|
|
ksft_exit_fail_msg("Failed to open %s\n", PAGEMAP_FILE_PATH);
|
|
|
|
pagesize = getpagesize();
|
|
|
|
test_simple(pagemap_fd, pagesize);
|
|
test_vma_reuse(pagemap_fd, pagesize);
|
|
test_hugepage(pagemap_fd, pagesize);
|
|
test_mprotect_anon(pagemap_fd, pagesize);
|
|
test_mprotect_file(pagemap_fd, pagesize);
|
|
|
|
close(pagemap_fd);
|
|
|
|
ksft_finished();
|
|
}
|