This is a note to let you know that I've just added the patch titled
swap: redirty page if page write fails on swap file
to the 3.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
swap-redirty-page-if-page-write-fails-on-swap-file.patch
and it can be found in the queue-3.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2d30d31ea3c5be426ce25607b9bd1835acb85e0a Mon Sep 17 00:00:00 2001
From: Jerome Marchand <jmarchan@xxxxxxxxxx>
Date: Mon, 29 Apr 2013 15:08:47 -0700
Subject: swap: redirty page if page write fails on swap file
From: Jerome Marchand <jmarchan@xxxxxxxxxx>
commit 2d30d31ea3c5be426ce25607b9bd1835acb85e0a upstream.
Since commit 62c230bc1790 ("mm: add support for a filesystem to activate
swap files and use direct_IO for writing swap pages"), swap_writepage()
calls direct_IO on swap files. However, in that case the page isn't
redirtied if I/O fails, and is therefore handled afterwards as if it has
been successfully written to the swap file, leading to memory corruption
when the page is eventually swapped back in.
This patch sets the page dirty when direct_IO() fails. It fixes a
memory corruption that happened while using swap-over-NFS.
Signed-off-by: Jerome Marchand <jmarchan@xxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Acked-by: Mel Gorman <mgorman@xxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
mm/page_io.c | 2 ++
1 file changed, 2 insertions(+)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -222,6 +222,8 @@ int swap_writepage(struct page *page, st
if (ret == PAGE_SIZE) {
count_vm_event(PSWPOUT);
ret = 0;
+ } else {
+ set_page_dirty(page);
}
return ret;
}
Patches currently in stable-queue which might be from jmarchan@xxxxxxxxxx are
queue-3.9/mm-swap-mark-swap-pages-writeback-before-queueing-for-direct-io.patch
queue-3.9/inotify-invalid-mask-should-return-a-error-number-but-not-set-it.patch
queue-3.9/swap-redirty-page-if-page-write-fails-on-swap-file.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html