Received-SPF: softfail (google.com: domain of transitioning linux-nfs-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
MIME-Version: 1.0
References: <20220223211305.296816-1-trondmy@kernel.org> <20220223211305.296816-2-trondmy@kernel.org>
 <20220223211305.296816-3-trondmy@kernel.org> <20220223211305.296816-4-trondmy@kernel.org>
 <20220223211305.296816-5-trondmy@kernel.org> <20220223211305.296816-6-trondmy@kernel.org>
 <20220223211305.296816-7-trondmy@kernel.org>
In-Reply-To: <20220223211305.296816-7-trondmy@kernel.org>
From:   Anna Schumaker <schumaker.anna@gmail.com>
Date:   Thu, 24 Feb 2022 11:18:27 -0500
Message-ID: <CAFX2Jf=009PkXD0b9_NNyX1k60KJ1fz8WKswnd8iU8EFpmbROw@mail.gmail.com>
Subject: Re: [PATCH v7 06/21] NFS: If the cookie verifier changes, we must
 invalidate the page cache
To:     trondmy@kernel.org
Cc:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Trond,

On Wed, Feb 23, 2022 at 7:48 PM <trondmy@kernel.org> wrote:
>
> From: Trond Myklebust <trond.myklebust@hammerspace.com>
>
> Ensure that if the cookie verifier changes when we use the zero-valued
> cookie, then we invalidate any cached pages.
>
> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
> ---
>  fs/nfs/dir.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
> index 5d9367d9b651..7932d474ce00 100644
> --- a/fs/nfs/dir.c
> +++ b/fs/nfs/dir.c
> @@ -945,9 +945,14 @@ static int find_and_lock_cache_page(struct nfs_readd=
ir_descriptor *desc)
>                 /*
>                  * Set the cookie verifier if the page cache was empty
>                  */
> -               if (desc->page_index =3D=3D 0)
> +               if (desc->last_cookie =3D=3D 0 &&
> +                   memcmp(nfsi->cookieverf, verf, sizeof(nfsi->cookiever=
f))) {
>                         memcpy(nfsi->cookieverf, verf,
>                                sizeof(nfsi->cookieverf));
> +                       invalidate_inode_pages2_range(desc->file->f_mappi=
ng,
> +                                                     desc->page_index_ma=
x + 1,

I'm getting this when I try to compile this patch:

fs/nfs/dir.c: In function =E2=80=98find_and_lock_cache_page=E2=80=99:
fs/nfs/dir.c:953:61: error: =E2=80=98struct nfs_readdir_descriptor=E2=80=99=
 has no
member named =E2=80=98page_index_max=E2=80=99; did you mean =E2=80=98page_i=
ndex=E2=80=99?
  953 |
desc->page_index_max + 1,
      |
^~~~~~~~~~~~~~
      |                                                             page_in=
dex
make[2]: *** [scripts/Makefile.build:288: fs/nfs/dir.o] Error 1
make[1]: *** [scripts/Makefile.build:550: fs/nfs] Error 2
make: *** [Makefile:1831: fs] Error 2
make: *** Waiting for unfinished jobs....

It looks like the "page_index_max" field is added in patch 8.

Anna


Anna
> +                                                     -1);
> +               }
>         }
>         res =3D nfs_readdir_search_array(desc);
>         if (res =3D=3D 0)
> --
> 2.35.1
>