From: trondmy@kernel.org
To: linux-nfs@vger.kernel.org
Subject: [PATCH v9 09/27] NFS: Don't advance the page pointer unless the page is full
Date: Sun, 27 Feb 2022 18:12:09 -0500 [thread overview]
Message-ID: <20220227231227.9038-10-trondmy@kernel.org> (raw)
In-Reply-To: <20220227231227.9038-9-trondmy@kernel.org>
From: Trond Myklebust <trond.myklebust@hammerspace.com>
When we hit the end of the data in the readdir page, we don't want to
start filling a new page, unless this one is full.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
fs/nfs/dir.c | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 37f78b0ebc40..e2aafc7263d5 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -417,6 +417,18 @@ bool nfs_readdir_use_cookie(const struct file *filp)
return true;
}
+static void nfs_readdir_seek_next_array(struct nfs_cache_array *array,
+ struct nfs_readdir_descriptor *desc)
+{
+ if (array->page_full) {
+ desc->last_cookie = array->last_cookie;
+ desc->current_index += array->size;
+ desc->cache_entry_index = 0;
+ desc->page_index++;
+ } else
+ desc->last_cookie = array->array[0].cookie;
+}
+
static int nfs_readdir_search_for_pos(struct nfs_cache_array *array,
struct nfs_readdir_descriptor *desc)
{
@@ -428,6 +440,7 @@ static int nfs_readdir_search_for_pos(struct nfs_cache_array *array,
if (diff >= array->size) {
if (array->page_is_eof)
goto out_eof;
+ nfs_readdir_seek_next_array(array, desc);
return -EAGAIN;
}
@@ -500,7 +513,8 @@ static int nfs_readdir_search_for_cookie(struct nfs_cache_array *array,
status = -EBADCOOKIE;
if (desc->dir_cookie == array->last_cookie)
desc->eof = true;
- }
+ } else
+ nfs_readdir_seek_next_array(array, desc);
out:
return status;
}
@@ -517,11 +531,6 @@ static int nfs_readdir_search_array(struct nfs_readdir_descriptor *desc)
else
status = nfs_readdir_search_for_cookie(array, desc);
- if (status == -EAGAIN) {
- desc->last_cookie = array->last_cookie;
- desc->current_index += array->size;
- desc->page_index++;
- }
kunmap_atomic(array);
return status;
}
@@ -998,7 +1007,7 @@ static void nfs_do_filldir(struct nfs_readdir_descriptor *desc,
{
struct file *file = desc->file;
struct nfs_cache_array *array;
- unsigned int i = 0;
+ unsigned int i;
array = kmap(desc->page);
for (i = desc->cache_entry_index; i < array->size; i++) {
@@ -1011,10 +1020,13 @@ static void nfs_do_filldir(struct nfs_readdir_descriptor *desc,
break;
}
memcpy(desc->verf, verf, sizeof(desc->verf));
- if (i < (array->size-1))
- desc->dir_cookie = array->array[i+1].cookie;
- else
+ if (i == array->size - 1) {
desc->dir_cookie = array->last_cookie;
+ nfs_readdir_seek_next_array(array, desc);
+ } else {
+ desc->dir_cookie = array->array[i + 1].cookie;
+ desc->last_cookie = array->array[0].cookie;
+ }
if (nfs_readdir_use_cookie(file))
desc->ctx->pos = desc->dir_cookie;
else
--
2.35.1
next prev parent reply other threads:[~2022-02-27 23:18 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-27 23:12 [PATCH v9 00/27] Readdir improvements trondmy
2022-02-27 23:12 ` [PATCH v9 01/27] NFS: Return valid errors from nfs2/3_decode_dirent() trondmy
2022-02-27 23:12 ` [PATCH v9 02/27] NFS: constify nfs_server_capable() and nfs_have_writebacks() trondmy
2022-02-27 23:12 ` [PATCH v9 03/27] NFS: Trace lookup revalidation failure trondmy
2022-02-27 23:12 ` [PATCH v9 04/27] NFS: Initialise the readdir verifier as best we can in nfs_opendir() trondmy
2022-02-27 23:12 ` [PATCH v9 05/27] NFS: Use kzalloc() to avoid initialising the nfs_open_dir_context trondmy
2022-02-27 23:12 ` [PATCH v9 06/27] NFS: Calculate page offsets algorithmically trondmy
2022-02-27 23:12 ` [PATCH v9 07/27] NFS: Store the change attribute in the directory page cache trondmy
2022-02-27 23:12 ` [PATCH v9 08/27] NFS: Don't re-read the entire page cache to find the next cookie trondmy
2022-02-27 23:12 ` trondmy [this message]
2022-02-27 23:12 ` [PATCH v9 10/27] NFS: Adjust the amount of readahead performed by NFS readdir trondmy
2022-02-27 23:12 ` [PATCH v9 11/27] NFS: If the cookie verifier changes, we must invalidate the page cache trondmy
2022-02-27 23:12 ` [PATCH v9 12/27] NFS: Simplify nfs_readdir_xdr_to_array() trondmy
2022-02-27 23:12 ` [PATCH v9 13/27] NFS: Reduce use of uncached readdir trondmy
2022-02-27 23:12 ` [PATCH v9 14/27] NFS: Improve heuristic for readdirplus trondmy
2022-02-27 23:12 ` [PATCH v9 15/27] NFS: Don't ask for readdirplus unless it can help nfs_getattr() trondmy
2022-02-27 23:12 ` [PATCH v9 16/27] NFSv4: Ask for a full XDR buffer of readdir goodness trondmy
2022-02-27 23:12 ` [PATCH v9 17/27] NFS: Readdirplus can't help lookup for case insensitive filesystems trondmy
2022-02-27 23:12 ` [PATCH v9 18/27] NFS: Don't request readdirplus when revalidation was forced trondmy
2022-02-27 23:12 ` [PATCH v9 19/27] NFS: Add basic readdir tracing trondmy
2022-02-27 23:12 ` [PATCH v9 20/27] NFS: Trace effects of readdirplus on the dcache trondmy
2022-02-27 23:12 ` [PATCH v9 21/27] NFS: Trace effects of the readdirplus heuristic trondmy
2022-02-27 23:12 ` [PATCH v9 22/27] NFS: Clean up page array initialisation/free trondmy
2022-02-27 23:12 ` [PATCH v9 23/27] NFS: Convert readdir page cache to use a cookie based index trondmy
2022-02-27 23:12 ` [PATCH v9 24/27] NFS: Fix up forced readdirplus trondmy
2022-02-27 23:12 ` [PATCH v9 25/27] NFS: Remove unnecessary cache invalidations for directories trondmy
2022-02-27 23:12 ` [PATCH v9 26/27] NFS: Optimise away the previous cookie field trondmy
2022-02-27 23:12 ` [PATCH v9 27/27] NFS: Cache all entries in the readdirplus reply trondmy
2022-03-09 20:01 ` [PATCH v9 23/27] NFS: Convert readdir page cache to use a cookie based index Benjamin Coddington
2022-03-09 21:03 ` Benjamin Coddington
2022-03-10 21:07 ` Trond Myklebust
2022-03-11 11:58 ` Benjamin Coddington
2022-03-11 14:02 ` Trond Myklebust
2022-03-11 16:14 ` Benjamin Coddington
2022-03-11 16:51 ` Trond Myklebust
2022-03-09 17:39 ` [PATCH v9 14/27] NFS: Improve heuristic for readdirplus Benjamin Coddington
2022-03-10 14:31 ` [PATCH] NFS: Trigger "ls -l" readdir heuristic sooner Benjamin Coddington
2022-03-16 22:25 ` Olga Kornievskaia
2022-03-10 20:15 ` [PATCH v9 14/27] NFS: Improve heuristic for readdirplus Trond Myklebust
2022-03-11 11:28 ` Benjamin Coddington
2022-03-01 19:09 ` [PATCH v9 07/27] NFS: Store the change attribute in the directory page cache Anna Schumaker
2022-03-01 23:11 ` Trond Myklebust
2022-03-09 13:42 ` [PATCH v9 03/27] NFS: Trace lookup revalidation failure Benjamin Coddington
2022-03-09 15:28 ` Chuck Lever III
2022-03-09 21:35 ` Benjamin Coddington
2022-03-09 21:32 ` [PATCH v9 00/27] Readdir improvements 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=20220227231227.9038-10-trondmy@kernel.org \
--to=trondmy@kernel.org \
--cc=linux-nfs@vger.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.