Add support for suppressing warning backtraces
Subsystems (18)
v2 cover Add support for suppressing warning backtraces
Some unit tests intentionally trigger warning backtraces by passing bad parameters to kernel API functions. Such unit tests typically check the return value from such calls, not the existence of the warning backtrace.
Such intentionally generated warning backtraces are neither desirable nor useful for a number of reasons.
- They can result in overlooked real problems.
- A warning that suddenly starts to show up in unit tests needs to be investigated and has to be marked to be ignored, for example by adjusting filter scripts. Such filters are ad-hoc because there is no real standard format for warnings. On top of that, such filter scripts would require constant maintenance.
One option to address problem would be to add messages such as "expected warning backtraces start / end here" to the kernel log. However, that would again require filter scripts, it might result in missing real problematic warning backtraces triggered while the test is running, and the irrelevant backtrace(s) would still clog the kernel log.
Solve the problem by providing a means to identify and suppress specific warning backtraces while executing test code. Support suppressing multiple backtraces while at the same time limiting changes to generic code to the absolute minimum. Architecture specific changes are kept at minimum by retaining function names only if both CONFIG_DEBUG_BUGVERBOSE and CONFIG_KUNIT are enabled.
The first patch of the series introduces the necessary infrastructure. The second patch introduces support for counting suppressed backtraces. This capability is used in patch three to implement unit tests. Patch four documents the new API.
The next two patches add support for suppressing backtraces in drm_rect and dev_addr_lists unit tests. These patches are intended to serve as examples for the use of the functionality introduced with this series. The remaining patches implement the necessary changes for all architectures with GENERIC_BUG support.
With CONFIG_KUNIT enabled, image size increase with this series applied is approximately 1%. The image size increase (and with it the functionality introduced by this series) can be avoided by disabling CONFIG_KUNIT_SUPPRESS_BACKTRACE.
This series is based on the RFC patch and subsequent discussion at
https://patchwork.kernel.org/project/linux-kselftest/patch/[email protected]/
and offers a more comprehensive solution of the problem discussed there.
Design note:
Function pointers are only added to the __bug_table section if both CONFIG_KUNIT_SUPPRESS_BACKTRACE and CONFIG_DEBUG_BUGVERBOSE are enabled to avoid image size increases if CONFIG_KUNIT is disabled. There would be some benefits to adding those pointers all the time (reduced complexity, ability to display function names in BUG/WARNING messages). That change, if desired, can be made later.
Checkpatch note:
Remaining checkpatch errors and warnings were deliberately ignored. Some are triggered by matching coding style or by comments interpreted as code, others by assembler macros which are disliked by checkpatch. Suggestions for improvements are welcome.
Changes since RFC:
- Introduced CONFIG_KUNIT_SUPPRESS_BACKTRACE
- Minor cleanups and bug fixes
- Added support for all affected architectures
- Added support for counting suppressed warnings
- Added unit tests using those counters
- Added patch to suppress warning backtraces in dev_addr_lists tests
Changes since v1:
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
[I retained those tags since there have been no functional changes]
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option, enabled by default.
PATCH v2 1/14 bug/kunit: Core support for suppressing warning backtraces
Some unit tests intentionally trigger warning backtraces by passing bad parameters to API functions. Such unit tests typically check the return value from those calls, not the existence of the warning backtrace.
Such intentionally generated warning backtraces are neither desirable nor useful for a number of reasons.
- They can result in overlooked real problems.
- A warning that suddenly starts to show up in unit tests needs to be investigated and has to be marked to be ignored, for example by adjusting filter scripts. Such filters are ad-hoc because there is no real standard format for warnings. On top of that, such filter scripts would require constant maintenance.
One option to address problem would be to add messages such as "expected warning backtraces start / end here" to the kernel log. However, that would again require filter scripts, it might result in missing real problematic warning backtraces triggered while the test is running, and the irrelevant backtrace(s) would still clog the kernel log.
Solve the problem by providing a means to identify and suppress specific warning backtraces while executing test code. Since the new functionality results in an image size increase of about 1% if CONFIG_KUNIT is enabled, provide configuration option KUNIT_SUPPRESS_BACKTRACE to be able to disable the new functionality. This option is by default enabled since almost all systems with CONFIG_KUNIT enabled will want to benefit from it.
---
v2:
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Added CONFIG_KUNIT_SUPPRESS_BACKTRACE configuration option, enabled by default
include/asm-generic/bug.h | 16 +++++++++--- include/kunit/bug.h | 51 +++++++++++++++++++++++++++++++++++++++ include/kunit/test.h | 1 + include/linux/bug.h | 13 ++++++++++ lib/bug.c | 51 ++++++++++++++++++++++++++++++++++++--- lib/kunit/Kconfig | 9 +++++++ lib/kunit/Makefile | 6 +++-- lib/kunit/bug.c | 40 ++++++++++++++++++++++++++++++ 8 files changed, 178 insertions(+), 9 deletions(-) create mode 100644 include/kunit/bug.h create mode 100644 lib/kunit/bug.c
include/asm-generic/bug.h +13 -3
@@ -18,6 +18,7 @@#endif #ifndef __ASSEMBLY__ +#include <kunit/bug.h> #include <linux/panic.h> #include <linux/printk.h>
@@ -39,8 +40,14 @@ struct bug_entry {#ifdef CONFIG_DEBUG_BUGVERBOSE #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS const char *file; +#ifdef HAVE_BUG_FUNCTION +const char *function; +#endif #else signed int file_disp; +#ifdef HAVE_BUG_FUNCTION +signed int function_disp; +#endif #endif unsigned short line;#endif
@@ -96,15 +103,18 @@ extern __printf(1, 2) void __warn_printk(const char *fmt, ...);#define __WARN () __WARN_printf(TAINT_WARN, NULL) #define __WARN_printf(taint, arg...) do { \ instrumentation_begin(); \ - warn_slowpath_fmt(__FILE__, __LINE__, taint, arg); \ + if (!IS_SUPPRESSED_WARNING(__func__)) \ + warn_slowpath_fmt(__FILE__, __LINE__, taint, arg);\ instrumentation_end(); \ } while (0)#else #define __WARN () __WARN_FLAGS(BUGFLAG_TAINT(TAINT_WARN)) #define __WARN_printf(taint, arg...) do { \ instrumentation_begin(); \ - __warn_printk(arg); \ - __WARN_FLAGS(BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\ + if (!IS_SUPPRESSED_WARNING(__func__)) { \ + __warn_printk(arg); \ + __WARN_FLAGS(BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\ + } \ instrumentation_end(); \ } while (0)#define WARN_ON_ONCE (condition) ({ \
include/kunit/bug.h new file +51 -0
51 lines not on this page · raw message
include/kunit/test.h +1 -0
@@ -10,6 +10,7 @@#define _KUNIT_TEST_H#include <kunit/assert.h> +#include <kunit/bug.h> #include <kunit/try-catch.h> #include <linux/args.h>
include/linux/bug.h +13 -0
@@ -36,6 +36,9 @@ static inline int is_warning_bug(const struct bug_entry *bug)return bug->flags &BUGFLAG_WARNING ; } +void bug_get_file_function_line (struct bug_entry *bug,const char **file, +const char **function,unsigned int *line); +void bug_get_file_line (struct bug_entry *bug,const char **file,unsigned int *line);
@@ -62,6 +65,16 @@ static inline enum bug_trap_type report_bug(unsigned long bug_addr, }struct bug_entry ; +static inline void bug_get_file_function_line (struct bug_entry *bug, +const char **file, +const char **function, +unsigned int *line) +{ + *file =NULL ; + *function =NULL ; + *line =0 ; +} +static inline void bug_get_file_line (struct bug_entry *bug,const char **file,unsigned int *line) {
lib/bug.c +47 -4
93 lines not on this page · raw message
lib/kunit/Kconfig +9 -0
@@ -15,6 +15,15 @@ menuconfig KUNIT if KUNIT +config KUNIT_SUPPRESS_BACKTRACE + bool "KUnit - Enable backtrace suppression" + default y + help + Enable backtrace suppression for KUnit. If enabled, backtraces + generated intentionally by KUnit tests are suppressed. Disable + to reduce kernel image size if image size is more important than + suppression of backtraces generated by KUnit tests. + config KUNIT_DEBUGFS bool "KUnit - Enable /sys/kernel/debug/kunit debugfs representation" if !KUNIT_ALL_TESTS default KUNIT_ALL_TESTS
lib/kunit/Makefile +4 -2
@@ -14,8 +14,10 @@ ifeq ($(CONFIG_KUNIT_DEBUGFS),y) kunit-objs += debugfs.o endif -# KUnit 'hooks' are built-in even when KUnit is built as a module. -obj-y += hooks.o +# KUnit 'hooks' and bug handling are built-in even when KUnit is built +# as a module. +obj-y += hooks.o \ + bug.o obj-$(CONFIG_KUNIT_TEST) += kunit-test.o
lib/kunit/bug.c new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* KUnit helpers for backtrace suppression +* +* Copyright (c) 2024 Guenter Roeck <[email protected]> +*/ + +#include <kunit/bug.h> +#include <linux/export.h> +#include <linux/list.h> +#include <linux/string.h> + +static LIST_HEAD (suppressed_warnings); + +void __start_suppress_warning (struct __suppressed_warning *warning) +{ +list_add (&warning->node, &suppressed_warnings); +} +EXPORT_SYMBOL_GPL (__start_suppress_warning); + +void __end_suppress_warning (struct __suppressed_warning *warning) +{ +list_del (&warning->node); +} +EXPORT_SYMBOL_GPL (__end_suppress_warning); + +bool __is_suppressed_warning (const char *function) +{ +struct __suppressed_warning *warning; + +if (!function) +return false; + +list_for_each_entry (warning, &suppressed_warnings, node) { +if (!strcmp (function, warning->function)) +return true; + } +return false; +} +EXPORT_SYMBOL_GPL (__is_suppressed_warning);
Signature · 1 line
2.39.2
PATCH v2 2/14 kunit: bug: Count suppressed warning backtraces
In reply to Guenter RoeckCount suppressed warning backtraces to enable code which suppresses warning backtraces to check if the expected backtrace(s) have been observed.
Using atomics for the backtrace count resulted in build errors on some architectures due to include file recursion, so use a plain integer for now.
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
include/kunit/bug.h | 7 ++++++- lib/kunit/bug.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-)
include/kunit/bug.h +6 -1
@@ -20,6 +20,7 @@struct __suppressed_warning {struct list_head node;const char *function; +int counter; };void __start_suppress_warning (struct __suppressed_warning *warning);
@@ -28,7 +29,7 @@ bool __is_suppressed_warning(const char *function);#define DEFINE_SUPPRESSED_WARNING (func) \ struct __suppressed_warning __kunit_suppress_##func = \ - { .function = __stringify(func) } + { .function = __stringify(func), .counter = 0 }#define START_SUPPRESSED_WARNING (func) \ __start_suppress_warning(&__kunit_suppress_##func)
@@ -39,12 +40,16 @@ bool __is_suppressed_warning(const char *function);#define IS_SUPPRESSED_WARNING (func) \ __is_suppressed_warning(func) +#define SUPPRESSED_WARNING_COUNT (func) \ + (__kunit_suppress_##func.counter) +#else /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ #define DEFINE_SUPPRESSED_WARNING (func)#define START_SUPPRESSED_WARNING (func)#define END_SUPPRESSED_WARNING (func)#define IS_SUPPRESSED_WARNING (func) (false) +#define SUPPRESSED_WARNING_COUNT (func) (0)#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ #endif /* __ASSEMBLY__ */
lib/kunit/bug.c +3 -1
@@ -32,8 +32,10 @@ bool __is_suppressed_warning(const char *function)return false;list_for_each_entry (warning, &suppressed_warnings, node) { -if (!strcmp (function, warning->function)) +if (!strcmp (function, warning->function)) { + warning->counter++;return true; + } }return false; }
Signature · 1 line
2.39.2
PATCH v2 3/14 kunit: Add test cases for backtrace warning suppression
In reply to Guenter RoeckAdd unit tests to verify that warning backtrace suppression works.
If backtrace suppression does _not_ work, the unit tests will likely trigger unsuppressed backtraces, which should actually help to get the affected architectures / platforms fixed.
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
lib/kunit/Makefile | 7 +- lib/kunit/backtrace-suppression-test.c | 104 +++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 lib/kunit/backtrace-suppression-test.c
lib/kunit/Makefile +5 -2
@@ -16,10 +16,13 @@ endif # KUnit 'hooks' and bug handling are built-in even when KUnit is built # as a module. -obj-y += hooks.o \ - bug.o +obj-y += hooks.o +obj-$(CONFIG_KUNIT_SUPPRESS_BACKTRACE) += bug.o obj-$(CONFIG_KUNIT_TEST) += kunit-test.o +ifeq ($(CCONFIG_KUNIT_SUPPRESS_BACKTRACE),y) +obj-$(CONFIG_KUNIT_TEST) += backtrace-suppression-test.o +endif # string-stream-test compiles built-in only. ifeq ($(CONFIG_KUNIT_TEST),y)
lib/kunit/backtrace-suppression-test.c new file +104 -0
104 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v2 4/14 kunit: Add documentation for warning backtrace suppression API
In reply to Guenter RoeckDocument API functions for suppressing warning backtraces.
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
Documentation/dev-tools/kunit/usage.rst | 30 ++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
Documentation/dev-tools/kunit/usage.rst +29 -1
@@ -157,6 +157,34 @@ Alternatively, one can take full control over the error message by using if (some_setup_function()) KUNIT_FAIL(test, "Failed to setup thing for testing"); +Suppressing warning backtraces +------------------------------ + +Some unit tests trigger warning backtraces either intentionally or as side +effect. Such backtraces are normally undesirable since they distract from +the actual test and may result in the impression that there is a problem. + +Such backtraces can be suppressed. To suppress a backtrace in some_function(), +use the following code. + +.. code-block:: c + + static void some_test(struct kunit *test) + { + DEFINE_SUPPRESSED_WARNING(some_function); + + START_SUPPRESSED_WARNING(some_function); + trigger_backtrace(); + END_SUPPRESSED_WARNING(some_function); + } + +SUPPRESSED_WARNING_COUNT() returns the number of suppressed backtraces. If the +suppressed backtrace was triggered on purpose, this can be used to check if +the backtrace was actually triggered. + +.. code-block:: c + + KUNIT_EXPECT_EQ(test, SUPPRESSED_WARNING_COUNT(some_function), 1); Test Suites ~~~~~~~~~~~
@@ -857,4 +885,4 @@ For example: dev_managed_string = devm_kstrdup(fake_device, "Hello, World!"); // Everything is cleaned up automatically when the test ends. - } + }
Signature · 1 line
2.39.2
PATCH v2 5/14 drm: Suppress intentional warning backtraces in scaling unit tests
In reply to Guenter RoeckThe drm_test_rect_calc_hscale and drm_test_rect_calc_vscale unit tests intentionally trigger warning backtraces by providing bad parameters to the tested functions. What is tested is the return value, not the existence of a warning backtrace. Suppress the backtraces to avoid clogging the kernel log.
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
drivers/gpu/drm/tests/drm_rect_test.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/tests/drm_rect_test.c +6 -0
@@ -406,22 +406,28 @@ KUNIT_ARRAY_PARAM(drm_rect_scale, drm_rect_scale_cases, drm_rect_scale_case_descstatic void drm_test_rect_calc_hscale (struct kunit *test) { +DEFINE_SUPPRESSED_WARNING (drm_calc_scale);const struct drm_rect_scale_case *params = test->param_value;int scaling_factor; +START_SUPPRESSED_WARNING (drm_calc_scale); scaling_factor =drm_rect_calc_hscale (¶ms->src, ¶ms->dst, params->min_range, params->max_range); +END_SUPPRESSED_WARNING (drm_calc_scale);KUNIT_EXPECT_EQ (test, scaling_factor, params->expected_scaling_factor); }static void drm_test_rect_calc_vscale (struct kunit *test) { +DEFINE_SUPPRESSED_WARNING (drm_calc_scale);const struct drm_rect_scale_case *params = test->param_value;int scaling_factor; +START_SUPPRESSED_WARNING (drm_calc_scale); scaling_factor =drm_rect_calc_vscale (¶ms->src, ¶ms->dst, params->min_range, params->max_range); +END_SUPPRESSED_WARNING (drm_calc_scale);KUNIT_EXPECT_EQ (test, scaling_factor, params->expected_scaling_factor); }
Signature · 1 line
2.39.2
Re: [PATCH v2 05/14] drm: Suppress intentional warning backtraces in scaling unit tests
Hi Guenter,
Quoted 21 lines · Guenter Roeck
The
drm_test_rect_calc_hscaleanddrm_test_rect_calc_vscaleunit tests intentionally trigger warning backtraces by providing bad parameters to the tested functions. What is tested is the return value, not the existence of a warning backtrace. Suppress the backtraces to avoid clogging the kernel log.Acked-by Dan Carpenter <[email protected]>Signed-off-by Guenter Roeck <[email protected]>---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tagsdrivers/gpu/drm/tests/drm_rect_test.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/tests/drm_rect_test.c +0
-0
drivers/gpu/drm/tests/drm_rect_test.c KUNIT_ARRAY_PARAM(drm_rect_scale, drm_rect_scale_cases, drm_rect_scale_case_desc · line 413
Quoted 8 lines
drivers/gpu/drm/tests/drm_rect_test.c +2
-0@@ -406,22 +406,28 @@ KUNIT_ARRAY_PARAM(drm_rect_scale, drm_rect_scale_cases, drm_rect_scale_case_descstatic void drm_test_rect_calc_hscale (struct kunit *test) { +DEFINE_SUPPRESSED_WARNING (drm_calc_scale);const struct drm_rect_scale_case *params = test->param_value;int scaling_factor; +START_SUPPRESSED_WARNING (drm_calc_scale);
I'm not sure if it is not that obvious only to me, but it would be nice to have a comment here, remembering that we provide bad parameters in some test cases.
Best Regards,
- Maíra
Quoted 20 lines
drivers/gpu/drm/tests/drm_rect_test.c +4
-0scaling_factor =drm_rect_calc_hscale (¶ms->src, ¶ms->dst, params->min_range, params->max_range); +END_SUPPRESSED_WARNING (drm_calc_scale);KUNIT_EXPECT_EQ (test, scaling_factor, params->expected_scaling_factor); }static void drm_test_rect_calc_vscale (struct kunit *test) { +DEFINE_SUPPRESSED_WARNING (drm_calc_scale);const struct drm_rect_scale_case *params = test->param_value;int scaling_factor; +START_SUPPRESSED_WARNING (drm_calc_scale); scaling_factor =drm_rect_calc_vscale (¶ms->src, ¶ms->dst, params->min_range, params->max_range); +END_SUPPRESSED_WARNING (drm_calc_scale);KUNIT_EXPECT_EQ (test, scaling_factor, params->expected_scaling_factor); }
Re: [PATCH v2 05/14] drm: Suppress intentional warning backtraces in scaling unit tests
Hi,
Quoted 19 lines · Maíra Canal
Hi Guenter,
Quoted 16 lines · Guenter Roeck
The
drm_test_rect_calc_hscaleanddrm_test_rect_calc_vscaleunit tests intentionally trigger warning backtraces by providing bad parameters to the tested functions. What is tested is the return value, not the existence of a warning backtrace. Suppress the backtraces to avoid clogging the kernel log.Acked-by Dan Carpenter <[email protected]>Signed-off-by Guenter Roeck <[email protected]>---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tagsdrivers/gpu/drm/tests/drm_rect_test.c | 6 ++++++ 1 file changed, 6 insertions(+)
Quoted 15 lines
drivers/gpu/drm/tests/drm_rect_test.c KUNIT_ARRAY_PARAM(drm_rect_scale, drm_rect_scale_cases, drm_rect_scale_case_desc · line 411
Quoted 11 lines
drivers/gpu/drm/tests/drm_rect_test.c +2
-0@@ -406,22 +406,28 @@ KUNIT_ARRAY_PARAM(drm_rect_scale, drm_rect_scale_cases, drm_rect_scale_case_descstatic void drm_test_rect_calc_hscale (struct kunit *test) { +DEFINE_SUPPRESSED_WARNING (drm_calc_scale);const struct drm_rect_scale_case *params = test->param_value;int scaling_factor; +START_SUPPRESSED_WARNING (drm_calc_scale);I'm not sure if it is not that obvious only to me, but it would be nice to have a comment here, remembering that we provide bad parameters in some test cases.
Sure. Something like this ?
/*
* drm_rect_calc_hscale() generates a warning backtrace whenever bad
* parameters are passed to it. This affects all unit tests with an
* error code in expected_scaling_factor.
*/
Thanks,
Guenter
Maíra Canal
Acked-byRe: [PATCH v2 05/14] drm: Suppress intentional warning backtraces in scaling unit tests
Quoted 38 lines · Guenter Roeck
Hi,
Quoted 19 lines · Maíra Canal
Hi Guenter,
Quoted 16 lines · Guenter Roeck
The
drm_test_rect_calc_hscaleanddrm_test_rect_calc_vscaleunit tests intentionally trigger warning backtraces by providing bad parameters to the tested functions. What is tested is the return value, not the existence of a warning backtrace. Suppress the backtraces to avoid clogging the kernel log.Acked-by Dan Carpenter <[email protected]>Signed-off-by Guenter Roeck <[email protected]>---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tagsdrivers/gpu/drm/tests/drm_rect_test.c | 6 ++++++ 1 file changed, 6 insertions(+)Quoted 15 lines
drivers/gpu/drm/tests/drm_rect_test.c KUNIT_ARRAY_PARAM(drm_rect_scale, drm_rect_scale_cases, drm_rect_scale_case_desc · line 411
Quoted 11 lines
drivers/gpu/drm/tests/drm_rect_test.c +2
-0@@ -406,22 +406,28 @@ KUNIT_ARRAY_PARAM(drm_rect_scale, drm_rect_scale_cases, drm_rect_scale_case_descstatic void drm_test_rect_calc_hscale (struct kunit *test) { +DEFINE_SUPPRESSED_WARNING (drm_calc_scale);const struct drm_rect_scale_case *params = test->param_value;int scaling_factor; +START_SUPPRESSED_WARNING (drm_calc_scale);I'm not sure if it is not that obvious only to me, but it would be nice to have a comment here, remembering that we provide bad parameters in some test cases.
Quoted 8 lines
Sure. Something like this ?
/*
*drm_rect_calc_hscale()generates a warning backtrace whenever bad
* parameters are passed to it. This affects all unit tests with an
* error code inexpected_scaling_factor.
*/
Yeah, perfect. With that, feel free to add my
Best Regards,
- Maíra
Quoted 2 lines
Thanks,
Guenter
Re: [PATCH v2 05/14] drm: Suppress intentional warning backtraces in scaling unit tests
Quoted 48 lines · Maíra Canal
Quoted 38 lines · Guenter Roeck
Hi,
Quoted 19 lines · Maíra Canal
Hi Guenter,
Quoted 16 lines · Guenter Roeck
The
drm_test_rect_calc_hscaleanddrm_test_rect_calc_vscaleunit tests intentionally trigger warning backtraces by providing bad parameters to the tested functions. What is tested is the return value, not the existence of a warning backtrace. Suppress the backtraces to avoid clogging the kernel log.Acked-by Dan Carpenter <[email protected]>Signed-off-by Guenter Roeck <[email protected]>---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
drivers/gpu/drm/tests/drm_rect_test.c| 6 ++++++1 file changed, 6 insertions(+)Quoted 15 lines
drivers/gpu/drm/tests/drm_rect_test.c KUNIT_ARRAY_PARAM(drm_rect_scale, drm_rect_scale_cases, drm_rect_scale_case_desc · line 411
Quoted 11 lines
drivers/gpu/drm/tests/drm_rect_test.c +2
-0@@ -406,22 +406,28 @@ KUNIT_ARRAY_PARAM(drm_rect_scale, drm_rect_scale_cases, drm_rect_scale_case_desc static void drm_test_rect_calc_hscale(struct kunit *test) { + DEFINE_SUPPRESSED_WARNING(drm_calc_scale); const struct drm_rect_scale_case *params = test->param_value; int scaling_factor; + START_SUPPRESSED_WARNING(drm_calc_scale);I'm not sure if it is not that obvious only to me, but it would be nice to have a comment here, remembering that we provide bad parameters in some test cases.
Quoted 8 lines
Sure. Something like this ?
/*
*drm_rect_calc_hscale()generates a warning backtrace whenever bad
* parameters are passed to it. This affects all unit tests with an
* error code inexpected_scaling_factor.
*/
Quoted 4 lines
Yeah, perfect. With that, feel free to add my
Acked-by Maíra Canal <[email protected]>
Thanks!
Guenter
PATCH v2 6/14 net: kunit: Suppress lock warning noise at end of dev_addr_lists tests
In reply to Guenter Roeckdev_addr_lists_test generates lock warning noise at the end of tests if lock debugging is enabled. There are two sets of warnings.
WARNING: CPU: 0 PID: 689 at kernel/locking/mutex.c:923 __mutex_unlock_slowpath.constprop.0+0x13c/0x368
DEBUG_LOCKS_WARN_ON(__owner_task(owner) != __get_current())
WARNING: kunit_try_catch/1336 still has locks held!
KUnit test cleanup is not guaranteed to run in the same thread as the test itself. For this test, this means that rtnl_lock() and rtnl_unlock() may be called from different threads. This triggers the warnings. Suppress the warnings because they are irrelevant for the test and just confusing.
The first warning can be suppressed by using START_SUPPRESSED_WARNING() and END_SUPPRESSED_WARNING() around the call to rtnl_unlock(). To suppress the second warning, it is necessary to set debug_locks_silent while the rtnl lock is held.
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
net/core/dev_addr_lists_test.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/core/dev_addr_lists_test.c +6 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0-or-later #include <kunit/test.h> +#include <linux/debug_locks.h> #include <linux/etherdevice.h> #include <linux/netdevice.h> #include <linux/rtnetlink.h>
@@ -49,6 +50,7 @@ static int dev_addr_test_init(struct kunit *test)KUNIT_FAIL (test,"Can't register netdev %d" , err); } + debug_locks_silent =1 ;rtnl_lock ();return 0 ; }
@@ -56,8 +58,12 @@ static int dev_addr_test_init(struct kunit *test)static void dev_addr_test_exit (struct kunit *test) {struct net_device *netdev = test->priv; +DEFINE_SUPPRESSED_WARNING (__mutex_unlock_slowpath); +START_SUPPRESSED_WARNING (__mutex_unlock_slowpath);rtnl_unlock (); +END_SUPPRESSED_WARNING (__mutex_unlock_slowpath); + debug_locks_silent =0 ;unregister_netdev (netdev);free_netdev (netdev); }
Signature · 1 line
2.39.2
PATCH v2 7/14 x86: Add support for suppressing warning backtraces
In reply to Guenter RoeckAdd name of functions triggering warning backtraces to the __bug_table object section to enable support for suppressing WARNING backtraces.
To limit image size impact, the pointer to the function name is only added to the __bug_table section if both CONFIG_KUNIT_SUPPRESS_BACKTRACE and CONFIG_DEBUG_BUGVERBOSE are enabled. Otherwise, the __func__ assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused __func__ entries (this is necessary because __func__ is not a define but a virtual variable).
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
arch/x86/include/asm/bug.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
arch/x86/include/asm/bug.h +16 -5
@@ -23,18 +23,28 @@#ifdef CONFIG_DEBUG_BUGVERBOSE +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR __BUG_REL(%c1) +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC_PTR +# define __BUG_FUNC NULL +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ +#define _BUG_FLAGS (ins, flags, extra) \ do { \ asm_inline volatile("1:\t" ins "\n" \ ".pushsection __bug_table,\"aw\"\n" \ "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ "\t" __BUG_REL(%c0) "\t# bug_entry::file\n" \ - "\t.word %c1" "\t# bug_entry::line\n" \ - "\t.word %c2" "\t# bug_entry::flags\n" \ - "\t.org 2b+%c3\n" \ + "\t" __BUG_FUNC_PTR "\t# bug_entry::function\n" \ + "\t.word %c2" "\t# bug_entry::line\n" \ + "\t.word %c3" "\t# bug_entry::flags\n" \ + "\t.org 2b+%c4\n" \ ".popsection\n" \ extra \ - : : "i" (__FILE__), "i" (__LINE__), \ + : : "i" (__FILE__), "i" (__BUG_FUNC), "i" (__LINE__),\ "i" (flags), \ "i" (sizeof(struct bug_entry))); \ } while (0)
@@ -80,7 +90,8 @@ do { \do { \__auto_type __flags =BUGFLAG_WARNING |(flags); \instrumentation_begin (); \ -_BUG_FLAGS (ASM_UD2 , __flags,ASM_REACHABLE ); \ +if (!IS_SUPPRESSED_WARNING (__func__)) \ +_BUG_FLAGS (ASM_UD2 , __flags,ASM_REACHABLE ); \instrumentation_end (); \ }while (0 )
Signature · 1 line
2.39.2
PATCH v2 8/14 arm64: Add support for suppressing warning backtraces
In reply to Guenter RoeckAdd name of functions triggering warning backtraces to the __bug_table object section to enable support for suppressing WARNING backtraces.
To limit image size impact, the pointer to the function name is only added to the __bug_table section if both CONFIG_KUNIT_SUPPRESS_BACKTRACE and CONFIG_DEBUG_BUGVERBOSE are enabled. Otherwise, the __func__ assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused __func__ entries (this is necessary because __func__ is not a define but a virtual variable).
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
arch/arm64/include/asm/asm-bug.h | 29 +++++++++++++++++++---------- arch/arm64/include/asm/bug.h | 8 +++++++- 2 files changed, 26 insertions(+), 11 deletions(-)
arch/arm64/include/asm/asm-bug.h +19 -10
@@ -8,36 +8,45 @@#include <asm/brk-imm.h> #ifdef CONFIG_DEBUG_BUGVERBOSE -#define _BUGVERBOSE_LOCATION (file, line) __BUGVERBOSE_LOCATION(file, line) -#define __BUGVERBOSE_LOCATION (file, line) \ + +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR (func) .long func - .; +#else +# define __BUG_FUNC_PTR (func) +#endif + +#define _BUGVERBOSE_LOCATION (file, func, line) __BUGVERBOSE_LOCATION(file, func, line) +#define __BUGVERBOSE_LOCATION (file, func, line) \ .pushsection .rodata.str,"aMS",@progbits,1; \ 14472: .string file; \ .popsection; \ \ .long 14472b - .; \ + __BUG_FUNC_PTR(func) \ .short line;#else -#define _BUGVERBOSE_LOCATION (file, line) +#define _BUGVERBOSE_LOCATION (file, func, line)#endif #ifdef CONFIG_GENERIC_BUG -#define __BUG_ENTRY (flags) \ +#define __BUG_ENTRY (flags, func) \ .pushsection __bug_table,"aw"; \ .align 2; \ 14470: .long 14471f - .; \ -_BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ - .short flags; \ +_BUGVERBOSE_LOCATION(__FILE__, func, __LINE__) \ + .short flags; \ .popsection; \ 14471:#else -#define __BUG_ENTRY (flags) +#define __BUG_ENTRY (flags, func)#endif -#define ASM_BUG_FLAGS (flags) \ - __BUG_ENTRY(flags) \ +#define ASM_BUG_FLAGS (flags, func) \ + __BUG_ENTRY(flags, func) \ brk BUG_BRK_IMM -#define ASM_BUG () ASM_BUG_FLAGS(0) +#define ASM_BUG () ASM_BUG_FLAGS(0, .)#endif /* __ASM_ASM_BUG_H */
arch/arm64/include/asm/bug.h +7 -1
@@ -11,8 +11,14 @@#include <asm/asm-bug.h> +#ifdef HAVE_BUG_FUNCTION +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC NULL +#endif +#define __BUG_FLAGS (flags) \ - asm volatile (__stringify(ASM_BUG_FLAGS(flags))); + asm volatile (__stringify(ASM_BUG_FLAGS(flags, %c0)) : : "i" (__BUG_FUNC));#define BUG () do { \ __BUG_FLAGS(0); \
Signature · 1 line
2.39.2
PATCH v2 9/14 loongarch: Add support for suppressing warning backtraces
In reply to Guenter RoeckAdd name of functions triggering warning backtraces to the __bug_table object section to enable support for suppressing WARNING backtraces.
To limit image size impact, the pointer to the function name is only added to the __bug_table section if both CONFIG_KUNIT_SUPPRESS_BACKTRACE and CONFIG_DEBUG_BUGVERBOSE are enabled. Otherwise, the __func__ assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused __func__ entries (this is necessary because __func__ is not a define but a virtual variable).
---
- Rebased to v6.9-rc1; resolved context conflict
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
arch/loongarch/include/asm/bug.h | 38 +++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 11 deletions(-)
arch/loongarch/include/asm/bug.h +27 -11
@@ -3,47 +3,63 @@#define __ASM_BUG_H#include <asm/break.h> +#include <kunit/bug.h> #include <linux/stringify.h> #ifndef CONFIG_DEBUG_BUGVERBOSE -#define _BUGVERBOSE_LOCATION (file, line) +#define _BUGVERBOSE_LOCATION (file, func, line)#else -#define __BUGVERBOSE_LOCATION (file, line) \ +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR (func) .long func - .; +#else +# define __BUG_FUNC_PTR (func) +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ + +#define __BUGVERBOSE_LOCATION (file, func, line) \ .pushsection .rodata.str, "aMS", @progbits, 1; \ 10002: .string file; \ .popsection; \ \ .long 10002b - .; \ + __BUG_FUNC_PTR(func) \ .short line; -#define _BUGVERBOSE_LOCATION (file, line) __BUGVERBOSE_LOCATION(file, line) +#define _BUGVERBOSE_LOCATION (file, func, line) __BUGVERBOSE_LOCATION(file, func, line)#endif #ifndef CONFIG_GENERIC_BUG -#define __BUG_ENTRY (flags) +#define __BUG_ENTRY (flags, func)#else -#define __BUG_ENTRY (flags) \ +#define __BUG_ENTRY (flags, func) \ .pushsection __bug_table, "aw"; \ .align 2; \ 10000: .long 10001f - .; \ - _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ + _BUGVERBOSE_LOCATION(__FILE__, func, __LINE__) \ .short flags; \ .popsection; \ 10001:#endif -#define ASM_BUG_FLAGS (flags) \ - __BUG_ENTRY(flags) \ +#define ASM_BUG_FLAGS (flags, func) \ + __BUG_ENTRY(flags, func) \ break BRK_BUG -#define ASM_BUG () ASM_BUG_FLAGS(0) +#define ASM_BUG () ASM_BUG_FLAGS(0, .) + +#ifdef HAVE_BUG_FUNCTION +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC NULL +#endif #define __BUG_FLAGS (flags) \ - asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags))); + asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags, %0)) : : "i" (__BUG_FUNC));#define __WARN_FLAGS (flags) \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(BUGFLAG_WARNING|(flags)); \ + if (!IS_SUPPRESSED_WARNING(__func__)) \ + __BUG_FLAGS(BUGFLAG_WARNING|(flags)); \ annotate_reachable(); \ instrumentation_end(); \ } while (0)
Signature · 1 line
2.39.2
PATCH v2 10/14 parisc: Add support for suppressing warning backtraces
In reply to Guenter RoeckAdd name of functions triggering warning backtraces to the __bug_table object section to enable support for suppressing WARNING backtraces.
To limit image size impact, the pointer to the function name is only added to the __bug_table section if both CONFIG_KUNIT_SUPPRESS_BACKTRACE and CONFIG_DEBUG_BUGVERBOSE are enabled. Otherwise, the __func__ assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused __func__ entries (this is necessary because __func__ is not a define but a virtual variable).
While at it, declare assembler parameters as constants where possible. Refine .blockz instructions to calculate the necessary padding instead of using fixed values.
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
arch/parisc/include/asm/bug.h | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
arch/parisc/include/asm/bug.h +21 -8
@@ -23,8 +23,17 @@# define __BUG_REL (val) ".word " __stringify(val)#endif -#ifdef CONFIG_DEBUG_BUGVERBOSE + +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR __BUG_REL(%c1) +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC_PTR +# define __BUG_FUNC NULL +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ +#define BUG () \ do { \ asm volatile("\n" \
@@ -33,10 +42,12 @@"\t.align 4\n" \ "2:\t" __BUG_REL(1b) "\n" \ "\t" __BUG_REL(%c0) "\n" \ -"\t.short %1, %2\n" \ -"\t.blockz %3-2*4-2*2\n" \ +"\t" __BUG_FUNC_PTR"\n" \ +"\t.short %c2, %c3\n" \ +"\t.blockz %c4-(.-2b)\n" \"\t.popsection" \ - : : "i" (__FILE__), "i" (__LINE__), \ + : : "i" (__FILE__), "i" (__BUG_FUNC), \ +"i" (__LINE__), \ "i" (0), "i" (sizeof(struct bug_entry)) ); \unreachable (); \ }while (0 )
@@ -58,10 +69,12 @@"\t.align 4\n" \ "2:\t" __BUG_REL(1b) "\n" \ "\t" __BUG_REL(%c0) "\n" \ -"\t.short %1, %2\n" \ -"\t.blockz %3-2*4-2*2\n" \ +"\t" __BUG_FUNC_PTR"\n" \ +"\t.short %c2, %3\n" \ +"\t.blockz %c4-(.-2b)\n" \"\t.popsection" \ - : : "i" (__FILE__), "i" (__LINE__), \ + : : "i" (__FILE__), "i" (__BUG_FUNC), \ +"i" (__LINE__), \"i" (BUGFLAG_WARNING |(flags)), \ "i" (sizeof(struct bug_entry)) ); \ }while (0 )
@@ -74,7 +87,7 @@"\t.align 4\n" \ "2:\t" __BUG_REL(1b) "\n" \"\t.short %0\n" \ -"\t.blockz %1-4-2\n" \ +"\t.blockz %c1-(.-2b)\n" \"\t.popsection" \ : : "i" (BUGFLAG_WARNING|(flags)), \ "i" (sizeof(struct bug_entry)) ); \
Signature · 1 line
2.39.2
PATCH v2 11/14 s390: Add support for suppressing warning backtraces
In reply to Guenter RoeckAdd name of functions triggering warning backtraces to the __bug_table object section to enable support for suppressing WARNING backtraces.
To limit image size impact, the pointer to the function name is only added to the __bug_table section if both CONFIG_KUNIT_SUPPRESS_BACKTRACE and CONFIG_DEBUG_BUGVERBOSE are enabled. Otherwise, the __func__ assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused __func__ entries (this is necessary because __func__ is not a define but a virtual variable).
---
- Rebased to v6.9-rc1 (simplified assembler changes after upstream commit 3938490e78f4 ("s390/bug: remove entry size from __bug_table section")
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
arch/s390/include/asm/bug.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/s390/include/asm/bug.h +14 -3
@@ -8,6 +8,15 @@#ifdef CONFIG_DEBUG_BUGVERBOSE +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR " .long %0-.\n" +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC_PTR +# define __BUG_FUNC NULL +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ +#define __EMIT_BUG (x) do { \ asm_inline volatile( \ "0: mc 0,0\n" \
@@ -17,10 +26,12 @@".section __bug_table,\"aw\"\n" \"2: .long 0b-.\n" \" .long 1b-.\n" \ -" .short %0,%1\n" \ -" .org 2b+%2\n" \ + __BUG_FUNC_PTR \ +" .short %1,%2\n" \ +" .org 2b+%3\n" \".previous\n" \ - : : "i" (__LINE__), \ + : : "i" (__BUG_FUNC), \ +"i" (__LINE__), \"i" (x), \ "i" (sizeof(struct bug_entry))); \ }while (0 )
Signature · 1 line
2.39.2
PATCH v2 12/14 sh: Add support for suppressing warning backtraces
In reply to Guenter RoeckAdd name of functions triggering warning backtraces to the __bug_table object section to enable support for suppressing WARNING backtraces.
To limit image size impact, the pointer to the function name is only added to the __bug_table section if both CONFIG_KUNIT_SUPPRESS_BACKTRACE and CONFIG_DEBUG_BUGVERBOSE are enabled. Otherwise, the __func__ assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused __func__ entries (this is necessary because __func__ is not a define but a virtual variable).
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
arch/sh/include/asm/bug.h | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)
arch/sh/include/asm/bug.h +22 -4
@@ -24,21 +24,36 @@* The offending file and line are encoded in the __bug_table section. */ #ifdef CONFIG_DEBUG_BUGVERBOSE + +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR "\t.long %O2\n" +#else +# define __BUG_FUNC_PTR +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ +#define _EMIT_BUG_ENTRY \ "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b, %O1\n" \ - "\t.short %O2, %O3\n" \ - "\t.org 2b+%O4\n" \ + __BUG_FUNC_PTR \ + "\t.short %O3, %O4\n" \ + "\t.org 2b+%O5\n" \ "\t.popsection\n"#else #define _EMIT_BUG_ENTRY \ "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b\n" \ - "\t.short %O3\n" \ - "\t.org 2b+%O4\n" \ + "\t.short %O4\n" \ + "\t.org 2b+%O5\n" \ "\t.popsection\n"#endif +#ifdef HAVE_BUG_FUNCTION +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC NULL +#endif +#define BUG () \ do { \ __asm__ __volatile__ ( \
@@ -47,6 +62,7 @@ do { \ : \ : "n" (TRAPA_BUG_OPCODE), \"i" (__FILE__), \ +"i" (__BUG_FUNC), \"i" (__LINE__),"i" (0 ), \ "i" (sizeof(struct bug_entry))); \unreachable (); \
@@ -60,6 +76,7 @@ do { \ : \ : "n" (TRAPA_BUG_OPCODE), \"i" (__FILE__), \ +"i" (__BUG_FUNC), \"i" (__LINE__), \"i" (BUGFLAG_WARNING |(flags)), \ "i" (sizeof(struct bug_entry))); \
@@ -85,6 +102,7 @@ do { \ : \ : "n" (TRAPA_BUG_OPCODE), \"i" (__FILE__), \ +"i" (__BUG_FUNC), \"i" (__LINE__), \"i" (BUGFLAG_UNWINDER ), \ "i" (sizeof(struct bug_entry))); \
Signature · 1 line
2.39.2
Simon Horman
reviewerRe: [PATCH v2 12/14] sh: Add support for suppressing warning backtraces
Quoted 27 lines · Guenter Roeck
Add name of functions triggering warning backtraces to the
__bug_tableobject section to enable support for suppressing WARNING backtraces.To limit image size impact, the pointer to the function name is only added to the
__bug_tablesection if bothCONFIG_KUNIT_SUPPRESS_BACKTRACEandCONFIG_DEBUG_BUGVERBOSEare enabled. Otherwise, the__func__assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused__func__entries (this is necessary because__func__is not a define but a virtual variable).Acked-by Dan Carpenter <[email protected]>Signed-off-by Guenter Roeck <[email protected]>---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- IntroducedKUNIT_SUPPRESS_BACKTRACEconfiguration optionarch/sh/include/asm/bug.h | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)arch/sh/include/asm/bug.h +0
-0@@ -24,21 +24,36 @@* The offending file and line are encoded in the __bug_table section.
arch/sh/include/asm/bug.h line 34
Quoted 10 lines
arch/sh/include/asm/bug.h +8
-0*/ #ifdef CONFIG_DEBUG_BUGVERBOSE + +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR "\t.long %O2\n" +#else +# define __BUG_FUNC_PTR +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ +
Hi Guenter,
a minor nit from my side: this change results in a Kernel doc warning.
.../bug.h:29: warning: expecting prototype for _EMIT_BUG_ENTRY(). Prototype was for HAVE_BUG_FUNCTION() instead
Perhaps either the new code should be placed above the Kernel doc, or scripts/kernel-doc should be enhanced?
Quoted 29 lines
arch/sh/include/asm/bug.h +11
-4#define _EMIT_BUG_ENTRY \ "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b, %O1\n" \ - "\t.short %O2, %O3\n" \ - "\t.org 2b+%O4\n" \ + __BUG_FUNC_PTR \ + "\t.short %O3, %O4\n" \ + "\t.org 2b+%O5\n" \ "\t.popsection\n"#else #define _EMIT_BUG_ENTRY \ "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b\n" \ - "\t.short %O3\n" \ - "\t.org 2b+%O4\n" \ + "\t.short %O4\n" \ + "\t.org 2b+%O5\n" \ "\t.popsection\n"#endif +#ifdef HAVE_BUG_FUNCTION +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC NULL +#endif +#define BUG () \ do { \ __asm__ __volatile__ ( \
...
Re: [PATCH v2 12/14] sh: Add support for suppressing warning backtraces
Quoted 41 lines · Simon Horman
Quoted 27 lines · Guenter Roeck
Add name of functions triggering warning backtraces to the
__bug_tableobject section to enable support for suppressing WARNING backtraces.To limit image size impact, the pointer to the function name is only added to the
__bug_tablesection if bothCONFIG_KUNIT_SUPPRESS_BACKTRACEandCONFIG_DEBUG_BUGVERBOSEare enabled. Otherwise, the__func__assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused__func__entries (this is necessary because__func__is not a define but a virtual variable).Acked-by Dan Carpenter <[email protected]>Signed-off-by Guenter Roeck <[email protected]>---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- IntroducedKUNIT_SUPPRESS_BACKTRACEconfiguration optionarch/sh/include/asm/bug.h | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)arch/sh/include/asm/bug.h +0
-0@@ -24,21 +24,36 @@* The offending file and line are encoded in the __bug_table section. arch/sh/include/asm/bug.h line 34
Quoted 10 lines
arch/sh/include/asm/bug.h +8
-0*/ #ifdef CONFIG_DEBUG_BUGVERBOSE + +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR "\t.long %O2\n" +#else +# define __BUG_FUNC_PTR +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ +Hi Guenter,
Quoted 7 lines
a minor nit from my side: this change results in a Kernel doc warning.
.../bug.h:29: warning: expecting prototype for_EMIT_BUG_ENTRY(). Prototype was forHAVE_BUG_FUNCTION()insteadPerhaps either the new code should be placed above the Kernel doc, or
scripts/kernel-docshould be enhanced?
Thanks a lot for the feedback.
The definition block needs to be inside CONFIG_DEBUG_BUGVERBOSE, so it would be a bit odd to move it above the documentation just to make kerneldoc happy. I am not really sure that to do about it.
I'll wait for comments from others before making any changes.
Thanks,
Guenter
Quoted 31 lines
Quoted 29 lines
arch/sh/include/asm/bug.h +11
-4#define _EMIT_BUG_ENTRY \ "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b, %O1\n" \ - "\t.short %O2, %O3\n" \ - "\t.org 2b+%O4\n" \ + __BUG_FUNC_PTR \ + "\t.short %O3, %O4\n" \ + "\t.org 2b+%O5\n" \ "\t.popsection\n"#else #define _EMIT_BUG_ENTRY \ "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b\n" \ - "\t.short %O3\n" \ - "\t.org 2b+%O4\n" \ + "\t.short %O4\n" \ + "\t.org 2b+%O5\n" \ "\t.popsection\n"#endif +#ifdef HAVE_BUG_FUNCTION +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC NULL +#endif +#define BUG () \ do { \ __asm__ __volatile__ ( \...
Simon Horman
reviewerRe: [PATCH v2 12/14] sh: Add support for suppressing warning backtraces
Quoted 50 lines · Guenter Roeck
Quoted 41 lines · Simon Horman
Quoted 27 lines · Guenter Roeck
Add name of functions triggering warning backtraces to the
__bug_tableobject section to enable support for suppressing WARNING backtraces.To limit image size impact, the pointer to the function name is only added to the
__bug_tablesection if bothCONFIG_KUNIT_SUPPRESS_BACKTRACEandCONFIG_DEBUG_BUGVERBOSEare enabled. Otherwise, the__func__assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused__func__entries (this is necessary because__func__is not a define but a virtual variable).Acked-by Dan Carpenter <[email protected]>Signed-off-by Guenter Roeck <[email protected]>---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- IntroducedKUNIT_SUPPRESS_BACKTRACEconfiguration optionarch/sh/include/asm/bug.h | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)arch/sh/include/asm/bug.h +0
-0@@ -24,21 +24,36 @@* The offending file and line are encoded in the __bug_table section. arch/sh/include/asm/bug.h line 34
Quoted 10 lines
arch/sh/include/asm/bug.h +8
-0*/ #ifdef CONFIG_DEBUG_BUGVERBOSE + +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR "\t.long %O2\n" +#else +# define __BUG_FUNC_PTR +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ +Hi Guenter,
Quoted 7 lines
a minor nit from my side: this change results in a Kernel doc warning.
.../bug.h:29: warning: expecting prototype for_EMIT_BUG_ENTRY(). Prototype was forHAVE_BUG_FUNCTION()insteadPerhaps either the new code should be placed above the Kernel doc, or
scripts/kernel-docshould be enhanced?
Quoted 6 lines
Thanks a lot for the feedback.
The definition block needs to be inside
CONFIG_DEBUG_BUGVERBOSE, so it would be a bit odd to move it above the documentation just to make kerneldoc happy. I am not really sure that to do about it.
FWIIW, I agree that would be odd.
But perhaps the #ifdef could also move above the Kernel doc? Maybe not a great idea, but the best one I've had so far.
Quoted 36 lines
I'll wait for comments from others before making any changes.
Thanks,
GuenterQuoted 30 lines
Quoted 28 lines
arch/sh/include/asm/bug.h +11
-4#define _EMIT_BUG_ENTRY \ "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b, %O1\n" \ - "\t.short %O2, %O3\n" \ - "\t.org 2b+%O4\n" \ + __BUG_FUNC_PTR \ + "\t.short %O3, %O4\n" \ + "\t.org 2b+%O5\n" \ "\t.popsection\n"#else #define _EMIT_BUG_ENTRY \ "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b\n" \ - "\t.short %O3\n" \ - "\t.org 2b+%O4\n" \ + "\t.short %O4\n" \ + "\t.org 2b+%O5\n" \ "\t.popsection\n"#endif +#ifdef HAVE_BUG_FUNCTION +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC NULL +#endif +#define BUG () \ do { \ __asm__ __volatile__ ( \...
Re: [PATCH v2 12/14] sh: Add support for suppressing warning backtraces
On Wed, Mar 27, 2024 at 07:39:20PM +0000, Simon Horman wrote:
[ ... ]
Quoted 13 lines
Quoted 13 lines
Quoted 10 lines
Hi Guenter,
a minor nit from my side: this change results in a Kernel doc warning.
.../bug.h:29: warning: expecting prototype for_EMIT_BUG_ENTRY(). Prototype was forHAVE_BUG_FUNCTION()insteadPerhaps either the new code should be placed above the Kernel doc, or
scripts/kernel-docshould be enhanced?Thanks a lot for the feedback.
Quoted 9 lines
Quoted 4 lines
The definition block needs to be inside
CONFIG_DEBUG_BUGVERBOSE, so it would be a bit odd to move it above the documentation just to make kerneldoc happy. I am not really sure that to do about it.FWIIW, I agree that would be odd.
But perhaps the #ifdef could also move above the Kernel doc? Maybe not a great idea, but the best one I've had so far.
I did that for the next version of the patch series. It is a bit more clumsy, so I left it as separate patch on top of this patch. I'd still like to get input from others before making the change final.
Thanks,
Guenter
PATCH v2 13/14 riscv: Add support for suppressing warning backtraces
In reply to Guenter RoeckAdd name of functions triggering warning backtraces to the __bug_table object section to enable support for suppressing WARNING backtraces.
To limit image size impact, the pointer to the function name is only added to the __bug_table section if both CONFIG_KUNIT_SUPPRESS_BACKTRACE and CONFIG_DEBUG_BUGVERBOSE are enabled. Otherwise, the __func__ assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused __func__ entries (this is necessary because __func__ is not a define but a virtual variable).
To simplify the implementation, unify the __BUG_ENTRY_ADDR and __BUG_ENTRY_FILE macros into a single macro named __BUG_REL() which takes the address, file, or function reference as parameter.
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
arch/riscv/include/asm/bug.h | 38 ++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-)
arch/riscv/include/asm/bug.h +26 -12
@@ -30,26 +30,39 @@typedef u32 bug_insn_t ;#ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS -#define __BUG_ENTRY_ADDR RISCV_INT " 1b - ." -#define __BUG_ENTRY_FILE RISCV_INT " %0 - ." +#define __BUG_REL (val) RISCV_INT " " __stringify(val) " - ."#else -#define __BUG_ENTRY_ADDR RISCV_PTR " 1b" -#define __BUG_ENTRY_FILE RISCV_PTR " %0" +#define __BUG_REL (val) RISCV_PTR " " __stringify(val)#endif #ifdef CONFIG_DEBUG_BUGVERBOSE + +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR __BUG_REL(%1) +#else +# define __BUG_FUNC_PTR +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ +#define __BUG_ENTRY \ - __BUG_ENTRY_ADDR "\n\t" \ - __BUG_ENTRY_FILE "\n\t" \ - RISCV_SHORT " %1\n\t" \ - RISCV_SHORT " %2" + __BUG_REL(1b) "\n\t" \ + __BUG_REL(%0) "\n\t" \ + __BUG_FUNC_PTR "\n\t" \ + RISCV_SHORT " %2\n\t" \ + RISCV_SHORT " %3"#else #define __BUG_ENTRY \ - __BUG_ENTRY_ADDR "\n\t" \ - RISCV_SHORT " %2" + __BUG_REL(1b) "\n\t" \ + RISCV_SHORT " %3"#endif #ifdef CONFIG_GENERIC_BUG +#ifdef HAVE_BUG_FUNCTION +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC NULL +#endif +#define __BUG_FLAGS (flags) \ do { \ __asm__ __volatile__ ( \
@@ -58,10 +71,11 @@ do { \".pushsection __bug_table,\"aw\"\n\t" \"2:\n\t" \ __BUG_ENTRY"\n\t" \ -".org 2b + %3\n\t" \ +".org 2b + %4\n\t" \".popsection" \ : \ - : "i" (__FILE__), "i" (__LINE__), \ + : "i" (__FILE__), "i" (__BUG_FUNC), \ +"i" (__LINE__), \"i" (flags), \ "i" (sizeof(struct bug_entry))); \ }while (0 )
Signature · 1 line
2.39.2
PATCH v2 14/14 powerpc: Add support for suppressing warning backtraces
In reply to Guenter RoeckAdd name of functions triggering warning backtraces to the __bug_table object section to enable support for suppressing WARNING backtraces.
To limit image size impact, the pointer to the function name is only added to the __bug_table section if both CONFIG_KUNIT_SUPPRESS_BACKTRACE and CONFIG_DEBUG_BUGVERBOSE are enabled. Otherwise, the __func__ assembly parameter is replaced with a (dummy) NULL parameter to avoid an image size increase due to unused __func__ entries (this is necessary because __func__ is not a define but a virtual variable).
---
- Rebased to v6.9-rc1
- Added Tested-by:, Acked-by:, and Reviewed-by: tags
- Introduced KUNIT_SUPPRESS_BACKTRACE configuration option
arch/powerpc/include/asm/bug.h | 37 +++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-)
arch/powerpc/include/asm/bug.h +28 -9
@@ -14,6 +14,9 @@ .section __bug_table,"aw" 5001: .4byte \addr - . .4byte 5002f - . +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE + .4byte 0 +#endif .short \line, \flags .org 5001b+BUG_ENTRY_SIZE .previous
@@ -32,30 +35,46 @@#endif /* verbose */ #else /* !__ASSEMBLY__ */ -/* _EMIT_BUG_ENTRY expects args %0,%1,%2,%3 to be FILE, LINE, flags and -sizeof(struct bug_entry), respectively */ +/* _EMIT_BUG_ENTRY expects args %0,%1,%2,%3,%4 to be FILE, __func__, LINE, flags +and sizeof(struct bug_entry), respectively */ #ifdef CONFIG_DEBUG_BUGVERBOSE + +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE +# define HAVE_BUG_FUNCTION +# define __BUG_FUNC_PTR " .4byte %1 - .\n" +#else +# define __BUG_FUNC_PTR +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ +#define _EMIT_BUG_ENTRY \ ".section __bug_table,\"aw\"\n" \ "2: .4byte 1b - .\n" \ " .4byte %0 - .\n" \ - " .short %1, %2\n" \ - ".org 2b+%3\n" \ + __BUG_FUNC_PTR \ + " .short %2, %3\n" \ + ".org 2b+%4\n" \ ".previous\n"#else #define _EMIT_BUG_ENTRY \ ".section __bug_table,\"aw\"\n" \ "2: .4byte 1b - .\n" \ - " .short %2\n" \ - ".org 2b+%3\n" \ + " .short %3\n" \ + ".org 2b+%4\n" \ ".previous\n"#endif +#ifdef HAVE_BUG_FUNCTION +# define __BUG_FUNC __func__ +#else +# define __BUG_FUNC NULL +#endif +#define BUG_ENTRY (insn, flags, ...) \ __asm__ __volatile__( \ "1: " insn "\n" \ _EMIT_BUG_ENTRY \ - : : "i" (__FILE__), "i" (__LINE__), \ + : : "i" (__FILE__), "i" (__BUG_FUNC), \ + "i" (__LINE__), \ "i" (flags), \ "i" (sizeof(struct bug_entry)), \ ##__VA_ARGS__)
@@ -80,7 +99,7 @@if (x) \BUG (); \ }else { \ -BUG_ENTRY (PPC_TLNEI " %4, 0" ,0 ,"r" ((__force long )(x))); \ +BUG_ENTRY (PPC_TLNEI " %5, 0" ,0 ,"r" ((__force long )(x))); \ } \ }while (0 )
@@ -90,7 +109,7 @@if (__ret_warn_on) \__WARN (); \ }else { \ -BUG_ENTRY (PPC_TLNEI " %4, 0" , \ +BUG_ENTRY (PPC_TLNEI " %5, 0" , \BUGFLAG_WARNING |BUGFLAG_TAINT (TAINT_WARN ), \"r" (__ret_warn_on)); \ } \
Signature · 1 line
2.39.2