2021-03-18 14:53:13

by Chen Jun

Subject: [RESEND PATCH] Kconfig: Move CONFIG_DEBUG_KMEMLEAK_TEST to samples/Kconfig

From: Chen Jun <[email protected]>

commit 1abbef4f51724fb11f09adf0e75275f7cb422a8a
("mm,kmemleak-test.c: move kmemleak-test.c to samples dir")
make CONFIG_DEBUG_KMEMLEAK_TEST depend on CONFIG_SAMPLES implicitly.
And the dependency cannot be guaranteed by Kconfig.

move the definition of CONFIG_DEBUG_KMEMLEAK_TEST from lib/Kconfig.debug
to samples/Kconfig.

Signed-off-by: Chen Jun <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
---

lib/Kconfig.debug | 8 --------
samples/Kconfig | 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 66d44d3..debacdc 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -678,14 +678,6 @@ config DEBUG_KMEMLEAK_MEM_POOL_SIZE
fully initialised, this memory pool acts as an emergency one
if slab allocations fail.

-config DEBUG_KMEMLEAK_TEST
- tristate "Simple test for the kernel memory leak detector"
- depends on DEBUG_KMEMLEAK && m
- help
- This option enables a module that explicitly leaks memory.
-
- If unsure, say N.
-
config DEBUG_KMEMLEAK_DEFAULT_OFF
bool "Default kmemleak to off"
depends on DEBUG_KMEMLEAK
diff --git a/samples/Kconfig b/samples/Kconfig
index 0ed6e4d..15978dd 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -216,4 +216,12 @@ config SAMPLE_WATCH_QUEUE
Build example userspace program to use the new mount_notify(),
sb_notify() syscalls and the KEYCTL_WATCH_KEY keyctl() function.

+config DEBUG_KMEMLEAK_TEST
+ tristate "Simple test for the kernel memory leak detector"
+ depends on DEBUG_KMEMLEAK && m
+ help
+ This option enables a module that explicitly leaks memory.
+
+ If unsure, say N.
+
endif # SAMPLES
--
2.7.4

.

2021-03-19 17:58:23

by Catalin Marinas

Subject: Re: [RESEND PATCH] Kconfig: Move CONFIG_DEBUG_KMEMLEAK_TEST to samples/Kconfig

On Thu, Mar 18, 2021 at 02:51:07PM +0000, chenjun (AM) wrote:
> From: Chen Jun <[email protected]>
>
> commit 1abbef4f51724fb11f09adf0e75275f7cb422a8a
> ("mm,kmemleak-test.c: move kmemleak-test.c to samples dir")
> make CONFIG_DEBUG_KMEMLEAK_TEST depend on CONFIG_SAMPLES implicitly.
> And the dependency cannot be guaranteed by Kconfig.
>
> move the definition of CONFIG_DEBUG_KMEMLEAK_TEST from lib/Kconfig.debug
> to samples/Kconfig.
>
> Signed-off-by: Chen Jun <[email protected]>
> Acked-by: Catalin Marinas <[email protected]>

Cc'ing Andrew, I don't think he's seen the patch.

> lib/Kconfig.debug | 8 --------
> samples/Kconfig | 8 ++++++++
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index 66d44d3..debacdc 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -678,14 +678,6 @@ config DEBUG_KMEMLEAK_MEM_POOL_SIZE
> fully initialised, this memory pool acts as an emergency one
> if slab allocations fail.
>
> -config DEBUG_KMEMLEAK_TEST
> - tristate "Simple test for the kernel memory leak detector"
> - depends on DEBUG_KMEMLEAK && m
> - help
> - This option enables a module that explicitly leaks memory.
> -
> - If unsure, say N.
> -
> config DEBUG_KMEMLEAK_DEFAULT_OFF
> bool "Default kmemleak to off"
> depends on DEBUG_KMEMLEAK
> diff --git a/samples/Kconfig b/samples/Kconfig
> index 0ed6e4d..15978dd 100644
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@ -216,4 +216,12 @@ config SAMPLE_WATCH_QUEUE
> Build example userspace program to use the new mount_notify(),
> sb_notify() syscalls and the KEYCTL_WATCH_KEY keyctl() function.
>
> +config DEBUG_KMEMLEAK_TEST
> + tristate "Simple test for the kernel memory leak detector"
> + depends on DEBUG_KMEMLEAK && m
> + help
> + This option enables a module that explicitly leaks memory.
> +
> + If unsure, say N.
> +
> endif # SAMPLES
> --
> 2.7.4