Skip to content

Rework KUnit test execution in modules

David Gow linux-aspeed linux-kselftest linux-mmc linux-modules linux-usb lkml openbmc 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest5 patches 3 repliesIn review
  2. v35 patches 7 repliesSuperseded
  3. v25 patches 6 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v15 patches4 repliesSuperseded

Changes in v4 from the cover letter

https://lore.kernel.org/linux-kselftest/20220625050838.1618469-1-davidgow at google.com/
- Rebase on top of the TAINT_TEST patch series. This should now apply
cleanly on top of the kunit branch:
https://lore.kernel.org/linux-kselftest/20220708044847.531566-1-davidgow at google.com/T/#u
- Add Brendan's Reviewed/Acked-by tags.

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5kunit: unify module and builtin suite definitionsinclude/kunit/test.h include/linux/module.h kernel/module/main.c +1 more+68 -443 replies
2/5kunit: flatten kunit_suite*** to kunit_suite** in .kunit_test_suitesinclude/kunit/test.h include/linux/module.h lib/kunit/executor.c +2 more+82 -2100 replies
3/5thunderbolt: test: Use kunit_test_suite() macrodrivers/thunderbolt/Kconfig drivers/thunderbolt/domain.c drivers/thunderbolt/tb.h +1 more+5 -240 replies
4/5nitro_enclaves: test: Use kunit_test_suite() macrodrivers/virt/nitro_enclaves/Kconfig drivers/virt/nitro_enclaves/ne_misc_dev.c drivers/virt/nitro_enclaves/ne_misc_dev_test.c+4 -330 replies
5/5mmc: sdhci-of-aspeed: test: Use kunit_test_suite() macrodrivers/mmc/host/Kconfig drivers/mmc/host/sdhci-of-aspeed-test.c drivers/mmc/host/sdhci-of-aspeed.c+5 -420 replies

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by.

PatchMaíra CanalBrendan HigginsMika WesterbergDaniel LatypovAndra ParaschivUlf Hansson
1/5T-b R-b
2/5T-b R-b
3/5A-b A-b A-b
4/5A-b R-b
5/5A-b A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v4 thread

Cover letter [PATCH v4 0/5] Rework KUnit test execution in modules

This patch series makes two changes to how KUnit test suites are stored and executed:
- The .kunit_test_suites section is now used for tests in modules (in lieu of a module_init funciton), as well as for built-in tests. The module loader will now trigger test execution. This frees up the module_init function for other uses.
- Instead of storing an array of arrays of suites, have the kunit_test_suite() and kunit_test_suites() macros append to one global (or per-module) list of test suites. This removes a needless layer of indirection, and removes the need to NULL-terminate suite_sets.

The upshot of this is that it should now be possible to use the kunit_test_suite() and kunit_test_suites() macros to register test suites even from within modules which otherwise had module_init functions. This was proving to be quite a common issue, resulting in several modules calling into KUnit's private suite execution functions to run their tests (often introducing incompatibilities with the KUnit tooling).

This series also fixes the thunderbolt, nitro_enclaves, and sdhci-of-aspeed tests to use kunit_test_suite() now that it works. This is required, as otherwise the first two patches may break these tests entirely.

Huge thanks to Jeremy Kerr, who designed and implemented the module loader changes, and to Daniel Latypov for pushing the simplification of the nested arrays in .kunit_test_suites.

I've tested this series both with builtin tests on a number of architectures, and with modules on x86_64, and it seems good-to-go to me. More testing (particularly of modules) with more interesting setups never hurts, though!

Cheers,
-- David

Changes since v3:
https://lore.kernel.org/linux-kselftest/20220625050838.1618469-1-davidgow at google.com/
- Rebase on top of the TAINT_TEST patch series. This should now apply
cleanly on top of the kunit branch:
https://lore.kernel.org/linux-kselftest/20220708044847.531566-1-davidgow at google.com/T/#u
- Add Brendan's Reviewed/Acked-by tags.

Daniel Latypov (1):
kunit: flatten kunit_suite*** to kunit_suite** in .kunit_test_suites

David Gow (3):
thunderbolt: test: Use kunit_test_suite() macro
nitro_enclaves: test: Use kunit_test_suite() macro
mmc: sdhci-of-aspeed: test: Use kunit_test_suite() macro

Jeremy Kerr (1):
kunit: unify module and builtin suite definitions

 drivers/mmc/host/Kconfig                      |   5 +-
 drivers/mmc/host/sdhci-of-aspeed-test.c       |   8 +-
 drivers/mmc/host/sdhci-of-aspeed.c            |  34 +----
 drivers/thunderbolt/Kconfig                   |   6 +-
 drivers/thunderbolt/domain.c                  |   3 -
 drivers/thunderbolt/tb.h                      |   8 -
 drivers/thunderbolt/test.c                    |  12 +-
 drivers/virt/nitro_enclaves/Kconfig           |   5 +-
 drivers/virt/nitro_enclaves/ne_misc_dev.c     |  27 ----
 .../virt/nitro_enclaves/ne_misc_dev_test.c    |   5 +-
 include/kunit/test.h                          |  62 ++------
 include/linux/module.h                        |   5 +
 kernel/module/main.c                          |   6 +
 lib/kunit/executor.c                          | 115 ++++----------
 lib/kunit/executor_test.c                     | 144 +++++-------------
 lib/kunit/test.c                              |  54 ++++++-
 16 files changed, 155 insertions(+), 344 deletions(-)
Signature · 1 line
2.37.0.rc0.161.g10f37bed90-goog