From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: Michal Hocko <mhocko@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>,
linux-mm@kvack.org, LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>, Juergen Gross <jgross@suse.com>
Subject: Re: [PATCH 1/3] xen/gntdev: fix up blockable calls to mn_invl_range_start
Date: Mon, 27 Aug 2018 16:04:33 -0400 [thread overview]
Message-ID: <8adb816b-5d2c-4be1-379c-e4fdc5668e68@oracle.com> (raw)
In-Reply-To: <20180827112623.8992-2-mhocko@kernel.org>
On 08/27/2018 07:26 AM, Michal Hocko wrote:
> From: Michal Hocko <mhocko@suse.com>
>
> 93065ac753e4 ("mm, oom: distinguish blockable mode for mmu notifiers")
> has introduced blockable parameter to all mmu_notifiers and the notifier
> has to back off when called in !blockable case and it could block down
> the road.
>
> The above commit implemented that for mn_invl_range_start but both
> in_range checks are done unconditionally regardless of the blockable
> mode and as such they would fail all the time for regular calls.
> Fix this by checking blockable parameter as well.
>
> Once we are there we can remove the stale TODO. The lock has to be
> sleepable because we wait for completion down in gnttab_unmap_refs_sync.
>
> Changes since v1
> - pull in_range check into mn_invl_range_start - Juergen
>
> Fixes: 93065ac753e4 ("mm, oom: distinguish blockable mode for mmu notifiers")
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: Juergen Gross <jgross@suse.com>
> Signed-off-by: Michal Hocko <mhocko@suse.com>
LGTM, although in_range() has a single call site so we really don't need it.
I'll wait for Juergen to bless this since he asked for this approach.
-boris
> ---
> drivers/xen/gntdev.c | 26 +++++++++++++++-----------
> 1 file changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
> index 57390c7666e5..b0b02a501167 100644
> --- a/drivers/xen/gntdev.c
> +++ b/drivers/xen/gntdev.c
> @@ -492,12 +492,19 @@ static bool in_range(struct gntdev_grant_map *map,
> return true;
> }
>
> -static void unmap_if_in_range(struct gntdev_grant_map *map,
> - unsigned long start, unsigned long end)
> +static int unmap_if_in_range(struct gntdev_grant_map *map,
> + unsigned long start, unsigned long end,
> + bool blockable)
> {
> unsigned long mstart, mend;
> int err;
>
> + if (!in_range(map, start, end))
> + return 0;
> +
> + if (!blockable)
> + return -EAGAIN;
> +
> mstart = max(start, map->vma->vm_start);
> mend = min(end, map->vma->vm_end);
> pr_debug("map %d+%d (%lx %lx), range %lx %lx, mrange %lx %lx\n",
> @@ -508,6 +515,8 @@ static void unmap_if_in_range(struct gntdev_grant_map *map,
> (mstart - map->vma->vm_start) >> PAGE_SHIFT,
> (mend - mstart) >> PAGE_SHIFT);
> WARN_ON(err);
> +
> + return 0;
> }
>
> static int mn_invl_range_start(struct mmu_notifier *mn,
> @@ -519,25 +528,20 @@ static int mn_invl_range_start(struct mmu_notifier *mn,
> struct gntdev_grant_map *map;
> int ret = 0;
>
> - /* TODO do we really need a mutex here? */
> if (blockable)
> mutex_lock(&priv->lock);
> else if (!mutex_trylock(&priv->lock))
> return -EAGAIN;
>
> list_for_each_entry(map, &priv->maps, next) {
> - if (in_range(map, start, end)) {
> - ret = -EAGAIN;
> + ret = unmap_if_in_range(map, start, end, blockable);
> + if (ret)
> goto out_unlock;
> - }
> - unmap_if_in_range(map, start, end);
> }
> list_for_each_entry(map, &priv->freeable_maps, next) {
> - if (in_range(map, start, end)) {
> - ret = -EAGAIN;
> + ret = unmap_if_in_range(map, start, end, blockable);
> + if (ret)
> goto out_unlock;
> - }
> - unmap_if_in_range(map, start, end);
> }
>
> out_unlock:
next prev parent reply other threads:[~2018-08-27 20:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-27 11:26 [PATCH 0/3] mmu_notifiers follow ups Michal Hocko
2018-08-27 11:26 ` [PATCH 1/3] xen/gntdev: fix up blockable calls to mn_invl_range_start Michal Hocko
2018-08-27 20:04 ` Boris Ostrovsky [this message]
2018-08-28 6:03 ` Juergen Gross
2018-08-27 11:26 ` [PATCH 2/3] mm, mmu_notifier: be explicit about range invalition non-blocking mode Michal Hocko
2018-08-27 13:42 ` Jerome Glisse
2018-08-27 11:26 ` [PATCH 3/3] Revert "mm, mmu_notifier: annotate mmu notifiers with blockable invalidate callbacks" Michal Hocko
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=8adb816b-5d2c-4be1-379c-e4fdc5668e68@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=mhocko@suse.com \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
/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).