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>
90 lines
2.1 KiB
C
90 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __THP_SETTINGS_H__
|
|
#define __THP_SETTINGS_H__
|
|
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
|
|
enum thp_enabled {
|
|
THP_NEVER,
|
|
THP_ALWAYS,
|
|
THP_INHERIT,
|
|
THP_MADVISE,
|
|
};
|
|
|
|
enum thp_defrag {
|
|
THP_DEFRAG_ALWAYS,
|
|
THP_DEFRAG_DEFER,
|
|
THP_DEFRAG_DEFER_MADVISE,
|
|
THP_DEFRAG_MADVISE,
|
|
THP_DEFRAG_NEVER,
|
|
};
|
|
|
|
enum shmem_enabled {
|
|
SHMEM_NEVER,
|
|
SHMEM_ALWAYS,
|
|
SHMEM_WITHIN_SIZE,
|
|
SHMEM_ADVISE,
|
|
SHMEM_INHERIT,
|
|
SHMEM_DENY,
|
|
SHMEM_FORCE,
|
|
};
|
|
|
|
#define NR_ORDERS 20
|
|
|
|
struct hugepages_settings {
|
|
enum thp_enabled enabled;
|
|
};
|
|
|
|
struct khugepaged_settings {
|
|
bool defrag;
|
|
unsigned int alloc_sleep_millisecs;
|
|
unsigned int scan_sleep_millisecs;
|
|
unsigned int max_ptes_none;
|
|
unsigned int max_ptes_swap;
|
|
unsigned int max_ptes_shared;
|
|
unsigned long pages_to_scan;
|
|
};
|
|
|
|
struct shmem_hugepages_settings {
|
|
enum shmem_enabled enabled;
|
|
};
|
|
|
|
struct thp_settings {
|
|
enum thp_enabled thp_enabled;
|
|
enum thp_defrag thp_defrag;
|
|
enum shmem_enabled shmem_enabled;
|
|
bool use_zero_page;
|
|
struct khugepaged_settings khugepaged;
|
|
unsigned long read_ahead_kb;
|
|
struct hugepages_settings hugepages[NR_ORDERS];
|
|
struct shmem_hugepages_settings shmem_hugepages[NR_ORDERS];
|
|
};
|
|
|
|
int read_file(const char *path, char *buf, size_t buflen);
|
|
int write_file(const char *path, const char *buf, size_t buflen);
|
|
unsigned long read_num(const char *path);
|
|
void write_num(const char *path, unsigned long num);
|
|
|
|
int thp_read_string(const char *name, const char * const strings[]);
|
|
void thp_write_string(const char *name, const char *val);
|
|
unsigned long thp_read_num(const char *name);
|
|
void thp_write_num(const char *name, unsigned long num);
|
|
|
|
void thp_write_settings(struct thp_settings *settings);
|
|
void thp_read_settings(struct thp_settings *settings);
|
|
struct thp_settings *thp_current_settings(void);
|
|
void thp_push_settings(struct thp_settings *settings);
|
|
void thp_pop_settings(void);
|
|
void thp_restore_settings(void);
|
|
void thp_save_settings(void);
|
|
|
|
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__ */
|