Received-SPF: pass (google.com: domain of linux-kernel+bounces-122103-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240325235018.2028408-1-yosryahmed@google.com>
 <20240325235018.2028408-5-yosryahmed@google.com> <fef4556f-5d22-4941-9990-a4a3cf003dc4@linux.dev>
In-Reply-To: <fef4556f-5d22-4941-9990-a4a3cf003dc4@linux.dev>
From: Yosry Ahmed <yosryahmed@google.com>
Date: Wed, 27 Mar 2024 15:32:19 -0700
Message-ID: <CAJD7tkb-mo-ote4PGa06mksrVEfQ=qANXGneAwLn4OMSfVJySA@mail.gmail.com>
Subject: Re: [RFC PATCH 4/9] mm: zswap: move more same-filled pages checks
 outside of zswap_store()
To: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Andrew Morton <akpm@linux-foundation.org>, Johannes Weiner <hannes@cmpxchg.org>, 
	Nhat Pham <nphamcs@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Mar 26, 2024 at 7:39=E2=80=AFPM Chengming Zhou <chengming.zhou@linu=
x.dev> wrote:
>
> On 2024/3/26 07:50, Yosry Ahmed wrote:
> > Currently, zswap_store() check zswap_same_filled_pages_enabled, kmaps
> > the folio, then calls zswap_is_page_same_filled() to check the folio
> > contents. Move this logic into zswap_is_page_same_filled() as well (and
> > rename it to use 'folio' while we are at it).
> >
> > This makes zswap_store() cleaner, and makes following changes to that
> > logic contained within the helper.
> >
> > Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
>
> LGTM with one comment below:
>
> Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev>
>
> > ---
> >  mm/zswap.c | 45 ++++++++++++++++++++++++---------------------
> >  1 file changed, 24 insertions(+), 21 deletions(-)
> >
> > diff --git a/mm/zswap.c b/mm/zswap.c
> > index 6b890c8590ef7..498a6c5839bef 100644
> > --- a/mm/zswap.c
> > +++ b/mm/zswap.c
> > @@ -1385,26 +1385,36 @@ static void shrink_worker(struct work_struct *w=
)
> >       } while (zswap_total_pages() > thr);
> >  }
> >
> > -static int zswap_is_page_same_filled(void *ptr, unsigned long *value)
> > +static bool zswap_is_folio_same_filled(struct folio *folio, unsigned l=
ong *value)
> >  {
> >       unsigned long *page;
> >       unsigned long val;
> >       unsigned int pos, last_pos =3D PAGE_SIZE / sizeof(*page) - 1;
> > +     bool ret;
> >
> > -     page =3D (unsigned long *)ptr;
> > +     if (!zswap_same_filled_pages_enabled)
> > +             return false;
> > +
> > +     page =3D kmap_local_folio(folio, 0);
> >       val =3D page[0];
> >
> > -     if (val !=3D page[last_pos])
> > -             return 0;
> > +     if (val !=3D page[last_pos]) {
> > +             ret =3D false;
> > +             goto out;
> > +     }
> >
> >       for (pos =3D 1; pos < last_pos; pos++) {
> > -             if (val !=3D page[pos])
> > -                     return 0;
> > +             if (val !=3D page[pos]) {
> > +                     ret =3D false;
>
> nit: ret can be initialized to false, so
>
> > +                     goto out;
> > +             }
> >       }
> >
> >       *value =3D val;
> > -
> > -     return 1;
> > +     ret =3D true;
>
> only need to set to true here.

I didn't bother improving the code here because patch 6 will replace
it anyway, but I will do that in the next version anyway, might as
well.

Thanks!