On Thu, Aug 06, 2020 at 08:16:02PM +0000, Verma, Vishal L wrote:
> On Thu, 2020-08-06 at 19:44 +0000, Verma, Vishal L wrote:
> > >
> > > I'm running xfstests on this patchset right now. If one of the DAX
> > > people could try it out, that'd be fantastic.
> > >
> > > Matthew Wilcox (Oracle) (4):
> > > mm: Introduce and use page_cache_empty
> > > mm: Stop accounting shadow entries
> > > dax: Account DAX entries as nrpages
> > > mm: Remove nrexceptional from inode
> >
> > Hi Matthew,
> >
> > I applied these on top of 5.8 and ran them through the nvdimm unit test
> > suite, and saw some test failures. The first failing test signature is:
> >
> > + umount test_dax_mnt
> > ./dax-ext4.sh: line 62: 15749 Segmentation fault umount $MNT
> > FAIL dax-ext4.sh (exit status: 139)
Thanks. Fixed:
+++ b/fs/dax.c
@@ -644,7 +644,7 @@ static int __dax_invalidate_entry(struct address_space *mapping,
goto out;
dax_disassociate_entry(entry, mapping, trunc);
xas_store(&xas, NULL);
- mapping->nrpages -= dax_entry_order(entry);
+ mapping->nrpages -= 1UL << dax_entry_order(entry);
ret = 1;
out:
put_unlocked_entry(&xas, entry);
Updated git tree at
https://git.infradead.org/users/willy/pagecache.git/
It survives an xfstests run on an fsdax namespace which supports 2MB pages.
