diff mbox series

zsmalloc: reset compaction source zspage pointer after putback_zspage()

Message ID 20230417050140.1653593-1-senozhatsky@chromium.org (mailing list archive)
State New
Headers show
Series zsmalloc: reset compaction source zspage pointer after putback_zspage() | expand

Commit Message

Sergey Senozhatsky April 17, 2023, 5:01 a.m. UTC
Fixup.

Reported-by: Yu Zhao <yuzhao@google.com>
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
 mm/zsmalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Yu Zhao April 17, 2023, 5:11 a.m. UTC | #1
On Sun, Apr 16, 2023 at 11:01 PM Sergey Senozhatsky
<senozhatsky@chromium.org> wrote:
>
> Fixup.
>
> Reported-by: Yu Zhao <yuzhao@google.com>
> Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>

Tested-by: Yu Zhao <yuzhao@google.com>
Yosry Ahmed April 17, 2023, 11:43 a.m. UTC | #2
Hi Sergey,

On Sun, Apr 16, 2023 at 10:01 PM Sergey Senozhatsky
<senozhatsky@chromium.org> wrote:
>
> Fixup.

I think the original patch landed in mm-stable already, so we might
want a proper commit log and fixes tag.

I suspect we want:
Fixes: 5a845e9f2d66 ("zsmalloc: rework compaction algorithm")

>
> Reported-by: Yu Zhao <yuzhao@google.com>
> Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>

Otherwise, LGTM.

Reviewed-by: Yosry Ahmed <yosryahmed@google.com>

> ---
>  mm/zsmalloc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
> index aea50e2aa350..cc81dfba05a0 100644
> --- a/mm/zsmalloc.c
> +++ b/mm/zsmalloc.c
> @@ -2239,8 +2239,8 @@ static unsigned long __zs_compact(struct zs_pool *pool,
>                 if (fg == ZS_INUSE_RATIO_0) {
>                         free_zspage(pool, class, src_zspage);
>                         pages_freed += class->pages_per_zspage;
> -                       src_zspage = NULL;
>                 }
> +               src_zspage = NULL;
>
>                 if (get_fullness_group(class, dst_zspage) == ZS_INUSE_RATIO_100
>                     || spin_is_contended(&pool->lock)) {
> --
> 2.40.0.634.g4ca3ef3211-goog
>
Sergey Senozhatsky April 17, 2023, 1:07 p.m. UTC | #3
Hi,

On (23/04/17 04:43), Yosry Ahmed wrote:
> <senozhatsky@chromium.org> wrote:
> >
> > Fixup.
> 
> I think the original patch landed in mm-stable already, so we might
> want a proper commit log and fixes tag.
> 
> I suspect we want:
> Fixes: 5a845e9f2d66 ("zsmalloc: rework compaction algorithm")

Oh, OK, let me send out a proper patch, just in case.

> >
> > Reported-by: Yu Zhao <yuzhao@google.com>
> > Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
> 
> Otherwise, LGTM.
> 
> Reviewed-by: Yosry Ahmed <yosryahmed@google.com>

Thanks.
diff mbox series

Patch

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index aea50e2aa350..cc81dfba05a0 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -2239,8 +2239,8 @@  static unsigned long __zs_compact(struct zs_pool *pool,
 		if (fg == ZS_INUSE_RATIO_0) {
 			free_zspage(pool, class, src_zspage);
 			pages_freed += class->pages_per_zspage;
-			src_zspage = NULL;
 		}
+		src_zspage = NULL;
 
 		if (get_fullness_group(class, dst_zspage) == ZS_INUSE_RATIO_100
 		    || spin_is_contended(&pool->lock)) {