lib: Introduce tst_path.h to consolidate system paths
PATCH 1/1 lib: Introduce tst_path.h to consolidate system paths
Currently, definitions for various /proc and /sys paths are scattered across multiple testcases and library files, often as hardcoded strings or redundant macros.
This patch introduces a new common header, tst_path.h, to centralize and standardize these path definitions. By unifying these macros, we reduce code duplication, improve maintainability, and ensure consistent path usage across the entire LTP codebase.
--- include/tst_hugepage.h | 10 +---- include/tst_path.h | 41 +++++++++++++++++++ include/tst_test.h | 1 + lib/newlib_tests/test19.c | 6 +-- lib/newlib_tests/test20.c | 4 +- lib/tst_hugepage.c | 4 +- testcases/cve/cve-2015-3290.c | 6 +-- testcases/cve/cve-2017-16939.c | 2 +- testcases/cve/cve-2022-4378.c | 16 ++++---- testcases/cve/icmp_rate_limit01.c | 2 +- testcases/cve/tcindex01.c | 2 +- testcases/kernel/containers/pidns/pidns05.c | 2 +- testcases/kernel/containers/userns/userns01.c | 4 +- .../containers/userns/userns06_capcheck.c | 2 +- testcases/kernel/containers/userns/userns07.c | 2 +- testcases/kernel/containers/userns/userns08.c | 8 ++-- testcases/kernel/include/ksm_helper.h | 2 +- testcases/kernel/logging/kmsg/kmsg01.c | 4 +- .../kernel/mem/hugetlb/hugemmap/hugemmap05.c | 8 +--- .../kernel/mem/hugetlb/hugemmap/hugemmap32.c | 11 +++-- .../kernel/mem/hugetlb/hugemmap/hugemmap34.c | 1 - .../mem/hugetlb/hugeshmat/hugeshmat04.c | 2 +- .../mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +- testcases/kernel/mem/hugetlb/lib/hugetlb.h | 2 +- testcases/kernel/mem/ksm/ksm01.c | 10 ++--- testcases/kernel/mem/ksm/ksm02.c | 10 ++--- testcases/kernel/mem/ksm/ksm03.c | 10 ++--- testcases/kernel/mem/ksm/ksm04.c | 10 ++--- testcases/kernel/mem/ksm/ksm05.c | 4 +- testcases/kernel/mem/ksm/ksm06.c | 10 ++--- testcases/kernel/mem/ksm/ksm07.c | 8 ++-- testcases/kernel/mem/oom/oom.h | 11 ++--- testcases/kernel/mem/oom/oom01.c | 2 - testcases/kernel/mem/oom/oom02.c | 2 +- testcases/kernel/mem/oom/oom03.c | 2 +- testcases/kernel/mem/oom/oom04.c | 2 +- testcases/kernel/mem/oom/oom05.c | 2 +- testcases/kernel/mem/thp/thp.h | 2 +- .../kernel/sched/sysctl/proc_sched_rt01.c | 6 +-- .../kernel/syscalls/fanotify/fanotify10.c | 9 ++-- testcases/kernel/syscalls/fcntl/fcntl35.c | 10 ++--- testcases/kernel/syscalls/inotify/inotify07.c | 2 +- testcases/kernel/syscalls/inotify/inotify08.c | 2 +- .../kernel/syscalls/io_uring/io_uring01.c | 2 +- .../kernel/syscalls/io_uring/io_uring02.c | 2 +- .../kernel/syscalls/io_uring/io_uring03.c | 2 +- .../kernel/syscalls/ipc/msgget/msgget03.c | 2 +- .../kernel/syscalls/ipc/msgget/msgget04.c | 2 +- .../kernel/syscalls/ipc/msgget/msgget05.c | 2 +- .../kernel/syscalls/ipc/semget/semget05.c | 4 +- .../kernel/syscalls/ipc/shmctl/shmctl03.c | 6 +-- .../kernel/syscalls/ipc/shmget/shmget02.c | 2 +- .../kernel/syscalls/ipc/shmget/shmget03.c | 2 +- .../kernel/syscalls/ipc/shmget/shmget05.c | 2 +- .../kernel/syscalls/ipc/shmget/shmget06.c | 2 +- testcases/kernel/syscalls/keyctl/keyctl02.c | 2 +- testcases/kernel/syscalls/madvise/madvise01.c | 1 - testcases/kernel/syscalls/madvise/madvise02.c | 3 +- testcases/kernel/syscalls/madvise/madvise06.c | 2 +- testcases/kernel/syscalls/madvise/madvise08.c | 2 +- .../syscalls/migrate_pages/migrate_pages02.c | 2 +- testcases/kernel/syscalls/mmap/mmap10.c | 2 +- .../kernel/syscalls/move_pages/move_pages12.c | 10 ++--- .../kernel/syscalls/newuname/newuname01.c | 8 ++-- .../perf_event_open/perf_event_open02.c | 2 +- testcases/kernel/syscalls/pkeys/pkey01.c | 1 - testcases/kernel/syscalls/preadv2/preadv203.c | 2 +- .../kernel/syscalls/readahead/readahead02.c | 5 +-- .../sched_rr_get_interval01.c | 2 +- testcases/kernel/syscalls/sendmsg/sendmsg03.c | 2 +- testcases/kernel/syscalls/sendto/sendto03.c | 2 +- testcases/kernel/syscalls/setpgid/setpgid02.c | 2 +- .../kernel/syscalls/setsockopt/setsockopt05.c | 2 +- .../kernel/syscalls/setsockopt/setsockopt06.c | 2 +- .../kernel/syscalls/setsockopt/setsockopt08.c | 2 +- .../kernel/syscalls/setsockopt/setsockopt09.c | 2 +- testcases/kernel/syscalls/splice/splice.h | 8 ++-- testcases/kernel/syscalls/splice/splice06.c | 4 +- testcases/kernel/syscalls/syslog/syslog11.c | 2 +- testcases/kernel/syscalls/wait4/wait402.c | 2 +- testcases/kernel/syscalls/waitid/waitid10.c | 2 +- testcases/network/iptables/nft02.c | 2 +- testcases/network/packet/fanout01.c | 2 +- 83 files changed, 195 insertions(+), 173 deletions(-) create mode 100644 include/tst_path.h
include/tst_hugepage.h +1 -9
@@ -6,15 +6,7 @@#ifndef TST_HUGEPAGE__ #define TST_HUGEPAGE__ -#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/" -#define PATH_NR_HPAGES "/proc/sys/vm/nr_hugepages" -#define PATH_OC_HPAGES "/proc/sys/vm/nr_overcommit_hugepages" - -#define MEMINFO_HPAGE_TOTAL "HugePages_Total:" -#define MEMINFO_HPAGE_FREE "HugePages_Free:" -#define MEMINFO_HPAGE_RSVD "HugePages_Rsvd:" -#define MEMINFO_HPAGE_SURP "HugePages_Surp:" -#define MEMINFO_HPAGE_SIZE "Hugepagesize:" +#include "tst_path.h" extern char *nr_opt;/* -s num Set the number of the been allocated hugepages */ extern char *Hopt;/* -H /.. Location of hugetlbfs, i.e. -H /var/hugetlbfs */
include/tst_path.h new file +41 -0
41 lines not on this page · raw message
include/tst_test.h +1 -0
@@ -26,6 +26,7 @@#include "tst_mkfs.h" #include "tst_fs.h" #include "tst_pid.h" +#include "tst_path.h" #include "tst_cmd.h" #include "tst_cpu.h" #include "tst_process_state.h"
lib/newlib_tests/test19.c +3 -3
@@ -10,7 +10,7 @@static void setup (void ) { -SAFE_FILE_PRINTF ("/proc/sys/kernel/core_pattern" ,"changed" ); +SAFE_FILE_PRINTF (PROC_SYS_KERNEL "core_pattern" ,"changed" );tst_sys_conf_dump (); }
@@ -25,8 +25,8 @@ static struct tst_test test = { .setup = setup, .save_restore = (const struct tst_path_val []) { {"/proc/nonexistent" ,NULL ,TST_SR_SKIP }, - {"/proc/sys/kernel/numa_balancing" ,NULL ,TST_SR_TBROK }, - {"/proc/sys/kernel/core_pattern" ,NULL ,TST_SR_TCONF }, + {PROC_SYS_KERNEL "numa_balancing" ,NULL ,TST_SR_TBROK }, + {PROC_SYS_KERNEL "core_pattern" ,NULL ,TST_SR_TCONF }, {} }, };
lib/newlib_tests/test20.c +2 -2
@@ -16,7 +16,7 @@ static void do_test(void) {unsigned long val, hpages;tst_res (TINFO ,"tst_hugepages = %lu" , tst_hugepages); -SAFE_FILE_PRINTF ("/proc/sys/kernel/numa_balancing" ,"1" ); +SAFE_FILE_PRINTF (PROC_SYS_KERNEL "numa_balancing" ,"1" ); hpages = test.hugepages.number;SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val);
@@ -39,7 +39,7 @@ static struct tst_test test = { .test_all = do_test, .hugepages = {2, TST_NEEDS}, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/numa_balancing" ,"0" ,TST_SR_TBROK }, + {PROC_SYS_KERNEL "numa_balancing" ,"0" ,TST_SR_TBROK }, {} }, };
lib/tst_hugepage.c +2 -2
@@ -46,8 +46,8 @@ unsigned long tst_reserve_hugepages(struct tst_hugepage *hp) goto set_hugepages; } -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); -SAFE_FILE_PRINTF ("/proc/sys/vm/compact_memory" ,"1" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"3" ); +SAFE_FILE_PRINTF (PATH_COMPACT_MEMORY ,"1" );if (hp->policy ==TST_NEEDS ) { tst_hugepages +=SAFE_READ_MEMINFO ("HugePages_Total:" ); goto set_hugepages;
testcases/cve/cve-2015-3290.c +3 -3
@@ -466,12 +466,12 @@ static void setup(void)* knowing if perf_event_open() support is enabled is checking for * the existence of the file /proc/sys/kernel/perf_event_paranoid. */ -if (access ("/proc/sys/kernel/perf_event_paranoid" ,F_OK ) ==-1 ) +if (access (PROC_SYS_KERNEL "perf_event_paranoid" ,F_OK ) ==-1 )tst_brk (TCONF ,"Kernel doesn't have perf_event support" ); -SAFE_FILE_SCANF ("/proc/sys/kernel/perf_event_mlock_kb" , +SAFE_FILE_SCANF (PROC_SYS_KERNEL "perf_event_mlock_kb" ,"%d" , &event_mlock_kb); -SAFE_FILE_SCANF ("/proc/sys/kernel/perf_event_max_sample_rate" , +SAFE_FILE_SCANF (PROC_SYS_KERNEL "perf_event_max_sample_rate" ,"%d" , &max_sample_rate); }
testcases/cve/cve-2017-16939.c +1 -1
@@ -91,7 +91,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/cve/cve-2022-4378.c +8 -8
@@ -22,13 +22,13 @@ static struct testcase {const char *path;int err; } testcase_list[] = { - {"/proc/sys/net/ipv4/icmp_ratelimit", EINVAL}, - {"/proc/sys/net/ipv4/icmp_ratemask", EINVAL}, - {"/proc/sys/net/ipv4/icmp_echo_ignore_all", EINVAL}, - {"/proc/sys/net/ipv4/tcp_probe_interval", EINVAL}, - {"/proc/sys/net/ipv4/tcp_keepalive_time", EINVAL}, - {"/proc/sys/net/ipv4/tcp_notsent_lowat", EINVAL}, - {"/proc/sys/net/ipv4/ip_local_reserved_ports", 0} + {PROC_SYS_NET "ipv4/icmp_ratelimit", EINVAL}, + {PROC_SYS_NET "ipv4/icmp_ratemask", EINVAL}, + {PROC_SYS_NET "ipv4/icmp_echo_ignore_all", EINVAL}, + {PROC_SYS_NET "ipv4/tcp_probe_interval", EINVAL}, + {PROC_SYS_NET "ipv4/tcp_keepalive_time", EINVAL}, + {PROC_SYS_NET "ipv4/tcp_notsent_lowat", EINVAL}, + {PROC_SYS_NET "ipv4/ip_local_reserved_ports", 0} }; static void setup(void)
@@ -93,7 +93,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/cve/icmp_rate_limit01.c +1 -1
@@ -256,7 +256,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/cve/tcindex01.c +1 -1
@@ -149,7 +149,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/containers/pidns/pidns05.c +1 -1
@@ -71,7 +71,7 @@ static int find_cinit_pids(pid_t *pids)static void setup (void ) { -SAFE_FILE_SCANF ("/proc/sys/kernel/pid_max" ,"%d\n" , &pid_max); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "pid_max" ,"%d\n" , &pid_max); }static void run (void )
testcases/kernel/containers/userns/userns01.c +2 -2
@@ -22,8 +22,8 @@#include <sys/capability.h> #include "lapi/sched.h" -#define OVERFLOWUIDPATH "/proc/sys/kernel/overflowuid" -#define OVERFLOWGIDPATH "/proc/sys/kernel/overflowgid" +#define OVERFLOWUIDPATH PROC_SYS_KERNEL "overflowuid" +#define OVERFLOWGIDPATH PROC_SYS_KERNEL "overflowgid"static long overflowuid;static long overflowgid;
testcases/kernel/containers/userns/userns06_capcheck.c +1 -1
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])if (argc <2 )tst_brk (TBROK ,"userns06_capcheck <privileged|unprivileged>" ); -SAFE_FILE_SCANF ("/proc/sys/kernel/cap_last_cap" ,"%d" , &last_cap); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "cap_last_cap" ,"%d" , &last_cap);if (strcmp ("privileged" , argv[1 ])) expected_cap_flag =0 ;
testcases/kernel/containers/userns/userns07.c +1 -1
@@ -93,7 +93,7 @@ static struct tst_test test = { NULL, }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/kernel/unprivileged_userns_clone" ,"1" ,TST_SR_SKIP }, + {PROC_SYS_KERNEL "unprivileged_userns_clone" ,"1" ,TST_SR_SKIP }, {} }, };
testcases/kernel/containers/userns/userns08.c +5 -3
@@ -26,6 +26,8 @@#include "lapi/sched.h" #include "tst_safe_file_at.h" +#define PROC_SYS_USER "/proc/sys/user/" +static pid_t clone_newuser (void ) {const struct tst_clone_args cargs = {
@@ -119,7 +121,7 @@ static void setup(void)SAFE_WRITE (SAFE_WRITE_ALL , fd,"\n" ,1 );SAFE_CLOSE (fd); -SAFE_TRY_FILE_PRINTF ("/proc/sys/user/max_user_namespaces" ,"%d" ,10 ); +SAFE_TRY_FILE_PRINTF (PROC_SYS_USER "max_user_namespaces" ,"%d" ,10 ); }static struct tst_test test = {
@@ -133,8 +135,8 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,NULL ,TST_SR_SKIP }, - {"/proc/sys/kernel/unprivileged_userns_clone" ,"1" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,NULL ,TST_SR_SKIP }, + {PROC_SYS_KERNEL "unprivileged_userns_clone" ,"1" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/include/ksm_helper.h +1 -1
@@ -7,7 +7,7 @@#ifndef KSM_HELPER_H #define KSM_HELPER_H -#define PATH_KSM "/sys/kernel/mm/ksm/" +#include "tst_path.h" void wait_ksmd_full_scan (void );
testcases/kernel/logging/kmsg/kmsg01.c +2 -2
@@ -32,8 +32,8 @@#define NUM_READ_MSGS 3#define NUM_READ_RETRY 10#define NUM_OVERWRITE_MSGS 1024 -#define PRINTK "/proc/sys/kernel/printk" -#define CONSOLE_LOGLEVEL_QUIET 4 +#define PRINTK PROC_SYS_KERNEL "printk" +#define CONSOLE_LOGLEVEL_QUIET 4static int console_loglevel =-1 ;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c +2 -6
@@ -31,10 +31,6 @@ static char path_sys_sz_resv[BUFSIZ];static char path_sys_sz_surp[BUFSIZ ];static char path_sys_sz_huge[BUFSIZ ]; -#define PATH_PROC_VM "/proc/sys/vm/" -#define PATH_PROC_OVER PATH_PROC_VM "nr_overcommit_hugepages" -#define PATH_PROC_HUGE PATH_PROC_VM "nr_hugepages" -/* Only ia64 requires this */ #ifdef __ia64__#define ADDR (void *)(0x8000000000000000UL)
@@ -191,8 +187,8 @@ static void setup(void) path = path_sys_sz_huge; pathover = path_sys_sz_over; }else { - path =PATH_PROC_HUGE ; - pathover =PATH_PROC_OVER ; + path =PATH_NR_HPAGES ; + pathover =PATH_OC_HPAGES ; }if (opt_alloc) {
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +5 -6
@@ -21,7 +21,6 @@#include "hugetlb.h" -#define PATH_HUGEPAGE "/sys/kernel/mm/hugepages"#define GIGANTIC_MIN_ORDER 10static int org_g_hpages;
@@ -45,14 +44,14 @@ static void setup(void)struct dirent *ent;unsigned long hpage_size; -if (access (PATH_HUGEPAGE ,F_OK )) +if (access (PATH_HUGEPAGES ,F_OK ))tst_brk (TCONF ,"hugetlbfs is not supported" ); - dir =SAFE_OPENDIR (PATH_HUGEPAGE ); + dir =SAFE_OPENDIR (PATH_HUGEPAGES );while ((ent =SAFE_READDIR (dir))) {if ((sscanf (ent->d_name,"hugepages-%lukB" , &hpage_size) ==1 ) &&is_hugetlb_gigantic (hpage_size *1024 )) { -sprintf (g_hpage_path,"%s/%s/%s" ,PATH_HUGEPAGE , +sprintf (g_hpage_path,"%s/%s/%s" ,PATH_HUGEPAGES , ent->d_name,"nr_hugepages" );break ; }
@@ -62,8 +61,8 @@ static void setup(void)SAFE_CLOSEDIR (dir); -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); -SAFE_FILE_PRINTF ("/proc/sys/vm/compact_memory" ,"1" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"3" ); +SAFE_FILE_PRINTF (PATH_COMPACT_MEMORY ,"1" );if (tst_available_mem () < (long long )hpage_size) { g_hpage_path[0 ] ='\0' ;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap34.c +0 -1
@@ -32,7 +32,6 @@#define STACK_ALLOCATION_SIZE (16*1024*1024)#endif #define MNTPOINT "hugetlbfs/" -#define PATH_HUGEPAGE "/sys/kernel/mm/hugepages"#define STACKS_MAX 64
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c +1 -1
@@ -82,7 +82,7 @@ static void setup(void)long hpage_size, orig_hugepages;unsigned long new_shmmax; - orig_hugepages =TST_SYS_CONF_LONG_GET ("/proc/sys/vm/nr_hugepages" ); + orig_hugepages =TST_SYS_CONF_LONG_GET (PATH_NR_HPAGES );SAFE_FILE_SCANF (PATH_SHMMAX ,"%lu" , &new_shmmax);if (new_shmmax <SIZE )
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +1 -1
@@ -19,7 +19,7 @@* depending on the system being tested. */ #define MAXIDS 8192 -#define PATH_SHMMNI "/proc/sys/kernel/shmmni" +#define PATH_SHMMNI PROC_SYS_KERNEL "shmmni"static size_t shm_size;static int shm_id_1 =-1 ;
testcases/kernel/mem/hugetlb/lib/hugetlb.h +1 -1
@@ -29,7 +29,7 @@#define SHM_HUGETLB 04000/* segment is mapped via hugetlb */ #endif -#define PATH_SHMMAX "/proc/sys/kernel/shmmax" +#define PATH_SHMMAX PROC_SYS_KERNEL "shmmax"#ifndef barrier# ifdef mb
testcases/kernel/mem/ksm/ksm01.c +5 -5
@@ -74,13 +74,13 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,"1" , + {KSM_FP ("merge_across_nodes" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm02.c +5 -5
@@ -97,13 +97,13 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,"1" , + {KSM_FP ("merge_across_nodes" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm03.c +5 -5
@@ -79,13 +79,13 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,"1" , + {KSM_FP ("merge_across_nodes" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm04.c +5 -5
@@ -86,13 +86,13 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,"1" , + {KSM_FP ("merge_across_nodes" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm05.c +2 -2
@@ -93,8 +93,8 @@ static struct tst_test test = { .forks_child = 1, .test_all = test_ksm, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,"1" ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {KSM_FP ("run" ),"1" ,TST_SR_TBROK }, + {KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm06.c +5 -5
@@ -132,12 +132,12 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,NULL ,TST_SR_TCONF }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {KSM_FP ("merge_across_nodes" ),NULL ,TST_SR_TCONF }, + {KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm07.c +4 -4
@@ -98,10 +98,10 @@ static struct tst_test test = { {} }, .save_restore = (const struct tst_path_val[]) { - {PATH_KSM "pages_skipped" ,NULL ,TST_SR_TCONF }, - {PATH_KSM "run" ,NULL ,TST_SR_TCONF }, - {PATH_KSM "sleep_millisecs" ,NULL ,TST_SR_TCONF }, - {PATH_KSM "smart_scan" ,"1" , + {KSM_FP ("pages_skipped" ),NULL ,TST_SR_TCONF }, + {KSM_FP ("run" ),NULL ,TST_SR_TCONF }, + {KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TCONF }, + {KSM_FP ("smart_scan" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF }, {} },
testcases/kernel/mem/oom/oom.h +6 -5
@@ -7,16 +7,17 @@#define OOM_H_ #include <pthread.h> +#include "tst_path.h" #include "config.h" #include "numa_helper.h" -#define PATH_KSM "/sys/kernel/mm/ksm/" -#define LENGTH (3UL<<30)#define NORMAL 1#define MLOCK 2#define KSM 3 +#define OVERCOMMIT_MEMORY PROC_SYS_VM "overcommit_memory" +#ifdef HAVE_NUMA_V2 static inline void set_global_mempolicy (int mempolicy) {
@@ -222,10 +223,10 @@ static inline void testoom(int mempolicy, int lite, int retcode, int allow_sigki "skip OOM test for KSM pags"); }else {tst_res (TINFO ,"start OOM testing for KSM pages." ); -SAFE_FILE_SCANF (PATH_KSM "run" ,"%d" , &ksm_run_orig); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"1" ); +SAFE_FILE_SCANF (KSM_FP ("run" ),"%d" , &ksm_run_orig); +SAFE_FILE_PRINTF (KSM_FP ("run" ),"1" );oom (KSM , lite, retcode, allow_sigkill); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"%d" , ksm_run_orig); +SAFE_FILE_PRINTF (KSM_FP ("run" ),"%d" , ksm_run_orig); } }
testcases/kernel/mem/oom/oom01.c +0 -2
@@ -17,8 +17,6 @@#include "tst_test.h" #include "oom.h" -#define OVERCOMMIT_MEMORY "/proc/sys/vm/overcommit_memory" -static void verify_oom (void ) {/* we expect mmap to fail before OOM is hit */
testcases/kernel/mem/oom/oom02.c +1 -1
@@ -49,7 +49,7 @@ static struct tst_test test = { .test_all = verify_oom, .skip_in_compat = 1, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {OVERCOMMIT_MEMORY ,"1" ,TST_SR_TBROK }, {} }, };
testcases/kernel/mem/oom/oom03.c +1 -1
@@ -76,7 +76,7 @@ static struct tst_test test = { .needs_cgroup_ctrls = (const char *const []){ "memory", NULL }, .skip_in_compat = 1, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {OVERCOMMIT_MEMORY ,"1" ,TST_SR_TBROK }, {} }, };
testcases/kernel/mem/oom/oom04.c +1 -1
@@ -72,7 +72,7 @@ static struct tst_test test = { .needs_cgroup_ctrls = (const char *const []){ "cpuset", NULL }, .skip_in_compat = 1, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {OVERCOMMIT_MEMORY ,"1" ,TST_SR_TBROK }, {} }, };
testcases/kernel/mem/oom/oom05.c +1 -1
@@ -95,7 +95,7 @@ static struct tst_test test = { }, .skip_in_compat = 1, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {OVERCOMMIT_MEMORY ,"1" ,TST_SR_TBROK }, {} }, };
testcases/kernel/mem/thp/thp.h +1 -1
@@ -6,7 +6,7 @@#ifndef THP_H #define THP_H -#define PATH_THP "/sys/kernel/mm/transparent_hugepage/" +#include "tst_path.h" static inline void check_hugepage (void ) {
testcases/kernel/sched/sysctl/proc_sched_rt01.c +3 -3
@@ -26,9 +26,9 @@#include <stdio.h> #include "tst_test.h" -#define RT_PERIOD_US "/proc/sys/kernel/sched_rt_period_us" -#define RT_RUNTIME_US "/proc/sys/kernel/sched_rt_runtime_us" -#define RR_TIMESLICE_MS "/proc/sys/kernel/sched_rr_timeslice_ms" +#define RT_PERIOD_US PROC_SYS_KERNEL "sched_rt_period_us" +#define RT_RUNTIME_US PROC_SYS_KERNEL "sched_rt_runtime_us" +#define RR_TIMESLICE_MS PROC_SYS_KERNEL "sched_rr_timeslice_ms"static int period_fd;static int runtime_fd;
testcases/kernel/syscalls/fanotify/fanotify10.c +4 -5
@@ -99,8 +99,7 @@ static int ignore_mark_unsupported;#define FILE_EXEC_PATH2 MNT2_PATH"/"TEST_APP#define FILE2_EXEC_PATH2 MNT2_PATH"/"TEST_APP2 -#define DROP_CACHES_FILE "/proc/sys/vm/drop_caches" -#define CACHE_PRESSURE_FILE "/proc/sys/vm/vfs_cache_pressure" +#define CACHE_PRESSURE_FILE PROC_SYS_VM "vfs_cache_pressure"static pid_t child_pid;static int bind_mount_created;
@@ -517,9 +516,9 @@ static void drop_caches(void)* In order to ensure that the inode can be released in the two-tier * directory structure, drop_cache is required three times. */ -SAFE_FILE_PRINTF (DROP_CACHES_FILE ,"3" ); -SAFE_FILE_PRINTF (DROP_CACHES_FILE ,"3" ); -SAFE_FILE_PRINTF (DROP_CACHES_FILE ,"3" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"3" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"3" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"3" ); }static int create_fanotify_groups (unsigned int n)
testcases/kernel/syscalls/fcntl/fcntl35.c +5 -5
@@ -49,13 +49,13 @@ static void setup(void) test_max_unpriv =getpagesize (); test_max_priv = test_max_unpriv *16 ; -if (!access ("/proc/sys/fs/pipe-max-size" ,F_OK )) { -SAFE_FILE_SCANF ("/proc/sys/fs/pipe-max-size" ,"%d" , +if (!access (PROC_SYS_FS "pipe-max-size" ,F_OK )) { +SAFE_FILE_SCANF (PROC_SYS_FS "pipe-max-size" ,"%d" , &pipe_max_unpriv); -SAFE_FILE_PRINTF ("/proc/sys/fs/pipe-max-size" ,"%d" , +SAFE_FILE_PRINTF (PROC_SYS_FS "pipe-max-size" ,"%d" , test_max_unpriv); }else { -tst_brk (TCONF ,"/proc/sys/fs/pipe-max-size doesn't exist" ); +tst_brk (TCONF ,PROC_SYS_FS "pipe-max-size doesn't exist" ); } pw =SAFE_GETPWNAM ("nobody" );
@@ -63,7 +63,7 @@ static void setup(void)static void cleanup (void ) { -SAFE_FILE_PRINTF ("/proc/sys/fs/pipe-max-size" ,"%d" , pipe_max_unpriv); +SAFE_FILE_PRINTF (PROC_SYS_FS "pipe-max-size" ,"%d" , pipe_max_unpriv); }static int verify_pipe_size (int exp_pip_sz,char *desp)
testcases/kernel/syscalls/inotify/inotify07.c +1 -1
@@ -153,7 +153,7 @@ static void setup(void)tst_res (TINFO ,DIR_PATH " ino=%lu" , buf.st_ino);/* Drop dentry caches, so overlayfs will allocate a new dentry */ -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"2" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"2" );/* Copy up directory to make it a merge directory */ SAFE_CHMOD (DIR_PATH ,0700 );
testcases/kernel/syscalls/inotify/inotify08.c +1 -1
@@ -146,7 +146,7 @@ static void setup(void) major(buf.st_dev), minor(buf.st_dev));/* Drop dentry caches, so overlayfs will allocate a new dentry */ -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"2" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"2" );/* Copy up file */ SAFE_CHMOD (FILE_PATH ,0600 );
testcases/kernel/syscalls/io_uring/io_uring01.c +1 -1
@@ -165,7 +165,7 @@ static struct tst_test test = { {} }, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/io_uring_disabled" ,"0" , + {PROC_SYS_KERNEL "io_uring_disabled" ,"0" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, {} }
testcases/kernel/syscalls/io_uring/io_uring02.c +1 -1
@@ -255,7 +255,7 @@ static struct tst_test test = { {} }, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/io_uring_disabled" ,"0" , + {PROC_SYS_KERNEL "io_uring_disabled" ,"0" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, {} },
testcases/kernel/syscalls/io_uring/io_uring03.c +1 -1
@@ -133,7 +133,7 @@ static struct tst_test test = { {} }, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/io_uring_disabled" ,"0" , + {PROC_SYS_KERNEL "io_uring_disabled" ,"0" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, {} }
testcases/kernel/syscalls/ipc/msgget/msgget03.c +1 -1
@@ -74,7 +74,7 @@ static struct tst_test test = { .cleanup = cleanup, .test_all = verify_msgget, .save_restore = (const struct tst_path_val []){ - {"/proc/sys/kernel/msgmni" ,NULL ,TST_SR_TCONF }, + {PROC_SYS_KERNEL "msgmni" ,NULL ,TST_SR_TCONF }, {} } };
testcases/kernel/syscalls/ipc/msgget/msgget04.c +1 -1
@@ -22,7 +22,7 @@#include "tst_safe_sysv_ipc.h" #include "tse_newipc.h" -#define NEXT_ID_PATH "/proc/sys/kernel/msg_next_id" +#define NEXT_ID_PATH PROC_SYS_KERNEL "msg_next_id"static int queue_id, pid;static key_t msgkey;
testcases/kernel/syscalls/ipc/msgget/msgget05.c +1 -1
@@ -20,7 +20,7 @@#include "tst_safe_sysv_ipc.h" #include "tse_newipc.h" -#define NEXT_ID_PATH "/proc/sys/kernel/msg_next_id" +#define NEXT_ID_PATH PROC_SYS_KERNEL "msg_next_id"static int queue_id[2 ], pid;static key_t msgkey[2 ];
testcases/kernel/syscalls/ipc/semget/semget05.c +2 -2
@@ -38,7 +38,7 @@ static void setup(void) used_cnt =GET_USED_ARRAYS ();tst_res (TINFO ,"Current environment %d semaphore arrays are already in use" , used_cnt); -SAFE_FILE_SCANF ("/proc/sys/kernel/sem" ,"%*d %*d %*d %d" , &maxsems); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "sem" ,"%*d %*d %*d %d" , &maxsems);/* Prevent timeout due to high semaphore array limit */ tst_set_runtime (maxsems /200 );
@@ -74,7 +74,7 @@ static struct tst_test test = { .cleanup = cleanup, .test_all = verify_semget, .save_restore = (const struct tst_path_val[]){ - {"/proc/sys/kernel/sem" ,NULL , + {PROC_SYS_KERNEL "sem" ,NULL ,TST_SR_TCONF_MISSING |TST_SR_SKIP_RO }, {} }
testcases/kernel/syscalls/ipc/shmctl/shmctl03.c +3 -3
@@ -30,9 +30,9 @@ static void verify_ipcinfo(void)else tst_res (TPASS ,"shmmin = 1" ); -TST_ASSERT_ULONG ("/proc/sys/kernel/shmmax" , info.shmmax); -TST_ASSERT_ULONG ("/proc/sys/kernel/shmmni" , info.shmmni); -TST_ASSERT_ULONG ("/proc/sys/kernel/shmall" , info.shmall); +TST_ASSERT_ULONG (PROC_SYS_KERNEL "shmmax" , info.shmmax); +TST_ASSERT_ULONG (PROC_SYS_KERNEL "shmmni" , info.shmmni); +TST_ASSERT_ULONG (PROC_SYS_KERNEL "shmall" , info.shmall); }static struct tst_test test = {
testcases/kernel/syscalls/ipc/shmget/shmget02.c +1 -1
@@ -143,7 +143,7 @@ static struct tst_test test = { .tcnt = ARRAY_SIZE(tcases), .hugepages = {TST_NO_HUGEPAGES}, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/shmmax", "8192", TST_SR_TCONF_MISSING | TST_SR_TBROK_RO}, + {PROC_SYS_KERNEL "shmmax", "8192", TST_SR_TCONF_MISSING | TST_SR_TBROK_RO}, {} }, };
testcases/kernel/syscalls/ipc/shmget/shmget03.c +1 -1
@@ -37,7 +37,7 @@ static void setup(void) used_cnt =GET_USED_SEGMENTS ();tst_res (TINFO ,"Current environment %d shared memory segments are already in use" , used_cnt); -SAFE_FILE_SCANF ("/proc/sys/kernel/shmmni" ,"%i" , &maxshms); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "shmmni" ,"%i" , &maxshms); queues =SAFE_MALLOC ((maxshms - used_cnt) *sizeof (int ));for (num =0 ; num < maxshms - used_cnt; num++) {
testcases/kernel/syscalls/ipc/shmget/shmget05.c +1 -1
@@ -23,7 +23,7 @@#include "tst_safe_sysv_ipc.h" #include "tse_newipc.h" -#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" +#define NEXT_ID_PATH PROC_SYS_KERNEL "shm_next_id"static int shm_id, pid;static key_t shmkey;
testcases/kernel/syscalls/ipc/shmget/shmget06.c +1 -1
@@ -21,7 +21,7 @@#include "tst_safe_sysv_ipc.h" #include "tse_newipc.h" -#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" +#define NEXT_ID_PATH PROC_SYS_KERNEL "shm_next_id"static int shm_id[2 ], pid;static key_t shmkey[2 ];
testcases/kernel/syscalls/keyctl/keyctl02.c +1 -1
@@ -30,7 +30,7 @@#define LOOPS 20000#define MAX_WAIT_FOR_GC_MS 5000 -#define PATH_KEY_COUNT_QUOTA "/proc/sys/kernel/keys/root_maxkeys" +#define PATH_KEY_COUNT_QUOTA PROC_SYS_KERNEL "keys/root_maxkeys"static int orig_maxkeys;static int realtime_kernel;
testcases/kernel/syscalls/madvise/madvise01.c +0 -1
@@ -24,7 +24,6 @@#define TMP_DIR "tmp_madvise"#define TEST_FILE TMP_DIR"/testfile" -#define KSM_SYS_DIR "/sys/kernel/mm/ksm"#define STR "abcdefghijklmnopqrstuvwxyz12345\n"static char *sfile;
testcases/kernel/syscalls/madvise/madvise02.c +1 -2
@@ -46,7 +46,6 @@#define MAP_SIZE (4 * 1024)#define TEST_FILE "testfile"#define STR "abcdefghijklmnopqrstuvwxyz12345\n" -#define KSM_SYS_DIR "/sys/kernel/mm/ksm"static struct stat st;static long pagesize;
@@ -98,7 +97,7 @@ static void tcases_filter(void)case MADV_UNMERGEABLE :/* kernel configured with CONFIG_KSM, * skip EINVAL test for MADV_MERGEABLE. */ -if (access (KSM_SYS_DIR ,F_OK ) ==0 ) +if (access (PATH_KSM ,F_OK ) ==0 ) tc->skip =1 ;break ;case MADV_WILLNEED :
testcases/kernel/syscalls/madvise/madvise06.c +1 -1
@@ -48,7 +48,7 @@#define PASS_THRESHOLD (CHUNK_SZ / 4)#define PASS_THRESHOLD_KB (PASS_THRESHOLD / 1024) -static const char drop_caches_fname[] ="/proc/sys/vm/drop_caches" ; +static const char drop_caches_fname[] =PATH_DROP_CACHES ;static int pg_sz, stat_refresh_sup;static long init_swap, init_swap_cached, init_cached;
testcases/kernel/syscalls/madvise/madvise08.c +1 -1
@@ -33,7 +33,7 @@#include "tst_test.h" #include "lapi/mmap.h" -#define CORE_PATTERN "/proc/sys/kernel/core_pattern" +#define CORE_PATTERN PROC_SYS_KERNEL "core_pattern"#define CORE_FILTER "/proc/self/coredump_filter"#define YCOUNT 0x500L#define FMEMSIZE (YCOUNT + 0x2L)
testcases/kernel/syscalls/migrate_pages/migrate_pages02.c +1 -1
@@ -324,7 +324,7 @@ static struct tst_test test = { .test_all = run, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/kernel/numa_balancing" ,"0" , + {PROC_SYS_KERNEL "numa_balancing" ,"0" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, {} },
testcases/kernel/syscalls/mmap/mmap10.c +1 -1
@@ -40,7 +40,7 @@#include "tst_test.h" #define SIZE (5 * TST_MB) -#define PATH_KSM "/sys/kernel/mm/ksm/" +#define PATH_KSM SYS_KERNEL_MM "ksm/"static size_t page_sz;static char *memory;
testcases/kernel/syscalls/move_pages/move_pages12.c +4 -6
@@ -76,8 +76,6 @@#define LOOPS 10000#define PATH_MEMINFO "/proc/meminfo" -#define PATH_NR_HUGEPAGES "/proc/sys/vm/nr_hugepages" -#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/"#define TEST_NODES 2 static struct tcase {
@@ -269,7 +267,7 @@ static void setup(void) pgsz = (int )get_page_size ();SAFE_FILE_LINES_SCANF (PATH_MEMINFO ,"Hugepagesize: %d" , &hpsz); -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"3" );SAFE_FILE_LINES_SCANF (PATH_MEMINFO ,"MemFree: %ld" , &memfree);tst_res (TINFO ,"Free RAM %ld kB" , memfree);
@@ -307,10 +305,10 @@ static void setup(void) hpsz *=1024 ;if (orig_hugepages_node1 ==-1 || orig_hugepages_node2 ==-1 ) { -SAFE_FILE_SCANF (PATH_NR_HUGEPAGES ,"%ld" , &orig_hugepages); +SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%ld" , &orig_hugepages);tst_res (TINFO ,"Increasing global hugepages pool to %ld" , orig_hugepages +8 ); -SAFE_FILE_PRINTF (PATH_NR_HUGEPAGES ,"%ld" , orig_hugepages +8 ); +SAFE_FILE_PRINTF (PATH_NR_HPAGES ,"%ld" , orig_hugepages +8 ); }alloc_free_huge_on_node (node1,4L * hpsz);
@@ -320,7 +318,7 @@ static void setup(void)static void cleanup (void ) {if (orig_hugepages !=-1 ) -SAFE_FILE_PRINTF (PATH_NR_HUGEPAGES ,"%ld" , orig_hugepages); +SAFE_FILE_PRINTF (PATH_NR_HPAGES ,"%ld" , orig_hugepages);if (orig_hugepages_node1 !=-1 ) { SAFE_FILE_PRINTF(path_hugepages_node1,
testcases/kernel/syscalls/newuname/newuname01.c +4 -4
@@ -31,16 +31,16 @@ static void run(void)TST_EXP_EQ_STR (name->sysname,"Linux" ); -SAFE_FILE_SCANF ("/proc/sys/kernel/hostname" ,"%1023[^\n]" , proc_val); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "hostname" ,"%1023[^\n]" , proc_val);TST_EXP_EQ_STR (name->nodename, proc_val); -SAFE_FILE_SCANF ("/proc/sys/kernel/osrelease" ,"%1023[^\n]" , proc_val); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "osrelease" ,"%1023[^\n]" , proc_val);TST_EXP_EQ_STR (name->release, proc_val); -SAFE_FILE_SCANF ("/proc/sys/kernel/version" ,"%1023[^\n]" , proc_val); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "version" ,"%1023[^\n]" , proc_val);TST_EXP_EQ_STR (name->version, proc_val); -SAFE_FILE_SCANF ("/proc/sys/kernel/domainname" ,"%1023[^\n]" , proc_val); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "domainname" ,"%1023[^\n]" , proc_val);TST_EXP_EQ_STR (name->domainname, proc_val); }
testcases/kernel/syscalls/perf_event_open/perf_event_open02.c +1 -1
@@ -211,7 +211,7 @@ static void setup(void)* knowing if perf_event_open() support is enabled is checking for * the existence of the file /proc/sys/kernel/perf_event_paranoid. */ -if (access ("/proc/sys/kernel/perf_event_paranoid" ,F_OK ) ==-1 ) +if (access (PROC_SYS_KERNEL "perf_event_paranoid" ,F_OK ) ==-1 )tst_brk (TCONF ,"Kernel doesn't have perf_event support" );bind_to_current_cpu ();
testcases/kernel/syscalls/pkeys/pkey01.c +0 -1
@@ -36,7 +36,6 @@#define TEST_FILE "pkey_testfile"#define STR "abcdefghijklmnopqrstuvwxyz12345\n" -#define PATH_VM_NRHPS "/proc/sys/vm/nr_hugepages"static int size;static int execute_supported =1 ;
testcases/kernel/syscalls/preadv2/preadv203.c +1 -1
@@ -58,7 +58,7 @@ static volatile int stop;static void drop_caches (void ) { -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"3" ); }/*
testcases/kernel/syscalls/readahead/readahead02.c +2 -3
@@ -35,7 +35,6 @@#include "lapi/syscalls.h" static char testfile[PATH_MAX ] ="testfile" ; -#define DROP_CACHES_FNAME "/proc/sys/vm/drop_caches"#define PROC_IO_FNAME "/proc/self/io"#define DEFAULT_FILESIZE (64 * 1024 * 1024)#define SHORT_SLEEP_US 5000
@@ -97,7 +96,7 @@ static int has_file(const char *fname, int required)static void drop_caches (void ) { -SAFE_FILE_PRINTF (DROP_CACHES_FNAME ,"1" ); +SAFE_FILE_PRINTF (PATH_DROP_CACHES ,"1" ); }static unsigned long get_bytes_read (void )
@@ -430,7 +429,7 @@ static void setup(void)if (access (PROC_IO_FNAME ,F_OK ))tst_brk (TCONF ,"Requires " PROC_IO_FNAME ); -has_file (DROP_CACHES_FNAME ,1 ); +has_file (PATH_DROP_CACHES ,1 );/* check if readahead is supported */ tst_syscall (__NR_readahead,0 ,0 ,0 );
testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c +1 -1
@@ -17,7 +17,7 @@#include "tst_timer.h" #include "tst_sched.h" -#define PROC_SCHED_RR_TIMESLICE_MS "/proc/sys/kernel/sched_rr_timeslice_ms" +#define PROC_SCHED_RR_TIMESLICE_MS PROC_SYS_KERNEL "sched_rr_timeslice_ms"static int proc_flag;struct tst_ts tp;
testcases/kernel/syscalls/sendmsg/sendmsg03.c +1 -1
@@ -111,7 +111,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/sendto/sendto03.c +1 -1
@@ -205,7 +205,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/setpgid/setpgid02.c +1 -1
@@ -42,7 +42,7 @@ static void setup(void)* pid_max would not be in use by another process and guarantees that * it corresponds to an invalid PGID, generating EPERM. */ -SAFE_FILE_SCANF ("/proc/sys/kernel/pid_max" ,"%d\n" , &inval_pgid); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "pid_max" ,"%d\n" , &inval_pgid); }static void run (unsigned int n)
testcases/kernel/syscalls/setsockopt/setsockopt05.c +1 -1
@@ -88,7 +88,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/setsockopt/setsockopt06.c +1 -1
@@ -116,7 +116,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/setsockopt/setsockopt08.c +1 -1
@@ -158,7 +158,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/setsockopt/setsockopt09.c +1 -1
@@ -111,7 +111,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/splice/splice.h +4 -4
@@ -26,13 +26,13 @@ static inline int get_max_limit(int default_len_data) {int pipe_max_unpriv; -if (!access ("/proc/sys/fs/pipe-max-size" ,F_OK )) { -SAFE_FILE_SCANF ("/proc/sys/fs/pipe-max-size" ,"%d" , &pipe_max_unpriv); +if (!access (PROC_SYS_FS "pipe-max-size" ,F_OK )) { +SAFE_FILE_SCANF (PROC_SYS_FS "pipe-max-size" ,"%d" , &pipe_max_unpriv);return MIN (pipe_max_unpriv, default_len_data); } -if (!access ("/proc/sys/fs/pipe-max-pages" ,F_OK )) { -SAFE_FILE_SCANF ("/proc/sys/fs/pipe-max-pages" ,"%d" , &pipe_max_unpriv); +if (!access (PROC_SYS_FS "pipe-max-pages" ,F_OK )) { +SAFE_FILE_SCANF (PROC_SYS_FS "pipe-max-pages" ,"%d" , &pipe_max_unpriv);return MIN (pipe_max_unpriv *getpagesize (), default_len_data); }
testcases/kernel/syscalls/splice/splice06.c +2 -2
@@ -25,8 +25,8 @@#define PIPE_MAX_INIT_SIZE 65536#define DOMAIN_INIT_NAME "LTP_INIT"#define DOMAIN_TEST_NAME "LTP_TEST" -#define INTEGER_PROCFILE "/proc/sys/fs/pipe-max-size" -#define STRING_PROCFILE "/proc/sys/kernel/domainname" +#define INTEGER_PROCFILE PROC_SYS_FS "pipe-max-size" +#define STRING_PROCFILE PROC_SYS_KERNEL "domainname"static int pipe_max_test_size;static void format_str (char *str)
testcases/kernel/syscalls/syslog/syslog11.c +1 -1
@@ -56,7 +56,7 @@ static void run(unsigned int n)static struct tst_test test = { .test = run, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/kernel/printk" ,NULL ,TST_SR_TBROK }, + {PROC_SYS_KERNEL "printk" ,NULL ,TST_SR_TBROK }, {} }, .needs_root =1 ,
testcases/kernel/syscalls/wait4/wait402.c +1 -1
@@ -25,7 +25,7 @@ static void run(void)static void setup (void ) { -SAFE_FILE_SCANF ("/proc/sys/kernel/pid_max" ,"%d\n" , &pid_max); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "pid_max" ,"%d\n" , &pid_max); }static struct tst_test test = {
testcases/kernel/syscalls/waitid/waitid10.c +1 -1
@@ -48,7 +48,7 @@ static void setup(void)char c;SAFE_GETRLIMIT (RLIMIT_CORE , &rlim); -SAFE_FILE_SCANF ("/proc/sys/kernel/core_pattern" ,"%c" , &c); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "core_pattern" ,"%c" , &c);if (rlim.rlim_cur)return ;
testcases/network/iptables/nft02.c +1 -1
@@ -203,7 +203,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/network/packet/fanout01.c +1 -1
@@ -96,7 +96,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
Signature · 5 lines
2.54.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 1/1 lib: Introduce tst_path.h to consolidate system paths
We have a lot of hardcoded strings and duplicated macros for /proc and /sys paths scattered throughout the testcases.
This patch introduces a new common header, tst_path.h, to centralize and standardize these path definitions. By unifying these macros, we reduce code duplication, improve maintainability, and ensure consistent path usage across the entire LTP codebase.
---
Notes:
v2:
* Added subsystem prefixes (VM_, MM_) to macros for better namespace.
* Renamed the KSM helper macro from KSM_FP(s) to MM_KSM_FP(s).
* Grouped hugepages/ and transparent_hugepage/ paths together.
* Added a new NETWORK section with PATH_NET_IPV4 and NET_IPV4_FP.
* Fixed formatting to use tabs for consistent alignment.
include/tst_hugepage.h | 10 +---- include/tst_path.h | 45 +++++++++++++++++++ include/tst_test.h | 1 + lib/newlib_tests/test19.c | 6 +-- lib/newlib_tests/test20.c | 8 ++-- lib/newlib_tests/test_zero_hugepage.c | 4 +- lib/tst_hugepage.c | 14 +++--- lib/tst_test.c | 2 +- testcases/cve/cve-2015-3290.c | 6 +-- testcases/cve/cve-2017-16939.c | 2 +- testcases/cve/cve-2022-4378.c | 16 +++---- testcases/cve/icmp_rate_limit01.c | 2 +- testcases/cve/tcindex01.c | 2 +- testcases/kernel/containers/pidns/pidns05.c | 2 +- testcases/kernel/containers/userns/userns01.c | 4 +- .../containers/userns/userns06_capcheck.c | 2 +- testcases/kernel/containers/userns/userns07.c | 2 +- testcases/kernel/containers/userns/userns08.c | 8 ++-- testcases/kernel/include/ksm_helper.h | 2 +- testcases/kernel/lib/ksm_helper.c | 4 +- testcases/kernel/logging/kmsg/kmsg01.c | 4 +- .../kernel/mem/hugetlb/hugemmap/hugemmap05.c | 8 +--- .../kernel/mem/hugetlb/hugemmap/hugemmap08.c | 6 +-- .../kernel/mem/hugetlb/hugemmap/hugemmap10.c | 8 ++-- .../kernel/mem/hugetlb/hugemmap/hugemmap32.c | 11 +++-- .../kernel/mem/hugetlb/hugemmap/hugemmap34.c | 1 - .../mem/hugetlb/hugeshmat/hugeshmat04.c | 2 +- .../mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +- testcases/kernel/mem/hugetlb/lib/hugetlb.h | 2 +- testcases/kernel/mem/ksm/ksm01.c | 10 ++--- testcases/kernel/mem/ksm/ksm02.c | 10 ++--- testcases/kernel/mem/ksm/ksm03.c | 10 ++--- testcases/kernel/mem/ksm/ksm04.c | 10 ++--- testcases/kernel/mem/ksm/ksm05.c | 4 +- testcases/kernel/mem/ksm/ksm06.c | 32 ++++++------- testcases/kernel/mem/ksm/ksm07.c | 28 ++++++------ testcases/kernel/mem/ksm/ksm_test.h | 24 +++++----- testcases/kernel/mem/oom/oom.h | 13 +++--- testcases/kernel/mem/oom/oom01.c | 2 - testcases/kernel/mem/oom/oom02.c | 2 +- testcases/kernel/mem/oom/oom03.c | 2 +- testcases/kernel/mem/oom/oom04.c | 2 +- testcases/kernel/mem/oom/oom05.c | 2 +- testcases/kernel/mem/thp/thp.h | 4 +- testcases/kernel/mem/thp/thp02.c | 2 +- testcases/kernel/mem/thp/thp03.c | 2 +- .../kernel/sched/sysctl/proc_sched_rt01.c | 6 +-- .../kernel/syscalls/fanotify/fanotify10.c | 9 ++-- testcases/kernel/syscalls/fcntl/fcntl35.c | 10 ++--- testcases/kernel/syscalls/inotify/inotify07.c | 2 +- testcases/kernel/syscalls/inotify/inotify08.c | 2 +- .../kernel/syscalls/io_uring/io_uring01.c | 2 +- .../kernel/syscalls/io_uring/io_uring02.c | 2 +- .../kernel/syscalls/io_uring/io_uring03.c | 2 +- .../kernel/syscalls/ipc/msgget/msgget03.c | 2 +- .../kernel/syscalls/ipc/msgget/msgget04.c | 2 +- .../kernel/syscalls/ipc/msgget/msgget05.c | 2 +- .../kernel/syscalls/ipc/semget/semget05.c | 4 +- .../kernel/syscalls/ipc/shmctl/shmctl03.c | 6 +-- .../kernel/syscalls/ipc/shmget/shmget02.c | 2 +- .../kernel/syscalls/ipc/shmget/shmget03.c | 2 +- .../kernel/syscalls/ipc/shmget/shmget05.c | 2 +- .../kernel/syscalls/ipc/shmget/shmget06.c | 2 +- testcases/kernel/syscalls/keyctl/keyctl02.c | 2 +- testcases/kernel/syscalls/madvise/madvise01.c | 1 - testcases/kernel/syscalls/madvise/madvise02.c | 3 +- testcases/kernel/syscalls/madvise/madvise06.c | 2 +- testcases/kernel/syscalls/madvise/madvise08.c | 2 +- .../syscalls/memfd_create/memfd_create04.c | 4 +- .../syscalls/migrate_pages/migrate_pages02.c | 2 +- .../syscalls/migrate_pages/migrate_pages03.c | 8 ++-- testcases/kernel/syscalls/mmap/mmap10.c | 4 +- .../kernel/syscalls/move_pages/move_pages12.c | 12 +++-- .../kernel/syscalls/newuname/newuname01.c | 8 ++-- .../perf_event_open/perf_event_open02.c | 2 +- testcases/kernel/syscalls/pkeys/pkey01.c | 1 - testcases/kernel/syscalls/preadv2/preadv203.c | 2 +- .../kernel/syscalls/readahead/readahead02.c | 5 +-- .../sched_rr_get_interval01.c | 2 +- testcases/kernel/syscalls/sendmsg/sendmsg03.c | 2 +- testcases/kernel/syscalls/sendto/sendto03.c | 2 +- testcases/kernel/syscalls/setpgid/setpgid02.c | 2 +- .../kernel/syscalls/setsockopt/setsockopt05.c | 2 +- .../kernel/syscalls/setsockopt/setsockopt06.c | 2 +- .../kernel/syscalls/setsockopt/setsockopt08.c | 2 +- .../kernel/syscalls/setsockopt/setsockopt09.c | 2 +- testcases/kernel/syscalls/splice/splice.h | 8 ++-- testcases/kernel/syscalls/splice/splice06.c | 4 +- testcases/kernel/syscalls/syslog/syslog11.c | 2 +- testcases/kernel/syscalls/wait4/wait402.c | 2 +- testcases/kernel/syscalls/waitid/waitid10.c | 2 +- testcases/network/iptables/nft02.c | 2 +- testcases/network/packet/fanout01.c | 2 +- 93 files changed, 263 insertions(+), 237 deletions(-) create mode 100644 include/tst_path.h
include/tst_hugepage.h +1 -9
@@ -6,15 +6,7 @@#ifndef TST_HUGEPAGE__ #define TST_HUGEPAGE__ -#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/" -#define PATH_NR_HPAGES "/proc/sys/vm/nr_hugepages" -#define PATH_OC_HPAGES "/proc/sys/vm/nr_overcommit_hugepages" - -#define MEMINFO_HPAGE_TOTAL "HugePages_Total:" -#define MEMINFO_HPAGE_FREE "HugePages_Free:" -#define MEMINFO_HPAGE_RSVD "HugePages_Rsvd:" -#define MEMINFO_HPAGE_SURP "HugePages_Surp:" -#define MEMINFO_HPAGE_SIZE "Hugepagesize:" +#include "tst_path.h" extern char *nr_opt;/* -s num Set the number of the been allocated hugepages */ extern char *Hopt;/* -H /.. Location of hugetlbfs, i.e. -H /var/hugetlbfs */
include/tst_path.h new file +45 -0
45 lines not on this page · raw message
include/tst_test.h +1 -0
@@ -26,6 +26,7 @@#include "tst_mkfs.h" #include "tst_fs.h" #include "tst_pid.h" +#include "tst_path.h" #include "tst_cmd.h" #include "tst_cpu.h" #include "tst_process_state.h"
lib/newlib_tests/test19.c +3 -3
@@ -10,7 +10,7 @@static void setup (void ) { -SAFE_FILE_PRINTF ("/proc/sys/kernel/core_pattern" ,"changed" ); +SAFE_FILE_PRINTF (PROC_SYS_KERNEL "core_pattern" ,"changed" );tst_sys_conf_dump (); }
@@ -25,8 +25,8 @@ static struct tst_test test = { .setup = setup, .save_restore = (const struct tst_path_val []) { {"/proc/nonexistent" ,NULL ,TST_SR_SKIP }, - {"/proc/sys/kernel/numa_balancing" ,NULL ,TST_SR_TBROK }, - {"/proc/sys/kernel/core_pattern" ,NULL ,TST_SR_TCONF }, + {PROC_SYS_KERNEL "numa_balancing" ,NULL ,TST_SR_TBROK }, + {PROC_SYS_KERNEL "core_pattern" ,NULL ,TST_SR_TCONF }, {} }, };
lib/newlib_tests/test20.c +4 -4
@@ -16,10 +16,10 @@ static void do_test(void) {unsigned long val, hpages;tst_res (TINFO ,"tst_hugepages = %lu" , tst_hugepages); -SAFE_FILE_PRINTF ("/proc/sys/kernel/numa_balancing" ,"1" ); +SAFE_FILE_PRINTF (PROC_SYS_KERNEL "numa_balancing" ,"1" ); hpages = test.hugepages.number; -SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val); +SAFE_FILE_SCANF (PATH_VM_NR_HPAGES ,"%lu" , &val);if (val != hpages)tst_brk (TBROK ,"nr_hugepages = %lu, but expect %lu" , val, hpages);else
@@ -28,7 +28,7 @@ static void do_test(void) {struct tst_hugepage hp = {1000000000000 ,TST_REQUEST }; hpages =tst_reserve_hugepages (&hp); -SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val); +SAFE_FILE_SCANF (PATH_VM_NR_HPAGES ,"%lu" , &val);if (val != hpages)tst_brk (TBROK ,"nr_hugepages = %lu, but expect %lu" , val, hpages);else
@@ -39,7 +39,7 @@ static struct tst_test test = { .test_all = do_test, .hugepages = {2, TST_NEEDS}, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/numa_balancing" ,"0" ,TST_SR_TBROK }, + {PROC_SYS_KERNEL "numa_balancing" ,"0" ,TST_SR_TBROK }, {} }, };
lib/newlib_tests/test_zero_hugepage.c +2 -2
@@ -15,7 +15,7 @@ static void do_test(void) {unsigned long val, hpages; -SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val); +SAFE_FILE_SCANF (PATH_VM_NR_HPAGES ,"%lu" , &val);if (val !=0 )tst_brk (TBROK ,"nr_hugepages = %lu, but expect 0" , val);else
@@ -23,7 +23,7 @@ static void do_test(void)struct tst_hugepage hp = {3 ,TST_REQUEST }; hpages =tst_reserve_hugepages (&hp); -SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val); +SAFE_FILE_SCANF (PATH_VM_NR_HPAGES ,"%lu" , &val);if (val != hpages)tst_brk (TBROK ,"nr_hugepages = %lu, but expect %lu" , val, hpages);else
lib/tst_hugepage.c +7 -7
@@ -14,7 +14,7 @@ char *Hopt;size_t tst_get_hugepage_size (void ) { -if (access (PATH_HUGEPAGES ,F_OK )) +if (access (PATH_MM_HUGEPAGES ,F_OK ))return 0 ;return SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
@@ -24,12 +24,12 @@ unsigned long tst_reserve_hugepages(struct tst_hugepage *hp) {unsigned long val, max_hpages;struct tst_path_val pvl = { - .path =PATH_NR_HPAGES , + .path =PATH_VM_NR_HPAGES , .val =NULL , .flags =TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }; -if (access (PATH_HUGEPAGES ,F_OK )) { +if (access (PATH_MM_HUGEPAGES ,F_OK )) {if (hp->policy ==TST_NEEDS )tst_brk (TCONF ,"hugetlbfs is not supported" ); tst_hugepages =0 ;
@@ -46,8 +46,8 @@ unsigned long tst_reserve_hugepages(struct tst_hugepage *hp) goto set_hugepages; } -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); -SAFE_FILE_PRINTF ("/proc/sys/vm/compact_memory" ,"1" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"3" ); +SAFE_FILE_PRINTF (PATH_VM_COMPACT_MEMORY ,"1" );if (hp->policy ==TST_NEEDS ) { tst_hugepages +=SAFE_READ_MEMINFO ("HugePages_Total:" ); goto set_hugepages;
@@ -66,8 +66,8 @@ unsigned long tst_reserve_hugepages(struct tst_hugepage *hp) set_hugepages:tst_sys_conf_save (&pvl); -SAFE_FILE_PRINTF (PATH_NR_HPAGES ,"%lu" , tst_hugepages); -SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val); +SAFE_FILE_PRINTF (PATH_VM_NR_HPAGES ,"%lu" , tst_hugepages); +SAFE_FILE_SCANF (PATH_VM_NR_HPAGES ,"%lu" , &val);if (val != tst_hugepages) tst_brk(TCONF, "nr_hugepages = %lu, but expect %lu. " "Not enough hugepages for testing.",
lib/tst_test.c +1 -1
@@ -1209,7 +1209,7 @@ static void prepare_and_mount_dev_fs(const char *mntpoint)static void prepare_and_mount_hugetlb_fs (void ) { -if (access (PATH_HUGEPAGES ,F_OK )) +if (access (PATH_MM_HUGEPAGES ,F_OK ))tst_brk (TCONF ,"hugetlbfs is not supported" );SAFE_MOUNT ("none" , tst_test->mntpoint,"hugetlbfs" ,0 ,NULL );
testcases/cve/cve-2015-3290.c +3 -3
@@ -466,12 +466,12 @@ static void setup(void)* knowing if perf_event_open() support is enabled is checking for * the existence of the file /proc/sys/kernel/perf_event_paranoid. */ -if (access ("/proc/sys/kernel/perf_event_paranoid" ,F_OK ) ==-1 ) +if (access (PROC_SYS_KERNEL "perf_event_paranoid" ,F_OK ) ==-1 )tst_brk (TCONF ,"Kernel doesn't have perf_event support" ); -SAFE_FILE_SCANF ("/proc/sys/kernel/perf_event_mlock_kb" , +SAFE_FILE_SCANF (PROC_SYS_KERNEL "perf_event_mlock_kb" ,"%d" , &event_mlock_kb); -SAFE_FILE_SCANF ("/proc/sys/kernel/perf_event_max_sample_rate" , +SAFE_FILE_SCANF (PROC_SYS_KERNEL "perf_event_max_sample_rate" ,"%d" , &max_sample_rate); }
testcases/cve/cve-2017-16939.c +1 -1
@@ -91,7 +91,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/cve/cve-2022-4378.c +8 -8
@@ -22,13 +22,13 @@ static struct testcase {const char *path;int err; } testcase_list[] = { - {"/proc/sys/net/ipv4/icmp_ratelimit", EINVAL}, - {"/proc/sys/net/ipv4/icmp_ratemask", EINVAL}, - {"/proc/sys/net/ipv4/icmp_echo_ignore_all", EINVAL}, - {"/proc/sys/net/ipv4/tcp_probe_interval", EINVAL}, - {"/proc/sys/net/ipv4/tcp_keepalive_time", EINVAL}, - {"/proc/sys/net/ipv4/tcp_notsent_lowat", EINVAL}, - {"/proc/sys/net/ipv4/ip_local_reserved_ports", 0} + {NET_IPV4_FP("icmp_ratelimit"), EINVAL}, + {NET_IPV4_FP("icmp_ratemask"), EINVAL}, + {NET_IPV4_FP("icmp_echo_ignore_all"), EINVAL}, + {NET_IPV4_FP("tcp_probe_interval"), EINVAL}, + {NET_IPV4_FP("tcp_keepalive_time"), EINVAL}, + {NET_IPV4_FP("tcp_notsent_lowat"), EINVAL}, + {NET_IPV4_FP("ip_local_reserved_ports"), 0} }; static void setup(void)
@@ -93,7 +93,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/cve/icmp_rate_limit01.c +1 -1
@@ -256,7 +256,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/cve/tcindex01.c +1 -1
@@ -149,7 +149,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/containers/pidns/pidns05.c +1 -1
@@ -71,7 +71,7 @@ static int find_cinit_pids(pid_t *pids)static void setup (void ) { -SAFE_FILE_SCANF ("/proc/sys/kernel/pid_max" ,"%d\n" , &pid_max); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "pid_max" ,"%d\n" , &pid_max); }static void run (void )
testcases/kernel/containers/userns/userns01.c +2 -2
@@ -22,8 +22,8 @@#include <sys/capability.h> #include "lapi/sched.h" -#define OVERFLOWUIDPATH "/proc/sys/kernel/overflowuid" -#define OVERFLOWGIDPATH "/proc/sys/kernel/overflowgid" +#define OVERFLOWUIDPATH PROC_SYS_KERNEL "overflowuid" +#define OVERFLOWGIDPATH PROC_SYS_KERNEL "overflowgid"static long overflowuid;static long overflowgid;
testcases/kernel/containers/userns/userns06_capcheck.c +1 -1
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])if (argc <2 )tst_brk (TBROK ,"userns06_capcheck <privileged|unprivileged>" ); -SAFE_FILE_SCANF ("/proc/sys/kernel/cap_last_cap" ,"%d" , &last_cap); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "cap_last_cap" ,"%d" , &last_cap);if (strcmp ("privileged" , argv[1 ])) expected_cap_flag =0 ;
testcases/kernel/containers/userns/userns07.c +1 -1
@@ -93,7 +93,7 @@ static struct tst_test test = { NULL, }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/kernel/unprivileged_userns_clone" ,"1" ,TST_SR_SKIP }, + {PROC_SYS_KERNEL "unprivileged_userns_clone" ,"1" ,TST_SR_SKIP }, {} }, };
testcases/kernel/containers/userns/userns08.c +5 -3
@@ -26,6 +26,8 @@#include "lapi/sched.h" #include "tst_safe_file_at.h" +#define PROC_SYS_USER "/proc/sys/user/" +static pid_t clone_newuser (void ) {const struct tst_clone_args cargs = {
@@ -119,7 +121,7 @@ static void setup(void)SAFE_WRITE (SAFE_WRITE_ALL , fd,"\n" ,1 );SAFE_CLOSE (fd); -SAFE_TRY_FILE_PRINTF ("/proc/sys/user/max_user_namespaces" ,"%d" ,10 ); +SAFE_TRY_FILE_PRINTF (PROC_SYS_USER "max_user_namespaces" ,"%d" ,10 ); }static struct tst_test test = {
@@ -133,8 +135,8 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,NULL ,TST_SR_SKIP }, - {"/proc/sys/kernel/unprivileged_userns_clone" ,"1" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,NULL ,TST_SR_SKIP }, + {PROC_SYS_KERNEL "unprivileged_userns_clone" ,"1" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/include/ksm_helper.h +1 -1
@@ -7,7 +7,7 @@#ifndef KSM_HELPER_H #define KSM_HELPER_H -#define PATH_KSM "/sys/kernel/mm/ksm/" +#include "tst_path.h" void wait_ksmd_full_scan (void );
testcases/kernel/lib/ksm_helper.c +2 -2
@@ -15,7 +15,7 @@ void wait_ksmd_full_scan(void)unsigned long full_scans, at_least_one_full_scan;int count =0 ; -SAFE_FILE_SCANF (PATH_KSM "full_scans" ,"%lu" , &full_scans); +SAFE_FILE_SCANF (PATH_MM_KSM "full_scans" ,"%lu" , &full_scans);/* * The current scan is already in progress so we can't guarantee that * the get_user_pages() is called on every existing rmap_item if we
@@ -30,7 +30,7 @@ void wait_ksmd_full_scan(void)while (full_scans < at_least_one_full_scan) {sleep (1 ); count++; -SAFE_FILE_SCANF (PATH_KSM "full_scans" ,"%lu" , &full_scans); +SAFE_FILE_SCANF (PATH_MM_KSM "full_scans" ,"%lu" , &full_scans); }tst_res (TINFO ,"ksm daemon takes %ds to run two full scans" , count);
testcases/kernel/logging/kmsg/kmsg01.c +2 -2
@@ -32,8 +32,8 @@#define NUM_READ_MSGS 3#define NUM_READ_RETRY 10#define NUM_OVERWRITE_MSGS 1024 -#define PRINTK "/proc/sys/kernel/printk" -#define CONSOLE_LOGLEVEL_QUIET 4 +#define PRINTK PROC_SYS_KERNEL "printk" +#define CONSOLE_LOGLEVEL_QUIET 4static int console_loglevel =-1 ;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c +2 -6
@@ -31,10 +31,6 @@ static char path_sys_sz_resv[BUFSIZ];static char path_sys_sz_surp[BUFSIZ ];static char path_sys_sz_huge[BUFSIZ ]; -#define PATH_PROC_VM "/proc/sys/vm/" -#define PATH_PROC_OVER PATH_PROC_VM "nr_overcommit_hugepages" -#define PATH_PROC_HUGE PATH_PROC_VM "nr_hugepages" -/* Only ia64 requires this */ #ifdef __ia64__#define ADDR (void *)(0x8000000000000000UL)
@@ -191,8 +187,8 @@ static void setup(void) path = path_sys_sz_huge; pathover = path_sys_sz_over; }else { - path =PATH_PROC_HUGE ; - pathover =PATH_PROC_OVER ; + path =PATH_VM_NR_HPAGES ; + pathover =PATH_VM_OC_HPAGES ; }if (opt_alloc) {
testcases/kernel/mem/hugetlb/hugemmap/hugemmap08.c +3 -3
@@ -102,11 +102,11 @@ static void run_test(unsigned int test_type)switch (test_type) {case WITHOUT_OVERCOMMIT :tst_res (TINFO ,"Without overcommit testing..." ); -SAFE_FILE_PRINTF (PATH_OC_HPAGES ,"%d" ,0 ); +SAFE_FILE_PRINTF (PATH_VM_OC_HPAGES ,"%d" ,0 );break ;case WITH_OVERCOMMIT :tst_res (TINFO ,"With overcommit testing..." ); -SAFE_FILE_PRINTF (PATH_OC_HPAGES ,"%d" ,2 ); +SAFE_FILE_PRINTF (PATH_VM_OC_HPAGES ,"%d" ,2 );break ; }test_chunk_overcommit ();
@@ -129,7 +129,7 @@ static struct tst_test test = { .needs_hugetlbfs = 1, .forks_child = 1, .save_restore = (const struct tst_path_val []) { - {PATH_OC_HPAGES ,NULL ,TST_SR_TCONF }, + {PATH_VM_OC_HPAGES ,NULL ,TST_SR_TCONF }, {} }, .tcnt = 2,
testcases/kernel/mem/hugetlb/hugemmap/hugemmap10.c +4 -4
@@ -134,7 +134,7 @@ static int set_nr_hugepages_(long count, char *desc, int line)long min_size;long et, ef, er, es; -SAFE_FILE_PRINTF (PATH_NR_HPAGES ,"%lu" , count); +SAFE_FILE_PRINTF (PATH_VM_NR_HPAGES ,"%lu" , count);/* The code below is based on set_max_huge_pages in mm/hugetlb.c */ es = prev_surp;
@@ -433,7 +433,7 @@ static void run_test(void)static void setup (void ) { hpage_size =SAFE_READ_MEMINFO (MEMINFO_HPAGE_SIZE )*1024 ; -SAFE_FILE_PRINTF (PATH_OC_HPAGES ,"%lu" , tst_hugepages); +SAFE_FILE_PRINTF (PATH_VM_OC_HPAGES ,"%lu" , tst_hugepages); private_resv =kernel_has_private_reservations (); }
@@ -447,8 +447,8 @@ static struct tst_test test = { .mntpoint = MNTPOINT, .needs_hugetlbfs = 1, .save_restore = (const struct tst_path_val []) { - {PATH_OC_HPAGES ,NULL ,TST_SR_TCONF }, - {PATH_NR_HPAGES ,NULL ,TST_SR_TCONF }, + {PATH_VM_OC_HPAGES ,NULL ,TST_SR_TCONF }, + {PATH_VM_NR_HPAGES ,NULL ,TST_SR_TCONF }, {} }, .setup = setup,
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +5 -6
@@ -21,7 +21,6 @@#include "hugetlb.h" -#define PATH_HUGEPAGE "/sys/kernel/mm/hugepages"#define GIGANTIC_MIN_ORDER 10static int org_g_hpages;
@@ -45,14 +44,14 @@ static void setup(void)struct dirent *ent;unsigned long hpage_size; -if (access (PATH_HUGEPAGE ,F_OK )) +if (access (PATH_MM_HUGEPAGES ,F_OK ))tst_brk (TCONF ,"hugetlbfs is not supported" ); - dir =SAFE_OPENDIR (PATH_HUGEPAGE ); + dir =SAFE_OPENDIR (PATH_MM_HUGEPAGES );while ((ent =SAFE_READDIR (dir))) {if ((sscanf (ent->d_name,"hugepages-%lukB" , &hpage_size) ==1 ) &&is_hugetlb_gigantic (hpage_size *1024 )) { -sprintf (g_hpage_path,"%s/%s/%s" ,PATH_HUGEPAGE , +sprintf (g_hpage_path,"%s/%s/%s" ,PATH_MM_HUGEPAGES , ent->d_name,"nr_hugepages" );break ; }
@@ -62,8 +61,8 @@ static void setup(void)SAFE_CLOSEDIR (dir); -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); -SAFE_FILE_PRINTF ("/proc/sys/vm/compact_memory" ,"1" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"3" ); +SAFE_FILE_PRINTF (PATH_VM_COMPACT_MEMORY ,"1" );if (tst_available_mem () < (long long )hpage_size) { g_hpage_path[0 ] ='\0' ;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap34.c +0 -1
@@ -32,7 +32,6 @@#define STACK_ALLOCATION_SIZE (16*1024*1024)#endif #define MNTPOINT "hugetlbfs/" -#define PATH_HUGEPAGE "/sys/kernel/mm/hugepages"#define STACKS_MAX 64
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c +1 -1
@@ -82,7 +82,7 @@ static void setup(void)long hpage_size, orig_hugepages;unsigned long new_shmmax; - orig_hugepages =TST_SYS_CONF_LONG_GET ("/proc/sys/vm/nr_hugepages" ); + orig_hugepages =TST_SYS_CONF_LONG_GET (PATH_VM_NR_HPAGES );SAFE_FILE_SCANF (PATH_SHMMAX ,"%lu" , &new_shmmax);if (new_shmmax <SIZE )
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +1 -1
@@ -19,7 +19,7 @@* depending on the system being tested. */ #define MAXIDS 8192 -#define PATH_SHMMNI "/proc/sys/kernel/shmmni" +#define PATH_SHMMNI PROC_SYS_KERNEL "shmmni"static size_t shm_size;static int shm_id_1 =-1 ;
testcases/kernel/mem/hugetlb/lib/hugetlb.h +1 -1
@@ -29,7 +29,7 @@#define SHM_HUGETLB 04000/* segment is mapped via hugetlb */ #endif -#define PATH_SHMMAX "/proc/sys/kernel/shmmax" +#define PATH_SHMMAX PROC_SYS_KERNEL "shmmax"#ifndef barrier# ifdef mb
testcases/kernel/mem/ksm/ksm01.c +5 -5
@@ -74,13 +74,13 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {MM_KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,"1" , + {MM_KSM_FP ("merge_across_nodes" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {MM_KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm02.c +5 -5
@@ -97,13 +97,13 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {MM_KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,"1" , + {MM_KSM_FP ("merge_across_nodes" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {MM_KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm03.c +5 -5
@@ -79,13 +79,13 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {MM_KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,"1" , + {MM_KSM_FP ("merge_across_nodes" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {MM_KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm04.c +5 -5
@@ -86,13 +86,13 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {MM_KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,"1" , + {MM_KSM_FP ("merge_across_nodes" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {MM_KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm05.c +2 -2
@@ -93,8 +93,8 @@ static struct tst_test test = { .forks_child = 1, .test_all = test_ksm, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,"1" ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {MM_KSM_FP ("run" ),"1" ,TST_SR_TBROK }, + {MM_KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm06.c +16 -16
@@ -78,8 +78,8 @@ static void test_ksm(void)numa_free_nodemask (bm); -SAFE_FILE_PRINTF (PATH_KSM "sleep_millisecs" ,"0" ); -SAFE_FILE_PRINTF (PATH_KSM "pages_to_scan" ,"%ld" , +SAFE_FILE_PRINTF (PATH_MM_KSM "sleep_millisecs" ,"0" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "pages_to_scan" ,"%ld" , nr_pages * nodes->cnt);/* * merge_across_nodes and max_page_sharing setting can be changed
@@ -87,24 +87,24 @@ static void test_ksm(void)* to unmerge pages first, then to 1 after changing merge_across_nodes, * to remerge according to the new setting. */ -SAFE_FILE_PRINTF (PATH_KSM "run" ,"2" ); -if (access (PATH_KSM "max_page_sharing" ,F_OK ) ==0 ) -SAFE_FILE_PRINTF (PATH_KSM "max_page_sharing" , +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"2" ); +if (access (PATH_MM_KSM "max_page_sharing" ,F_OK ) ==0 ) +SAFE_FILE_PRINTF (PATH_MM_KSM "max_page_sharing" ,"%ld" , nr_pages * nodes->cnt);tst_res (TINFO ,"Start to test KSM with merge_across_nodes=1" ); -SAFE_FILE_PRINTF (PATH_KSM "merge_across_nodes" ,"1" ); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"1" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "merge_across_nodes" ,"1" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"1" );ksm_group_check (1 ,1 , nr_pages * nodes->cnt -1 ,0 ,0 ,0 , nr_pages * nodes->cnt); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"2" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"2" );tst_res (TINFO ,"Start to test KSM with merge_across_nodes=0" ); -SAFE_FILE_PRINTF (PATH_KSM "merge_across_nodes" ,"0" ); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"1" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "merge_across_nodes" ,"0" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"1" );ksm_group_check (1 , nodes->cnt, nr_pages * nodes->cnt - nodes->cnt,0 ,0 ,0 , nr_pages * nodes->cnt); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"2" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"2" );for (i =0 ; i < nodes->cnt; i++)SAFE_MUNMAP (memory[i], length);
@@ -132,12 +132,12 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {MM_KSM_FP ("max_page_sharing" ),NULL ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,NULL ,TST_SR_TCONF }, - {"/sys/kernel/mm/ksm/smart_scan" ,"0" , + {MM_KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("merge_across_nodes" ),NULL ,TST_SR_TCONF }, + {MM_KSM_FP ("smart_scan" ),"0" ,TST_SR_SKIP_MISSING |TST_SR_TBROK_RO }, {} },
testcases/kernel/mem/ksm/ksm07.c +14 -14
@@ -57,24 +57,24 @@ static void verify_ksm(void)tst_res (TINFO ,"KSM merging" ); -if (access (PATH_KSM "max_page_sharing" ,F_OK ) ==0 ) -SAFE_FILE_PRINTF (PATH_KSM "run" ,"2" ); +if (access (PATH_MM_KSM "max_page_sharing" ,F_OK ) ==0 ) +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"2" );/* Set defalut ksm scan values. */ -SAFE_FILE_PRINTF (PATH_KSM "run" ,"1" ); -SAFE_FILE_PRINTF (PATH_KSM "pages_to_scan" ,"%ld" ,100l ); -SAFE_FILE_PRINTF (PATH_KSM "sleep_millisecs" ,"0" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"1" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "pages_to_scan" ,"%ld" ,100l ); +SAFE_FILE_PRINTF (PATH_MM_KSM "sleep_millisecs" ,"0" );/* Measure pages skipped aka "smart scan". */ -SAFE_FILE_SCANF (PATH_KSM "full_scans" ,"%d" , &full_scans_begin); -SAFE_FILE_SCANF (PATH_KSM "pages_skipped" ,"%d" , &pages_skipped_begin); +SAFE_FILE_SCANF (PATH_MM_KSM "full_scans" ,"%d" , &full_scans_begin); +SAFE_FILE_SCANF (PATH_MM_KSM "pages_skipped" ,"%d" , &pages_skipped_begin);wait_ksmd_full_scan ();tst_res (TINFO ,"stop KSM" ); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"0" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"0" ); -SAFE_FILE_SCANF (PATH_KSM "full_scans" ,"%d" , &full_scans_end); -SAFE_FILE_SCANF (PATH_KSM "pages_skipped" ,"%d" , &pages_skipped_end); +SAFE_FILE_SCANF (PATH_MM_KSM "full_scans" ,"%d" , &full_scans_end); +SAFE_FILE_SCANF (PATH_MM_KSM "pages_skipped" ,"%d" , &pages_skipped_end); diff_pages = pages_skipped_end - pages_skipped_begin; diff_scans = full_scans_end - full_scans_begin;
@@ -98,10 +98,10 @@ static struct tst_test test = { {} }, .save_restore = (const struct tst_path_val[]) { - {PATH_KSM "pages_skipped" ,NULL ,TST_SR_TCONF }, - {PATH_KSM "run" ,NULL ,TST_SR_TCONF }, - {PATH_KSM "sleep_millisecs" ,NULL ,TST_SR_TCONF }, - {PATH_KSM "smart_scan" ,"1" , + {MM_KSM_FP ("pages_skipped" ),NULL ,TST_SR_TCONF }, + {MM_KSM_FP ("run" ),NULL ,TST_SR_TCONF }, + {MM_KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TCONF }, + {MM_KSM_FP ("smart_scan" ),"1" ,TST_SR_SKIP_MISSING |TST_SR_TCONF }, {} },
testcases/kernel/mem/ksm/ksm_test.h +12 -12
@@ -13,7 +13,7 @@ static inline void check(char *path, long int value)char fullpath[BUFSIZ ];long actual_val; -snprintf (fullpath,BUFSIZ ,PATH_KSM "%s" , path); +snprintf (fullpath,BUFSIZ ,PATH_MM_KSM "%s" , path);SAFE_FILE_SCANF (fullpath,"%ld" , &actual_val);if (actual_val != value)
@@ -41,8 +41,8 @@ static inline void final_group_check(int run, int pages_shared, int pages_sharin* can lead to unexpected false positives where page_volatile * is elevated and page_unshared is recessed. */ -SAFE_FILE_SCANF (PATH_KSM "run" ,"%d" , &ksm_run_orig); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"0" ); +SAFE_FILE_SCANF (PATH_MM_KSM "run" ,"%d" , &ksm_run_orig); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"0" );check ("pages_shared" , pages_shared);check ("pages_sharing" , pages_sharing);
@@ -51,7 +51,7 @@ static inline void final_group_check(int run, int pages_shared, int pages_sharincheck ("sleep_millisecs" , sleep_millisecs);check ("pages_to_scan" , pages_to_scan); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"%d" , ksm_run_orig); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"%d" , ksm_run_orig); } static inline void ksm_group_check(int run, int pages_shared, int pages_sharing,
@@ -251,14 +251,14 @@ static inline void create_same_memory(unsigned int size, int num, unsigned int ustop_ksm_children (child, num);tst_res (TINFO ,"KSM merging..." ); -if (access (PATH_KSM "max_page_sharing" ,F_OK ) ==0 ) { -SAFE_FILE_PRINTF (PATH_KSM "run" ,"2" ); -SAFE_FILE_PRINTF (PATH_KSM "max_page_sharing" ,"%ld" , size * pages * num); +if (access (PATH_MM_KSM "max_page_sharing" ,F_OK ) ==0 ) { +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"2" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "max_page_sharing" ,"%ld" , size * pages * num); } -SAFE_FILE_PRINTF (PATH_KSM "run" ,"1" ); -SAFE_FILE_PRINTF (PATH_KSM "pages_to_scan" ,"%ld" , size * pages * num); -SAFE_FILE_PRINTF (PATH_KSM "sleep_millisecs" ,"0" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"1" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "pages_to_scan" ,"%ld" , size * pages * num); +SAFE_FILE_PRINTF (PATH_MM_KSM "sleep_millisecs" ,"0" );resume_ksm_children (child, num);stop_ksm_children (child, num);
@@ -277,13 +277,13 @@ static inline void create_same_memory(unsigned int size, int num, unsigned int uksm_group_check (1 ,1 , size * num * pages -2 ,0 ,1 ,0 , size * pages * num);tst_res (TINFO ,"KSM unmerging..." ); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"2" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"2" );resume_ksm_children (child, num);final_group_check (2 ,0 ,0 ,0 ,0 ,0 , size * pages * num);tst_res (TINFO ,"stop KSM." ); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"0" ); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"0" );final_group_check (0 ,0 ,0 ,0 ,0 ,0 , size * pages * num);while (waitpid (-1 , &status,0 ) >0 )
testcases/kernel/mem/oom/oom.h +7 -6
@@ -7,16 +7,17 @@#define OOM_H_ #include <pthread.h> +#include "tst_path.h" #include "config.h" #include "numa_helper.h" -#define PATH_KSM "/sys/kernel/mm/ksm/" -#define LENGTH (3UL<<30)#define NORMAL 1#define MLOCK 2#define KSM 3 +#define OVERCOMMIT_MEMORY PROC_SYS_VM "overcommit_memory" +#ifdef HAVE_NUMA_V2 static inline void set_global_mempolicy (int mempolicy) {
@@ -217,15 +218,15 @@ static inline void testoom(int mempolicy, int lite, int retcode, int allow_sigki* Skip oom(KSM) if lite == 1, since limit_in_bytes may vary from * run to run, which isn't reliable for oom03 cgroup test. */ -if (access (PATH_KSM ,F_OK ) ==-1 || lite ==1 ) { +if (access (PATH_MM_KSM ,F_OK ) ==-1 || lite ==1 ) {tst_res (TINFO ,"KSM is not configed or lite == 1, " "skip OOM test for KSM pags" ); }else {tst_res (TINFO ,"start OOM testing for KSM pages." ); -SAFE_FILE_SCANF (PATH_KSM "run" ,"%d" , &ksm_run_orig); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"1" ); +SAFE_FILE_SCANF (MM_KSM_FP ("run" ),"%d" , &ksm_run_orig); +SAFE_FILE_PRINTF (MM_KSM_FP ("run" ),"1" );oom (KSM , lite, retcode, allow_sigkill); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"%d" , ksm_run_orig); +SAFE_FILE_PRINTF (MM_KSM_FP ("run" ),"%d" , ksm_run_orig); } }
testcases/kernel/mem/oom/oom01.c +0 -2
@@ -17,8 +17,6 @@#include "tst_test.h" #include "oom.h" -#define OVERCOMMIT_MEMORY "/proc/sys/vm/overcommit_memory" -static void verify_oom (void ) {/* we expect mmap to fail before OOM is hit */
testcases/kernel/mem/oom/oom02.c +1 -1
@@ -49,7 +49,7 @@ static struct tst_test test = { .test_all = verify_oom, .skip_in_compat = 1, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {OVERCOMMIT_MEMORY ,"1" ,TST_SR_TBROK }, {} }, };
testcases/kernel/mem/oom/oom03.c +1 -1
@@ -76,7 +76,7 @@ static struct tst_test test = { .needs_cgroup_ctrls = (const char *const []){ "memory", NULL }, .skip_in_compat = 1, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {OVERCOMMIT_MEMORY ,"1" ,TST_SR_TBROK }, {} }, };
testcases/kernel/mem/oom/oom04.c +1 -1
@@ -72,7 +72,7 @@ static struct tst_test test = { .needs_cgroup_ctrls = (const char *const []){ "cpuset", NULL }, .skip_in_compat = 1, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {OVERCOMMIT_MEMORY ,"1" ,TST_SR_TBROK }, {} }, };
testcases/kernel/mem/oom/oom05.c +1 -1
@@ -95,7 +95,7 @@ static struct tst_test test = { }, .skip_in_compat = 1, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {OVERCOMMIT_MEMORY ,"1" ,TST_SR_TBROK }, {} }, };
testcases/kernel/mem/thp/thp.h +2 -2
@@ -6,11 +6,11 @@#ifndef THP_H #define THP_H -#define PATH_THP "/sys/kernel/mm/transparent_hugepage/" +#include "tst_path.h" static inline void check_hugepage (void ) { -if (access (PATH_HUGEPAGES ,F_OK )) +if (access (PATH_MM_HUGEPAGES ,F_OK ))tst_brk (TCONF ,"Huge page is not supported." ); }
testcases/kernel/mem/thp/thp02.c +1 -1
@@ -97,7 +97,7 @@ static void setup(void) {long memfree; -if (access (PATH_THP ,F_OK ) ==-1 ) +if (access (PATH_MM_THP ,F_OK ) ==-1 )tst_brk (TCONF ,"THP not enabled in kernel?" );check_hugepage ();
testcases/kernel/mem/thp/thp03.c +1 -1
@@ -79,7 +79,7 @@ static void thp_test(void)static void setup (void ) { -if (access (PATH_THP ,F_OK ) ==-1 ) +if (access (PATH_MM_THP ,F_OK ) ==-1 )tst_brk (TCONF ,"THP not enabled in kernel?" );check_hugepage ();
testcases/kernel/sched/sysctl/proc_sched_rt01.c +3 -3
@@ -26,9 +26,9 @@#include <stdio.h> #include "tst_test.h" -#define RT_PERIOD_US "/proc/sys/kernel/sched_rt_period_us" -#define RT_RUNTIME_US "/proc/sys/kernel/sched_rt_runtime_us" -#define RR_TIMESLICE_MS "/proc/sys/kernel/sched_rr_timeslice_ms" +#define RT_PERIOD_US PROC_SYS_KERNEL "sched_rt_period_us" +#define RT_RUNTIME_US PROC_SYS_KERNEL "sched_rt_runtime_us" +#define RR_TIMESLICE_MS PROC_SYS_KERNEL "sched_rr_timeslice_ms"static int period_fd;static int runtime_fd;
testcases/kernel/syscalls/fanotify/fanotify10.c +4 -5
@@ -99,8 +99,7 @@ static int ignore_mark_unsupported;#define FILE_EXEC_PATH2 MNT2_PATH"/"TEST_APP#define FILE2_EXEC_PATH2 MNT2_PATH"/"TEST_APP2 -#define DROP_CACHES_FILE "/proc/sys/vm/drop_caches" -#define CACHE_PRESSURE_FILE "/proc/sys/vm/vfs_cache_pressure" +#define CACHE_PRESSURE_FILE PROC_SYS_VM "vfs_cache_pressure"static pid_t child_pid;static int bind_mount_created;
@@ -517,9 +516,9 @@ static void drop_caches(void)* In order to ensure that the inode can be released in the two-tier * directory structure, drop_cache is required three times. */ -SAFE_FILE_PRINTF (DROP_CACHES_FILE ,"3" ); -SAFE_FILE_PRINTF (DROP_CACHES_FILE ,"3" ); -SAFE_FILE_PRINTF (DROP_CACHES_FILE ,"3" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"3" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"3" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"3" ); }static int create_fanotify_groups (unsigned int n)
testcases/kernel/syscalls/fcntl/fcntl35.c +5 -5
@@ -49,13 +49,13 @@ static void setup(void) test_max_unpriv =getpagesize (); test_max_priv = test_max_unpriv *16 ; -if (!access ("/proc/sys/fs/pipe-max-size" ,F_OK )) { -SAFE_FILE_SCANF ("/proc/sys/fs/pipe-max-size" ,"%d" , +if (!access (PROC_SYS_FS "pipe-max-size" ,F_OK )) { +SAFE_FILE_SCANF (PROC_SYS_FS "pipe-max-size" ,"%d" , &pipe_max_unpriv); -SAFE_FILE_PRINTF ("/proc/sys/fs/pipe-max-size" ,"%d" , +SAFE_FILE_PRINTF (PROC_SYS_FS "pipe-max-size" ,"%d" , test_max_unpriv); }else { -tst_brk (TCONF ,"/proc/sys/fs/pipe-max-size doesn't exist" ); +tst_brk (TCONF ,PROC_SYS_FS "pipe-max-size doesn't exist" ); } pw =SAFE_GETPWNAM ("nobody" );
@@ -63,7 +63,7 @@ static void setup(void)static void cleanup (void ) { -SAFE_FILE_PRINTF ("/proc/sys/fs/pipe-max-size" ,"%d" , pipe_max_unpriv); +SAFE_FILE_PRINTF (PROC_SYS_FS "pipe-max-size" ,"%d" , pipe_max_unpriv); }static int verify_pipe_size (int exp_pip_sz,char *desp)
testcases/kernel/syscalls/inotify/inotify07.c +1 -1
@@ -153,7 +153,7 @@ static void setup(void)tst_res (TINFO ,DIR_PATH " ino=%lu" , buf.st_ino);/* Drop dentry caches, so overlayfs will allocate a new dentry */ -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"2" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"2" );/* Copy up directory to make it a merge directory */ SAFE_CHMOD (DIR_PATH ,0700 );
testcases/kernel/syscalls/inotify/inotify08.c +1 -1
@@ -146,7 +146,7 @@ static void setup(void) major(buf.st_dev), minor(buf.st_dev));/* Drop dentry caches, so overlayfs will allocate a new dentry */ -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"2" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"2" );/* Copy up file */ SAFE_CHMOD (FILE_PATH ,0600 );
testcases/kernel/syscalls/io_uring/io_uring01.c +1 -1
@@ -165,7 +165,7 @@ static struct tst_test test = { {} }, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/io_uring_disabled" ,"0" , + {PROC_SYS_KERNEL "io_uring_disabled" ,"0" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, {} }
testcases/kernel/syscalls/io_uring/io_uring02.c +1 -1
@@ -255,7 +255,7 @@ static struct tst_test test = { {} }, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/io_uring_disabled" ,"0" , + {PROC_SYS_KERNEL "io_uring_disabled" ,"0" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, {} },
testcases/kernel/syscalls/io_uring/io_uring03.c +1 -1
@@ -133,7 +133,7 @@ static struct tst_test test = { {} }, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/io_uring_disabled" ,"0" , + {PROC_SYS_KERNEL "io_uring_disabled" ,"0" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, {} }
testcases/kernel/syscalls/ipc/msgget/msgget03.c +1 -1
@@ -74,7 +74,7 @@ static struct tst_test test = { .cleanup = cleanup, .test_all = verify_msgget, .save_restore = (const struct tst_path_val []){ - {"/proc/sys/kernel/msgmni" ,NULL ,TST_SR_TCONF }, + {PROC_SYS_KERNEL "msgmni" ,NULL ,TST_SR_TCONF }, {} } };
testcases/kernel/syscalls/ipc/msgget/msgget04.c +1 -1
@@ -22,7 +22,7 @@#include "tst_safe_sysv_ipc.h" #include "tse_newipc.h" -#define NEXT_ID_PATH "/proc/sys/kernel/msg_next_id" +#define NEXT_ID_PATH PROC_SYS_KERNEL "msg_next_id"static int queue_id, pid;static key_t msgkey;
testcases/kernel/syscalls/ipc/msgget/msgget05.c +1 -1
@@ -20,7 +20,7 @@#include "tst_safe_sysv_ipc.h" #include "tse_newipc.h" -#define NEXT_ID_PATH "/proc/sys/kernel/msg_next_id" +#define NEXT_ID_PATH PROC_SYS_KERNEL "msg_next_id"static int queue_id[2 ], pid;static key_t msgkey[2 ];
testcases/kernel/syscalls/ipc/semget/semget05.c +2 -2
@@ -38,7 +38,7 @@ static void setup(void) used_cnt =GET_USED_ARRAYS ();tst_res (TINFO ,"Current environment %d semaphore arrays are already in use" , used_cnt); -SAFE_FILE_SCANF ("/proc/sys/kernel/sem" ,"%*d %*d %*d %d" , &maxsems); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "sem" ,"%*d %*d %*d %d" , &maxsems);/* Prevent timeout due to high semaphore array limit */ tst_set_runtime (maxsems /200 );
@@ -74,7 +74,7 @@ static struct tst_test test = { .cleanup = cleanup, .test_all = verify_semget, .save_restore = (const struct tst_path_val[]){ - {"/proc/sys/kernel/sem" ,NULL , + {PROC_SYS_KERNEL "sem" ,NULL ,TST_SR_TCONF_MISSING |TST_SR_SKIP_RO }, {} }
testcases/kernel/syscalls/ipc/shmctl/shmctl03.c +3 -3
@@ -30,9 +30,9 @@ static void verify_ipcinfo(void)else tst_res (TPASS ,"shmmin = 1" ); -TST_ASSERT_ULONG ("/proc/sys/kernel/shmmax" , info.shmmax); -TST_ASSERT_ULONG ("/proc/sys/kernel/shmmni" , info.shmmni); -TST_ASSERT_ULONG ("/proc/sys/kernel/shmall" , info.shmall); +TST_ASSERT_ULONG (PROC_SYS_KERNEL "shmmax" , info.shmmax); +TST_ASSERT_ULONG (PROC_SYS_KERNEL "shmmni" , info.shmmni); +TST_ASSERT_ULONG (PROC_SYS_KERNEL "shmall" , info.shmall); }static struct tst_test test = {
testcases/kernel/syscalls/ipc/shmget/shmget02.c +1 -1
@@ -143,7 +143,7 @@ static struct tst_test test = { .tcnt = ARRAY_SIZE(tcases), .hugepages = {TST_NO_HUGEPAGES}, .save_restore = (const struct tst_path_val[]) { - {"/proc/sys/kernel/shmmax", "8192", TST_SR_TCONF_MISSING | TST_SR_TBROK_RO}, + {PROC_SYS_KERNEL "shmmax", "8192", TST_SR_TCONF_MISSING | TST_SR_TBROK_RO}, {} }, };
testcases/kernel/syscalls/ipc/shmget/shmget03.c +1 -1
@@ -37,7 +37,7 @@ static void setup(void) used_cnt =GET_USED_SEGMENTS ();tst_res (TINFO ,"Current environment %d shared memory segments are already in use" , used_cnt); -SAFE_FILE_SCANF ("/proc/sys/kernel/shmmni" ,"%i" , &maxshms); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "shmmni" ,"%i" , &maxshms); queues =SAFE_MALLOC ((maxshms - used_cnt) *sizeof (int ));for (num =0 ; num < maxshms - used_cnt; num++) {
testcases/kernel/syscalls/ipc/shmget/shmget05.c +1 -1
@@ -23,7 +23,7 @@#include "tst_safe_sysv_ipc.h" #include "tse_newipc.h" -#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" +#define NEXT_ID_PATH PROC_SYS_KERNEL "shm_next_id"static int shm_id, pid;static key_t shmkey;
testcases/kernel/syscalls/ipc/shmget/shmget06.c +1 -1
@@ -21,7 +21,7 @@#include "tst_safe_sysv_ipc.h" #include "tse_newipc.h" -#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" +#define NEXT_ID_PATH PROC_SYS_KERNEL "shm_next_id"static int shm_id[2 ], pid;static key_t shmkey[2 ];
testcases/kernel/syscalls/keyctl/keyctl02.c +1 -1
@@ -30,7 +30,7 @@#define LOOPS 20000#define MAX_WAIT_FOR_GC_MS 5000 -#define PATH_KEY_COUNT_QUOTA "/proc/sys/kernel/keys/root_maxkeys" +#define PATH_KEY_COUNT_QUOTA PROC_SYS_KERNEL "keys/root_maxkeys"static int orig_maxkeys;static int realtime_kernel;
testcases/kernel/syscalls/madvise/madvise01.c +0 -1
@@ -24,7 +24,6 @@#define TMP_DIR "tmp_madvise"#define TEST_FILE TMP_DIR"/testfile" -#define KSM_SYS_DIR "/sys/kernel/mm/ksm"#define STR "abcdefghijklmnopqrstuvwxyz12345\n"static char *sfile;
testcases/kernel/syscalls/madvise/madvise02.c +1 -2
@@ -46,7 +46,6 @@#define MAP_SIZE (4 * 1024)#define TEST_FILE "testfile"#define STR "abcdefghijklmnopqrstuvwxyz12345\n" -#define KSM_SYS_DIR "/sys/kernel/mm/ksm"static struct stat st;static long pagesize;
@@ -98,7 +97,7 @@ static void tcases_filter(void)case MADV_UNMERGEABLE :/* kernel configured with CONFIG_KSM, * skip EINVAL test for MADV_MERGEABLE. */ -if (access (KSM_SYS_DIR ,F_OK ) ==0 ) +if (access (PATH_MM_KSM ,F_OK ) ==0 ) tc->skip =1 ;break ;case MADV_WILLNEED :
testcases/kernel/syscalls/madvise/madvise06.c +1 -1
@@ -48,7 +48,7 @@#define PASS_THRESHOLD (CHUNK_SZ / 4)#define PASS_THRESHOLD_KB (PASS_THRESHOLD / 1024) -static const char drop_caches_fname[] ="/proc/sys/vm/drop_caches" ; +static const char drop_caches_fname[] =PATH_VM_DROP_CACHES ;static int pg_sz, stat_refresh_sup;static long init_swap, init_swap_cached, init_cached;
testcases/kernel/syscalls/madvise/madvise08.c +1 -1
@@ -33,7 +33,7 @@#include "tst_test.h" #include "lapi/mmap.h" -#define CORE_PATTERN "/proc/sys/kernel/core_pattern" +#define CORE_PATTERN PROC_SYS_KERNEL "core_pattern"#define CORE_FILTER "/proc/self/coredump_filter"#define YCOUNT 0x500L#define FMEMSIZE (YCOUNT + 0x2L)
testcases/kernel/syscalls/memfd_create/memfd_create04.c +2 -2
@@ -46,7 +46,7 @@ static void check_hugepage_support(struct test_flag *test_flags) {char pattern[64 ]; -sprintf (pattern,PATH_HUGEPAGES ); +sprintf (pattern,PATH_MM_HUGEPAGES );strcat (pattern,"hugepages-" );strcat (pattern, test_flags->h_size);
@@ -84,7 +84,7 @@ static void memfd_huge_x_controller(unsigned int n)static void setup (void ) { -if (access (PATH_HUGEPAGES ,F_OK )) +if (access (PATH_MM_HUGEPAGES ,F_OK ))tst_brk (TCONF ,"Huge page is not supported" ); }
testcases/kernel/syscalls/migrate_pages/migrate_pages02.c +1 -1
@@ -324,7 +324,7 @@ static struct tst_test test = { .test_all = run, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/kernel/numa_balancing" ,"0" , + {PROC_SYS_KERNEL "numa_balancing" ,"0" ,TST_SR_SKIP_MISSING |TST_SR_TCONF_RO }, {} },
testcases/kernel/syscalls/migrate_pages/migrate_pages03.c +4 -4
@@ -49,7 +49,7 @@ static void setup(void)int n;unsigned long nodemask_size; -if (access (PATH_KSM ,F_OK )) +if (access (PATH_MM_KSM ,F_OK ))tst_brk (TCONF ,"KSM configuration was not enabled" );if (get_allowed_nodes_arr (NH_MEMS , &num_nodes, &nodes) <0 )
@@ -93,8 +93,8 @@ static void setup(void)memset (test_pages[n],0 , page_size); } -SAFE_FILE_SCANF (PATH_KSM "run" ,"%d" , &orig_ksm_run); -SAFE_FILE_PRINTF (PATH_KSM "run" ,"%d" ,1 ); +SAFE_FILE_SCANF (PATH_MM_KSM "run" ,"%d" , &orig_ksm_run); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"%d" ,1 );wait_ksmd_full_scan (); }
@@ -111,7 +111,7 @@ static void cleanup(void)free (new_nodes[1 ]);if (orig_ksm_run !=-1 ) -SAFE_FILE_PRINTF (PATH_KSM "run" ,"%d" , orig_ksm_run); +SAFE_FILE_PRINTF (PATH_MM_KSM "run" ,"%d" , orig_ksm_run); }static void migrate_test (void )
testcases/kernel/syscalls/mmap/mmap10.c +2 -2
@@ -40,7 +40,7 @@#include "tst_test.h" #define SIZE (5 * TST_MB) -#define PATH_KSM "/sys/kernel/mm/ksm/" +#define PATH_MM_KSM SYS_KERNEL_MM "ksm/"static size_t page_sz;static char *memory;
@@ -60,7 +60,7 @@ static void run(unsigned int i)int fd =-1 ;if (tc->add_ksm) { -if (access (PATH_KSM ,F_OK ) ==-1 ) +if (access (PATH_MM_KSM ,F_OK ) ==-1 )tst_brk (TCONF ,"KSM configuration is not enabled" );else tst_res (TINFO ,"Add to KSM regions" );
testcases/kernel/syscalls/move_pages/move_pages12.c +5 -7
@@ -76,8 +76,6 @@#define LOOPS 10000#define PATH_MEMINFO "/proc/meminfo" -#define PATH_NR_HUGEPAGES "/proc/sys/vm/nr_hugepages" -#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/"#define TEST_NODES 2 static struct tcase {
@@ -259,7 +257,7 @@ static void setup(void)check_config (TEST_NODES ); -if (access (PATH_HUGEPAGES ,F_OK )) +if (access (PATH_MM_HUGEPAGES ,F_OK ))tst_brk (TCONF ,"Huge page not supported" ); ret =get_allowed_nodes (NH_MEMS ,TEST_NODES , &node1, &node2);
@@ -269,7 +267,7 @@ static void setup(void) pgsz = (int )get_page_size ();SAFE_FILE_LINES_SCANF (PATH_MEMINFO ,"Hugepagesize: %d" , &hpsz); -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"3" );SAFE_FILE_LINES_SCANF (PATH_MEMINFO ,"MemFree: %ld" , &memfree);tst_res (TINFO ,"Free RAM %ld kB" , memfree);
@@ -307,10 +305,10 @@ static void setup(void) hpsz *=1024 ;if (orig_hugepages_node1 ==-1 || orig_hugepages_node2 ==-1 ) { -SAFE_FILE_SCANF (PATH_NR_HUGEPAGES ,"%ld" , &orig_hugepages); +SAFE_FILE_SCANF (PATH_VM_NR_HPAGES ,"%ld" , &orig_hugepages);tst_res (TINFO ,"Increasing global hugepages pool to %ld" , orig_hugepages +8 ); -SAFE_FILE_PRINTF (PATH_NR_HUGEPAGES ,"%ld" , orig_hugepages +8 ); +SAFE_FILE_PRINTF (PATH_VM_NR_HPAGES ,"%ld" , orig_hugepages +8 ); }alloc_free_huge_on_node (node1,4L * hpsz);
@@ -320,7 +318,7 @@ static void setup(void)static void cleanup (void ) {if (orig_hugepages !=-1 ) -SAFE_FILE_PRINTF (PATH_NR_HUGEPAGES ,"%ld" , orig_hugepages); +SAFE_FILE_PRINTF (PATH_VM_NR_HPAGES ,"%ld" , orig_hugepages);if (orig_hugepages_node1 !=-1 ) { SAFE_FILE_PRINTF(path_hugepages_node1,
testcases/kernel/syscalls/newuname/newuname01.c +4 -4
@@ -31,16 +31,16 @@ static void run(void)TST_EXP_EQ_STR (name->sysname,"Linux" ); -SAFE_FILE_SCANF ("/proc/sys/kernel/hostname" ,"%1023[^\n]" , proc_val); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "hostname" ,"%1023[^\n]" , proc_val);TST_EXP_EQ_STR (name->nodename, proc_val); -SAFE_FILE_SCANF ("/proc/sys/kernel/osrelease" ,"%1023[^\n]" , proc_val); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "osrelease" ,"%1023[^\n]" , proc_val);TST_EXP_EQ_STR (name->release, proc_val); -SAFE_FILE_SCANF ("/proc/sys/kernel/version" ,"%1023[^\n]" , proc_val); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "version" ,"%1023[^\n]" , proc_val);TST_EXP_EQ_STR (name->version, proc_val); -SAFE_FILE_SCANF ("/proc/sys/kernel/domainname" ,"%1023[^\n]" , proc_val); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "domainname" ,"%1023[^\n]" , proc_val);TST_EXP_EQ_STR (name->domainname, proc_val); }
testcases/kernel/syscalls/perf_event_open/perf_event_open02.c +1 -1
@@ -211,7 +211,7 @@ static void setup(void)* knowing if perf_event_open() support is enabled is checking for * the existence of the file /proc/sys/kernel/perf_event_paranoid. */ -if (access ("/proc/sys/kernel/perf_event_paranoid" ,F_OK ) ==-1 ) +if (access (PROC_SYS_KERNEL "perf_event_paranoid" ,F_OK ) ==-1 )tst_brk (TCONF ,"Kernel doesn't have perf_event support" );bind_to_current_cpu ();
testcases/kernel/syscalls/pkeys/pkey01.c +0 -1
@@ -36,7 +36,6 @@#define TEST_FILE "pkey_testfile"#define STR "abcdefghijklmnopqrstuvwxyz12345\n" -#define PATH_VM_NRHPS "/proc/sys/vm/nr_hugepages"static int size;static int execute_supported =1 ;
testcases/kernel/syscalls/preadv2/preadv203.c +1 -1
@@ -58,7 +58,7 @@ static volatile int stop;static void drop_caches (void ) { -SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"3" ); }/*
testcases/kernel/syscalls/readahead/readahead02.c +2 -3
@@ -35,7 +35,6 @@#include "lapi/syscalls.h" static char testfile[PATH_MAX ] ="testfile" ; -#define DROP_CACHES_FNAME "/proc/sys/vm/drop_caches"#define PROC_IO_FNAME "/proc/self/io"#define DEFAULT_FILESIZE (64 * 1024 * 1024)#define SHORT_SLEEP_US 5000
@@ -97,7 +96,7 @@ static int has_file(const char *fname, int required)static void drop_caches (void ) { -SAFE_FILE_PRINTF (DROP_CACHES_FNAME ,"1" ); +SAFE_FILE_PRINTF (PATH_VM_DROP_CACHES ,"1" ); }static unsigned long get_bytes_read (void )
@@ -430,7 +429,7 @@ static void setup(void)if (access (PROC_IO_FNAME ,F_OK ))tst_brk (TCONF ,"Requires " PROC_IO_FNAME ); -has_file (DROP_CACHES_FNAME ,1 ); +has_file (PATH_VM_DROP_CACHES ,1 );/* check if readahead is supported */ tst_syscall (__NR_readahead,0 ,0 ,0 );
testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c +1 -1
@@ -17,7 +17,7 @@#include "tst_timer.h" #include "tst_sched.h" -#define PROC_SCHED_RR_TIMESLICE_MS "/proc/sys/kernel/sched_rr_timeslice_ms" +#define PROC_SCHED_RR_TIMESLICE_MS PROC_SYS_KERNEL "sched_rr_timeslice_ms"static int proc_flag;struct tst_ts tp;
testcases/kernel/syscalls/sendmsg/sendmsg03.c +1 -1
@@ -111,7 +111,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/sendto/sendto03.c +1 -1
@@ -205,7 +205,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/setpgid/setpgid02.c +1 -1
@@ -42,7 +42,7 @@ static void setup(void)* pid_max would not be in use by another process and guarantees that * it corresponds to an invalid PGID, generating EPERM. */ -SAFE_FILE_SCANF ("/proc/sys/kernel/pid_max" ,"%d\n" , &inval_pgid); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "pid_max" ,"%d\n" , &inval_pgid); }static void run (unsigned int n)
testcases/kernel/syscalls/setsockopt/setsockopt05.c +1 -1
@@ -88,7 +88,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/setsockopt/setsockopt06.c +1 -1
@@ -116,7 +116,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/setsockopt/setsockopt08.c +1 -1
@@ -158,7 +158,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/setsockopt/setsockopt09.c +1 -1
@@ -111,7 +111,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/kernel/syscalls/splice/splice.h +4 -4
@@ -26,13 +26,13 @@ static inline int get_max_limit(int default_len_data) {int pipe_max_unpriv; -if (!access ("/proc/sys/fs/pipe-max-size" ,F_OK )) { -SAFE_FILE_SCANF ("/proc/sys/fs/pipe-max-size" ,"%d" , &pipe_max_unpriv); +if (!access (PROC_SYS_FS "pipe-max-size" ,F_OK )) { +SAFE_FILE_SCANF (PROC_SYS_FS "pipe-max-size" ,"%d" , &pipe_max_unpriv);return MIN (pipe_max_unpriv, default_len_data); } -if (!access ("/proc/sys/fs/pipe-max-pages" ,F_OK )) { -SAFE_FILE_SCANF ("/proc/sys/fs/pipe-max-pages" ,"%d" , &pipe_max_unpriv); +if (!access (PROC_SYS_FS "pipe-max-pages" ,F_OK )) { +SAFE_FILE_SCANF (PROC_SYS_FS "pipe-max-pages" ,"%d" , &pipe_max_unpriv);return MIN (pipe_max_unpriv *getpagesize (), default_len_data); }
testcases/kernel/syscalls/splice/splice06.c +2 -2
@@ -25,8 +25,8 @@#define PIPE_MAX_INIT_SIZE 65536#define DOMAIN_INIT_NAME "LTP_INIT"#define DOMAIN_TEST_NAME "LTP_TEST" -#define INTEGER_PROCFILE "/proc/sys/fs/pipe-max-size" -#define STRING_PROCFILE "/proc/sys/kernel/domainname" +#define INTEGER_PROCFILE PROC_SYS_FS "pipe-max-size" +#define STRING_PROCFILE PROC_SYS_KERNEL "domainname"static int pipe_max_test_size;static void format_str (char *str)
testcases/kernel/syscalls/syslog/syslog11.c +1 -1
@@ -56,7 +56,7 @@ static void run(unsigned int n)static struct tst_test test = { .test = run, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/kernel/printk" ,NULL ,TST_SR_TBROK }, + {PROC_SYS_KERNEL "printk" ,NULL ,TST_SR_TBROK }, {} }, .needs_root =1 ,
testcases/kernel/syscalls/wait4/wait402.c +1 -1
@@ -25,7 +25,7 @@ static void run(void)static void setup (void ) { -SAFE_FILE_SCANF ("/proc/sys/kernel/pid_max" ,"%d\n" , &pid_max); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "pid_max" ,"%d\n" , &pid_max); }static struct tst_test test = {
testcases/kernel/syscalls/waitid/waitid10.c +1 -1
@@ -48,7 +48,7 @@ static void setup(void)char c;SAFE_GETRLIMIT (RLIMIT_CORE , &rlim); -SAFE_FILE_SCANF ("/proc/sys/kernel/core_pattern" ,"%c" , &c); +SAFE_FILE_SCANF (PROC_SYS_KERNEL "core_pattern" ,"%c" , &c);if (rlim.rlim_cur)return ;
testcases/network/iptables/nft02.c +1 -1
@@ -203,7 +203,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
testcases/network/packet/fanout01.c +1 -1
@@ -96,7 +96,7 @@ static struct tst_test test = {NULL }, .save_restore = (const struct tst_path_val []) { - {"/proc/sys/user/max_user_namespaces" ,"1024" ,TST_SR_SKIP }, + {PROC_SYS_USER "max_user_namespaces" ,"1024" ,TST_SR_SKIP }, {} }, .tags = (const struct tst_tag []) {
Signature · 5 lines
2.54.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Li,
Quoted 3 lines · Li Wang
lib: Introduce
tst_path.hto consolidate system paths+#define
PROC_SYS_USER"/proc/sys/user/"
userns08.c includes tst_test.h (line 24), which now includes tst_path.h added by this same patch, so PROC_SYS_USER is already visible. This local definition causes a -Wmacro-redefined warning. Remove it.
Quoted 1 line
+#endif /*
TST_PATH_H*/
The guard symbol is TST_PATH__, so the comment should read /* TST_PATH__ */ to match.
testcases/kernel/syscalls/setpgid/setpgid02.c static void setup(void) · line 45
Quoted 1 line
testcases/kernel/syscalls/setpgid/setpgid02.c +1
-0+SAFE_FILE_SCANF (PROC_SYS_KERNEL "pid_max" ,"%d\n" , &inval_pgid);
A few replacement sites (pidns05.c, userns06_capcheck.c, waitid10.c, userns01.c) have a tab between the macro and the string literal instead of a single space like the rest of the patch.
---
Note:
Our agent completed the review of the patch. The full review can be found at: https://github.com/linux-test-project/ltp-agent/actions/runs/25323298192
The agent can sometimes produce false positives although often its findings are genuine. If you find issues with the review, please comment this email or ignore the suggestions.
Regards,
LTP AI Reviewer
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Quoted 7 lines
include/tst_path.h new file +7
-0+// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) Linux Test Project, 2026 +* Copyright (c) 2026 Li Wang <[email protected]> +*/ + +#ifndef TST_PATH__
include/tst_path.h line 18
Quoted 10 lines
include/tst_path.h new file +10
-0+#define TST_PATH__ + +/* PROC */ +#define PROC_SYS_VM "/proc/sys/vm/" +#define PROC_SYS_FS "/proc/sys/fs/" +#define PROC_SYS_NET "/proc/sys/net/" +#define PROC_SYS_USER "/proc/sys/user/" +#define PROC_SYS_KERNEL "/proc/sys/kernel/" +/* SYS */ +#define SYS_KERNEL_MM "/sys/kernel/mm/"
I wonder if this is really better. The macro name is not shorter and the kernel path is not going to change since it's part of API.
include/tst_path.h line 28
Quoted 10 lines
include/tst_path.h new file +10
-0+ +/* VM */ +#define PATH_VM_NR_HPAGES PROC_SYS_VM "nr_hugepages" +#define PATH_VM_OC_HPAGES PROC_SYS_VM "nr_overcommit_hugepages" +#define PATH_VM_DROP_CACHES PROC_SYS_VM "drop_caches" +#define PATH_VM_COMPACT_MEMORY PROC_SYS_VM "compact_memory" + +/* HUGETLB */ +#define PATH_MM_HUGEPAGES SYS_KERNEL_MM "hugepages/" +#define PATH_MM_THP SYS_KERNEL_MM "transparent_hugepage/"
These make more sense since the path is long and the macro makes it shorter.
Quoted 42 lines
include/tst_path.h new file +16
-0+/* KSM */ +#define PATH_MM_KSM SYS_KERNEL_MM "ksm/" +#define MM_KSM_FP (s) (PATH_MM_KSM s) + +/* NETWORK */ +#define PATH_NET_IPV4 PROC_SYS_NET "ipv4/" +#define NET_IPV4_FP (s) (PATH_NET_IPV4 s) + +/* MEMINFO */ +#define MEMINFO_HPAGE_TOTAL "HugePages_Total:" +#define MEMINFO_HPAGE_FREE "HugePages_Free:" +#define MEMINFO_HPAGE_RSVD "HugePages_Rsvd:" +#define MEMINFO_HPAGE_SURP "HugePages_Surp:" +#define MEMINFO_HPAGE_SIZE "Hugepagesize:" + +#endif /* TST_PATH_H */ include/tst_test.h +1
-0@@ -26,6 +26,7 @@#include "tst_mkfs.h" #include "tst_fs.h" #include "tst_pid.h" +#include "tst_path.h" #include "tst_cmd.h" #include "tst_cpu.h" #include "tst_process_state.h" lib/newlib_tests/test19.c +1
-1@@ -10,7 +10,7 @@static void setup (void ) { -SAFE_FILE_PRINTF ("/proc/sys/kernel/core_pattern" ,"changed" ); +SAFE_FILE_PRINTF (PROC_SYS_KERNEL "core_pattern" ,"changed" );tst_sys_conf_dump (); }
lib/newlib_tests/test19.c static struct tst_test test = { · line 29
Quoted 7 lines
lib/newlib_tests/test19.c +2
-2@@ -25,8 +25,8 @@ static struct tst_test test = { .setup = setup, .save_restore = (const struct tst_path_val []) { {"/proc/nonexistent" ,NULL ,TST_SR_SKIP }, - {"/proc/sys/kernel/numa_balancing" ,NULL ,TST_SR_TBROK }, - {"/proc/sys/kernel/core_pattern" ,NULL ,TST_SR_TCONF }, + {PROC_SYS_KERNEL "numa_balancing" ,NULL ,TST_SR_TBROK }, + {PROC_SYS_KERNEL "core_pattern" ,NULL ,TST_SR_TCONF },
This is exactly what I'm unsure about, it's not shorter, nor more readable.
Maybe if this was PATH_NUMA_BALANCING and PATH_CORE_PATTERN it would be shorter and would make much more sense.
Shortening this to SYS_KERNEL("numa_balancing") would be confusing since we have both /proc/sys/ and /sys/
...
Quoted 13 lines
testcases/kernel/mem/ksm/ksm01.c +2
-3@@ -74,13 +74,13 @@ static struct tst_test test = { }, .setup = setup, .save_restore = (const struct tst_path_val []) { - {"/sys/kernel/mm/ksm/run" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/sleep_millisecs" ,NULL ,TST_SR_TBROK }, - {"/sys/kernel/mm/ksm/max_page_sharing" ,NULL , + {MM_KSM_FP ("run" ),NULL ,TST_SR_TBROK }, + {MM_KSM_FP ("sleep_millisecs" ),NULL ,TST_SR_TBROK },
testcases/kernel/mem/ksm/ksm01.c static struct tst_test test = { · line 86
Quoted 10 lines
testcases/kernel/mem/ksm/ksm01.c +3
-2+ {MM_KSM_FP ("max_page_sharing" ),NULL , TST_SR_SKIP_MISSING | TST_SR_TCONF_RO}, - {"/sys/kernel/mm/ksm/merge_across_nodes" ,"1" , + {MM_KSM_FP("merge_across_nodes"), "1", TST_SR_SKIP_MISSING | TST_SR_TCONF_RO}, - {"/sys/kernel/mm/ksm/smart_scan", "0", + {MM_KSM_FP("smart_scan"), "0", TST_SR_SKIP_MISSING | TST_SR_TBROK_RO}, {} },
These looks reasonable.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 12 lines · Cyril Hrubis
lib/newlib_tests/test19.c static struct tst_test test = { · line 29
Quoted 8 lines
lib/newlib_tests/test19.c +2
-2@@ -25,8 +25,8 @@ static struct tst_test test = { .setup = setup, .save_restore = (const struct tst_path_val []) { {"/proc/nonexistent" ,NULL ,TST_SR_SKIP }, - {"/proc/sys/kernel/numa_balancing" ,NULL ,TST_SR_TBROK }, - {"/proc/sys/kernel/core_pattern" ,NULL ,TST_SR_TCONF }, + {PROC_SYS_KERNEL "numa_balancing" ,NULL ,TST_SR_TBROK }, + {PROC_SYS_KERNEL "core_pattern" ,NULL ,TST_SR_TCONF },This is exactly what I'm unsure about, it's not shorter, nor more readable.
Quoted 2 lines
Maybe if this was
PATH_NUMA_BALANCINGandPATH_CORE_PATTERNit would be shorter and would make much more sense.
v3-A version:
Yes, that ways would be simpler. Then we will finally get v3-A as below:
/* KERNEL */ #define PATH_HOSTNAME "/proc/sys/kernel/hostname" #define PATH_OSRELEASE "/proc/sys/kernel/osrelease" #define PATH_VERSION "/proc/sys/kernel/version" #define PATH_DOMAINNAME "/proc/sys/kernel/domainname" #define PATH_PRINTK "/proc/sys/kernel/printk" #define PATH_PID_MAX "/proc/sys/kernel/pid_max" #define PATH_SHMMAX "/proc/sys/kernel/shmmax" #define PATH_SHMMNI "/proc/sys/kernel/shmmni" #define PATH_SHMALL "/proc/sys/kernel/shmall" #define PATH_MSGMNI "/proc/sys/kernel/msgmni" #define PATH_SHM_NEXT_ID "/proc/sys/kernel/shm_next_id" #define PATH_MSG_NEXT_ID "/proc/sys/kernel/msg_next_id" #define PATH_SEM "/proc/sys/kernel/sem" #define PATH_CORE_PATTERN "/proc/sys/kernel/core_pattern" #define PATH_CAP_LAST_CAP "/proc/sys/kernel/cap_last_cap" #define PATH_NUMA_BALANCING "/proc/sys/kernel/numa_balancing" #define PATH_IO_URING_DISABLED "/proc/sys/kernel/io_uring_disabled" #define PATH_OVERFLOWUID "/proc/sys/kernel/overflowuid" #define PATH_OVERFLOWGID "/proc/sys/kernel/overflowgid" #define PATH_PERF_EVENT_PARANOID "/proc/sys/kernel/perf_event_paranoid" #define PATH_PERF_EVENT_MLOCK_KB "/proc/sys/kernel/perf_event_mlock_kb" #define PATH_PERF_EVENT_MAX_SAMPLE_RATE "/proc/sys/kernel/perf_event_max_sample_rate" #define PATH_SCHED_RT_PERIOD_US "/proc/sys/kernel/sched_rt_period_us" #define PATH_SCHED_RT_RUNTIME_US "/proc/sys/kernel/sched_rt_runtime_us" #define PATH_SCHED_RR_TIMESLICE_MS "/proc/sys/kernel/sched_rr_timeslice_ms" #define PATH_UNPRIVILEGED_USERNS_CLONE "/proc/sys/kernel/unprivileged_userns_clone" /* USER */ #define PATH_MAX_USER_NAMESPACES "/proc/sys/user/max_user_namespaces" /* FS */ #define PATH_FS_PIPE_MAX_SIZE "/proc/sys/fs/pipe-max-size" #define PATH_FS_PIPE_MAX_PAGES "/proc/sys/fs/pipe-max-pages" /* VM */ #define PATH_VM_NR_HPAGES "/proc/sys/vm/nr_hugepages" #define PATH_VM_OVERCOMMIT_HPAGES "/proc/sys/vm/nr_overcommit_hugepages" #define PATH_VM_DROP_CACHES "/proc/sys/vm/drop_caches" #define PATH_VM_COMPACT_MEMORY "/proc/sys/vm/compact_memory" #define PATH_VM_VFS_CACHE_PRESSURE "/proc/sys/vm/vfs_cache_pressure" #define PATH_VM_OVERCOMMIT_MEMORY "/proc/sys/vm/overcommit_memory" /* HUGETLB */ #define PATH_MM_HUGEPAGES "/sys/kernel/mm/hugepages/" #define PATH_MM_THP "/sys/kernel/mm/transparent_hugepage/" /* KSM */ #define PATH_MM_KSM "/sys/kernel/mm/ksm/" #define MM_KSM_FP(s) (PATH_MM_KSM s) /* NETWORK */ #define PATH_NET_IPV4 "/proc/sys/net/ipv4/" #define NET_IPV4_FP(s) (PATH_NET_IPV4 s) /* MEMINFO */ #define MEMINFO_HPAGE_TOTAL "HugePages_Total:" #define MEMINFO_HPAGE_FREE "HugePages_Free:" #define MEMINFO_HPAGE_RSVD "HugePages_Rsvd:" #define MEMINFO_HPAGE_SURP "HugePages_Surp:" #define MEMINFO_HPAGE_SIZE "Hugepagesize:"
Quoted 2 lines
Shortening this to
SYS_KERNEL("numa_balancing")would be confusing since we have both/proc/sys/and/sys/
v3-B version:
After looking through all the LTP frequently used knobs (shown above), I found that '/sys/kernel/' is not quite often used like '/proc/sys/kernel', so basically we only need to handle the /proc one.
thus, maybe define PROC_KER_FP() or PROC_SYS_KERNEL_FP() instead of list many KERNEL files in tst_path.h:
/* KERNEL */
#define PROC_KER_FP(s) ("/proc/sys/kernel/" s)
/* USER */
#define PROC_USER_FP(s) ("/proc/sys/user/" s)...
In testcase used like:
PROC_KER_FP("pid_max");
PROC_KER_FP("shmmni");
PROC_KER_FP("perf_event_mlock_kb");
PROC_USER_FP("max_user_namespaces");Which version (v3-A or v3-B) do you think is better? Or any other suggestion?
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Quoted 2 lines
Which version (v3-A or v3-B) do you think is better? Or any other suggestion?
I vote for v3-A, it's simpler and descriptive enough.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 4 lines · Cyril Hrubis
Quoted 2 lines
Which version (v3-A or v3-B) do you think is better? Or any other suggestion?
I vote for v3-A, it's simpler and descriptive enough.
Thank you, I feel the same way.
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 13 lines
Hi!
Quoted 12 lines
include/tst_path.h new file +12
-0+// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) Linux Test Project, 2026 +* Copyright (c) 2026 Li Wang <[email protected]> +*/ + +#ifndef TST_PATH__ +#define TST_PATH__ + +/* PROC */ +#define PROC_SYS_VM "/proc/sys/vm/" +#define PROC_SYS_FS "/proc/sys/fs/"
Quoted 8 lines
include/tst_path.h line 18
Quoted 5 lines
include/tst_path.h new file +5
-0+#define PROC_SYS_NET "/proc/sys/net/" +#define PROC_SYS_USER "/proc/sys/user/" +#define PROC_SYS_KERNEL "/proc/sys/kernel/" +/* SYS */ +#define SYS_KERNEL_MM "/sys/kernel/mm/"I wonder if this is really better. The macro name is not shorter and the kernel path is not going to change since it's part of API.
IMHO it's not about kernel change but about user typos :).
I prefer constants (build failure in case of typo instead of wrong patch being hidden for years).
I thought in the past about replacing tag keys ("linux-git", "glibc-git", ...) with constants, but never implement it as I expected it'd be rejected as useless.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp