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 4F065EB64DC for ; Tue, 11 Jul 2023 05:21:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D71438E0001; Tue, 11 Jul 2023 01:21:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D237A8D0001; Tue, 11 Jul 2023 01:21:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE95E8E0001; Tue, 11 Jul 2023 01:21:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B00308D0001 for ; Tue, 11 Jul 2023 01:21:30 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7405EA0102 for ; Tue, 11 Jul 2023 05:21:30 +0000 (UTC) X-FDA: 80998183140.10.08DCA8F Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) by imf21.hostedemail.com (Postfix) with ESMTP id A33C81C0002 for ; Tue, 11 Jul 2023 05:21:28 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=gyY0bp7w; spf=pass (imf21.hostedemail.com: domain of hughd@google.com designates 209.85.128.175 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689052888; 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=4d48r8GTZbdJlOqJGQ4Vo1gCwNbXVoPPV42zrJqRnTU=; b=vPzuDYMDUt+T8Y7vfmqltGkth1YkFpJijniRphLKLlCuB5fo24qYKrUuczuh/vLyMNnrIL Hj3ET7O4nmEkJV0CYC5dwR6EEgOD6ZdzQi4paqA0505sr/9xDc6bxstUpHOimWCN7UPumi U1WcjF7FIxGtjepQCSVasjbbIIjuCVw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689052888; a=rsa-sha256; cv=none; b=dLO6rTPSRkOewSBQPPj8M3j2JU7L5XvfH4BLWN7iwAbTXL0SRbr56t1HOMesgM5HGA6YNc TCs5ehDzQzlUNnfcqK7VgIoyGksobjyeM7ebl6ZqucYD7guo4RNxoqHFPRqVcNa2aKxEt5 WHtYac9VNJvIYtnpLGEnAzzFVr1blYI= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=gyY0bp7w; spf=pass (imf21.hostedemail.com: domain of hughd@google.com designates 209.85.128.175 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-579dd20b1c8so61708217b3.1 for ; Mon, 10 Jul 2023 22:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689052888; x=1691644888; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=4d48r8GTZbdJlOqJGQ4Vo1gCwNbXVoPPV42zrJqRnTU=; b=gyY0bp7wWQIfa1W/Ys3ut4yBlFS1qg1RqPy6sd0fbLNdzot/mcNhKJq0rBlM8x1Z6U BW3ColUcX/9/si0qaQEOoylXkoNjV9jKuYp29KqlfBSjM9nNwdUNOqNsxTcKhJ/Ddw9g B91uYg+rYLx58sf4via0Zt5UDG+8engIXOF3jU3Y4T4/Y4GoHNo/vWddhW+qMiwIAUA+ PvZaoTQ29hWS2EPEUVsx/sBlZJgi6dXbq8ffMbtH5iIJBJy3bqbBkQ6gw118+wue+/0A Bvc4aHLaM7/WLdw6IHSbMZe7hjpzHq2Coa/5Vt49jfyH7OjN4CtzItCIs7woN2huQuIy SjGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689052888; x=1691644888; 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=4d48r8GTZbdJlOqJGQ4Vo1gCwNbXVoPPV42zrJqRnTU=; b=kgIEAYjCeN7O1vkZez5jDG5ZYNCBNVV1dY/i5EgvnIVcLlGIp7d/lFWKlf9YHFjPCY 4jDzZwgTWjEWc5346h8/TPDtOFbJHghy/+65eAw4FFR4HRvyYHUa7f/miVBuRBD5Fy2m A0c/KNEtWjS+FYN0/c/p4C6hptakNkdPg2HDKOOhMmcAhyLZ9EoyCdNEiJf/5RcirxUG bAN77fL0xIgprIaHX8Z+qrZDw4h4AGgY9K04hdo76U9/77QepcJ16OhwU/0jneP3BmvE OaGEBp6Fwtsv/+keudQxSkSMreWegoNyjKKaYMcXEPeWKEyypqi++6OuxGoju17JHRD7 8HSw== X-Gm-Message-State: ABy/qLacwEQJa8LegB3jnzsD8kh2HBc466vpQhT9ps0j3S1APJhB4xBo k2y/y9gi5fOUQy03mHX6OxoWuw== X-Google-Smtp-Source: APBJJlGQl0+fPagJ1ipgPbbTNzE6x+C+5FDcl+1yj4mfnsvxhoBI6O7h7iStTH97nC2bRK2Rk441dg== X-Received: by 2002:a0d:db0f:0:b0:568:f406:cd6a with SMTP id d15-20020a0ddb0f000000b00568f406cd6amr13401170ywe.46.1689052887592; Mon, 10 Jul 2023 22:21:27 -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 x125-20020a0dd583000000b00579df9098e3sm388116ywd.38.2023.07.10.22.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 22:21:27 -0700 (PDT) Date: Mon, 10 Jul 2023 22:21:16 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Zi Yan 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 , 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: Re: [PATCH v2 05/32] mm/filemap: allow pte_offset_map_lock() to fail In-Reply-To: <68C1B34D-B8B7-4151-B780-5A05812F402C@nvidia.com> Message-ID: <7df13a2d-1c95-c753-da64-4a47e8872fd9@google.com> References: <54607cf4-ddb6-7ef3-043-1d2de1a9a71@google.com> <68C1B34D-B8B7-4151-B780-5A05812F402C@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: A33C81C0002 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 7rmydha91pp5syoyee35dimpk3uooosm X-HE-Tag: 1689052888-619945 X-HE-Meta: U2FsdGVkX1/RsTNGyaq7NSqO5Dkob2XufH0IGqb1QnMEf1qWD3VVkxMfVdu7O2wfBCsfllnjhlGwaEVdXRIR5D04f7nf6EUGpdKpDK5jCW9nZgCnfynOyYTJscKGeBJkuqIqltbWds4Rgx65dMHfAnwyP844FIN+KesLhP8+cKw4wEWEsFjKaC8LJJaPiDjQ5fRL1cTsgP1N6YMVP3kVcJn73S3X1MSFAbJHEtSuQ2C/2PzlRSesB0tWkfTSBmwoJvSU5i3FnBhPLNCHCOEm8sGqpzLhT7YRxHCNjvcCxz8A6NgFTw54V5HaXhvhbG5HnVUdEiIeYTTet9tENxz7ZYDuUm/CAJSlkpvh4TtfykzMS84tm6n4f2DUFMBog/B+aP8B92MhL5p/cs+u7DbQVd8JPStdvK0wZTXVha8br6uvt97kA3p3e4Xl577jhPiYWA9EBP043hiUfw1SsBMQGpMhG4Vyin65HX6bMF2FSuNBrN7pYnKV0Ws8rF5iiLtSnieV9YxnXtmqgW3LF6+4cr5Vox6S+Vpat9zIcUtt0CaVtHUoUOYb/q0bd1YFddJCfF3K/u19dz8ID127Gie0KOjv2JAX9l6BiUD6GeirhjIUJ5ny+UbcaWvpJThdqWvMhlJo2I9g768m3msE9RcqWUNaD5AdtYRMVSC5oia8AunWaGs98nrM+L4Ql2ciYW4zYg9iGV/+9UyNKDo1AoZER7rq1aqiprjbT1AXleYzCXJHchZkpUKumozEVk1TKdhJrmTl4FXXNQqW5kJ2QD2nnX7WLl9SIpxeqxnf31DvUeWmQgWlkyOcaPH9YXGoNQ4cKdbcnud+rI9mBX3iN7pIhmHugPmSXkbT7KTxDa2fFp5i7SFAz2DOiENJgFqzm6bQ6+QubI6pYYAcImuTege4ZEvD1igupx87Mfu/zr6fSDd+dLNxHVp2D/JJYaY3nlbVyQl4q8waqMBZ+u3GZj3 aqbv1RsE ADpZCjTzZLUA4sotDl9p5d/TIhUKMgN7uS1JrPusjGRRLxhSZuwGhrJStqVhmsz/usU3w2GRViebYIkOy6q5sK6ZLZ78hLlDzjF8vykfcfaAYcItzHKEHM4UtwuU3nvy0UlZDfEUPm6zha1zRUCgQ47H2PELY+J4YG9i8v8LxF+g4jxUk8+yMKtzY+5jqwHR/VcoV3o2GlZXgBe7xCeXMOLaiXJQdqV4qkHdXHXC7RCsTi+kDKisiJUETk383v2RbrKSRJ+1++WQ7h8Pq12QjiNnPiX0uJZvMIMAQ5NxRDe/AKMlvez6D5SpJ+kMdbqlleRKFozKMoN3x94oSCR2mG0t0vUB3P2ovGIUI4Qx+f/8K3kLLjZPrV6Vw6UjS7QHnUG+2w+WRi6oZf7dIhsgpCsZ/2YK+1VbnXfsZBtBC3Qmo+iOgK2+MribZfY2MZyRqRXPpRNcbhHhVD9DXb75xugu/rAPbTDLJW3FGTiodR1R4vYbiPrq+XFcOT2hcTXQpf04VfImreZ1MXv4= 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, 10 Jul 2023, Zi Yan wrote: > On 8 Jun 2023, at 21:11, 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; > > - } > > - > > There is a pmd_trans_huge() check at the beginning, should it be removed > as well? Since pte_offset_map_lock() is also able to detect it. It probably could be removed: but mostly I avoided such cleanups, in the hope that the patches could be more easily reviewed as safe. But I was eager to delete that obscure pmd_devmap_trans_unstable(). The whole strategy of dealing with the pmd_trans_huge()-like cases first, and only finally arriving at the pte_offset_map_lock() when other cases have been excluded, could be reversed in *many* places. It had to be that way before, because pte_offset_map_lock() could only cope with a page table; but now we could reverse them to do the pte_offset_map_lock() first, and only try the other cases when it fails. That would in theory be more efficient; but whether measurably more efficient I doubt. And very easy to introduce errors on the way: my enthusiasm for such cleanups is low! But maybe there's a few places where the rearrangement would be worthwhile. > > > 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); > > + goto out; > > + } > > do { > > again: > > page = folio_file_page(folio, xas.xa_index); > > -- > > 2.35.3 > > These two changes affect the ret value. Before, pmd_devmap_trans_unstable() == true > made ret = VM_FAULT_NPAGE, but now ret is the default 0 value. So ret should be set > to VM_FAULT_NPAGE before goto out in the second hunk? Qi Zheng raised a similar question on the original posting, I answered https://lore.kernel.org/linux-mm/fb9a9d57-dbd7-6a6e-d1cb-8dcd64c829a6@google.com/ It's a rare case to fault here, then find pmd_devmap(*pmd), and it really doesn't matter whether we return VM_FAULT_NOPAGE or 0 for it - maybe I've left it inconsistent between THP and devmap, but it doesn't really matter. I haven't checked Matthew's v5 "new page table range API" posted today, but I expect this all looks different here anyway. Thanks a lot for checking these: they are now in 6.5-rc1, so if you find something that needs fixing, all the more important that we do fix it. Hugh