On Wed, Mar 23, 2022 at 12:41 PM Jan Kara <jack@xxxxxxx> wrote: > > On Wed 23-03-22 00:41:28, Amir Goldstein wrote: > > > > > So the cleanest solution I currently see is > > > > > to come up with helpers like "fsnotify_lock_group() & > > > > > fsnotify_unlock_group()" which will lock/unlock mark_mutex and also do > > > > > memalloc_nofs_save / restore magic. > > > > > > > > > > > > > Sounds good. Won't this cause a regression - more failures to setup new mark > > > > under memory pressure? > > > > > > Well, yes, the chances of hitting ENOMEM under heavy memory pressure are > > > higher. But I don't think that much memory is consumed by connectors or > > > marks that the reduced chances for direct reclaim would really > > > substantially matter for the system as a whole. > > > > > > > Should we maintain a flag in the group FSNOTIFY_GROUP_SHRINKABLE? > > > > and set NOFS state only in that case, so at least we don't cause regression > > > > for existing applications? > > > > > > So that's a possibility I've left in my sleeve ;). We could do it but then > > > we'd also have to tell lockdep that there are two kinds of mark_mutex locks > > > so that it does not complain about possible reclaim deadlocks. Doable but > > > at this point I didn't consider it worth it unless someone comes with a bug > > > report from a real user scenario. > > > > Are you sure about that? > > Feel free to try it, I can be wrong... > > > Note that fsnotify_destroy_mark() and friends already use lockdep class > > SINGLE_DEPTH_NESTING, so I think the lockdep annotation already > > assumes that deadlock from direct reclaim cannot happen and it is that > > assumption that was nearly broken by evictable inode marks. > > > > IIUC that means that we only need to wrap the fanotify allocations > > with GFP_NOFS (technically only after the first evictable mark)? > > Well, the dependencies lockdep will infer are: Once fsnotify_destroy_mark() > is called from inode reclaim, it will record mark_mutex as > 'fs-reclaim-unsafe' (essentially fs_reclaim->mark_mutex dependency). Once > filesystem direct reclaim happens from an allocation under mark_mutex, > lockdep will record mark_mutex as 'need-to-be-fs-reclaim-safe' > (mark_mutex->fs_reclaim) dependency. Hence a loop. Now I agree that > SINGLE_DEPTH_NESTING (which is BTW used in several other places for unclear > reasons - we should clean that up) might defeat this lockdep detection but > in that case it would also defeat detection of real potential deadlocks > (because the deadlock scenario you've found is real). Proper lockdep Definitely. My test now reproduces the deadlock very reliably within seconds lockdep is unaware of the deadlock because of the SINGLE_DEPTH_NESTING subclass missguided annotation. > annotation needs to distinguish mark_locks which can be acquired from under > fs reclaim and mark_locks which cannot be. > I see. So technically we can annotate the fanotify group mark_mutex with a different key and then we have 4 subclasses of lock: - fanotify mark_mutex are NOT reclaim safe - non-fanotify mark_mutex are reclaim safe - ANY mark_mutex(SINGLE_DEPTH_NESTING) are fs-reclaim unsafe The reason I am a bit uneasy with regressing inotify is that there are users of large recursive inotify watch crawlers out there (e.g. watchman) and when crawling a large tree to add marks, there may be a need to reclaim some memory by evicting inode cache (of non-marked subtrees). Thanks, Amir.
