Skip to contentSkip to conversation

hugetlb: migrate library and numa helpers to libs/

PATCH Superseded Pradeep Susarla 2 participants 3 messages Jan 8 – Jan 9

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hugetlb: migrate library and numa helpers to libs/

Closes #1276
---
 .../lib/hugetlb.h => include/tst_hugetlb.h    |  8 +-
 include/tst_numa.h                            |  9 +++
 libs/hugetlb/Makefile                         |  8 ++
 .../hugetlb.c => libs/hugetlb/libhugetlb.c    | 10 +--
 libs/numa/tst_numa.c                          | 79 ++++++++++++++++---
 testcases/kernel/include/numa_helper.h        |  2 +-
 testcases/kernel/lib/numa_cpuset.c            | 64 ---------------
 testcases/kernel/mem/hugetlb/Makefile         | 28 ++-----
 testcases/kernel/mem/hugetlb/Makefile.inc     | 24 +++---
 .../hugetlb/hugefallocate/hugefallocate01.c   |  2 +-
 .../hugetlb/hugefallocate/hugefallocate02.c   |  2 +-
 .../kernel/mem/hugetlb/hugefork/hugefork01.c  |  2 +-
 .../kernel/mem/hugetlb/hugefork/hugefork02.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap01.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap02.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap04.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap05.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap06.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap07.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap08.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap09.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap10.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap11.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap12.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap13.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap14.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap15.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap16.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap17.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap18.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap19.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap20.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap21.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap22.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap23.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap24.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap25.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap26.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap27.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap28.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap29.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap30.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap31.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap32.c  |  2 +-
 .../kernel/mem/hugetlb/hugemmap/hugemmap34.c  |  2 +-
 .../mem/hugetlb/hugeshmat/hugeshmat01.c       |  2 +-
 .../mem/hugetlb/hugeshmat/hugeshmat02.c       |  2 +-
 .../mem/hugetlb/hugeshmat/hugeshmat03.c       |  2 +-
 .../mem/hugetlb/hugeshmat/hugeshmat04.c       |  2 +-
 .../mem/hugetlb/hugeshmat/hugeshmat05.c       |  2 +-
 .../mem/hugetlb/hugeshmctl/hugeshmctl01.c     |  2 +-
 .../mem/hugetlb/hugeshmctl/hugeshmctl02.c     |  2 +-
 .../mem/hugetlb/hugeshmctl/hugeshmctl03.c     |  2 +-
 .../mem/hugetlb/hugeshmdt/hugeshmdt01.c       |  2 +-
 .../mem/hugetlb/hugeshmget/hugeshmget01.c     |  2 +-
 .../mem/hugetlb/hugeshmget/hugeshmget02.c     |  2 +-
 .../mem/hugetlb/hugeshmget/hugeshmget03.c     |  2 +-
 .../mem/hugetlb/hugeshmget/hugeshmget05.c     |  2 +-
 .../mem/hugetlb/hugeshmget/hugeshmget06.c     |  2 +-
 testcases/kernel/mem/hugetlb/lib/Makefile     | 10 ---
 testcases/kernel/mem/ksm/ksm02.c              |  5 +-
 testcases/kernel/mem/ksm/ksm04.c              |  7 +-
 testcases/kernel/mem/oom/oom04.c              |  1 +
 testcases/kernel/mem/oom/oom05.c              |  1 +
 64 files changed, 179 insertions(+), 177 deletions(-)
 rename testcases/kernel/mem/hugetlb/lib/hugetlb.h => include/tst_hugetlb.h (91%)
 create mode 100644 libs/hugetlb/Makefile
 rename testcases/kernel/mem/hugetlb/lib/hugetlb.c => libs/hugetlb/libhugetlb.c (90%)
 delete mode 100644 testcases/kernel/lib/numa_cpuset.c
 delete mode 100644 testcases/kernel/mem/hugetlb/lib/Makefile
include/tst_hugetlb.h renamed from testcases/kernel/mem/hugetlb/lib/hugetlb.h +4 -4
similarity index 91%
rename from testcases/kernel/mem/hugetlb/lib/hugetlb.h
rename to include/tst_hugetlb.h
index fa742eb8d..409302137 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  *
  * Copyright (c) Linux Test Project, 2004-2025
@@ -9,8 +9,8 @@
  * hugetlb.h - common definitions for the hugepage tests
  */
 
-#ifndef __HUGETLB_H
-#define __HUGETLB_H
+#ifndef TST_HUGETLB_H
+#define TST_HUGETLB_H
 
 #include <stdlib.h>
 #include <sys/ipc.h>
@@ -61,4 +61,4 @@ int do_readback(void *p, size_t size, char *desc);
 
 void update_shm_size(size_t *shm_size);
 
-#endif /* hugetlb.h */
+#endif /* TST_HUGETLB_H */
include/tst_numa.h +9 -0
index a1f961630..38019a17f 100644
@@ -119,4 +119,13 @@ enum tst_numa_types {
  */
 struct tst_nodemap *tst_get_nodemap(int type, size_t min_mem_kb);
 
+struct tst_cg_group;
+
+/**
+ * write_node_cpusets() - Writes cpusets for a given node.
+ * @cg: Cgroup structure.
+ * @nd: Node number.
+ */
+void write_node_cpusets(const struct tst_cg_group *cg, long nd);
+
 #endif /* TST_NUMA_H__ */
libs/hugetlb/Makefile new file +8 -0
new file mode 100644
index 000000000..c60468976
@@ -0,0 +1,8 @@
+top_srcdir		?= ../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+# This follows the naming convention seen in your ls -R output
+LIB := libltphugetlb.a
+
+include $(top_srcdir)/include/mk/lib.mk
libs/hugetlb/libhugetlb.c renamed from testcases/kernel/mem/hugetlb/lib/hugetlb.c +5 -5
similarity index 90%
rename from testcases/kernel/mem/hugetlb/lib/hugetlb.c
rename to libs/hugetlb/libhugetlb.c
index 92b484d4a..a1addc565 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (c) Linux Test Project, 2006-2025
  * Copyright (c) International Business Machines Corp., 2001
@@ -10,7 +10,7 @@
 #include <sys/shm.h>
 #include <sys/time.h>
 #include <pwd.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 key_t shmkey;
 
@@ -91,15 +91,15 @@ int do_readback(void *p, size_t size, char *desc)
 
 	for (i = 0; i < (size / sizeof(*q)); i++) {
 		if (q[i] != (RANDOM_CONSTANT ^ i)) {
-			tst_res(TFAIL, "At \"%s\": Mismatch at offset 0x%lx: 0x%x "
-					"instead of 0x%lx", desc, i, q[i], RANDOM_CONSTANT ^ i);
+			tst_res(TFAIL, "At \"%s\": Mismatch at offset 0x%lx: 0x%x instead of 0x%lx",
+					desc, i, q[i], RANDOM_CONSTANT ^ i);
 			return -1;
 		}
 	}
 	return 0;
 }
 
-void update_shm_size(size_t * shm_size)
+void update_shm_size(size_t *shm_size)
 {
 	size_t shmmax;
 
libs/numa/tst_numa.c +70 -9

136 lines not on this page · raw message

testcases/kernel/include/numa_helper.h +1 -1
index e67ddaaca..2eae1160e 100644
@@ -55,6 +55,6 @@ int get_allowed_nodes(int flag, int count, ...);
 void nh_dump_nodes(void);
 int is_numa(void (*cleanup_fn)(void), int flag, int min_nodes);
 
-void write_node_cpusets(const struct tst_cg_group *cg, long nd);
+
 
 #endif /* NUMA_HELPER_H */
testcases/kernel/lib/numa_cpuset.c deleted +0 -64

64 lines not on this page · raw message

testcases/kernel/mem/hugetlb/Makefile +8 -20
index 82ae5330e..c456d5e16 100644
@@ -1,25 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (c) International Business Machines  Corp., 2001
+# Copyright (c) International Business Machines Corp., 2001
 
-top_srcdir		?= ../../../..
+top_srcdir      ?= ../../../..
 
-include	$(top_srcdir)/include/mk/env_pre.mk
+include $(top_srcdir)/include/mk/env_pre.mk
 
-LIBDIR			:= lib
-LIB			:= $(LIBDIR)/libhugetlb.a
-FILTER_OUT_DIRS		:= $(LIBDIR)
+# The actual test subdirectories are automatically found 
+# by generic_trunk_target.mk. 
+# We don't need to define LIB or MAKE_DEPS here because 
+# they are now handled in Makefile.inc.
 
-$(LIBDIR):
-	mkdir -p "$@"
-
-$(LIB): $(LIBDIR)
-	$(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" all
-
-MAKE_DEPS		:= $(LIB)
-
-trunk-clean:: | lib-clean
-
-lib-clean:: $(LIBDIR)
-	$(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" clean
-
-include $(top_srcdir)/include/mk/generic_trunk_target.mk
+include $(top_srcdir)/include/mk/generic_trunk_target.mk
\ No newline at end of file
testcases/kernel/mem/hugetlb/Makefile.inc +14 -10
index b272e62a8..d4c9ecab1 100644
@@ -21,15 +21,19 @@
 #
 
 # DO NOT USE THIS FILE FOR hugetlb / lib!!!
-LIBIPCDIR		:= ../lib
-LIBIPC			:= $(LIBIPCDIR)/libhugetlb.a
 
-$(LIBIPCDIR):
-	mkdir -p "$@"
-$(LIBIPC): $(LIBIPCDIR)
-	$(MAKE) -C "$^" -f "$(abs_srcdir)/$^/Makefile" all
+# Point to the new global library location
+LIBHUGETLB_DIR  := $(top_srcdir)/libs/hugetlb
+LIBHUGETLB      := $(LIBHUGETLB_DIR)/libltphugetlb.a
 
-CPPFLAGS		+= -I$(abs_srcdir)/$(LIBIPCDIR)
-LDFLAGS			+= -L$(abs_builddir)/$(LIBIPCDIR)
-LDLIBS			+= -lhugetlb
-MAKE_DEPS		+= $(LIBIPC)
+# We don't need to mkdir here anymore because the folder is part of the repo
+# But we must ensure the library is built before the test
+$(LIBHUGETLB):
+	$(MAKE) -C $(LIBHUGETLB_DIR) all
+
+# Linker flags: Tell the compiler where to find the .a file and what to call it
+LDFLAGS         += -L$(LIBHUGETLB_DIR)
+LDLIBS          += -lltphugetlb
+
+# Ensure the library is a dependency for the tests
+MAKE_DEPS       += $(LIBHUGETLB)
testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate01.c +1 -1
index 53fef3ddb..9568ac40d 100644
@@ -18,7 +18,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 #include "lapi/fallocate.h"
 
 #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate02.c +1 -1
index 1f7c4dcc6..fb7f0e40d 100644
@@ -16,7 +16,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 #include "lapi/fallocate.h"
 
 #define MAX_PAGES_TO_USE 5
testcases/kernel/mem/hugetlb/hugefork/hugefork01.c +1 -1
index 54603b98b..a1afedda3 100644
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define C1		0x1234ABCD
 #define C2		~0x1234ABCD
testcases/kernel/mem/hugetlb/hugefork/hugefork02.c +1 -1
index cafeaa242..013e6d77a 100644
@@ -11,7 +11,7 @@
  */
 
 #include "tst_safe_sysv_ipc.h"
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static int shmid = -1;
 
testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c +1 -1
index de5133381..d6cde4492 100644
@@ -26,7 +26,7 @@
 #include <sys/mount.h>
 #include <limits.h>
 #include <sys/param.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static long *addr;
 static int  fildes;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c +1 -1
index 611ae7090..4c05f7757 100644
@@ -29,7 +29,7 @@
 #include <limits.h>
 #include <sys/param.h>
 #include "lapi/abisize.h"
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define LOW_ADDR       0x80000000
 #define LOW_ADDR2      0x90000000
testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +1 -1
index f52747e68..02516e4ae 100644
@@ -28,7 +28,7 @@
 #include <limits.h>
 #include <sys/param.h>
 #include "lapi/abisize.h"
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static char TEMPFILE[MAXPATHLEN];
 
testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c +1 -1
index 75f28102d..2f34b3d52 100644
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 #include "tst_safe_sysv_ipc.h"
 #include "tst_test.h"
 
testcases/kernel/mem/hugetlb/hugemmap/hugemmap06.c +1 -1
index 1ac989487..42eee50c3 100644
@@ -26,7 +26,7 @@
 #define _GNU_SOURCE
 #include <pthread.h>
 #include <stdio.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 #include "lapi/mmap.h"
 
 static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c +1 -1
index 5a965e182..360ab9255 100644
@@ -18,7 +18,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 #include "tst_safe_stdio.h"
 
 #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap08.c +1 -1
index b9d61dd66..07dbafdf1 100644
@@ -26,7 +26,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 #define WITH_OVERCOMMIT 0
testcases/kernel/mem/hugetlb/hugemmap/hugemmap09.c +1 -1
index 10f64674d..0aa81c2b1 100644
@@ -18,7 +18,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap10.c +1 -1
index e1795153d..833996d6d 100644
@@ -20,7 +20,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 
testcases/kernel/mem/hugetlb/hugemmap/hugemmap11.c +1 -1
index 087e8c691..622f82830 100644
@@ -17,7 +17,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define P0 "ffffffff"
 #define IOSZ 4096
testcases/kernel/mem/hugetlb/hugemmap/hugemmap12.c +1 -1
index 523ea9025..e962ac26b 100644
@@ -20,7 +20,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap13.c +1 -1
index 206582ebe..e517f47ee 100644
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <lapi/mmap.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define FOURGB (1ULL << 32)
 #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap14.c +1 -1
index 5a0fba9bb..1dbc0a863 100644
@@ -21,7 +21,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define FOURGB (1ULL << 32)
 #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c +1 -1
index 1dde9e87b..4413b59d3 100644
@@ -22,7 +22,7 @@
 #endif
 
 #define _GNU_SOURCE
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #if defined(__powerpc__) || defined(__powerpc64__) || defined(__ia64__) || \
 	defined(__s390__) || defined(__s390x__) || defined(__sparc__) || \
testcases/kernel/mem/hugetlb/hugemmap/hugemmap16.c +1 -1
index bd5fae5c9..9ced89906 100644
@@ -20,7 +20,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 static int  fd = -1;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap17.c +1 -1
index b784005af..5dd623baf 100644
@@ -27,7 +27,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 #define MAP_LENGTH	(4UL * hpage_size)
testcases/kernel/mem/hugetlb/hugemmap/hugemmap18.c +1 -1
index 45796decd..fcc33808f 100644
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap19.c +1 -1
index 13c3c7ac6..67db1a4dd 100644
@@ -25,7 +25,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define RANDOM_CONSTANT	0x1234ABCD
 #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap20.c +1 -1
index 313efb4bc..50075498e 100644
@@ -9,7 +9,7 @@
  * of MAP_PRIVATE and MAP_SHARED with and without MAP_LOCKED specified.
  */
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 #define FLAGS_DESC(x) .flags = x, .flags_str = #x
testcases/kernel/mem/hugetlb/hugemmap/hugemmap21.c +1 -1
index 3792cff89..86b67a517 100644
@@ -11,7 +11,7 @@
  * were not corrupted by the other threads.
  */
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define THREADS 5
 #define NR_HUGEPAGES 6
testcases/kernel/mem/hugetlb/hugemmap/hugemmap22.c +1 -1
index 78e4a3bf9..6793906d6 100644
@@ -12,7 +12,7 @@
  * iterations.
  */
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define NR_HUGEPAGES 2
 #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap23.c +1 -1
index 86157d262..7f9dc2fb8 100644
@@ -12,7 +12,7 @@
  */
 
 #include <setjmp.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 #define RANDOM_CONSTANT 0x1234ABCD
testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c +1 -1
index 0de44d58a..eef6b0fb0 100644
@@ -14,7 +14,7 @@
  */
 
 #define _GNU_SOURCE
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define RANDOM_CONSTANT 0x1234ABCD
 #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap25.c +1 -1
index 7d9fd0b60..605ed2556 100644
@@ -14,7 +14,7 @@
  */
 
 #define _GNU_SOURCE
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 
testcases/kernel/mem/hugetlb/hugemmap/hugemmap26.c +1 -1
index cd60d7403..34fdbc1ba 100644
@@ -14,7 +14,7 @@
  */
 
 #define _GNU_SOURCE
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 
testcases/kernel/mem/hugetlb/hugemmap/hugemmap27.c +1 -1
index f79258da6..ab7d95f52 100644
@@ -12,7 +12,7 @@
  */
 
 #include <setjmp.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap28.c +1 -1
index 48cedd158..2567eb996 100644
@@ -10,7 +10,7 @@
  * mapping. Otherwise, reserve count will be overflowed.
  */
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap29.c +1 -1
index f04974500..e5ed91005 100644
@@ -12,7 +12,7 @@
  * shared mmap data.
  */
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define C1 0x1234ABCD
 #define C2 0xFEDC9876
testcases/kernel/mem/hugetlb/hugemmap/hugemmap30.c +1 -1
index a624f4a26..09a3f3c06 100644
@@ -14,7 +14,7 @@
  */
 
 #define _GNU_SOURCE
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define MNTPOINT "hugetlbfs/"
 static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap31.c +1 -1
index 57367b641..0f9c366a6 100644
@@ -10,7 +10,7 @@
  * seen to other mapping or not?
  */
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define RANDOM_CONSTANT 0x1234ABCD
 #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +1 -1
index 188ee2176..c99554277 100644
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define PATH_HUGEPAGE "/sys/kernel/mm/hugepages"
 #define GIGANTIC_MIN_ORDER 10
testcases/kernel/mem/hugetlb/hugemmap/hugemmap34.c +1 -1
index ab7469cd7..b355a1497 100644
@@ -20,7 +20,7 @@
 
 #define _GNU_SOURCE
 #include "lapi/mmap.h"
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 #include "tst_safe_stdio.h"
 #include <errno.h>
 #include <inttypes.h>
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +1 -1
index 3a50e6b55..7729a7e83 100644
@@ -27,7 +27,7 @@
  */
 
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define CASE0 10 /* values to write into the shared */
 #define CASE1 20 /* memory location.                */
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c +1 -1
index e79d682f3..8e8e4a04d 100644
@@ -26,7 +26,7 @@
 #include <pwd.h>
 #include <limits.h>
 #include "lapi/abisize.h"
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #ifdef TST_ABI64
 #define NADDR	0x10000000eef	/* a 64bit non alligned address value */
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +1 -1
index 9de925739..39ecbaaec 100644
@@ -31,7 +31,7 @@
  */
 
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static size_t shm_size;
 static int shm_id_1 = -1;
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c +1 -1
index 9f877fd07..48b9d917b 100644
@@ -19,7 +19,7 @@
  * 	test must be run at root
  */
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define SIZE	(1024 * 1024 * 1024)
 #define BOUNDARY (1024 * 1024 * 1024)
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat05.c +1 -1
index 3b2ae351c..6725de8d5 100644
@@ -26,7 +26,7 @@
  *
  */
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static long page_size;
 static long hpage_size;
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +1 -1
index bd4437b13..b1fc18b46 100644
@@ -10,7 +10,7 @@
  */
 
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 #define N_ATTACH	4U
 #define NEWMODE		0066
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +1 -1
index 82126f52c..883cf522e 100644
@@ -26,7 +26,7 @@
 
 #include <pwd.h>
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 #include "lapi/syscalls.h"
 
 static size_t shm_size;
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +1 -1
index ec4640686..544e7c04b 100644
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static size_t shm_size;
 static int shm_id_1 = -1;
testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +1 -1
index 0b9515fda..540927b68 100644
@@ -30,7 +30,7 @@
 
 #include <setjmp.h>
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static size_t shm_size;
 static int shm_id_1 = -1;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +1 -1
index 627356510..f977c8ed6 100644
@@ -13,7 +13,7 @@
  */
 
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static size_t shm_size;
 static int shm_id_1 = -1;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +1 -1
index bbd968c06..aff45f305 100644
@@ -12,7 +12,7 @@
  *	04/2004 - Updated by Robbie Williamson
  */
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static size_t shm_size;
 static int shm_id_1 = -1;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +1 -1
index 625761f6e..5b1c914a7 100644
@@ -12,7 +12,7 @@
  */
 
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 /*
  * The MAXIDS value is somewhat arbitrary and may need to be increased
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +1 -1
index 336319603..c1dc2d0d5 100644
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <limits.h>
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 
 static size_t shm_size;
 static int shm_id_1 = -1;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c +1 -1
index ca93ae6d8..8f1d1d6ae 100644
@@ -12,7 +12,7 @@
  * works correctly by validating the data written to segment.
  */
 
-#include "hugetlb.h"
+#include "tst_hugetlb.h"
 #include "tst_safe_sysv_ipc.h"
 
 #define NR_HUGEPAGES 4
testcases/kernel/mem/hugetlb/lib/Makefile deleted +0 -10
deleted file mode 100644
index 45606b17f..000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (c) International Business Machines  Corp., 2001
-
-top_srcdir		?= ../../../../..
-
-include $(top_srcdir)/include/mk/env_pre.mk
-
-INTERNAL_LIB		:= libhugetlb.a
-
-include $(top_srcdir)/include/mk/lib.mk
testcases/kernel/mem/ksm/ksm02.c +4 -1
index ab16af29e..142aa868c 100644
@@ -54,7 +54,10 @@
 #include <stdio.h>
 #include <unistd.h>
 #include "tst_test.h"
-#include "ksm_common.h"
+#include "tst_safe_stdio.h"
+#include "tst_numa.h"
+#include "ksm_helper.h"
+#include "numa_helper.h"
 
 #ifdef HAVE_NUMA_V2
 #include <numaif.h>
testcases/kernel/mem/ksm/ksm04.c +4 -3
index 26506b4f6..5877a04ea 100644
@@ -34,10 +34,11 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <stdio.h>
-#include <unistd.h>
 #include "tst_test.h"
-#include "ksm_common.h"
+#include "tst_safe_stdio.h"
+#include "tst_numa.h"
+#include "ksm_helper.h"
+#include "numa_helper.h"
 
 #ifdef HAVE_NUMA_V2
 #include <numaif.h>
testcases/kernel/mem/oom/oom04.c +1 -0
index d4beb12c7..b0859271c 100644
@@ -19,6 +19,7 @@
 
 #include "tst_test.h"
 #include "numa_helper.h"
+#include "tst_numa.h"
 #include "oom.h"
 
 #ifdef HAVE_NUMA_V2
testcases/kernel/mem/oom/oom05.c +1 -0
index 6b8d436d1..30321a342 100644
@@ -19,6 +19,7 @@
 
 #include "tst_test.h"
 #include "numa_helper.h"
+#include "tst_numa.h"
 #include "oom.h"
 
 #ifdef HAVE_NUMA_V2
Signature · 5 lines
2.43.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw
Quoted 1 line · Pradeep Susarla
 .../lib/hugetlb.h => include/tst_hugetlb.h    |  8 +-

This would be better named "libhugetlb.h", anything under the ltp/libs/* should not have a prefix 'tst_' to distinguish the main LTP API.

Otherwise, people may be confused about tst_hugepage.h tst_hugetlb.h and can't find the '*.c' achieved file in ltp/lib/.

Quoted 1 line
 include/tst_numa.h                            |  9 +++

Rename to libnuma.h.

There are some other libs/tst_*.c that should be renamed to prefix lib*, but yes, this is not related to your patch.

Quoted 7 lines
 libs/hugetlb/Makefile                         |  8 ++
 .../hugetlb.c => libs/hugetlb/libhugetlb.c    | 10 +--
 libs/numa/tst_numa.c                          | 79 ++++++++++++++++---
 testcases/kernel/include/numa_helper.h        |  2 +-
 testcases/kernel/lib/numa_cpuset.c            | 64 ---------------
 testcases/kernel/mem/hugetlb/Makefile         | 28 ++-----
 testcases/kernel/mem/hugetlb/Makefile.inc     | 24 +++---

...

Quoted 3 lines
 testcases/kernel/mem/hugetlb/lib/Makefile     | 10 ---
 testcases/kernel/mem/ksm/ksm02.c              |  5 +-

ksm02.c compile failed on CentOS 10 x86_64.

--
Regards,
Li Wang

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw

Hi Pradeep,

Quoted 2 lines · Li Wang

There are some other libs/tst_*.c that should be renamed to prefix lib*, but yes, this is not related to your patch.

To simplify your work, I just sent a patch to rename all of that libs/, you could rebase your patch on this one once others ACK the change.

https://lists.linux.it/pipermail/ltp/2026-January/046071.html

Signature · 6 lines
Regards,
Li Wang


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp