Linux-NFS Archive on lore.kernel.org
 help / color / Atom feed
From: "Benjamin Coddington" <bcodding@redhat.com>
To: trondmy@kernel.org
Cc: linux-nfs@vger.kernel.org
Subject: Re: [PATCH v2 05/16] NFS: Don't discard readdir results
Date: Tue, 03 Nov 2020 10:55:21 -0500
Message-ID: <DEB8710B-8D01-4FC9-9DA6-78A701C46E19@redhat.com> (raw)
In-Reply-To: <20201103153329.531942-6-trondmy@kernel.org>

On 3 Nov 2020, at 10:33, trondmy@kernel.org wrote:

> From: Trond Myklebust <trond.myklebust@hammerspace.com>
>
> If a readdir call returns more data than we can fit into one page
> cache page, then allocate a new one for that data rather than
> discarding the data.
>
> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
> ---
>  fs/nfs/dir.c | 46 ++++++++++++++++++++++++++++++++++++++++++----
>  1 file changed, 42 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
> index b4861a33ad60..788c2a2eeaa3 100644
> --- a/fs/nfs/dir.c
> +++ b/fs/nfs/dir.c
> @@ -321,6 +321,26 @@ static void nfs_readdir_page_set_eof(struct page 
> *page)
>  	kunmap_atomic(array);
>  }
>
> +static void nfs_readdir_page_unlock_and_put(struct page *page)
> +{
> +	unlock_page(page);
> +	put_page(page);
> +}
> +
> +static struct page *nfs_readdir_page_get_next(struct address_space 
> *mapping,
> +					      pgoff_t index, u64 cookie)
> +{
> +	struct page *page;
> +
> +	page = nfs_readdir_page_get_locked(mapping, index, cookie);
> +	if (page) {
> +		if (nfs_readdir_page_last_cookie(page) == cookie)
> +			return page;
> +		nfs_readdir_page_unlock_and_put(page);
> +	}
> +	return NULL;
> +}
> +
>  static inline
>  int is_32bit_api(void)
>  {
> @@ -638,13 +658,15 @@ void nfs_prime_dcache(struct dentry *parent, 
> struct nfs_entry *entry,
>  }
>
>  /* Perform conversion from xdr to cache array */
> -static
> -int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct 
> nfs_entry *entry,
> -				struct page **xdr_pages, struct page *page, unsigned int buflen)
> +static int nfs_readdir_page_filler(struct nfs_readdir_descriptor 
> *desc,
> +				   struct nfs_entry *entry,
> +				   struct page **xdr_pages,
> +				   struct page *fillme, unsigned int buflen)
>  {
> +	struct address_space *mapping = desc->file->f_mapping;
>  	struct xdr_stream stream;
>  	struct xdr_buf buf;
> -	struct page *scratch;
> +	struct page *scratch, *new, *page = fillme;
>  	int status;
>
>  	scratch = alloc_page(GFP_KERNEL);
> @@ -667,6 +689,19 @@ int 
> nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct 
> nfs_entry *en
>  					desc->dir_verifier);
>
>  		status = nfs_readdir_add_to_array(entry, page);
> +		if (status != -ENOSPC)
> +			continue;
> +
> +		if (page->mapping != mapping)
> +			break;

^^ How can this happen?

Ben


  parent reply index

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-03 15:33 [PATCH v2 00/16] Readdir enhancements trondmy
2020-11-03 15:33 ` [PATCH v2 01/16] NFS: Ensure contents of struct nfs_open_dir_context are consistent trondmy
2020-11-03 15:33   ` [PATCH v2 02/16] NFS: Clean up readdir struct nfs_cache_array trondmy
2020-11-03 15:33     ` [PATCH v2 03/16] NFS: Clean up nfs_readdir_page_filler() trondmy
2020-11-03 15:33       ` [PATCH v2 04/16] NFS: Clean up directory array handling trondmy
2020-11-03 15:33         ` [PATCH v2 05/16] NFS: Don't discard readdir results trondmy
2020-11-03 15:33           ` [PATCH v2 06/16] NFS: Remove unnecessary kmap in nfs_readdir_xdr_to_array() trondmy
2020-11-03 15:33             ` [PATCH v2 07/16] NFS: Replace kmap() with kmap_atomic() in nfs_readdir_search_array() trondmy
2020-11-03 15:33               ` [PATCH v2 08/16] NFS: Simplify struct nfs_cache_array_entry trondmy
2020-11-03 15:33                 ` [PATCH v2 09/16] NFS: Support larger readdir buffers trondmy
2020-11-03 15:33                   ` [PATCH v2 10/16] NFS: More readdir cleanups trondmy
2020-11-03 15:33                     ` [PATCH v2 11/16] NFS: nfs_do_filldir() does not return a value trondmy
2020-11-03 15:33                       ` [PATCH v2 12/16] NFS: Reduce readdir stack usage trondmy
2020-11-03 15:33                         ` [PATCH v2 13/16] NFS: Cleanup to remove nfs_readdir_descriptor_t typedef trondmy
2020-11-03 15:33                           ` [PATCH v2 14/16] NFS: Allow the NFS generic code to pass in a verifier to readdir trondmy
2020-11-03 15:33                             ` [PATCH v2 15/16] NFS: Handle NFS4ERR_NOT_SAME and NFSERR_BADCOOKIE from readdir calls trondmy
2020-11-03 15:33                               ` [PATCH v2 16/16] NFS: Improve handling of directory verifiers trondmy
2020-11-04 10:12                                 ` Mkrtchyan, Tigran
2020-11-04 17:21                                   ` Trond Myklebust
2020-11-03 15:55           ` Benjamin Coddington [this message]
2020-11-03 16:14             ` [PATCH v2 05/16] NFS: Don't discard readdir results Trond Myklebust
2020-11-04 16:14 ` [PATCH v2 00/16] Readdir enhancements Benjamin Coddington
2020-11-04 17:04   ` Trond Myklebust
2020-11-04 17:19     ` Benjamin Coddington

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DEB8710B-8D01-4FC9-9DA6-78A701C46E19@redhat.com \
    --to=bcodding@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trondmy@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-NFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \
		linux-nfs@vger.kernel.org
	public-inbox-index linux-nfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git