On Wed, Oct 07, 2015 at 09:19:28AM -0700, Dan Williams wrote: > On Tue, Oct 6, 2015 at 3:28 PM, Ross Zwisler > <ross.zwisler@xxxxxxxxxxxxxxx> wrote: <snip> > > diff --git a/mm/memory.c b/mm/memory.c > > index 9cb2747..5ec066f 100644 > > --- a/mm/memory.c > > +++ b/mm/memory.c > > @@ -2426,10 +2426,17 @@ void unmap_mapping_range(struct address_space *mapping, > > if (details.last_index < details.first_index) > > details.last_index = ULONG_MAX; > > > > - i_mmap_lock_write(mapping); > > + > > + /* > > + * DAX already holds i_mmap_lock to serialise file truncate vs > > + * page fault and page fault vs page fault. > > + */ > > + if (!IS_DAX(mapping->host)) > > + i_mmap_lock_write(mapping); > > if (unlikely(!RB_EMPTY_ROOT(&mapping->i_mmap))) > > unmap_mapping_range_tree(&mapping->i_mmap, &details); > > - i_mmap_unlock_write(mapping); > > + if (!IS_DAX(mapping->host)) > > + i_mmap_unlock_write(mapping); > > } > > EXPORT_SYMBOL(unmap_mapping_range); > > What about cases where unmap_mapping_range() is called without an fs > lock? For the get_user_pages() and ZONE_DEVICE implementation I'm > looking to call truncate_pagecache() from the driver shutdown path to > revoke usage of the struct page's that were allocated by > devm_memremap_pages(). > > Likely I'm introducing a path through unmap_mapping_range() that does > not exist today, but I don't like that unmap_mapping_range() with this > change is presuming a given locking context. It's not clear to me how > this routine is safe when it optionally takes i_mmap_lock_write(), at > a minimum this needs documenting, and possibly assertions if the > locking assumptions are violated. Yep, this is very confusing - these changes were undone by the second revert in the series (they were done and then undone by separate patches, both of which are getting reverted). After the series is applied in total unmap_mapping_range() takes the locks unconditionally: /* DAX uses i_mmap_lock to serialise file truncate vs page fault */ i_mmap_lock_write(mapping); if (unlikely(!RB_EMPTY_ROOT(&mapping->i_mmap))) unmap_mapping_range_tree(&mapping->i_mmap, &details); i_mmap_unlock_write(mapping); } EXPORT_SYMBOL(unmap_mapping_range); Yes, I totally agree this is confusing - I'll just bit the bullet, collapse the two reverts together and call it "dax locking fixes" or something. -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
