Re: [PATCH v6 18/20] selftests/liveupdate: Add kexec-based selftest for session lifecycle
From: David Matlack <dmatlack@google.com>
Date: 2025-11-17 19:28:19
Also in:
linux-doc, linux-fsdevel, linux-mm, lkml
On Sat, Nov 15, 2025 at 3:34 PM Pasha Tatashin [off-list ref] wrote:
quoted hunk ↗ jump to hunk
diff --git a/tools/testing/selftests/liveupdate/Makefile b/tools/testing/selftests/liveupdate/Makefile index 2a573c36016e..1563ac84006a 100644 --- a/tools/testing/selftests/liveupdate/Makefile +++ b/tools/testing/selftests/liveupdate/Makefile@@ -1,7 +1,39 @@ # SPDX-License-Identifier: GPL-2.0-only + +KHDR_INCLUDES ?= -I../../../../usr/include
You shouldn't need to set this variable and $(OUTPUT). Both should be provided by lib.mk. Maybe the include is too far down?
quoted hunk ↗ jump to hunk
CFLAGS += -Wall -O2 -Wno-unused-function CFLAGS += $(KHDR_INCLUDES) +LDFLAGS += -static
Is static build really required or just for your setup? If it's setup-specific, I would recommend letting the user pass in -static via EXTRA_CFLAGS. That what we do in the KVM and VFIO selftests. CFLAGS += $(EXTRA_CFLAGS) Then the user can pass EXTRA_CFLAGS=-static on the command line.
quoted hunk ↗ jump to hunk
+OUTPUT ?= . + +# --- Test Configuration (Edit this section when adding new tests) --- +LUO_SHARED_SRCS := luo_test_utils.c +LUO_SHARED_HDRS += luo_test_utils.h
I would suggest using the -MD flag and Make's -include directive to automatically handle headers. That way you don't need to add every header to Makefile for Make to detect changes. See the end of my email for how to do this.
quoted hunk ↗ jump to hunk
+ +LUO_MANUAL_TESTS += luo_kexec_simple + +TEST_FILES += do_kexec.sh TEST_GEN_PROGS += liveupdate +# --- Automatic Rule Generation (Do not edit below) --- + +TEST_GEN_PROGS_EXTENDED += $(LUO_MANUAL_TESTS) + +# Define the full list of sources for each manual test. +$(foreach test,$(LUO_MANUAL_TESTS), \ + $(eval $(test)_SOURCES := $(test).c $(LUO_SHARED_SRCS)))
This does not build with Google's gbuild wrapper around make. I get these errors (after fixing the semi-colon issue below): clang: error: no such file or directory: 'luo_kexec_simple.c' clang: error: no such file or directory: 'luo_test_utils.c' clang: error: no such file or directory: 'luo_test_utils.h'
quoted hunk ↗ jump to hunk
+ +# This loop automatically generates an explicit build rule for each manual test. +# It includes dependencies on the shared headers and makes the output +# executable. +# Note the use of '$$' to escape automatic variables for the 'eval' command. +$(foreach test,$(LUO_MANUAL_TESTS), \ + $(eval $(OUTPUT)/$(test): $($(test)_SOURCES) $(LUO_SHARED_HDRS) \ + $(call msg,LINK,,$$@) ; \ + $(Q)$(LINK.c) $$^ $(LDLIBS) -o $$@ ; \ + $(Q)chmod +x $$@ \
These semi-colons swollow any errors. I would recommend against using a foreach and eval. Make supports pattern-based targets so there's really no need for loops. See below.
quoted hunk ↗ jump to hunk
+ ) \ +) + include ../lib.mk
Putting it all together, here is what I'd recommend for this Makefile
(drop-in replacement for the current Makefile). This will also make it
easier for me to share the library code with VFIO selftests, which
I'll need to do in the VFIO series.
(Sorry in advance for the line wrap. I had to send this through gmail.)
# SPDX-License-Identifier: GPL-2.0-only
LIBLIVEUPDATE_C += luo_test_utils.c
TEST_GEN_PROGS_EXTENDED += luo_kexec_simple
TEST_GEN_PROGS_EXTENDED += luo_multi_session
TEST_FILES += do_kexec.sh
include ../lib.mk
CFLAGS += $(KHDR_INCLUDES)
CFLAGS += -Wall -O2 -Wno-unused-function
CFLAGS += -MD
CFLAGS += $(EXTRA_CFLAGS)
LIBLIVEUPDATE_O := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBLIVEUPDATE_C))
TEST_GEN_PROGS_EXTENDED_O += $(patsubst %, %.o, $(TEST_GEN_PROGS_EXTENDED))
TEST_DEP_FILES += $(patsubst %.o, %.d, $(LIBLIVEUPDATE_O))
TEST_DEP_FILES += $(patsubst %.o, %.d, $(TEST_GEN_PROGS_EXTENDED_O))
-include $(TEST_DEP_FILES)
$(LIBLIVEUPDATE_O): $(OUTPUT)/%.o: %.c
$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
$(TEST_GEN_PROGS_EXTENDED): %: %.o $(LIBLIVEUPDATE_O)
$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $<
$(LIBLIVEUPDATE_O) $(LDLIBS) -o $@
EXTRA_CLEAN += $(LIBLIVEUPDATE_O) $(TEST_GEN_PROGS_EXTENDED_O) $(TEST_DEP_FILES)