From patchwork Fri Jun 9 01:24:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13273078 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B8B4C7EE25 for ; Fri, 9 Jun 2023 01:24:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F1458E0002; Thu, 8 Jun 2023 21:24:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A18F8E0001; Thu, 8 Jun 2023 21:24:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 090858E0002; Thu, 8 Jun 2023 21:24:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id EFF868E0001 for ; Thu, 8 Jun 2023 21:24:45 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D05241A02F5 for ; Fri, 9 Jun 2023 01:24:45 +0000 (UTC) X-FDA: 80881464930.21.BD255BF Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182]) by imf23.hostedemail.com (Postfix) with ESMTP id 1183D140005 for ; Fri, 9 Jun 2023 01:24:43 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=En3MWCFj; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of hughd@google.com designates 209.85.219.182 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686273884; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wNia0t/q7bIuS9YTvnKusLroNIjYrblkNZ2RtXpvdKE=; b=WGVeP/iSQs1HiyUMs6xOEGx9CeC4t5qTz5Yb5N7hUjNuvSGZsJI6/HW2z0cJBADvHc0yba 1NRCaYQw4awQJtaRqKXxM0jTPwfrI6SB/8LXTCyC1XKRLXyEF4OkCLz/uZAzEAx/6oJiBp dTbg9tqL94r+rSITzOzFEBcXop/ny2M= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=En3MWCFj; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of hughd@google.com designates 209.85.219.182 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686273884; a=rsa-sha256; cv=none; b=rpu+19WCANLEBp/WpVn49YlpcXycQ4/8yrHMgMgv37nGyf07jD+9SjY0Wif41wUKDu0UNu xoiJdx4V+75nbSnP8cnRkVApCO4NWuJQ5sxZaFX4FORF3uHXGBrygSMs4A0diTuIxFdDHy RQ2EEd72IeXPddnGGQtxT5Y7ZkIX+q0= Received: by mail-yb1-f182.google.com with SMTP id 3f1490d57ef6-bad010e1e50so1319049276.1 for ; Thu, 08 Jun 2023 18:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686273883; x=1688865883; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=wNia0t/q7bIuS9YTvnKusLroNIjYrblkNZ2RtXpvdKE=; b=En3MWCFjZBPbHoaHE9aTCrwnidrPgxHv9KrEbLe/hJSNlvG00NQArOmMAEVh1cdPK1 c0avwttgIxMg1/M4xoSdtZvgHC6q+oGNCMIaib2sYWv0Fx3ipPlY1RUsAjzGUeuRCY7q f4C9d8VWmMay/sRpQantLYEl4VbdRT+IrwRgP0s1LNmuiH920qhuNY3jPTG46R78i5+k 9bDaQ6fLa6fnzNxc3zf976MlEqNb+2p/4gql5IeQqWDTKZblvLqIpzvT31fUaUlXU1zw KT/OmxBpL9FU5MCWQGoReuGTHeYWIqJH3GhVd3emhvyvLQrP6bSWfVqdEbmUf+1ykpPu 0Uaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686273883; x=1688865883; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wNia0t/q7bIuS9YTvnKusLroNIjYrblkNZ2RtXpvdKE=; b=lwjlju13qztAwBUY3plrgQmbg5Dn9LWS7+wrEUG8R/SU6vcsTLvYDMaXiTPU671s7V Zvp+4bgZxxCFdYBZWRE9IB2CMXDG7w9QkVzAfYeaOuEKYd3nFMljqA34Uzdw7NUS5mw7 2O0UVhqLrFX0mmCITzrgnZsregoPPfFCnYyI3T6HlRe7ODvDueSVyMgQTd/nO/dDeZGD V7bsjySU+n0X5HBgLLtRK3u89OborBW8/U1j2paU7VIBVLOVimgeY1xVv9cWBFnf9KBs 3gprkUlaYZLiNAuIJ5bGUiSOsa6wh/OjIve3sy2R5xHuS+FSXLWrK83hjBB7nsGKCHn7 Hr0A== X-Gm-Message-State: AC+VfDxVqtjm4o5lTGiEsIYSXMeBqfkU3q1IdlG9hlf+KFANjP6MdbwC QC4iofTnUMMjasIQ92wtmYA53g== X-Google-Smtp-Source: ACHHUZ7fnPyD1AB15VbBenw69LG3/w2FA1xyBpqbSoDD115cddrIVPxKnnpMPhIjJpC81nscf3jcJA== X-Received: by 2002:a25:8d83:0:b0:ba1:6bad:41a4 with SMTP id o3-20020a258d83000000b00ba16bad41a4mr1193186ybl.14.1686273882963; Thu, 08 Jun 2023 18:24:42 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id ch22-20020a0569020b1600b00bac1087b44esm587924ybb.35.2023.06.08.18.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 18:24:42 -0700 (PDT) Date: Thu, 8 Jun 2023 18:24:38 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: Mike Kravetz , Mike Rapoport , "Kirill A. Shutemov" , Matthew Wilcox , David Hildenbrand , Suren Baghdasaryan , Qi Zheng , Yang Shi , Mel Gorman , Peter Xu , Peter Zijlstra , Will Deacon , Yu Zhao , Alistair Popple , Ralph Campbell , Ira Weiny , Steven Price , SeongJae Park , Lorenzo Stoakes , Huang Ying , Naoya Horiguchi , Christophe Leroy , Zack Rusin , Jason Gunthorpe , Axel Rasmussen , Anshuman Khandual , Pasha Tatashin , Miaohe Lin , Minchan Kim , Christoph Hellwig , Song Liu , Thomas Hellstrom , Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 14/32] mm/userfaultfd: retry if pte_offset_map() fails In-Reply-To: Message-ID: <54423f-3dff-fd8d-614a-632727cc4cfb@google.com> References: MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1183D140005 X-Stat-Signature: f65a9jjihgzymeksimocxritzqybsosn X-Rspam-User: X-HE-Tag: 1686273883-307421 X-HE-Meta: U2FsdGVkX1/2VWBCexX0nW/QEpGmuEnTdoAEYN+z6t49KlekqFYFKEQgFRrnOUfPkokTyNsYVsDaaGa/J6cg5LgpdrIuDgCIwK3Mb3I01fXSVGTvXD8wtp4TiQdJM5FMN74IpG/IlKys6J2/h0VWl6z0rI00zocripmLJomPgvBlFRImUErscE4dXWUhFICRe6E8gDnFmD0+fTMdX0W8HV+w3tJztRbqVrITE1/4Cwz5KgUBSNdOKz8HjIIsADSKXmJCUJdjuNdnQcqTwIRGDXv6WD7yLo/IPXSrnirhA/wk9+0DMoEAJ/1Om4vL6HZV02ZoBtl8rDuR/wwCSpcLzaiqpCGxNxak+iBvbPydSWMCxYND/aSuvua66m8LeNhPVYBIyCOdGTrgv192lkN2y6h6Yf4sbANqmgbsCB8pUwRDIUqGUCxWMbRbVQD5bVqRoXU3so6BJZXEjoteA+FoSnAbqw+U795EBIdJK10qb8mJgtem5xnSu0zXFqBi/71ZAPydYq/+8owE4yV1B4+1/PNSy9sz2+++AREUwg2Uu/ThwNVHy2FnRp+e975Cjy3wt/jfr07oZjBEJMGCqlI2FlwCC7/mfUC831XmN+UBxu3rAIZzwYpxOYqJ2ryorBe9Q/4xDnhstsB34XnBs9iboGERIT2Ws+PBYnLxEKIeicN2dKxWPsmp0ilopRKEmjxXIZgXsfaGqF09iBwEmK1G3W2sTCxn3CikUw2atY6XHplfH5Wb48KZSDlBum/TZYJ4MhMCbUEoadNeNIzNrcU8R0yHvsSwUJFwS1lcfapFtZqmwNowqJpe69QJ5rYzXJ70HLM13aV6Ou59F16efzqTH7AtcdgkQs2cU7we2tX2eUQ2dYjKHqHrtKqGjci2sz+R1ojlwERo3kdyQcrQ9qhlY0wz9QhohzQ0atMHZv0SKbwEPwV0p4lYaTl6zF9fSB8lkN04ddRuR8i8oUkDJkl Xwt1hgkH vtmqkmArk/U4KWRai2UTRLXMaXRr/+5YoMF+frUE05iPRiHfhuvfmoMsrJTVeGU7I6/QnAFKtSEmytdIOt+ZPbL4aGBg8kQo47HIBES5E/rM3M7pYY7LG4J/jP/MO5pQt88O/W1xyJMCkUFiMM/TjlOuZUJf80L8+iIflF/v4lUfZ7P/ktYICdzD7xa9PK2B22SUBIGpg4QAnd7VY8j+cGWXqWuj23RlPoo2QLQ6OE6ZS7I0jQ47S/ohKaDHv+v9iq8xApSLUBIFzwYj59QsAtf22oO4FMXfadk+kRTust1jn9BQV0JnE0Vvcq8l7EDUAELTwFFeok7tCeLjJ1HFNULhOtXBW8woBP4dId6EY9GdAUyrab1h1VjMAwOKjZpGydMQyZSqoQgz9enpTxjWXEapJZaUDNAWWMaNm8XRhvjwNqhr8YDOpHpb+tLdYvTupab6h9PBJCOFpBnc= 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: Instead of worrying whether the pmd is stable, userfaultfd_must_wait() call pte_offset_map() as before, but go back to try again if that fails. Risk of endless loop? It already broke out if pmd_none(), !pmd_present() or pmd_trans_huge(), and pte_offset_map() would have cleared pmd_bad(): which leaves pmd_devmap(). Presumably pmd_devmap() is inappropriate in a vma subject to userfaultfd (it would have been mistreated before), but add a check just to avoid all possibility of endless loop there. Signed-off-by: Hugh Dickins Acked-by: Peter Xu --- fs/userfaultfd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index f7a0817b1ec0..ca83423f8d54 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -349,12 +349,13 @@ static inline bool userfaultfd_must_wait(struct userfaultfd_ctx *ctx, if (!pud_present(*pud)) goto out; pmd = pmd_offset(pud, address); +again: _pmd = pmdp_get_lockless(pmd); if (pmd_none(_pmd)) goto out; ret = false; - if (!pmd_present(_pmd)) + if (!pmd_present(_pmd) || pmd_devmap(_pmd)) goto out; if (pmd_trans_huge(_pmd)) { @@ -363,11 +364,11 @@ static inline bool userfaultfd_must_wait(struct userfaultfd_ctx *ctx, goto out; } - /* - * the pmd is stable (as in !pmd_trans_unstable) so we can re-read it - * and use the standard pte_offset_map() instead of parsing _pmd. - */ pte = pte_offset_map(pmd, address); + if (!pte) { + ret = true; + goto again; + } /* * Lockless access: we're in a wait_event so it's ok if it * changes under us. PTE markers should be handled the same as none