Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/nfs-don-t-call-generic_error_remove_page-while-holdi.patch b/queue-4.14/nfs-don-t-call-generic_error_remove_page-while-holdi.patch
new file mode 100644 (file)
index 0000000..bf5f481
--- /dev/null
+++ b/queue-4.14/nfs-don-t-call-generic_error_remove_page-while-holdi.patch
@@ -0,0 +1,38 @@
+From b53cd0a7877a5f25d319665afa1d91cc456945ee Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sun, 7 Apr 2019 13:59:03 -0400
+Subject: NFS: Don't call generic_error_remove_page() while holding locks
+
+From: Trond Myklebust <trondmy@gmail.com>
+
+[ Upstream commit 22876f540bdf19af9e4fca893ce02ba7ee65ebcc ]
+
+The NFS read code can trigger writeback while holding the page lock.
+If an error then triggers a call to nfs_write_error_remove_page(),
+we can deadlock.
+
+Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ fs/nfs/write.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/fs/nfs/write.c b/fs/nfs/write.c
+index 010733c8bdcd3..1b5791d5537a3 100644
+--- a/fs/nfs/write.c
++++ b/fs/nfs/write.c
+@@ -587,9 +587,8 @@ nfs_lock_and_join_requests(struct page *page)
+ 
+ static void nfs_write_error_remove_page(struct nfs_page *req)
+ {
++      SetPageError(req->wb_page);
+       nfs_end_page_writeback(req);
+-      generic_error_remove_page(page_file_mapping(req->wb_page),
+-                                req->wb_page);
+       nfs_release_request(req);
+ }
+ 
+-- 
+2.42.0
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 98268a38328c960ebb506064cd08bd70bead260e..7a065b4ec9fb6295b433063b5c431b5135b05487 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -11,3 +11,4 @@ i2c-muxes-i2c-mux-pinctrl-use-of_get_i2c_adapter_by_node.patch
 i2c-muxes-i2c-mux-gpmux-use-of_get_i2c_adapter_by_node.patch
 i2c-muxes-i2c-demux-pinctrl-use-of_get_i2c_adapter_by_node.patch
 perf-core-fix-potential-null-deref.patch
+nfs-don-t-call-generic_error_remove_page-while-holdi.patch