From: Greg Kurz <groug@kaod.org>
To: Vivek Goyal <vgoyal@redhat.com>
Cc: <linux-fsdevel@vger.kernel.org>, <dan.j.williams@intel.com>,
<jack@suse.cz>, <willy@infradead.org>,
<linux-nvdimm@lists.01.org>, <miklos@szeredi.hu>,
<linux-kernel@vger.kernel.org>, <virtio-fs@redhat.com>
Subject: Re: [Virtio-fs] [PATCH v3 2/3] dax: Add a wakeup mode parameter to put_unlocked_entry()
Date: Tue, 20 Apr 2021 09:34:20 +0200 [thread overview]
Message-ID: <20210420093420.2eed3939@bahia.lan> (raw)
In-Reply-To: <20210419213636.1514816-3-vgoyal@redhat.com>
On Mon, 19 Apr 2021 17:36:35 -0400
Vivek Goyal <vgoyal@redhat.com> wrote:
> As of now put_unlocked_entry() always wakes up next waiter. In next
> patches we want to wake up all waiters at one callsite. Hence, add a
> parameter to the function.
>
> This patch does not introduce any change of behavior.
>
> Suggested-by: Dan Williams <dan.j.williams@intel.com>
> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
> ---
> fs/dax.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/fs/dax.c b/fs/dax.c
> index 00978d0838b1..f19d76a6a493 100644
> --- a/fs/dax.c
> +++ b/fs/dax.c
> @@ -275,11 +275,12 @@ static void wait_entry_unlocked(struct xa_state *xas, void *entry)
> finish_wait(wq, &ewait.wait);
> }
>
> -static void put_unlocked_entry(struct xa_state *xas, void *entry)
> +static void put_unlocked_entry(struct xa_state *xas, void *entry,
> + enum dax_entry_wake_mode mode)
> {
> /* If we were the only waiter woken, wake the next one */
With this change, the comment is no longer accurate since the
function can now wake all waiters if passed mode == WAKE_ALL.
Also, it paraphrases the code which is simple enough, so I'd
simply drop it.
This is minor though and it shouldn't prevent this fix to go
forward.
Reviewed-by: Greg Kurz <groug@kaod.org>
> if (entry && !dax_is_conflict(entry))
> - dax_wake_entry(xas, entry, WAKE_NEXT);
> + dax_wake_entry(xas, entry, mode);
> }
>
> /*
> @@ -633,7 +634,7 @@ struct page *dax_layout_busy_page_range(struct address_space *mapping,
> entry = get_unlocked_entry(&xas, 0);
> if (entry)
> page = dax_busy_page(entry);
> - put_unlocked_entry(&xas, entry);
> + put_unlocked_entry(&xas, entry, WAKE_NEXT);
> if (page)
> break;
> if (++scanned % XA_CHECK_SCHED)
> @@ -675,7 +676,7 @@ static int __dax_invalidate_entry(struct address_space *mapping,
> mapping->nrexceptional--;
> ret = 1;
> out:
> - put_unlocked_entry(&xas, entry);
> + put_unlocked_entry(&xas, entry, WAKE_NEXT);
> xas_unlock_irq(&xas);
> return ret;
> }
> @@ -954,7 +955,7 @@ static int dax_writeback_one(struct xa_state *xas, struct dax_device *dax_dev,
> return ret;
>
> put_unlocked:
> - put_unlocked_entry(xas, entry);
> + put_unlocked_entry(xas, entry, WAKE_NEXT);
> return ret;
> }
>
> @@ -1695,7 +1696,7 @@ dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn, unsigned int order)
> /* Did we race with someone splitting entry or so? */
> if (!entry || dax_is_conflict(entry) ||
> (order == 0 && !dax_is_pte_entry(entry))) {
> - put_unlocked_entry(&xas, entry);
> + put_unlocked_entry(&xas, entry, WAKE_NEXT);
> xas_unlock_irq(&xas);
> trace_dax_insert_pfn_mkwrite_no_entry(mapping->host, vmf,
> VM_FAULT_NOPAGE);
next prev parent reply other threads:[~2021-04-20 7:40 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 21:36 [PATCH v3 0/3] dax: Fix missed wakeup in put_unlocked_entry() Vivek Goyal
2021-04-19 21:36 ` [PATCH v3 1/3] dax: Add an enum for specifying dax wakup mode Vivek Goyal
2021-04-20 7:19 ` [Virtio-fs] " Greg Kurz
2021-04-21 9:24 ` Jan Kara
2021-04-21 15:56 ` Vivek Goyal
2021-04-21 16:16 ` Matthew Wilcox
2021-04-21 17:21 ` Vivek Goyal
2021-04-19 21:36 ` [PATCH v3 2/3] dax: Add a wakeup mode parameter to put_unlocked_entry() Vivek Goyal
2021-04-20 7:34 ` Greg Kurz [this message]
2021-04-20 14:00 ` [Virtio-fs] " Vivek Goyal
2021-04-21 19:09 ` Dan Williams
2021-04-21 19:13 ` Vivek Goyal
2021-04-22 6:24 ` Christoph Hellwig
2021-04-22 16:12 ` Darrick J. Wong
2021-04-22 20:01 ` Dan Williams
2021-04-22 20:07 ` Vivek Goyal
2021-05-17 17:10 ` Dan Williams
2021-04-21 17:39 ` Vivek Goyal
2021-04-21 9:25 ` Jan Kara
2021-04-19 21:36 ` [PATCH v3 3/3] dax: Wake up all waiters after invalidating dax entry Vivek Goyal
2021-04-21 9:26 ` Jan Kara
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=20210420093420.2eed3939@bahia.lan \
--to=groug@kaod.org \
--cc=dan.j.williams@intel.com \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=miklos@szeredi.hu \
--cc=vgoyal@redhat.com \
--cc=virtio-fs@redhat.com \
--cc=willy@infradead.org \
/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 NNTP newsgroup(s).