From mboxrd@z Thu Jan 1 00:00:00 1970 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 A19E3C7EE23 for ; Wed, 24 May 2023 02:35:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 11BBF900003; Tue, 23 May 2023 22:35:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A57C900002; Tue, 23 May 2023 22:35:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8799900003; Tue, 23 May 2023 22:35:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D56D9900002 for ; Tue, 23 May 2023 22:35:49 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A3E9B16080C for ; Wed, 24 May 2023 02:35:49 +0000 (UTC) X-FDA: 80823583218.05.CE9BC6E Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) by imf18.hostedemail.com (Postfix) with ESMTP id D1F441C0004 for ; Wed, 24 May 2023 02:35:46 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=ItVpWLlr; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of hughd@google.com designates 209.85.219.175 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=1684895746; 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=Wlph9cB1dhCI97ix8lDyBIocNZ3f9lb+2PkhBnFZ2ZY=; b=HJY3e3PVo4tIBJtEZ780uUWpemx/Zn1h8CNZnyInbY3ZLjLTFA8F5CV/AWxq/B6Kmvws/f QUeCnJ0DjVALK48mEGbvT24edZ9hHub1Vfm8DoM757wu41ZhVFw2SrWFtM9l3hU379a+P1 6Cfs1qq8UBZzs1ywlr5pKYhYiXraYTo= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=ItVpWLlr; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of hughd@google.com designates 209.85.219.175 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684895746; a=rsa-sha256; cv=none; b=PLyDQWt6JXBK8S/0Xt4QKab38SjCiSdM9ZhL1E9Ugygy454XFmte+ZiTPQQY6Kekjr5Die /XfubPV/k19xtU07c7kUv+rq6miia9rByIwpzFpIdEpybyn4R2/WVxoOz/6i1th3UxEnn3 Zbn2PxLRDkUgWgzYrMa8VwNj37lhFZY= Received: by mail-yb1-f175.google.com with SMTP id 3f1490d57ef6-ba94605bcd5so935430276.2 for ; Tue, 23 May 2023 19:35:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684895746; x=1687487746; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=Wlph9cB1dhCI97ix8lDyBIocNZ3f9lb+2PkhBnFZ2ZY=; b=ItVpWLlriECpQhEznbXeBfDnLY+lB7sBi4HZnDHLCrhniPGxw5w7ZX+8zHEXVkGF7c TQ27yGTrm9s2eNnIrbpYXVUJ3sW7diNccw+n/qJQSu1/6oai6fj6I96DFMiuDFNPoxdU pGYRnwgUgzLW3Lsebos3GB4nKb02CNMXgI5T8FJUS8BKyuJpgguUWxX5mzap70W2YjpN WOyLPl95+nrQGmVYVgww4GL1WjCGtAcrGJ9iXIYo4Ed7/IeTpAKvUiit4Beujrpay+bH B5Mju7yr9I5ZMS7yB9xRmsUpCdLsKmivYHFuC/1wGqWF27zqNZPGVZL1V0luIVm6GaY0 opsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684895746; x=1687487746; 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=Wlph9cB1dhCI97ix8lDyBIocNZ3f9lb+2PkhBnFZ2ZY=; b=K9XebTtEfsUYhucTCitQ0xPcu3agFDbDOVD/pKiou8ZVIcTFe746z0a70r5GBPjuIj zU2Crov3M3fzHVQ3i3p4LMoFMVI257fsLLAz088CVrjgCMvrP7YWQy0SUjwSi75ADN8a bfghHv92Fn1KtytDLT785Bw70q6zkPk//i09VV5En57Qba+qZGlz2ZfcltlimWGY5tIL NIAg5BKS3Q8UP7+sDQZRW33AcwBgJoWer9U1TcMR8Jl5eM/0xL7l6+IpJWi3rD5EP4Ua YxX+EBDd3/gB3PcAL1So0BJnGItKEAl1iWUxDopWx+7VphutIDRozjnmpmJM4AqN60sH kI3Q== X-Gm-Message-State: AC+VfDwI1BXJEuNQol7ke8+bN0Q6/GOrnI7Oq22mge3pe2x4LVzI+bsU xMMrGI+7eTW/ZYMn0MkFbHLiQA== X-Google-Smtp-Source: ACHHUZ7FnGuO/Ia+ZwDLX+K2zSqJ/N35GxIm92w74a3HDYlMDZLC9ZLooXO4bDNAvIn/saKdy0O9Hw== X-Received: by 2002:a0d:d107:0:b0:561:b4e3:5fc8 with SMTP id t7-20020a0dd107000000b00561b4e35fc8mr16207052ywd.37.1684895745785; Tue, 23 May 2023 19:35:45 -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 k131-20020a816f89000000b0055a416529bbsm3357518ywc.24.2023.05.23.19.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 19:35:45 -0700 (PDT) Date: Tue, 23 May 2023 19:35:42 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Qi Zheng cc: Hugh Dickins , Andrew Morton , 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 , Naoya Horiguchi , Christophe Leroy , Zack Rusin , Jason Gunthorpe , Axel Rasmussen , Anshuman Khandual , Pasha Tatashin , Miaohe Lin , Minchan Kim , Christoph Hellwig , Song Liu , Thomas Hellstrom , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 05/31] mm/filemap: allow pte_offset_map_lock() to fail In-Reply-To: <8f6057b5-362b-a0f6-2f2f-579debe48fce@linux.dev> Message-ID: References: <68a97fbe-5c1e-7ac6-72c-7b9c6290b370@google.com> <3e6d4f8-9f4d-fa7e-304e-1494dddd45b@google.com> <8f6057b5-362b-a0f6-2f2f-579debe48fce@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: D1F441C0004 X-Stat-Signature: 147dmzrdkwteqnuqtyz9pisytbxnf9dz X-Rspam-User: X-HE-Tag: 1684895746-912034 X-HE-Meta: U2FsdGVkX190w6yZi6OADohfXg5FpyZufiiAwmloY09Ok6iPAbfyjpDcws5kKz34MhCgoTvyyBGRkpW+tb1MzC3qZu5krekTI7+7Pd5Xe3zOH+QqckKKwRxi64ZqKUlfSJx7psyzh84XgR34VBXpwnZ3HZNrm4H7oTeBcqJaZH4CWZm0zCxXliTFiy+JKKGPrZsblxkeUXbzY26VADJNgwxA2r9fcYTwqHM4hbqUt/BDB+VFd4/1+SfmZ6wRWrv0yRnZwa7YyU5yRSik+IBxwubuYp53TfFDFbcS4T2ts0ZQNOKlkRM4HM6KE5KV/oFdIyVjaYM17J/FL509mzWO87SQ5AMY6iwUtV1aXaZF5fgVhdwNDKzyw1u7gkKuBNGM40bh2TTDWPS62oyTWjSAfoRABlkZAEami24WR+i6ZDgJPXp60DyXnF+6/7aPzAp+S3dlGzBxwCQY8S+mEcY81kTm5yqHVjPmuNDFKVDK3gxAtQzEtH2d6IPmexpTig/DsvfgpwcmTRNNENQ0NF01RuVp7TW6yNYNtk4YDYMkZDquJISmsVBNOdCESAA+YW6hQ/2Yo4mdVvBW7fDdllOz9RMlJcOh0Uty5ZOEc/G7AIi+KX8SYB5gNhAX44iV/E73LGIjxYD3AAi9z5PrJkAMsnPiN/itXsjI1YHYZfvoZo5nbI+lzSx9RmnNo/rEGQzIDSU/QA/wWbeEt5n7durrUJ3hXmoPmVTOTXF5fnRMtugkWe2/agCaZgp2SZ9dbvSdfql9PCW9jYr1j6XfYcvOemResxfsnrdi8kU9dNDgBrd3TzkGrT2Ilow4wqYv/EDFCd1dlS2JEX4qwkwG/p69GC1tXpLeqTw4TwUrXzpBvvT+80zNA6t6UJbJ01DtBnW0aoC05kpHvCpuxKl2l5hCOI/EenFb2nz9pCBAbEXrGqDa6TUWW6oXfDdY1mU3cSaDGUWMG6zwB7jsOaq42N2 MsLJzP/w QfmUp+fl0lopPJCIRE/cdczOSlWWKV0giDnt919qJPsPDRRWcAPLDPrzbFHu1/zi6LPoMsb1X8hwJpILCXOUp02YZAT9H40lwoPQM4lmCq5DtMYH8B3RWOxfWLRX0G0QF2139daK1ZrSa2TBFzCsPYwKqKaYz42J6YOS6TXX9Lko7oiwk6tabv145oeJ3yWY4X2dgxBC8mviyGF/Zq8poLYBwGVErqEbfx5yjyvQSe9fJzw9Eua+pEzv7qnFQJM2QoqgPzXoPzBwNoML1JJqy/jC898VN4UiuH9TX2YRG2FWe9naL/kKqBlvFY9Jn3QkAYJVN1srrHaXs5n4NhQsJwcjzwtELEUL5aY4H5JWhm/yvZ22TMyatsJiyVmPW75xN5XFgWB6m+pL6ue/pryCfdGR7PKj4lYVvzJp9NJWjKOtOk5z7nK0ITfwN9Q== 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: On Mon, 22 May 2023, Qi Zheng wrote: > On 2023/5/22 12:54, Hugh Dickins wrote: > > filemap_map_pages() allow pte_offset_map_lock() to fail; and remove the > > pmd_devmap_trans_unstable() check from filemap_map_pmd(), which can safely > > return to filemap_map_pages() and let pte_offset_map_lock() discover that. > > > > Signed-off-by: Hugh Dickins > > --- > > mm/filemap.c | 12 +++++------- > > 1 file changed, 5 insertions(+), 7 deletions(-) > > > > diff --git a/mm/filemap.c b/mm/filemap.c > > index 28b42ee848a4..9e129ad43e0d 100644 > > --- a/mm/filemap.c > > +++ b/mm/filemap.c > > @@ -3408,13 +3408,6 @@ static bool filemap_map_pmd(struct vm_fault *vmf, > > struct folio *folio, > > if (pmd_none(*vmf->pmd)) > > pmd_install(mm, vmf->pmd, &vmf->prealloc_pte); > > - /* See comment in handle_pte_fault() */ > > - if (pmd_devmap_trans_unstable(vmf->pmd)) { > > - folio_unlock(folio); > > - folio_put(folio); > > - return true; > > - } > > - > > return false; > > } > > > > @@ -3501,6 +3494,11 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, > > > > addr = vma->vm_start + ((start_pgoff - vma->vm_pgoff) << PAGE_SHIFT); > > vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, addr, &vmf->ptl); > > + if (!vmf->pte) { > > + folio_unlock(folio); > > + folio_put(folio); > > Missing: > ret = VM_FAULT_NOPAGE; > ? No, not missed. Here ret is 0, which leads do_read_fault() to try __do_fault() afterwards. Whereas VM_FAULT_NOPAGE would send it back to userspace to retry the whole fault. Either will work, but I think the intention of VM_FAULT_NOPAGE here in filemap_map_pages() is to say "the page you want is now inserted", which is probably not the case. Hugh