Skip to content

Commit 9590544

Browse files
neilbrowntrondmypd
authored andcommitted
NFS: avoid deadlocks with loop-back mounted NFS filesystems.
Support for loop-back mounted NFS filesystems is useful when NFS is used to access shared storage in a high-availability cluster. If the node running the NFS server fails, some other node can mount the filesystem and start providing NFS service. If that node already had the filesystem NFS mounted, it will now have it loop-back mounted. nfsd can suffer a deadlock when allocating memory and entering direct reclaim. While direct reclaim does not write to the NFS filesystem it can send and wait for a COMMIT through nfs_release_page(). This patch modifies nfs_release_page() to wait a limited time for the commit to complete - one second. If the commit doesn't complete in this time, nfs_release_page() will fail. This means it might now fail in some cases where it wouldn't before. These cases are only when 'gfp' includes '__GFP_WAIT'. nfs_release_page() is only called by try_to_release_page(), and that can only be called on an NFS page with required 'gfp' flags from - page_cache_pipe_buf_steal() in splice.c - shrink_page_list() in vmscan.c - invalidate_inode_pages2_range() in truncate.c The first two handle failure quite safely. The last is only called after ->launder_page() has been called, and that will have waited for the commit to finish already. So aborting if the commit takes longer than 1 second is perfectly safe. Signed-off-by: NeilBrown <[email protected]> Acked-by: Jeff Layton <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
1 parent a4796e3 commit 9590544

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

fs/nfs/file.c

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -475,17 +475,23 @@ static int nfs_release_page(struct page *page, gfp_t gfp)
475475

476476
dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page);
477477

478-
/* Only do I/O if gfp is a superset of GFP_KERNEL, and we're not
479-
* doing this memory reclaim for a fs-related allocation.
478+
/* Always try to initiate a 'commit' if relevant, but only
479+
* wait for it if __GFP_WAIT is set and the calling process is
480+
* allowed to block. Even then, only wait 1 second.
481+
* Waiting indefinitely can cause deadlocks when the NFS
482+
* server is on this machine, and there is no particular need
483+
* to wait extensively here. A short wait has the benefit
484+
* that someone else can worry about the freezer.
480485
*/
481-
if (mapping && (gfp & GFP_KERNEL) == GFP_KERNEL &&
482-
!(current->flags & PF_FSTRANS)) {
483-
int how = FLUSH_SYNC;
484-
485-
/* Don't let kswapd deadlock waiting for OOM RPC calls */
486-
if (current_is_kswapd())
487-
how = 0;
488-
nfs_commit_inode(mapping->host, how);
486+
if (mapping) {
487+
struct nfs_server *nfss = NFS_SERVER(mapping->host);
488+
nfs_commit_inode(mapping->host, 0);
489+
if ((gfp & __GFP_WAIT) &&
490+
!current_is_kswapd() &&
491+
!(current->flags & PF_FSTRANS)) {
492+
wait_on_page_bit_killable_timeout(page, PG_private,
493+
HZ);
494+
}
489495
}
490496
/* If PagePrivate() is set, then the page is not freeable */
491497
if (PagePrivate(page))

fs/nfs/write.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,8 @@ static void nfs_inode_remove_request(struct nfs_page *req)
705705
if (likely(!PageSwapCache(head->wb_page))) {
706706
set_page_private(head->wb_page, 0);
707707
ClearPagePrivate(head->wb_page);
708+
smp_mb__after_atomic();
709+
wake_up_page(head->wb_page, PG_private);
708710
clear_bit(PG_MAPPED, &head->wb_flags);
709711
}
710712
nfsi->npages--;

0 commit comments

Comments
 (0)