3 files changed, 11 insertions, 0 deletions

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index ec57779c5a5..2c41b2c1943 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -100,6 +100,7 @@ enum zone_stat_item {
         NR_UNSTABLE_NFS,        /* NFS unstable pages */
         NR_BOUNCE,
         NR_VMSCAN_WRITE,
+        NR_VMSCAN_WRITE_SKIP,
         NR_WRITEBACK_TEMP,      /* Writeback using temporary buffers */
         NR_ISOLATED_ANON,       /* Temporary isolated pages from anon lru */
         NR_ISOLATED_FILE,       /* Temporary isolated pages from file lru */
diff --git a/mm/vmscan.c b/mm/vmscan.c
index d29b2bdb9e0..10f9c59aed5 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -865,6 +865,15 @@ static unsigned long shrink_page_list(struct list_head *page_list,
                 if (PageDirty(page)) {
                         nr_dirty++;
 
+                        /*
+                         * Only kswapd can writeback filesystem pages to
+                         * avoid risk of stack overflow
+                         */
+                        if (page_is_file_cache(page) && !current_is_kswapd()) {
+                                inc_zone_page_state(page, NR_VMSCAN_WRITE_SKIP);
+                                goto keep_locked;
+                        }
+
                         if (references == PAGEREF_RECLAIM_CLEAN)
                                 goto keep_locked;
                         if (!may_enter_fs)
diff --git a/mm/vmstat.c b/mm/vmstat.c
index d52b13d28e8..210bd8ff3a6 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -702,6 +702,7 @@ const char * const vmstat_text[] = {
         "nr_unstable",
         "nr_bounce",
         "nr_vmscan_write",
+        "nr_vmscan_write_skip",
         "nr_writeback_temp",
         "nr_isolated_anon",
         "nr_isolated_file",