From: Matthew Wilcox <willy@infradead.org>
To: Suren Baghdasaryan <surenb@google.com>
Cc: akpm@linux-foundation.org, hannes@cmpxchg.org, mhocko@suse.com,
josef@toxicpanda.com, jack@suse.cz, ldufour@linux.ibm.com,
laurent.dufour@fr.ibm.com, michel@lespinasse.org,
liam.howlett@oracle.com, jglisse@google.com, vbabka@suse.cz,
minchan@google.com, dave@stgolabs.net,
punit.agrawal@bytedance.com, lstoakes@gmail.com,
hdanton@sina.com, apopple@nvidia.com, peterx@redhat.com,
ying.huang@intel.com, david@redhat.com, yuzhao@google.com,
dhowells@redhat.com, hughd@google.com, viro@zeniv.linux.org.uk,
brauner@kernel.org, pasha.tatashin@soleen.com,
linux-mm@kvack.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-team@android.com
Subject: Re: [PATCH v2 5/6] mm: implement folio wait under VMA lock
Date: Fri, 9 Jun 2023 16:03:23 +0100 [thread overview]
Message-ID: <ZIM/O54Q0waFq/tx@casper.infradead.org> (raw)
In-Reply-To: <20230609005158.2421285-6-surenb@google.com>
On Thu, Jun 08, 2023 at 05:51:57PM -0700, Suren Baghdasaryan wrote:
> static inline bool folio_lock_or_retry(struct folio *folio,
> - struct mm_struct *mm, unsigned int flags)
> + struct vm_area_struct *vma, unsigned int flags,
> + bool *lock_dropped)
I hate these double-return-value functions.
How about this for an API:
vm_fault_t folio_lock_fault(struct folio *folio, struct vm_fault *vmf)
{
might_sleep();
if (folio_trylock(folio))
return 0;
return __folio_lock_fault(folio, vmf);
}
Then the users look like ...
> @@ -3580,8 +3581,10 @@ static vm_fault_t remove_device_exclusive_entry(struct vm_fault *vmf)
> if (!folio_try_get(folio))
> return 0;
>
> - if (!folio_lock_or_retry(folio, vma->vm_mm, vmf->flags)) {
> + if (!folio_lock_or_retry(folio, vma, vmf->flags, &lock_dropped)) {
> folio_put(folio);
> + if (lock_dropped && vmf->flags & FAULT_FLAG_VMA_LOCK)
> + return VM_FAULT_VMA_UNLOCKED | VM_FAULT_RETRY;
> return VM_FAULT_RETRY;
> }
ret = folio_lock_fault(folio, vmf);
if (ret)
return ret;
> @@ -3837,9 +3840,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
> goto out_release;
> }
>
> - locked = folio_lock_or_retry(folio, vma->vm_mm, vmf->flags);
> -
> - if (!locked) {
> + if (!folio_lock_or_retry(folio, vma, vmf->flags, &lock_dropped)) {
> + if (lock_dropped && vmf->flags & FAULT_FLAG_VMA_LOCK)
> + ret |= VM_FAULT_VMA_UNLOCKED;
> ret |= VM_FAULT_RETRY;
> goto out_release;
> }
ret |= folio_lock_fault(folio, vmf);
if (ret & VM_FAULT_RETRY)
goto out_release;
ie instead of trying to reconstruct what __folio_lock_fault() did from
its outputs, we just let folio_lock_fault() tell us what it did.
next prev parent reply other threads:[~2023-06-09 15:05 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 0:51 [PATCH v2 0/6] Per-vma lock support for swap and userfaults Suren Baghdasaryan
2023-06-09 0:51 ` [PATCH v2 1/6] swap: remove remnants of polling from read_swap_cache_async Suren Baghdasaryan
2023-06-09 1:57 ` Huang, Ying
2023-06-09 3:13 ` Ming Lei
2023-06-09 18:50 ` Suren Baghdasaryan
2023-06-12 4:53 ` Christoph Hellwig
2023-06-09 0:51 ` [PATCH v2 2/6] mm: handle swap page faults under VMA lock if page is uncontended Suren Baghdasaryan
2023-06-09 20:25 ` Peter Xu
2023-06-09 20:35 ` Matthew Wilcox
2023-06-09 20:45 ` Peter Xu
2023-06-09 22:34 ` Suren Baghdasaryan
2023-06-12 13:59 ` Peter Xu
2023-06-12 16:09 ` Suren Baghdasaryan
2023-06-09 0:51 ` [PATCH v2 3/6] mm: add missing VM_FAULT_RESULT_TRACE name for VM_FAULT_COMPLETED Suren Baghdasaryan
2023-06-09 20:34 ` Peter Xu
2023-06-09 0:51 ` [PATCH v2 4/6] mm: drop VMA lock before waiting for migration Suren Baghdasaryan
2023-06-09 20:42 ` Peter Xu
2023-06-09 22:30 ` Suren Baghdasaryan
2023-06-10 1:29 ` Suren Baghdasaryan
2023-06-12 13:36 ` Peter Xu
2023-06-12 16:07 ` Suren Baghdasaryan
2023-06-12 18:34 ` Peter Xu
2023-06-12 18:44 ` Suren Baghdasaryan
2023-06-12 18:57 ` Peter Xu
2023-06-12 13:28 ` Peter Xu
2023-06-12 15:41 ` Suren Baghdasaryan
2023-06-09 0:51 ` [PATCH v2 5/6] mm: implement folio wait under VMA lock Suren Baghdasaryan
2023-06-09 15:03 ` Matthew Wilcox [this message]
2023-06-09 18:49 ` Suren Baghdasaryan
2023-06-09 18:55 ` Suren Baghdasaryan
2023-06-09 19:36 ` Matthew Wilcox
2023-06-09 22:49 ` Suren Baghdasaryan
2023-06-09 20:54 ` Peter Xu
2023-06-09 22:48 ` Suren Baghdasaryan
2023-06-12 13:56 ` Peter Xu
2023-06-09 0:51 ` [PATCH v2 6/6] mm: handle userfaults " Suren Baghdasaryan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZIM/O54Q0waFq/tx@casper.infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=apopple@nvidia.com \
--cc=brauner@kernel.org \
--cc=dave@stgolabs.net \
--cc=david@redhat.com \
--cc=dhowells@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=hdanton@sina.com \
--cc=hughd@google.com \
--cc=jack@suse.cz \
--cc=jglisse@google.com \
--cc=josef@toxicpanda.com \
--cc=kernel-team@android.com \
--cc=laurent.dufour@fr.ibm.com \
--cc=ldufour@linux.ibm.com \
--cc=liam.howlett@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lstoakes@gmail.com \
--cc=mhocko@suse.com \
--cc=michel@lespinasse.org \
--cc=minchan@google.com \
--cc=pasha.tatashin@soleen.com \
--cc=peterx@redhat.com \
--cc=punit.agrawal@bytedance.com \
--cc=surenb@google.com \
--cc=vbabka@suse.cz \
--cc=viro@zeniv.linux.org.uk \
--cc=ying.huang@intel.com \
--cc=yuzhao@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).