iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kunit: Fix 'hooks.o' build by recursing into kunit

Browse Source 
KUnit's 'hooks.o' file need to be built-in whenever KUnit is enabled
(even if CONFIG_KUNIT=m).  We'd previously attemtped to do this by
adding 'kunit/hooks.o' to obj-y in lib/Makefile, but this caused hooks.c
to be rebuilt even when it was unchanged.

Instead, always recurse into lib/kunit using obj-y when KUnit is
enabled, and add the hooks there.

Fixes: 7170b7ed6a ("kunit: Add "hooks" to call into KUnit when it's built as a module").
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/linux-kselftest/CAHk-=wiEf7irTKwPJ0jTMOF3CS-13UXmF6Fns3wuWpOZ_wGyZQ@mail.gmail.com/
Signed-off-by: David Gow <davidgow@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Gow 2023-02-25 09:45:30 +08:00 committed by Linus Torvalds
parent 5ca26d6039
commit 32ff6831cd
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Makefile
View File

@ -127,14 +127,10 @@ CFLAGS_test_fpu.o += $(FPU_CFLAGS)
obj-$(CONFIG_TEST_LIVEPATCH) += livepatch/ obj-$(CONFIG_TEST_LIVEPATCH) += livepatch/
obj-$(CONFIG_KUNIT) += kunit/ # Some KUnit files (hooks.o) need to be built-in even when KUnit is a module,
# Include the KUnit hooks unconditionally. They'll compile to nothing if # so we can't just use obj-$(CONFIG_KUNIT).
# CONFIG_KUNIT=n, otherwise will be a small table of static data (static key, ifdef CONFIG_KUNIT
# function pointers) which need to be built-in even when KUnit is a module. obj-y += kunit/
ifeq ($(CONFIG_KUNIT), m)
obj-y += kunit/hooks.o
else
obj-$(CONFIG_KUNIT) += kunit/hooks.o
endif endif
ifeq ($(CONFIG_DEBUG_KOBJECT),y) ifeq ($(CONFIG_DEBUG_KOBJECT),y)

2
lib/kunit/Makefile
View File

@ -13,7 +13,7 @@ kunit-objs += debugfs.o
endif endif
# KUnit 'hooks' are built-in even when KUnit is built as a module. # KUnit 'hooks' are built-in even when KUnit is built as a module.
lib-y += hooks.o obj-y += hooks.o
obj-$(CONFIG_KUNIT_TEST) += kunit-test.o obj-$(CONFIG_KUNIT_TEST) += kunit-test.o