From: Greg Kroah-Hartman Date: Fri, 14 Aug 2015 20:36:14 +0000 (-0700) Subject: some email and comment tweaks X-Git-Tag: v3.10.87~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dd4eba1e7e8879fd8af5405b2a3aa6f26874f14;p=thirdparty%2Fkernel%2Fstable-queue.git some email and comment tweaks --- diff --git a/queue-3.10/mm-vmscan-do-not-wait-for-page-writeback-for-gfp_nofs-allocations.patch b/queue-3.10/mm-vmscan-do-not-wait-for-page-writeback-for-gfp_nofs-allocations.patch index 9b1a9cabded..85c5148b87c 100644 --- a/queue-3.10/mm-vmscan-do-not-wait-for-page-writeback-for-gfp_nofs-allocations.patch +++ b/queue-3.10/mm-vmscan-do-not-wait-for-page-writeback-for-gfp_nofs-allocations.patch @@ -97,13 +97,28 @@ Signed-off-by: Greg Kroah-Hartman --- - mm/vmscan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + mm/vmscan.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) --- a/mm/vmscan.c +++ b/mm/vmscan.c -@@ -743,7 +743,7 @@ static unsigned long shrink_page_list(st - * testing may_enter_fs here is liable to OOM on them. +@@ -730,20 +730,15 @@ static unsigned long shrink_page_list(st + * could easily OOM just because too many pages are in + * writeback and there is nothing else to reclaim. + * +- * Check __GFP_IO, certainly because a loop driver ++ * Require may_enter_fs to wait on writeback, because ++ * fs may not have submitted IO yet. And a loop driver + * thread might enter reclaim, and deadlock if it waits + * on a page for which it is needed to do the write + * (loop masks off __GFP_IO|__GFP_FS for this reason); + * but more thought would probably show more reasons. +- * +- * Don't require __GFP_FS, since we're not going into +- * the FS, just waiting on its writeback completion. +- * Worryingly, ext4 gfs2 and xfs allocate pages with +- * grab_cache_page_write_begin(,,AOP_FLAG_NOFS), so +- * testing may_enter_fs here is liable to OOM on them. */ if (global_reclaim(sc) || - !PageReclaim(page) || !(sc->gfp_mask & __GFP_IO)) { diff --git a/queue-3.10/xen-gntdevt-fix-race-condition-in-gntdev_release.patch b/queue-3.10/xen-gntdevt-fix-race-condition-in-gntdev_release.patch index 63aadc10ff0..c8aad62851d 100644 --- a/queue-3.10/xen-gntdevt-fix-race-condition-in-gntdev_release.patch +++ b/queue-3.10/xen-gntdevt-fix-race-condition-in-gntdev_release.patch @@ -1,13 +1,12 @@ From 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= - +From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 26 Jun 2015 03:28:24 +0200 Subject: xen/gntdevt: Fix race condition in gntdev_release() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= +From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= commit 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 upstream. diff --git a/queue-3.14/xen-gntdevt-fix-race-condition-in-gntdev_release.patch b/queue-3.14/xen-gntdevt-fix-race-condition-in-gntdev_release.patch index d141c7cde03..9cdf8a491f5 100644 --- a/queue-3.14/xen-gntdevt-fix-race-condition-in-gntdev_release.patch +++ b/queue-3.14/xen-gntdevt-fix-race-condition-in-gntdev_release.patch @@ -1,13 +1,12 @@ From 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= - +From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 26 Jun 2015 03:28:24 +0200 Subject: xen/gntdevt: Fix race condition in gntdev_release() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= +From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= commit 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 upstream. diff --git a/queue-4.1/xen-gntdevt-fix-race-condition-in-gntdev_release.patch b/queue-4.1/xen-gntdevt-fix-race-condition-in-gntdev_release.patch index 62d03c14ffd..0b342f9d7bd 100644 --- a/queue-4.1/xen-gntdevt-fix-race-condition-in-gntdev_release.patch +++ b/queue-4.1/xen-gntdevt-fix-race-condition-in-gntdev_release.patch @@ -1,13 +1,12 @@ From 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= - +From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 26 Jun 2015 03:28:24 +0200 Subject: xen/gntdevt: Fix race condition in gntdev_release() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= +From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= commit 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 upstream.