Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   trondmy@kernel.org
To:     linux-nfs@vger.kernel.org
Subject: [PATCH v8 24/24] NFS: Cache all entries in the readdirplus reply
Date:   Fri, 25 Feb 2022 13:28:29 -0500
Message-Id: <20220225182829.1236093-25-trondmy@kernel.org>
In-Reply-To: <20220225182829.1236093-24-trondmy@kernel.org>
References: <20220225182829.1236093-1-trondmy@kernel.org>
 <20220225182829.1236093-2-trondmy@kernel.org>
 <20220225182829.1236093-3-trondmy@kernel.org>
 <20220225182829.1236093-4-trondmy@kernel.org>
 <20220225182829.1236093-5-trondmy@kernel.org>
 <20220225182829.1236093-6-trondmy@kernel.org>
 <20220225182829.1236093-7-trondmy@kernel.org>
 <20220225182829.1236093-8-trondmy@kernel.org>
 <20220225182829.1236093-9-trondmy@kernel.org>
 <20220225182829.1236093-10-trondmy@kernel.org>
 <20220225182829.1236093-11-trondmy@kernel.org>
 <20220225182829.1236093-12-trondmy@kernel.org>
 <20220225182829.1236093-13-trondmy@kernel.org>
 <20220225182829.1236093-14-trondmy@kernel.org>
 <20220225182829.1236093-15-trondmy@kernel.org>
 <20220225182829.1236093-16-trondmy@kernel.org>
 <20220225182829.1236093-17-trondmy@kernel.org>
 <20220225182829.1236093-18-trondmy@kernel.org>
 <20220225182829.1236093-19-trondmy@kernel.org>
 <20220225182829.1236093-20-trondmy@kernel.org>
 <20220225182829.1236093-21-trondmy@kernel.org>
 <20220225182829.1236093-22-trondmy@kernel.org>
 <20220225182829.1236093-23-trondmy@kernel.org>
 <20220225182829.1236093-24-trondmy@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Trond Myklebust <trond.myklebust@hammerspace.com>

Even if we're not able to cache all the entries in the readdir buffer,
let's ensure that we do prime the dcache.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
 fs/nfs/dir.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 71f61565c72c..5e9c25a562bf 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -789,7 +789,7 @@ static int nfs_readdir_page_filler(struct nfs_readdir_descriptor *desc,
 	struct xdr_stream stream;
 	struct xdr_buf buf;
 	struct page *scratch, *new, *page = *arrays;
-	int status;
+	int err, status = 0;
 
 	scratch = alloc_page(GFP_KERNEL);
 	if (scratch == NULL)
@@ -802,25 +802,32 @@ static int nfs_readdir_page_filler(struct nfs_readdir_descriptor *desc,
 		if (entry->fattr->label)
 			entry->fattr->label->len = NFS4_MAXLABELLEN;
 
-		status = xdr_decode(desc, entry, &stream);
-		if (status != 0)
+		err = xdr_decode(desc, entry, &stream);
+		if (err != 0) {
+			if (!status)
+				status = err;
 			break;
+		}
 
-		if (desc->plus)
+		if (desc->plus) {
 			nfs_prime_dcache(file_dentry(desc->file), entry,
-					desc->dir_verifier);
+					 desc->dir_verifier);
+			if (status == -ENOSPC)
+				continue;
+		}
 
 		status = nfs_readdir_add_to_array(entry, page);
 		if (status != -ENOSPC)
 			continue;
 
 		if (page->mapping != mapping) {
-			if (!--narrays)
-				break;
+			if (narrays <= 1)
+				continue;
 			new = nfs_readdir_page_array_alloc(entry->prev_cookie,
 							   GFP_KERNEL);
 			if (!new)
-				break;
+				continue;
+			narrays--;
 			arrays++;
 			*arrays = page = new;
 		} else {
@@ -829,14 +836,14 @@ static int nfs_readdir_page_filler(struct nfs_readdir_descriptor *desc,
 							change_attr,
 							desc->clear_cache);
 			if (!new)
-				break;
+				continue;
 			if (page != *arrays)
 				nfs_readdir_page_unlock_and_put(page);
 			page = new;
 		}
 		desc->page_index_max++;
 		status = nfs_readdir_add_to_array(entry, page);
-	} while (!status && !entry->eof);
+	} while ((!status || (status == -ENOSPC && desc->plus)) && !entry->eof);
 
 	switch (status) {
 	case -EBADCOOKIE:
-- 
2.35.1