From patchwork Mon Aug 27 11:26:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 10576997 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE4E4174C for ; Mon, 27 Aug 2018 11:26:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE6E6298B7 for ; Mon, 27 Aug 2018 11:26:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B114B298D0; Mon, 27 Aug 2018 11:26:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 428CD298B7 for ; Mon, 27 Aug 2018 11:26:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 027036B4038; Mon, 27 Aug 2018 07:26:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EF30C6B4039; Mon, 27 Aug 2018 07:26:38 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D915E6B403A; Mon, 27 Aug 2018 07:26:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id 751AC6B4038 for ; Mon, 27 Aug 2018 07:26:38 -0400 (EDT) Received: by mail-ed1-f70.google.com with SMTP id g15-v6so6472349edm.11 for ; Mon, 27 Aug 2018 04:26:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=STAowy5i/Ovr7pcwqADRmxoChyUfmhzfp3gxWxxtQrg=; b=ZQxKB8n88ujp2Q237C2kq5j/E0gxvBwJe1gmYksdH34C5KfjyIBdYjh/0M+RqvQRU6 fJFfGkIVI608th/AJ/fKhQWsF7w0CgWeQtT8a1FANaLHkbDP069C3xVQ8BT07y4fru53 SClH0MeQv3iG4frSIdeY1cUgLuu8USHNadYkQFCGwLP6TpD2hLcGkwrXCMnZ7W+ZrxLR WbxpRWQvq8j+ePSRYLEBHy6wXwUANSPCoqHA04OKvuYUOwjWIrpzHh+Ze96bD1Jr0upu u7PeY58+cIDEvebgygK+pBwnhOq29h/zaNtxW6np/MiVlW3jxe68/rbAmAR5setkn5np POYA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Gm-Message-State: APzg51CM7Zx8JhX5iTH8x9PeB9kuYaWp2v8uSc4axlmPSEiqHe79y0Dz y9R3vRvq93aQBl+kNJWdAx+K+z2x70CbJU8IPIO1546xf4HcoMH3BgEWIJAEHXw9xBY+cbMVuVU a35gth1g173T/Y4X8U8Am+Iys5XiFxUpkCf3chUeTTArHG7ejsGzSmp45qSLIo5R3k9liZcXEjF a9sFQiEyJjKEioyev5qoa2cY46ML8Bkmvr/MvQNXfG883K5B9Kj9t1lzvJRSMbb5YWvRmjc6uSS 4IxgniV1+C5dj8RZJDGMLUDkYZScXyMJHevMrLw+KgikvtiNHZK5+MgqLLp1XZyBGJg9DS5AxFh UvhWk4OKVAS4k2JMJdZ6m5lm8Pxp1XjHTXBSdrPR7RIFiC/+ZWt8gNhRXWQBj3hAo4g1yTbYvA= = X-Received: by 2002:a50:86b5:: with SMTP id r50-v6mr16427722eda.201.1535369197954; Mon, 27 Aug 2018 04:26:37 -0700 (PDT) X-Received: by 2002:a50:86b5:: with SMTP id r50-v6mr16427662eda.201.1535369197091; Mon, 27 Aug 2018 04:26:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535369197; cv=none; d=google.com; s=arc-20160816; b=OZ+0rmULNUVaO4vEF1FKCqZun7Y7SbLl4vTJv/0LJ8VCuceSArDs3jr/UWbP54vApd r6MCVnTZO/1to6diaNNUbPOcvWLHX2QX/PPe15VIYBIvMMJYfnwcvIQ0vBFtTm6MjerA HXKNAyvPrQtQwp5Rvbk30mZv6pOSxG58tWNbkg+GBa166n6k13LQTQJAwFdUIWr9LKMk Fw89y0dv1ommlTRlVJ+znW1Gscc3x0Ppz892rofEO04koiwtei/KRCdnrwvzfV8jp50l 20NSdOv9NQBQuqdJ1CMaI0LVP12/tvmE5tlln7uwTUwT2sJLGJr8CtdXCmOdqy6upLBR sUuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=STAowy5i/Ovr7pcwqADRmxoChyUfmhzfp3gxWxxtQrg=; b=uRshvC8VXWCk/yA98EUTolGD6WVlfHwUZxKqam8V/JVGaifCfwlWhKh6Qf04qK+/uN kSWxiP/y+mHycHmtPWEZTg5VvxibKDWdAT8nGJs0S8SJbLDcWHU4Qm4LhQ5PsCaG+05P 4CH6GVkuofh7stEk+8O7zHk+Wr/3FNYSthNwBm2dEbD8CXE1KKk5CmaHATlujM3dmHJQ 8grUAWw7QSHJ2cv0GRXEsI8CS2i/nlXCap/wpZTQbB5a0eeBqxNs4p08m+R66BJ2k9mn jTha43hAXBIK7KgC1oTLKGk3vZM/45+o/83mMMvZtgUj4fHkFZpWi8BigBYmWs63mtKP AwCg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h30-v6sor3528010ede.57.2018.08.27.04.26.36 for (Google Transport Security); Mon, 27 Aug 2018 04:26:37 -0700 (PDT) Received-SPF: pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Google-Smtp-Source: ANB0VdZZvx39y8SIVRv6LKINEWVt8/gzqt2GkV12tMIsM+z3ubPdS1IMsggZrvMsyFhjO333Ydpw9Q== X-Received: by 2002:aa7:d28c:: with SMTP id w12-v6mr16823901edq.113.1535369196828; Mon, 27 Aug 2018 04:26:36 -0700 (PDT) Received: from tiehlicka.suse.cz (prg-ext-pat.suse.com. [213.151.95.130]) by smtp.gmail.com with ESMTPSA id v1-v6sm6454416edf.3.2018.08.27.04.26.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 04:26:36 -0700 (PDT) From: Michal Hocko To: Andrew Morton Cc: Tetsuo Handa , , LKML , Michal Hocko , Boris Ostrovsky , Juergen Gross Subject: [PATCH 1/3] xen/gntdev: fix up blockable calls to mn_invl_range_start Date: Mon, 27 Aug 2018 13:26:21 +0200 Message-Id: <20180827112623.8992-2-mhocko@kernel.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180827112623.8992-1-mhocko@kernel.org> References: <20180827112623.8992-1-mhocko@kernel.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Michal Hocko 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 Cc: Juergen Gross Signed-off-by: Michal Hocko Reviewed-by: Juergen Gross --- 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: