hugetlb/numa: migrate test helpers to libs/
v3 cover hugetlb/numa: migrate test helpers to libs/
From: Claude <[email protected]>
This series moves the hugetlb test library and the numa cpuset helper into the global libs/ location, following the tse_ naming scheme adopted for the extended (non-core) libraries, and fixes an out-of-bounds write found during review.
The remaining helpers from #1276 are left as follow-ups: numa_helper.c still uses the legacy test API and should be rewritten before being moved, and the placement of the single ksm_helper.c function is still open.
Part of #1276
Changes in v3:
- Split the two independent migrations into separate patches, as requested in review (hugetlb library vs write_node_cpusets()).
- New patch 3/3: fix the out-of-bounds write in gather_node_cpus() when a node has no online CPUs, reported in review (pre-existing, predates the move).
- Rebased onto current master; converted the newly added tests (hugemmap35, hugemmap36, hugemmap37, hugemmap38, hugemmap41) to the tse_hugetlb.h header.
Changes in v2:
- Rebased onto the merged tse_ naming scheme (v1 still used tst_).
- Fix the ksm02 link failure reported on v1: ksm02, ksm04, oom04 and oom05 now link -lltpnuma.
- Use the standard LTPLIBS mechanism for the hugetlb tests instead of a hand-rolled Makefile.inc.
- Size the per-CPU sysfs path buffer to avoid -Wformat-truncation.
Pradeep Susarla (3):
hugetlb: Migrate test library to libs/
numa: Move write_node_cpusets() into libs/numa
numa: Fix out-of-bounds write in gather_node_cpus()
.../lib/hugetlb.h => include/tse_hugetlb.h | 11 ++-- include/tse_numa.h | 13 ++++ libs/hugetlb/Makefile | 11 ++++ .../hugetlb.c => libs/hugetlb/tse_hugetlb.c | 2 +- libs/numa/tse_numa.c | 58 +++++++++++++++++ testcases/kernel/include/numa_helper.h | 4 -- testcases/kernel/lib/numa_cpuset.c | 64 ------------------- testcases/kernel/mem/hugetlb/Makefile | 21 +----- testcases/kernel/mem/hugetlb/Makefile.inc | 35 ---------- .../kernel/mem/hugetlb/hugefallocate/Makefile | 4 +- .../hugetlb/hugefallocate/hugefallocate01.c | 2 +- .../hugetlb/hugefallocate/hugefallocate02.c | 2 +- .../kernel/mem/hugetlb/hugefork/Makefile | 4 +- .../kernel/mem/hugetlb/hugefork/hugefork01.c | 2 +- .../kernel/mem/hugetlb/hugefork/hugefork02.c | 2 +- .../kernel/mem/hugetlb/hugemmap/Makefile | 4 +- .../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 +- .../kernel/mem/hugetlb/hugemmap/hugemmap35.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap36.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap37.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap38.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap41.c | 2 +- .../kernel/mem/hugetlb/hugeshmat/Makefile | 4 +- .../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 +- .../kernel/mem/hugetlb/hugeshmctl/Makefile | 4 +- .../mem/hugetlb/hugeshmctl/hugeshmctl01.c | 2 +- .../mem/hugetlb/hugeshmctl/hugeshmctl02.c | 2 +- .../mem/hugetlb/hugeshmctl/hugeshmctl03.c | 2 +- .../kernel/mem/hugetlb/hugeshmdt/Makefile | 4 +- .../mem/hugetlb/hugeshmdt/hugeshmdt01.c | 2 +- .../kernel/mem/hugetlb/hugeshmget/Makefile | 4 +- .../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/Makefile | 2 + testcases/kernel/mem/ksm/ksm_common.h | 1 + testcases/kernel/mem/oom/Makefile | 4 ++ testcases/kernel/mem/oom/oom04.c | 1 + testcases/kernel/mem/oom/oom05.c | 1 + 77 files changed, 175 insertions(+), 201 deletions(-) rename testcases/kernel/mem/hugetlb/lib/hugetlb.h => include/tse_hugetlb.h (87%) create mode 100644 libs/hugetlb/Makefile rename testcases/kernel/mem/hugetlb/lib/hugetlb.c => libs/hugetlb/tse_hugetlb.c (99%) delete mode 100644 testcases/kernel/lib/numa_cpuset.c delete mode 100644 testcases/kernel/mem/hugetlb/Makefile.inc delete mode 100644 testcases/kernel/mem/hugetlb/lib/Makefile
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 1/3 hugetlb: Migrate test library to libs/
Move the hugetlb test helper library out of the per-suite lib/ directory into the global libs/ location and adopt the tse_ (extended, non-core library) naming used for the other libraries under libs/:
testcases/kernel/mem/hugetlb/lib/hugetlb.h -> include/tse_hugetlb.h testcases/kernel/mem/hugetlb/lib/hugetlb.c -> libs/hugetlb/tse_hugetlb.c
The hand-rolled per-suite library build (lib/Makefile and Makefile.inc) is dropped in favour of the standard LTPLIBS mechanism: each hugetlb test directory now sets "LTPLIBS = hugetlb" and links -lltphugetlb, and the library is built as libs/hugetlb/libltphugetlb.a.
No functional changes intended.
Part of #1276.
--- .../lib/hugetlb.h => include/tse_hugetlb.h | 11 +++--- libs/hugetlb/Makefile | 11 ++++++ .../hugetlb.c => libs/hugetlb/tse_hugetlb.c | 2 +- testcases/kernel/mem/hugetlb/Makefile | 21 ++--------- testcases/kernel/mem/hugetlb/Makefile.inc | 35 ------------------- .../kernel/mem/hugetlb/hugefallocate/Makefile | 4 ++- .../hugetlb/hugefallocate/hugefallocate01.c | 2 +- .../hugetlb/hugefallocate/hugefallocate02.c | 2 +- .../kernel/mem/hugetlb/hugefork/Makefile | 4 ++- .../kernel/mem/hugetlb/hugefork/hugefork01.c | 2 +- .../kernel/mem/hugetlb/hugefork/hugefork02.c | 2 +- .../kernel/mem/hugetlb/hugemmap/Makefile | 4 ++- .../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 +- .../kernel/mem/hugetlb/hugemmap/hugemmap35.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap36.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap37.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap38.c | 2 +- .../kernel/mem/hugetlb/hugemmap/hugemmap41.c | 2 +- .../kernel/mem/hugetlb/hugeshmat/Makefile | 4 ++- .../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 +- .../kernel/mem/hugetlb/hugeshmctl/Makefile | 4 ++- .../mem/hugetlb/hugeshmctl/hugeshmctl01.c | 2 +- .../mem/hugetlb/hugeshmctl/hugeshmctl02.c | 2 +- .../mem/hugetlb/hugeshmctl/hugeshmctl03.c | 2 +- .../kernel/mem/hugetlb/hugeshmdt/Makefile | 4 ++- .../mem/hugetlb/hugeshmdt/hugeshmdt01.c | 2 +- .../kernel/mem/hugetlb/hugeshmget/Makefile | 4 ++- .../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 ------ 68 files changed, 95 insertions(+), 133 deletions(-) rename testcases/kernel/mem/hugetlb/lib/hugetlb.h => include/tse_hugetlb.h (87%) create mode 100644 libs/hugetlb/Makefile rename testcases/kernel/mem/hugetlb/lib/hugetlb.c => libs/hugetlb/tse_hugetlb.c (99%) delete mode 100644 testcases/kernel/mem/hugetlb/Makefile.inc delete mode 100644 testcases/kernel/mem/hugetlb/lib/Makefile
include/tse_hugetlb.h renamed from testcases/kernel/mem/hugetlb/lib/hugetlb.h +5 -6
@@ -1,16 +1,15 @@ -// SPDX-License-Identifier: GPL-2.0-or-later +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* -* * Copyright (c) Linux Test Project, 2004-2025 * Copyright (c) International Business Machines Corp., 2001 */ /* -* hugetlb.h - common definitions for the hugepage tests +* Common definitions for the hugepage tests */ -#ifndef __HUGETLB_H -#define __HUGETLB_H +#ifndef TSE_HUGETLB_H +#define TSE_HUGETLB_H #include <stdlib.h> #include <sys/ipc.h>
@@ -59,4 +58,4 @@ int do_readback(void *p, size_t size, char *desc);void update_shm_size (size_t *shm_size); -#endif /* hugetlb.h */ +#endif /* TSE_HUGETLB_H */
libs/hugetlb/Makefile new file +11 -0
@@ -0,0 +1,11 @@ +# 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 := libltphugetlb.a + +include $(top_srcdir)/include/mk/lib.mk +include $(top_srcdir)/include/mk/generic_leaf_target.mk
libs/hugetlb/tse_hugetlb.c renamed from testcases/kernel/mem/hugetlb/lib/hugetlb.c +1 -1
@@ -10,7 +10,7 @@#include <sys/shm.h> #include <sys/time.h> #include <pwd.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" key_t shmkey;
testcases/kernel/mem/hugetlb/Makefile +2 -19
@@ -1,25 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (c) International Business Machines Corp., 2001 +# Copyright (c) International Business Machines Corp., 2001 top_srcdir ?= ../../../.. -include $(top_srcdir)/include/mk/env_pre.mk - -LIBDIR := lib -LIB := $(LIBDIR)/libhugetlb.a -FILTER_OUT_DIRS := $(LIBDIR) - -$(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/env_pre.mk include $(top_srcdir)/include/mk/generic_trunk_target.mk
testcases/kernel/mem/hugetlb/Makefile.inc deleted +0 -35
@@ -1,35 +0,0 @@ -# -# kernel/mem/hugetlb testcase suite common definitions Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -# 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 - -CPPFLAGS += -I$(abs_srcdir)/$(LIBIPCDIR) -LDFLAGS += -L$(abs_builddir)/$(LIBIPCDIR) -LDLIBS += -lhugetlb -MAKE_DEPS += $(LIBIPC)
testcases/kernel/mem/hugetlb/hugefallocate/Makefile +3 -1
@@ -4,7 +4,9 @@ top_srcdir ?= ../../../../.. +LTPLIBS = hugetlb +LTPLDLIBS = -lltphugetlb + include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate01.c +1 -1
@@ -18,7 +18,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "lapi/fallocate.h" #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugefallocate/hugefallocate02.c +1 -1
@@ -16,7 +16,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "lapi/fallocate.h" #define MAX_PAGES_TO_USE 5
testcases/kernel/mem/hugetlb/hugefork/Makefile +3 -1
@@ -4,6 +4,8 @@ top_srcdir ?= ../../../../.. +LTPLIBS = hugetlb +LTPLDLIBS = -lltphugetlb + include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/mem/hugetlb/hugefork/hugefork01.c +1 -1
@@ -19,7 +19,7 @@#include <unistd.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define C1 0x1234ABCD#define C2 ~0x1234ABCD
testcases/kernel/mem/hugetlb/hugefork/hugefork02.c +1 -1
@@ -11,7 +11,7 @@*/ #include "tst_safe_sysv_ipc.h" -#include "hugetlb.h" +#include "tse_hugetlb.h" static int shmid =-1 ;
testcases/kernel/mem/hugetlb/hugemmap/Makefile +3 -1
@@ -4,8 +4,10 @@ top_srcdir ?= ../../../../.. +LTPLIBS = hugetlb +LTPLDLIBS = -lltphugetlb + include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc include $(top_srcdir)/include/mk/generic_leaf_target.mk CFLAGS_no_stack_prot := $(filter-out -fstack-clash-protection, $(CFLAGS))
testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c +1 -1
@@ -26,7 +26,7 @@#include <sys/mount.h> #include <limits.h> #include <sys/param.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" static long *addr;static int fildes;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c +1 -1
@@ -29,7 +29,7 @@#include <limits.h> #include <sys/param.h> #include "lapi/abisize.h" -#include "hugetlb.h" +#include "tse_hugetlb.h" #define LOW_ADDR 0x80000000#define LOW_ADDR2 0x90000000
testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +1 -1
@@ -28,7 +28,7 @@#include <limits.h> #include <sys/param.h> #include "lapi/abisize.h" -#include "hugetlb.h" +#include "tse_hugetlb.h" static char TEMPFILE [MAXPATHLEN ];
testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c +1 -1
@@ -17,7 +17,7 @@#include <string.h> #include <unistd.h> #include <stdio.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "tst_safe_sysv_ipc.h" #include "tst_test.h"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap06.c +1 -1
@@ -26,7 +26,7 @@#define _GNU_SOURCE#include <pthread.h> #include <stdio.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "lapi/mmap.h" static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap07.c +1 -1
@@ -18,7 +18,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "tst_safe_stdio.h" #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap08.c +1 -1
@@ -26,7 +26,7 @@#include <sys/wait.h> #include <signal.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"#define WITH_OVERCOMMIT 0
testcases/kernel/mem/hugetlb/hugemmap/hugemmap09.c +1 -1
@@ -18,7 +18,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap10.c +1 -1
@@ -20,7 +20,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap11.c +1 -1
@@ -17,7 +17,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define P0 "ffffffff"#define IOSZ 4096
testcases/kernel/mem/hugetlb/hugemmap/hugemmap12.c +1 -1
@@ -20,7 +20,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap13.c +1 -1
@@ -21,7 +21,7 @@#include <sys/types.h> #include <lapi/mmap.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define FOURGB (1ULL << 32)#define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap14.c +1 -1
@@ -21,7 +21,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define FOURGB (1ULL << 32)#define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c +1 -1
@@ -22,7 +22,7 @@#endif #define _GNU_SOURCE -#include "hugetlb.h" +#include "tse_hugetlb.h" #if defined(__powerpc__) || defined(__powerpc64__) || defined(__ia64__) || \ defined(__s390__) || defined(__s390x__) || defined(__sparc__) || \
testcases/kernel/mem/hugetlb/hugemmap/hugemmap16.c +1 -1
@@ -20,7 +20,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"static int fd =-1 ;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap17.c +1 -1
@@ -27,7 +27,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"#define MAP_LENGTH (4UL * hpage_size)
testcases/kernel/mem/hugetlb/hugemmap/hugemmap18.c +1 -1
@@ -26,7 +26,7 @@#include <stdlib.h> #include <sys/mman.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap19.c +1 -1
@@ -25,7 +25,7 @@#include <sys/param.h> #include <sys/types.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define RANDOM_CONSTANT 0x1234ABCD#define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap20.c +1 -1
@@ -9,7 +9,7 @@* of MAP_PRIVATE and MAP_SHARED with and without MAP_LOCKED specified. */ -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"#define FLAGS_DESC (x) .flags = x, .flags_str = #x
testcases/kernel/mem/hugetlb/hugemmap/hugemmap21.c +1 -1
@@ -11,7 +11,7 @@* were not corrupted by the other threads. */ -#include "hugetlb.h" +#include "tse_hugetlb.h" #define THREADS 5#define NR_HUGEPAGES 6
testcases/kernel/mem/hugetlb/hugemmap/hugemmap22.c +1 -1
@@ -12,7 +12,7 @@* iterations. */ -#include "hugetlb.h" +#include "tse_hugetlb.h" #define NR_HUGEPAGES 2#define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap23.c +1 -1
@@ -12,7 +12,7 @@*/ #include <setjmp.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"#define RANDOM_CONSTANT 0x1234ABCD
testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c +1 -1
@@ -14,7 +14,7 @@*/ #define _GNU_SOURCE -#include "hugetlb.h" +#include "tse_hugetlb.h" #define RANDOM_CONSTANT 0x1234ABCD#define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap25.c +1 -1
@@ -14,7 +14,7 @@*/ #define _GNU_SOURCE -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap26.c +1 -1
@@ -14,7 +14,7 @@*/ #define _GNU_SOURCE -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap27.c +1 -1
@@ -12,7 +12,7 @@*/ #include <setjmp.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap28.c +1 -1
@@ -10,7 +10,7 @@* mapping. Otherwise, reserve count will be overflowed. */ -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap29.c +1 -1
@@ -12,7 +12,7 @@* shared mmap data. */ -#include "hugetlb.h" +#include "tse_hugetlb.h" #define C1 0x1234ABCD#define C2 0xFEDC9876
testcases/kernel/mem/hugetlb/hugemmap/hugemmap30.c +1 -1
@@ -14,7 +14,7 @@*/ #define _GNU_SOURCE -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap31.c +1 -1
@@ -10,7 +10,7 @@* seen to other mapping or not? */ -#include "hugetlb.h" +#include "tse_hugetlb.h" #define RANDOM_CONSTANT 0x1234ABCD#define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +1 -1
@@ -19,7 +19,7 @@#include <stdio.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define GIGANTIC_MIN_ORDER 10
testcases/kernel/mem/hugetlb/hugemmap/hugemmap34.c +1 -1
@@ -20,7 +20,7 @@#define _GNU_SOURCE#include "lapi/mmap.h" -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "tst_safe_stdio.h" #include <errno.h> #include <inttypes.h>
testcases/kernel/mem/hugetlb/hugemmap/hugemmap35.c +1 -1
@@ -16,7 +16,7 @@#define _GNU_SOURCE#include "tst_test.h" -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "lapi/mman.h" #include "lapi/mmap.h"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap36.c +1 -1
@@ -27,7 +27,7 @@#include <signal.h> #include <setjmp.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" static int page_size;static long hpage_size;
testcases/kernel/mem/hugetlb/hugemmap/hugemmap37.c +1 -1
@@ -24,7 +24,7 @@#include <sys/mman.h> #include <errno.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "tst_test.h" #include "tst_safe_stdio.h" #include "tst_safe_macros.h"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap38.c +1 -1
@@ -21,7 +21,7 @@#include <signal.h> #include <setjmp.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c +1 -1
@@ -27,7 +27,7 @@#include <sys/wait.h> #include "tst_test.h" -#include "hugetlb.h" +#include "tse_hugetlb.h" #define CONST 0xdeadbeefL#define MNTPOINT "hugetlbfs/"
testcases/kernel/mem/hugetlb/hugeshmat/Makefile +3 -1
@@ -4,6 +4,8 @@ top_srcdir ?= ../../../../.. +LTPLIBS = hugetlb +LTPLDLIBS = -lltphugetlb + include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +1 -1
@@ -27,7 +27,7 @@*/ #include <limits.h> -#include "hugetlb.h" +#include "tse_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
@@ -26,7 +26,7 @@#include <pwd.h> #include <limits.h> #include "lapi/abisize.h" -#include "hugetlb.h" +#include "tse_hugetlb.h" #ifdef TST_ABI64 #define NADDR 0x10000000eef/* a 64bit non alligned address value */
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +1 -1
@@ -31,7 +31,7 @@*/ #include <limits.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" static size_t shm_size;static int shm_id_1 =-1 ;
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c +1 -1
@@ -19,7 +19,7 @@* test must be run at root */ -#include "hugetlb.h" +#include "tse_hugetlb.h" #define SIZE (1024 * 1024 * 1024)#define BOUNDARY (1024 * 1024 * 1024)
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat05.c +1 -1
@@ -26,7 +26,7 @@* */ -#include "hugetlb.h" +#include "tse_hugetlb.h" static long page_size;static long hpage_size;
testcases/kernel/mem/hugetlb/hugeshmctl/Makefile +3 -1
@@ -4,6 +4,8 @@ top_srcdir ?= ../../../../.. +LTPLIBS = hugetlb +LTPLDLIBS = -lltphugetlb + include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +1 -1
@@ -10,7 +10,7 @@*/ #include <limits.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #define N_ATTACH 4U#define NEWMODE 0066
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +1 -1
@@ -26,7 +26,7 @@#include <pwd.h> #include <limits.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "lapi/syscalls.h" static size_t shm_size;
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +1 -1
@@ -36,7 +36,7 @@#include <sys/types.h> #include <sys/wait.h> #include <limits.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" static size_t shm_size;static int shm_id_1 =-1 ;
testcases/kernel/mem/hugetlb/hugeshmdt/Makefile +3 -1
@@ -4,6 +4,8 @@ top_srcdir ?= ../../../../.. +LTPLIBS = hugetlb +LTPLDLIBS = -lltphugetlb + include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +1 -1
@@ -30,7 +30,7 @@#include <setjmp.h> #include <limits.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" static size_t shm_size;static int shm_id_1 =-1 ;
testcases/kernel/mem/hugetlb/hugeshmget/Makefile +3 -1
@@ -3,6 +3,8 @@ top_srcdir ?= ../../../../.. +LTPLIBS = hugetlb +LTPLDLIBS = -lltphugetlb + include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +1 -1
@@ -13,7 +13,7 @@*/ #include <limits.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" static size_t shm_size;static int shm_id_1 =-1 ;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +1 -1
@@ -12,7 +12,7 @@* 04/2004 - Updated by Robbie Williamson */ #include <limits.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" static size_t shm_size;static int shm_id_1 =-1 ;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +1 -1
@@ -12,7 +12,7 @@*/ #include <limits.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" /* * The MAXIDS value is somewhat arbitrary and may need to be increased
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +1 -1
@@ -14,7 +14,7 @@#include <sys/types.h> #include <sys/wait.h> #include <limits.h> -#include "hugetlb.h" +#include "tse_hugetlb.h" static size_t shm_size;static int shm_id_1 =-1 ;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c +1 -1
@@ -12,7 +12,7 @@* works correctly by validating the data written to segment. */ -#include "hugetlb.h" +#include "tse_hugetlb.h" #include "tst_safe_sysv_ipc.h" #define NR_HUGEPAGES 4
testcases/kernel/mem/hugetlb/lib/Makefile deleted +0 -10
@@ -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
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] hugetlb: Migrate test library to libs/
Hi Pradeep,
Quoted 1 line · Pradeep Susarla
[PATCH 1/3] hugetlb: Migrate test library to libs/
Verdict - Reviewed
No issues found in the three-commit series.
Review limitation: NUMA-enabled builds were not verified because numa.h is missing and dependency installation is blocked in this environment.
---
Note:
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
PATCH v3 2/3 numa: Move write_node_cpusets() into libs/numa
In reply to Pradeep Susarlawrite_node_cpusets() lived in testcases/kernel/lib/numa_cpuset.c and was built into libkerntest.a, while its declaration sat in numa_helper.h. Move the function into libs/numa/tse_numa.c (libltpnuma.a) next to the rest of the NUMA helpers and declare it in include/tse_numa.h, so that the exposed header matches the libs/ code it belongs to.
Tests that call write_node_cpusets() (ksm02, ksm04, oom04, oom05) now link -lltpnuma, matching ksm06 which already did. The buffer used to build the per-CPU sysfs path is sized to fit the "/online" suffix to avoid a -Wformat-truncation warning.
No functional changes intended.
Part of #1276.
--- include/tse_numa.h | 13 ++++++ libs/numa/tse_numa.c | 57 +++++++++++++++++++++++ testcases/kernel/include/numa_helper.h | 4 -- testcases/kernel/lib/numa_cpuset.c | 64 -------------------------- testcases/kernel/mem/ksm/Makefile | 2 + testcases/kernel/mem/ksm/ksm_common.h | 1 + testcases/kernel/mem/oom/Makefile | 4 ++ testcases/kernel/mem/oom/oom04.c | 1 + testcases/kernel/mem/oom/oom05.c | 1 + 9 files changed, 79 insertions(+), 68 deletions(-) delete mode 100644 testcases/kernel/lib/numa_cpuset.c
include/tse_numa.h +13 -0
@@ -119,4 +119,17 @@ enum tse_numa_types {*/ struct tse_nodemap *tse_get_nodemap (int type,size_t min_mem_kb); +struct tst_cg_group ; + +/** +* write_node_cpusets() - Sets up the cpuset cgroup controller for a NUMA node. +* +* Writes the node id to cpuset.mems and the list of the node's online CPUs to +* cpuset.cpus. If the node has no CPUs, CPU 0 is used instead. +* +* @cg: Cgroup to configure. +* @nd: NUMA node id. +*/ +void write_node_cpusets (const struct tst_cg_group *cg,long nd); +#endif /* TSE_NUMA_H__ */
libs/numa/tse_numa.c +57 -0
66 lines not on this page · raw message
testcases/kernel/include/numa_helper.h +0 -4
@@ -27,8 +27,6 @@# include <numaif.h> #endif -struct tst_cg_group ; -#define NH_MEMS (1 << 0)#define NH_CPUS (1 << 1)
@@ -55,6 +53,4 @@ 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/ksm/Makefile +2 -0
@@ -4,6 +4,8 @@ top_srcdir ?= ../../../.. LTPLIBS = numa +ksm02: LTPLDLIBS = -lltpnuma +ksm04: LTPLDLIBS = -lltpnuma ksm06: LTPLDLIBS = -lltpnuma include $(top_srcdir)/include/mk/testcases.mk
testcases/kernel/mem/ksm/ksm_common.h +1 -0
@@ -13,6 +13,7 @@#include "tst_test.h" #include "ksm_helper.h" #include "numa_helper.h" +#include "tse_numa.h" #include "ksm_test.h" #define DEFAULT_MEMSIZE 128
testcases/kernel/mem/oom/Makefile +4 -0
@@ -18,6 +18,10 @@ top_srcdir ?= ../../../.. +LTPLIBS = numa +oom04: LTPLDLIBS = -lltpnuma +oom05: LTPLDLIBS = -lltpnuma + include $(top_srcdir)/include/mk/testcases.mk include $(top_srcdir)/testcases/kernel/include/lib.mk
testcases/kernel/mem/oom/oom04.c +1 -0
@@ -19,6 +19,7 @@#include "tst_test.h" #include "numa_helper.h" +#include "tse_numa.h" #include "oom.h" #ifdef HAVE_NUMA_V2
testcases/kernel/mem/oom/oom05.c +1 -0
@@ -19,6 +19,7 @@#include "tst_test.h" #include "numa_helper.h" +#include "tse_numa.h" #include "oom.h" #ifdef HAVE_NUMA_V2
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 3/3 numa: Fix out-of-bounds write in gather_node_cpus()
In reply to Pradeep SusarlaThe trailing-comma removal
cpus[strlen(cpus) - 1] = '\0';
runs unconditionally after the CPU scan. When the node has no online CPUs (e.g. a memory-only NUMA node, a case write_node_cpusets() explicitly anticipates), the cpus buffer stays empty, strlen() returns 0 and the unsigned subtraction wraps around, writing a NUL byte out of bounds. Only strip the comma when at least one CPU was appended.
The bug predates the move from testcases/kernel/lib/numa_cpuset.c and was spotted during review of the libs/ migration.
--- libs/numa/tse_numa.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
libs/numa/tse_numa.c +3 -2
@@ -255,8 +255,9 @@ static void gather_node_cpus(char *cpus, long nd)strcat (cpus, buf); } } -/* Remove the trailing comma. */ - cpus[strlen (cpus) -1 ] ='\0' ; +/* Remove the trailing comma, if any CPU was found. */ +if (strlen (cpus) >0 ) + cpus[strlen (cpus) -1 ] ='\0' ; }void write_node_cpusets (const struct tst_cg_group *cg,long nd)
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Patchset pushed, thanks.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp