Received-SPF: pass (google.com: domain of linux-kernel+bounces-44918-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Precedence: bulk
MIME-Version: 1.0
References: <20240130014208.565554-1-hannes@cmpxchg.org> <20240130014208.565554-4-hannes@cmpxchg.org>
In-Reply-To: <20240130014208.565554-4-hannes@cmpxchg.org>
From: Nhat Pham <nphamcs@gmail.com>
Date: Tue, 30 Jan 2024 08:25:45 -0800
Message-ID: <CAKEwX=P2=+NDVFTSVKvxk6Ja9Mn44WRJvKvtY=WFsHxnCuMRJw@mail.gmail.com>
Subject: Re: [PATCH 03/20] mm: zswap: move zswap_invalidate_entry() to related functions
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>, Yosry Ahmed <yosryahmed@google.com>, 
	Chengming Zhou <zhouchengming@bytedance.com>, linux-mm@kvack.org, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 29, 2024 at 5:42=E2=80=AFPM Johannes Weiner <hannes@cmpxchg.org=
> wrote:
>
> Move it up to the other tree and refcounting functions.
>
> Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
> ---
>  mm/zswap.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/mm/zswap.c b/mm/zswap.c
> index cf864aaa214d..9f05282efe3c 100644
> --- a/mm/zswap.c
> +++ b/mm/zswap.c
> @@ -559,6 +559,18 @@ static void zswap_entry_put(struct zswap_entry *entr=
y)
>         }
>  }
>
> +/*
> + * If the entry is still valid in the tree, drop the initial ref and rem=
ove it
> + * from the tree. This function must be called with an additional ref he=
ld,
> + * otherwise it may race with another invalidation freeing the entry.
> + */
> +static void zswap_invalidate_entry(struct zswap_tree *tree,
> +                                  struct zswap_entry *entry)

nit? entry_invalidate? There's an entry_put above()

Anyway:
Reviewed-by: Nhat Pham <nphamcs@gmail.com>

> +{
> +       if (zswap_rb_erase(&tree->rbroot, entry))
> +               zswap_entry_put(entry);
> +}
> +
>  /*********************************
>  * shrinker functions
>  **********************************/
> @@ -809,18 +821,6 @@ static struct zswap_pool *zswap_pool_find_get(char *=
type, char *compressor)
>         return NULL;
>  }
>
> -/*
> - * If the entry is still valid in the tree, drop the initial ref and rem=
ove it
> - * from the tree. This function must be called with an additional ref he=
ld,
> - * otherwise it may race with another invalidation freeing the entry.
> - */
> -static void zswap_invalidate_entry(struct zswap_tree *tree,
> -                                  struct zswap_entry *entry)
> -{
> -       if (zswap_rb_erase(&tree->rbroot, entry))
> -               zswap_entry_put(entry);
> -}
> -
>  static enum lru_status shrink_memcg_cb(struct list_head *item, struct li=
st_lru_one *l,
>                                        spinlock_t *lock, void *arg)
>  {
> --
> 2.43.0
>