diff mbox series

[v2] kunit: fix longest symbol length test

Message ID 20250502143758.23135-1-sergio.collado@gmail.com
State Superseded
Headers show
Series [v2] kunit: fix longest symbol length test | expand

Commit Message

Sergio González Collado May 2, 2025, 2:37 p.m. UTC
The kunit test that checks the longests symbol length [1], has triggered
warnings in some pilelines when symbol prefixes are used [2]. The test
is adjunsted to depend on !PREFIX_SYMBOLS and !CFI_CLANG as sujested in [3]

[1] https://lore.kernel.org/rust-for-linux/CABVgOSm=5Q0fM6neBhxSbOUHBgNzmwf2V22vsYC10YRBT=kN1g@mail.gmail.com/T/#t
[2] https://lore.kernel.org/all/20250328112156.2614513-1-arnd@kernel.org/T/#u
[3] https://lore.kernel.org/linux-kselftest/20250427200916.GA1661412@ax162/T/#t

Signed-off-by: Sergio González Collado <sergio.collado@gmail.com>
---
V1 -> V2: added dependency on !CFI_CLANG as suggested in [3], removed
	CONFIG_ prefix
---
 lib/Kconfig.debug                | 2 +-
 lib/tests/longest_symbol_kunit.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)


base-commit: ebd297a2affadb6f6f4d2e5d975c1eda18ac762d

Comments

Rae Moar May 9, 2025, 7:09 p.m. UTC | #1
On Fri, May 2, 2025 at 10:38 AM Sergio González Collado
<sergio.collado@gmail.com> wrote:
>
> The kunit test that checks the longests symbol length [1], has triggered
> warnings in some pilelines when symbol prefixes are used [2]. The test
> is adjunsted to depend on !PREFIX_SYMBOLS and !CFI_CLANG as sujested in [3]
>
> [1] https://lore.kernel.org/rust-for-linux/CABVgOSm=5Q0fM6neBhxSbOUHBgNzmwf2V22vsYC10YRBT=kN1g@mail.gmail.com/T/#t
> [2] https://lore.kernel.org/all/20250328112156.2614513-1-arnd@kernel.org/T/#u
> [3] https://lore.kernel.org/linux-kselftest/20250427200916.GA1661412@ax162/T/#t
>
> Signed-off-by: Sergio González Collado <sergio.collado@gmail.com>

Hello!

This is working for me both when the test is built-in (run using
kunit.py) and when it is loaded as a module. Those that had issues
with this breaking with prefix symbols, feel free to dispute this if
you are still having issues. However, otherwise I am happy to see this
go through the KUnit tree.

Reviewed-by: Rae Moar <rmoar@google.com>

Thanks!
-Rae

>
> ---
> V1 -> V2: added dependency on !CFI_CLANG as suggested in [3], removed
>         CONFIG_ prefix
> ---
>  lib/Kconfig.debug                | 2 +-
>  lib/tests/longest_symbol_kunit.c | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index f9051ab610d5..5b33673d82da 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -2885,7 +2885,7 @@ config FORTIFY_KUNIT_TEST
>
>  config LONGEST_SYM_KUNIT_TEST
>         tristate "Test the longest symbol possible" if !KUNIT_ALL_TESTS
> -       depends on KUNIT && KPROBES
> +       depends on KUNIT && KPROBES && !PREFIX_SYMBOLS && !CFI_CLANG
>         default KUNIT_ALL_TESTS
>         help
>           Tests the longest symbol possible
> diff --git a/lib/tests/longest_symbol_kunit.c b/lib/tests/longest_symbol_kunit.c
> index e3c28ff1807f..b183fb92d1b2 100644
> --- a/lib/tests/longest_symbol_kunit.c
> +++ b/lib/tests/longest_symbol_kunit.c
> @@ -3,8 +3,7 @@
>   * Test the longest symbol length. Execute with:
>   *  ./tools/testing/kunit/kunit.py run longest-symbol
>   *  --arch=x86_64 --kconfig_add CONFIG_KPROBES=y --kconfig_add CONFIG_MODULES=y
> - *  --kconfig_add CONFIG_RETPOLINE=n --kconfig_add CONFIG_CFI_CLANG=n
> - *  --kconfig_add CONFIG_MITIGATION_RETPOLINE=n
> + *  --kconfig_add CONFIG_CPU_MITIGATIONS=n
>   */
>
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> base-commit: ebd297a2affadb6f6f4d2e5d975c1eda18ac762d
> --
> 2.39.2
>
diff mbox series

Patch

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index f9051ab610d5..5b33673d82da 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2885,7 +2885,7 @@  config FORTIFY_KUNIT_TEST
 
 config LONGEST_SYM_KUNIT_TEST
 	tristate "Test the longest symbol possible" if !KUNIT_ALL_TESTS
-	depends on KUNIT && KPROBES
+	depends on KUNIT && KPROBES && !PREFIX_SYMBOLS && !CFI_CLANG
 	default KUNIT_ALL_TESTS
 	help
 	  Tests the longest symbol possible
diff --git a/lib/tests/longest_symbol_kunit.c b/lib/tests/longest_symbol_kunit.c
index e3c28ff1807f..b183fb92d1b2 100644
--- a/lib/tests/longest_symbol_kunit.c
+++ b/lib/tests/longest_symbol_kunit.c
@@ -3,8 +3,7 @@ 
  * Test the longest symbol length. Execute with:
  *  ./tools/testing/kunit/kunit.py run longest-symbol
  *  --arch=x86_64 --kconfig_add CONFIG_KPROBES=y --kconfig_add CONFIG_MODULES=y
- *  --kconfig_add CONFIG_RETPOLINE=n --kconfig_add CONFIG_CFI_CLANG=n
- *  --kconfig_add CONFIG_MITIGATION_RETPOLINE=n
+ *  --kconfig_add CONFIG_CPU_MITIGATIONS=n
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt