KVM: selftests: Fix arm64 sysreg header dependencies
Fuad Tabba
reviewerPATCH 1/1 KVM: selftests: Fix arm64 sysreg header dependencies
The rule generating the arm64 sysreg header targets the generated directory, and its only prerequisites are tools/arch/arm64/tools/*, which is the inner Makefile. An existing directory looks up to date, so an incremental build never regenerates sysreg-defs.h. A selftest referencing a register added to the table since then fails with undeclared SYS_* identifiers. Clean builds are unaffected.
Depend on the generator's inputs, and target the header rather than its directory, whose mtime does not change when the header is rewritten.
---
Unlike the two existing sysreg-defs.h rules, this one's recipe is a recursive make, so its prerequisites are not the recipe's arguments. They only decide whether to recurse, which is a question tools/arch/arm64/tools/Makefile already answers. An alternative is therefore to drop the two explicit inputs in favour of:
$(GEN_SYSREG_DEFS): FORCE
leaving that Makefile as the only place naming the generator's inputs. Both forms regenerate the header and rebuild the dependents in the same invocation, and neither rebuilds anything when nothing changed. I kept the explicit prerequisites so that the recursion stays conditional, but I am happy to respin with FORCE if you would rather.
tools/testing/selftests/kvm/Makefile.kvm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/Makefile.kvm +10 -5
@@ -303,9 +303,14 @@ arm64_hdr_outdir := $(tools_dir)/ endif GEN_HDRS := $(arm64_hdr_outdir)arch/arm64/include/generated/ +GEN_SYSREG_DEFS := $(GEN_HDRS)asm/sysreg-defs.h CFLAGS += -I$(GEN_HDRS) -$(GEN_HDRS): $(wildcard $(arm64_tools_dir)/*) +# A directory's mtime does not track the header inside it. +# Sysreg inputs duplicated from tools/arch/arm64/tools/Makefile, keep in sync. +$(GEN_SYSREG_DEFS): $(top_srcdir)/arch/arm64/tools/sysreg \ + $(top_srcdir)/arch/arm64/tools/gen-sysreg.awk \ + $(wildcard $(arm64_tools_dir)/*) $(MAKE) -C $(arm64_tools_dir) OUTPUT=$(arm64_hdr_outdir) endif
@@ -359,10 +364,10 @@ EXTRA_CLEAN += $(GEN_HDRS) \ $(TEST_GEN_OBJ) \ cscope.* -$(LIBKVM_C_OBJ): $(OUTPUT)/%.o: %.c $(GEN_HDRS) +$(LIBKVM_C_OBJ): $(OUTPUT)/%.o: %.c $(GEN_SYSREG_DEFS) $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ -$(LIBKVM_S_OBJ): $(OUTPUT)/%.o: %.S $(GEN_HDRS) +$(LIBKVM_S_OBJ): $(OUTPUT)/%.o: %.S $(GEN_SYSREG_DEFS) $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ # Compile the string overrides as freestanding to prevent the compiler from
@@ -372,10 +377,10 @@ $(LIBKVM_STRING_OBJ): $(OUTPUT)/%.o: %.c $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -ffreestanding $< -o $@ $(shell mkdir -p $(sort $(dir $(TEST_GEN_PROGS)))) -$(SPLIT_TEST_GEN_OBJ): $(GEN_HDRS) +$(SPLIT_TEST_GEN_OBJ): $(GEN_SYSREG_DEFS) $(TEST_GEN_PROGS): $(LIBKVM_OBJS) $(TEST_GEN_PROGS_EXTENDED): $(LIBKVM_OBJS) -$(TEST_GEN_OBJ): $(GEN_HDRS) +$(TEST_GEN_OBJ): $(GEN_SYSREG_DEFS) cscope: include_paths = $(LINUX_TOOL_INCLUDE) $(LINUX_HDR_PATH) include lib .. cscope:
base-commit: cee9395acd8043be0644b25c34bfa86623f2b935
Signature · 1 line
2.39.5
Fuad Tabba
reviewerHi Oliver,
Quoted 6 lines · Fuad Tabba
The rule generating the arm64 sysreg header targets the generated directory, and its only prerequisites are
tools/arch/arm64/tools/*, which is the innerMakefile. An existing directory looks up to date, so an incremental build never regeneratessysreg-defs.h. A selftest referencing a register added to the table since then fails with undeclared SYS_* identifiers. Clean builds are unaffected.
[...]
Gentle ping on this one. It's arm64-only (the Makefile.kvm rule that generates sysreg-defs.h), so I think it'd go through kvmarm rather than Paolo's tree. Could you take a look when you get a chance?
Cheers,
/fuad
Oliver Upton
maintainerHey Fuad,
Thanks for the fix here.
Quoted 7 lines · Fuad Tabba
---
Unlike the two existingsysreg-defs.hrules, this one's recipe is a recursive make, so its prerequisites are not the recipe's arguments. They only decide whether to recurse, which is a questiontools/arch/arm64/tools/Makefilealready answers. An alternative is therefore to drop the two explicit inputs in favour of:
Quoted 7 lines
$(GEN_SYSREG_DEFS): FORCEleaving that
Makefileas the only place naming the generator's inputs. Both forms regenerate the header and rebuild the dependents in the same invocation, and neither rebuilds anything when nothing changed. I kept the explicit prerequisites so that the recursion stays conditional, but I am happy to respin with FORCE if you would rather.
This might be the better approach at this point. In the unlikely event that new dependencies get added to the kernel side of this, I'll give it approximately a 0% chance that the author will update this rule :)
Thanks,
Oliver
Fuad Tabba
reviewerQuoted 21 lines · Oliver Upton
Hey Fuad,
Thanks for the fix here.
Quoted 7 lines · Fuad Tabba
---
Unlike the two existingsysreg-defs.hrules, this one's recipe is a recursive make, so its prerequisites are not the recipe's arguments. They only decide whether to recurse, which is a questiontools/arch/arm64/tools/Makefilealready answers. An alternative is therefore to drop the two explicit inputs in favour of:Quoted 7 lines
$(GEN_SYSREG_DEFS): FORCEleaving that
Makefileas the only place naming the generator's inputs. Both forms regenerate the header and rebuild the dependents in the same invocation, and neither rebuilds anything when nothing changed. I kept the explicit prerequisites so that the recursion stays conditional, but I am happy to respin with FORCE if you would rather.
Quoted 3 lines
This might be the better approach at this point. In the unlikely event that new dependencies get added to the kernel side of this, I'll give it approximately a 0% chance that the author will update this rule :)
I'm on it!
/fuad
Quoted 3 lines
Thanks,
Oliver