mm: Kconfig: fixup zsmalloc configuration

[PATCH] mm: Kconfig: fixup zsmalloc configuration

Posted by Sergey Senozhatsky 1 year, 5 months ago

zsmalloc is not exclusive to zswap. Commit aa3ba6d72ce0
("mm: Kconfig: fixup zsmalloc configuration") made CONFIG_ZSMALLOC
only visible when CONFIG_ZSWAP is selected, which makes it
impossible to menuconfig zsmalloc-specific features (stats,
chain-size, etc.) on systems that use ZRAM but don't have ZSWAP
enabled.

Make zsmalloc depend on both ZRAM and ZSWAP.

Fixes: Fixes: aa3ba6d72ce0 ("mm: Kconfig: fixup zsmalloc configuration")
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
 mm/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/Kconfig b/mm/Kconfig
index b23913d4e47e..1aa282e35dc7 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -188,7 +188,7 @@ config Z3FOLD
 
 config ZSMALLOC
 	tristate
-	prompt "N:1 compression allocator (zsmalloc)" if ZSWAP
+	prompt "N:1 compression allocator (zsmalloc)" if (ZSWAP || ZRAM)
 	depends on MMU
 	help
 	  zsmalloc is a slab-based memory allocator designed to store
-- 
2.46.0.469.g59c65b2a67-goog

Re: [PATCH] mm: Kconfig: fixup zsmalloc configuration

Posted by Johannes Weiner 1 year, 5 months ago

On Tue, Sep 03, 2024 at 01:00:22PM +0900, Sergey Senozhatsky wrote:
> zsmalloc is not exclusive to zswap. Commit aa3ba6d72ce0
> ("mm: Kconfig: fixup zsmalloc configuration") made CONFIG_ZSMALLOC
> only visible when CONFIG_ZSWAP is selected, which makes it
> impossible to menuconfig zsmalloc-specific features (stats,
> chain-size, etc.) on systems that use ZRAM but don't have ZSWAP
> enabled.
> 
> Make zsmalloc depend on both ZRAM and ZSWAP.
> 
> Fixes: Fixes: aa3ba6d72ce0 ("mm: Kconfig: fixup zsmalloc configuration")

I can't find this commit upstream.

It looks like this was actually broken by

commit b3fbd58fcbb10725a1314688e03b1af6827c42f9
Author: Johannes Weiner <hannes@cmpxchg.org>
Date:   Thu May 19 14:08:53 2022 -0700

    mm: Kconfig: simplify zswap configuration

instead?

The patch itself looks good to me.

> Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
> ---
>  mm/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/mm/Kconfig b/mm/Kconfig
> index b23913d4e47e..1aa282e35dc7 100644
> --- a/mm/Kconfig
> +++ b/mm/Kconfig
> @@ -188,7 +188,7 @@ config Z3FOLD
>  
>  config ZSMALLOC
>  	tristate
> -	prompt "N:1 compression allocator (zsmalloc)" if ZSWAP
> +	prompt "N:1 compression allocator (zsmalloc)" if (ZSWAP || ZRAM)
>  	depends on MMU
>  	help
>  	  zsmalloc is a slab-based memory allocator designed to store
> -- 
> 2.46.0.469.g59c65b2a67-goog
>

Re: [PATCH] mm: Kconfig: fixup zsmalloc configuration

Posted by Andrew Morton 1 year, 5 months ago

On Tue, 3 Sep 2024 13:55:28 -0400 Johannes Weiner <hannes@cmpxchg.org> wrote:

> On Tue, Sep 03, 2024 at 01:00:22PM +0900, Sergey Senozhatsky wrote:
> > zsmalloc is not exclusive to zswap. Commit aa3ba6d72ce0
> > ("mm: Kconfig: fixup zsmalloc configuration") made CONFIG_ZSMALLOC
> > only visible when CONFIG_ZSWAP is selected, which makes it
> > impossible to menuconfig zsmalloc-specific features (stats,
> > chain-size, etc.) on systems that use ZRAM but don't have ZSWAP
> > enabled.
> > 
> > Make zsmalloc depend on both ZRAM and ZSWAP.
> > 
> > Fixes: Fixes: aa3ba6d72ce0 ("mm: Kconfig: fixup zsmalloc configuration")
> 
> I can't find this commit upstream.
> 
> It looks like this was actually broken by
> 
> commit b3fbd58fcbb10725a1314688e03b1af6827c42f9
> Author: Johannes Weiner <hannes@cmpxchg.org>
> Date:   Thu May 19 14:08:53 2022 -0700
> 
>     mm: Kconfig: simplify zswap configuration
> 
> instead?

Agree, I edited that into the changelog.

Re: [PATCH] mm: Kconfig: fixup zsmalloc configuration

Posted by Sergey Senozhatsky 1 year, 5 months ago

On (24/09/03 14:28), Andrew Morton wrote:
> On Tue, 3 Sep 2024 13:55:28 -0400 Johannes Weiner <hannes@cmpxchg.org> wrote:
> 
> > On Tue, Sep 03, 2024 at 01:00:22PM +0900, Sergey Senozhatsky wrote:
> > > zsmalloc is not exclusive to zswap. Commit aa3ba6d72ce0
> > > ("mm: Kconfig: fixup zsmalloc configuration") made CONFIG_ZSMALLOC
> > > only visible when CONFIG_ZSWAP is selected, which makes it
> > > impossible to menuconfig zsmalloc-specific features (stats,
> > > chain-size, etc.) on systems that use ZRAM but don't have ZSWAP
> > > enabled.
> > > 
> > > Make zsmalloc depend on both ZRAM and ZSWAP.
> > > 
> > > Fixes: Fixes: aa3ba6d72ce0 ("mm: Kconfig: fixup zsmalloc configuration")
> > 
> > I can't find this commit upstream.
> > 
> > It looks like this was actually broken by
> > 
> > commit b3fbd58fcbb10725a1314688e03b1af6827c42f9
> > Author: Johannes Weiner <hannes@cmpxchg.org>
> > Date:   Thu May 19 14:08:53 2022 -0700
> > 
> >     mm: Kconfig: simplify zswap configuration
> > 
> > instead?
> 
> Agree, I edited that into the changelog.

My bad, I didn't pay attention to what checkpatch suggested as an edit.
Thanks for spotting this Johannes and thanks for fixing this up Andrew!

Re: [PATCH] mm: Kconfig: fixup zsmalloc configuration

Posted by Sergey Senozhatsky 1 year, 5 months ago

On (24/09/03 13:00), Sergey Senozhatsky wrote:
> 
> Fixes: Fixes: aa3ba6d72ce0 ...
> 

Developers, developers