Commit fa587876 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-kunit-fixes-5.15-rc6' of... 

Merge tag 'linux-kselftest-kunit-fixes-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kunit fixes from Shuah Khan:

 - Fixes to address the structleak plugin causing the stack frame size
   to grow immensely when used with KUnit. Fixes include adding a new
   makefile to disable structleak and using it from KUnit iio, device
   property, thunderbolt, and bitfield tests to disable it.

 - KUnit framework reference count leak in kfree_at_end

 - KUnit tool fix to resolve conflict between --json and --raw_output
   and generate correct test output in either case.

 - kernel-doc warnings due to mismatched arg names

* tag 'linux-kselftest-kunit-fixes-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kunit: fix kernel-doc warnings due to mismatched arg names
  bitfield: build kunit tests without structleak plugin
  thunderbolt: build kunit tests without structleak plugin
  device property: build kunit tests without structleak plugin
  iio/test-format: build kunit tests without structleak plugin
  gcc-plugins/structleak: add makefile var for disabling structleak
  kunit: fix reference count leak in kfree_at_end
  kunit: tool: better handling of quasi-bool args (--json, --raw_output)
parents 459ea72c 361b57df

drivers/base/test/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
obj-$(CONFIG_TEST_ASYNC_DRIVER_PROBE)	+= test_async_driver_probe.o



obj-$(CONFIG_DRIVER_PE_KUNIT_TEST) += property-entry-test.o

CFLAGS_REMOVE_property-entry-test.o += -fplugin-arg-structleak_plugin-byref -fplugin-arg-structleak_plugin-byref-all
 
CFLAGS_property-entry-test.o += $(DISABLE_STRUCTLEAK_PLUGIN)

drivers/iio/test/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ 


# Keep in alphabetical order

obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.o

CFLAGS_iio-test-format.o += $(DISABLE_STRUCTLEAK_PLUGIN)

drivers/thunderbolt/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ thunderbolt-objs += usb4_port.o nvm.o retimer.o quirks.o 
thunderbolt-${CONFIG_ACPI} += acpi.o

thunderbolt-$(CONFIG_DEBUG_FS) += debugfs.o

thunderbolt-${CONFIG_USB4_KUNIT_TEST} += test.o

CFLAGS_test.o += $(DISABLE_STRUCTLEAK_PLUGIN)



thunderbolt_dma_test-${CONFIG_USB4_DMA_TEST} += dma_test.o

obj-$(CONFIG_USB4_DMA_TEST) += thunderbolt_dma_test.o

include/kunit/test.h

+3 −3
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ void kunit_remove_resource(struct kunit *test, struct kunit_resource *res); 
 * and is automatically cleaned up after the test case concludes. See &struct

 * kunit_resource for more information.

 */

void *kunit_kmalloc_array(struct kunit *test, size_t n, size_t size, gfp_t flags);

void *kunit_kmalloc_array(struct kunit *test, size_t n, size_t size, gfp_t gfp);



/**

 * kunit_kmalloc() - Like kmalloc() except the allocation is *test managed*.
@@ -657,9 +657,9 @@ static inline void *kunit_kzalloc(struct kunit *test, size_t size, gfp_t gfp) 
 *

 * See kcalloc() and kunit_kmalloc_array() for more information.

 */

static inline void *kunit_kcalloc(struct kunit *test, size_t n, size_t size, gfp_t flags)

static inline void *kunit_kcalloc(struct kunit *test, size_t n, size_t size, gfp_t gfp)

{

	return kunit_kmalloc_array(test, n, size, flags | __GFP_ZERO);

	return kunit_kmalloc_array(test, n, size, gfp | __GFP_ZERO);

}



void kunit_cleanup(struct kunit *test);

lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ obj-$(CONFIG_OBJAGG) += objagg.o 
obj-$(CONFIG_PLDMFW) += pldmfw/



# KUnit tests

CFLAGS_bitfield_kunit.o := $(call cc-option,-Wframe-larger-than=10240)

CFLAGS_bitfield_kunit.o := $(DISABLE_STRUCTLEAK_PLUGIN)

obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o

obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o

obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o