On Sun, 2009-04-26 at 08:40 +0200, Nick Piggin wrote:
> On Sat, Apr 25, 2009 at 10:57:08AM -0400, Trond Myklebust wrote:
> > On Fri, 2009-04-24 at 05:26 -0400, Rince wrote:
> > > Applied try 3 of Nick Piggin's patch to 2.6.30-rc3 (cleanly, no less!)
> > >
> > > Doesn't appear to have helped at all - I received my favorite BUG ON
> > > write.c:252 just like always, within 24 hours of booting the kernel,
> > > even.
> >
> > Can you apply the following incremental patch on top of Nick's. This
> > appears to suffice to close the race on my setup.
>
> Thanks, yes that looks good. Note: I deliberately didn't try to
> convert filesystems because it needs much better understanding
> of each one. So any fs maintainers using page_mkwrite I hope have
> looked at these patches and considered whether they need to
> do anything differently (ditto for the page_mkwrite return value
> fixup patch).
Note that after applying this, I put a WARN_ON(!PageDirty()) in the NFS
set_page_dirty() method, and ran some mmap stress tests.
As far as I can tell, the WARN_ON is never triggering. I take this to
mean that the remaining cases where the VM is calling set_page_dirty()
are basically all cases where we've already seen a page fault and set
the page dirty flag, but haven't yet written it out (i.e. we haven't yet
called clear_page_dirty_for_io() and so the pte is still marked as
dirty).
That again implies that set_page_dirty() is now fully redundant for
filesystems that define page_mkwrite(), provided that the filesystem
takes charge of marking the page as dirty.
This suggests an alternative fix for the stable kernels in the form of
the following patch.
Comments?
Cheers
Trond
------------------------------------------------------------------
commit 684049bf73059aa9be35f9cdf07acda29ebb0340
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Sun Apr 26 10:14:34 2009 -0400
NFS: Fix page dirtying races in NFS
If a filesystem defines a page_mkwrite() callback that also marks the page
as being dirty, then we don't need to define a set_page_dirty() callback.
The following patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=12913
by eliminating a race in do_wp_page() and __do_fault(). The latter two
mark the page as dirty after the call to page_mkwrite(). Since
nfs_vm_page_mkwrite() has already marked the page as dirty, this means that
there is a race whereby the filesystem may actually have cleaned the
page by the time it is marked as dirty (again) by the VM.
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
---
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 5a97bcf..21bffaf 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -465,10 +465,19 @@ static int nfs_launder_page(struct page *page)
return nfs_wb_page(inode, page);
}
+static int nfs_set_page_dirty(struct page *page)
+{
+ /* We don't need to have the VM mark the page as dirty, since
+ * nfs_updatepage() will do it. This eliminates the race
+ * that caused http://bugzilla.kernel.org/show_bug.cgi?id=12913
+ */
+ return 0;
+}
+
const struct address_space_operations nfs_file_aops = {
.readpage = nfs_readpage,
.readpages = nfs_readpages,
- .set_page_dirty = __set_page_dirty_nobuffers,
+ .set_page_dirty = nfs_set_page_dirty,
.writepage = nfs_writepage,
.writepages = nfs_writepages,
.write_begin = nfs_write_begin,
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
