On Fri, Jun 09, 2023 at 11:55:29AM -0700, Suren Baghdasaryan wrote: > Oh, after rereading I think you are suggesting to replace > folio_lock_or_retry()/__folio_lock_or_retry() with > folio_lock_fault()/__folio_lock_fault(), not to add them. Is that > right? Right. It only has two callers. And I'd do that before adding the FAULT_VMA_LOCK handling to it.