From patchwork Mon May 22 05:26:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13249790 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 AD956C7EE23 for ; Mon, 22 May 2023 05:26:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49E716B0074; Mon, 22 May 2023 01:26:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 44E176B0078; Mon, 22 May 2023 01:26:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31685900002; Mon, 22 May 2023 01:26:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 234596B0074 for ; Mon, 22 May 2023 01:26:47 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 00880140422 for ; Mon, 22 May 2023 05:26:46 +0000 (UTC) X-FDA: 80816756412.16.1A3E3E4 Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) by imf01.hostedemail.com (Postfix) with ESMTP id 2B34B40007 for ; Mon, 22 May 2023 05:26:44 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=pmFZ8eUZ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of hughd@google.com designates 209.85.128.181 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=1684733205; 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=6V2+W0bna42qnZ43tvOf68yFS9Jt1uoq2b6WWLaZ+Rg=; b=J1Z8vTf9jIluS4X6HBplSqVhRowTG3oHIMWNFeie0zuwS2LVCKDjfptls8Jq5yM4QpbIfO SVVco9hlRmDhI4xoefp4wu+f8Q3BumfOJjG03idARoOKIT+TN0CX3fYVNLM+PCVWqJk+dk oZGzMcOJDw3/ZhvuymUoykFOLf2oNV4= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=pmFZ8eUZ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of hughd@google.com designates 209.85.128.181 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684733205; a=rsa-sha256; cv=none; b=GR01mKwFIvwp5Y3QkArPoLazjbjCTK3e1DgyRkV2yzAiDYk1c1AVnCgFY+d7GXHqDRjkZv oPqPEXy936BsrVyR63oCI/Q5xDFfayv77OmwAMmBwclGDRoGujps0DjR/IehxVcY5qA6Yc oqYGAqrM/J4kLJhcac85KsFwT+G5P/A= Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-5619032c026so73114957b3.1 for ; Sun, 21 May 2023 22:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684733204; x=1687325204; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=6V2+W0bna42qnZ43tvOf68yFS9Jt1uoq2b6WWLaZ+Rg=; b=pmFZ8eUZ5rWyUxNcjOAbP+PUX2zOF/4/kxaRJz4z7PKZCL9sh91Sp1fz2BDSpLA8va PshjIXySjEbJBMm+E5T0DV3GV1KfmGHUHW7NoxKfPJtzpKWDj4nZyySG6hAbDZeMssbe CpZvDb9v4tBFY4XeT7TABIe79HTh891UxQUA304GYCwmuhQf0Ddrievqmcn4LZJQZqo+ AyQ3f5iFkop7qEDUFMOD3A4f3L3NVlS89hjrz223HyzYGxeKrVNBksEbzG6kBQ75cK67 0udH2XswWGkcnuzDyqRllpE286zOHOwA3ju/MkmzjXbIYSmo/1Xbs4kh16I1DKzJVpox VJug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684733204; x=1687325204; 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=6V2+W0bna42qnZ43tvOf68yFS9Jt1uoq2b6WWLaZ+Rg=; b=Nb4XTiI0wNhJ/t9qi3me6vWCyH9LV5sGlMzSP40HCqr4dH9t/GB0I6+g1yBXddL9Zq zykXspU5dn3yYDfgNHI/upd6l0FXl19SR0b0JnHN8QBwn2NshgXZGWEuwfA3eeba9vR+ mEswPfoPieNqOEZDJ8bNaRbaZMLmyVUSHIkaGnw3OHoymakXPqkt+Z5scn12ztWMFFBD 2f4BN8SMcNRZ2EmL827n62B3VD+87vMM2mcDRKMeMeWbZOjwJmQSTIsUh5tWnoxaaeJJ UAV71/FcWJQOQO/0brXZPFUM09ZxikPOIruxK3jDoqIkwWrtLS3/1BQfPhf170VeEMN/ eX7A== X-Gm-Message-State: AC+VfDy9fi3RRpnnEWJumQPYQGPI+nb2kby0dqlhCs8d4FhQOL54s1gv zaVaIfmDjRqhePVW88u1x+cI2A== X-Google-Smtp-Source: ACHHUZ6vQMBkQllrmMVkhqi7UHm68ru97kbfrpxbzO+74u3FaXGIYp1Xs+So1aiUfDsa50JYfZkYNw== X-Received: by 2002:a81:9383:0:b0:55a:7c7:c756 with SMTP id k125-20020a819383000000b0055a07c7c756mr11286138ywg.31.1684733204133; Sun, 21 May 2023 22:26:44 -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 d206-20020a814fd7000000b0054605c23114sm1832452ywb.66.2023.05.21.22.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 22:26:43 -0700 (PDT) Date: Sun, 21 May 2023 22:26:40 -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 , 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: [PATCH 29/31] mm/memory: handle_pte_fault() use pte_offset_map_nolock() In-Reply-To: <68a97fbe-5c1e-7ac6-72c-7b9c6290b370@google.com> Message-ID: <5f10e87-c413-eb92-fc6-541e52c1f6be@google.com> References: <68a97fbe-5c1e-7ac6-72c-7b9c6290b370@google.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2B34B40007 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ambwq9t4eidhyhg4u1og65pa8tie5p98 X-HE-Tag: 1684733204-353796 X-HE-Meta: U2FsdGVkX1/RvORPsS96ore4RKLhILY5va2I2WBCl1I2d5bdAhIrumJ8YNZylcUuqtvFT7XKa1TWJmkxKhP0kti3KQpYza9hz03MjOC2IuYGAuSBHv6aLDu5nMWKemA78T1gSLKKE6lELQFyEX0A6OJvHK5WTIGSAEtpekDlhYDrWm8cskY/tO+utvTeUBt+xGRuRo5p5aXL3eEpeUKdalWEQGfsw/yUlD3BPsGA6OhF2kgeRRwnO57Bdxzb4DBv1GB1Icvyv58pWtdhoN8Gy+TpfNPE9REnzyxNvM2Qi5g1icjCf/yzx12+UyQ4dfXL/tenXdncPIvTEMRdi6ip2JKayljDUztEX3xBj6zL0zwgsxOtN3IYXY6W9mLwjFTA+5wvECEoMBrynnDA7hcV9w8T79xlpE15t9IRpWdOiiFmXYBxBBZpycyyvkCehzIqYMz5vikr0emQkHnP+z044I4jBDXD5bsvsaEsP2vCK9gqnd3HOKlHq73trgi37CMc2HARlKU8qKRS26XWM8gaSU9bou6I3nqlHyliL4PiDzNm04PJxgDbr7BgUlKeY2TdF8gY8fZEQIlGLDvUPRG2/dUMmu92lORIoG13+G1DwnDcIJS9lnsAzpMwlguJc1I6oYS7dFIvbZaWrV1YiAb4wcIvELzOc2NtAFf8nViZWx1zdDNyl0CHRICJAgMMAP75dvIF9Umvbuh/QHsU16HqG72piwJxpVhd4s0KozqEeEeWpwQuMqOEVCDsyrljg3Nf8jaqyZe8BoBnZhLpNejN3CHC5RIda5rlli0lNvNIDx9ujAIgoI9Ak6b/h3R5I+uY+uxCSgWLCq/73WK0Mk9Qm6RPSJqqZqj6NroqwrXN/l9mV0ipP54CQiVTlunuVligeF2DmzYN5WXSI03sFfetz7JlSBMs59ZAyJmjrkh4XXBF7V6t+yhKSJ/OV3nCe8mbCMSmJFBNJT9wgFzac9L zkrA+EnF AbIiKsHDGERaj7p9MEdKFy/KC/pgs4igGGbsPLVswqAvMUOLTiChUp/+VGqMmr5tr2HfOUlP8xmSr88nfO5KMCQoOGGefU5Bh5oS4NleKmG3MNt+10G5/wmjGll/tV2JoAI2KVAabxvrxU0Divh11Y6oMGsq9rNASdVscwgJlqSUUsSzT0rI0CeA+z72lmO9Vaf4ZfvkrEaxW+xJrHxuKJTHGvqtlxC7Jmw9wq3XrNf6YKkxh9z/9hVFuTkzwoQ34awBxc8jZmv5lsihIr/qyvKeMFEVtW1G7ztyUNv9r0Isqt111xOCBrmR2DH/LVn166r4lw2S6oMT6ShIIG1X/DKmhwaiHwmdRlq6BAsqfqx5KgNRSoGzoAr2OOd1FStavIimZ0BCpr2rftKQeZdPr902MYI3O1jTmwfxe3tF7MZAsYWzfKmFrqpP2Tg== 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: handle_pte_fault() use pte_offset_map_nolock() to get the vmf.ptl which corresponds to vmf.pte, instead of pte_lockptr() being used later, when there's a chance that the pmd entry might have changed, perhaps to none, or to a huge pmd, with no split ptlock in its struct page. Remove its pmd_devmap_trans_unstable() call: pte_offset_map_nolock() will handle that case by failing. Update the "morph" comment above, looking forward to when shmem or file collapse to THP may not take mmap_lock for write (or not at all). do_numa_page() use the vmf->ptl from handle_pte_fault() at first, but refresh it when refreshing vmf->pte. do_swap_page()'s pte_unmap_same() (the thing that takes ptl to verify a two-part PAE orig_pte) use the vmf->ptl from handle_pte_fault() too; but do_swap_page() is also used by anon THP's __collapse_huge_page_swapin(), so adjust that to set vmf->ptl by pte_offset_map_nolock(). Signed-off-by: Hugh Dickins --- mm/khugepaged.c | 6 ++++-- mm/memory.c | 38 +++++++++++++------------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 49cfa7cdfe93..c11db2e78e95 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1005,6 +1005,7 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm, unsigned long address, end = haddr + (HPAGE_PMD_NR * PAGE_SIZE); int result; pte_t *pte = NULL; + spinlock_t *ptl; for (address = haddr; address < end; address += PAGE_SIZE) { struct vm_fault vmf = { @@ -1016,7 +1017,7 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm, }; if (!pte++) { - pte = pte_offset_map(pmd, address); + pte = pte_offset_map_nolock(mm, pmd, address, &ptl); if (!pte) { mmap_read_unlock(mm); result = SCAN_PMD_NULL; @@ -1024,11 +1025,12 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm, } } - vmf.orig_pte = *pte; + vmf.orig_pte = ptep_get_lockless(pte); if (!is_swap_pte(vmf.orig_pte)) continue; vmf.pte = pte; + vmf.ptl = ptl; ret = do_swap_page(&vmf); /* Which unmaps pte (after perhaps re-checking the entry) */ pte = NULL; diff --git a/mm/memory.c b/mm/memory.c index c7b920291a72..4ec46eecefd3 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2786,10 +2786,9 @@ static inline int pte_unmap_same(struct vm_fault *vmf) int same = 1; #if defined(CONFIG_SMP) || defined(CONFIG_PREEMPTION) if (sizeof(pte_t) > sizeof(unsigned long)) { - spinlock_t *ptl = pte_lockptr(vmf->vma->vm_mm, vmf->pmd); - spin_lock(ptl); + spin_lock(vmf->ptl); same = pte_same(*vmf->pte, vmf->orig_pte); - spin_unlock(ptl); + spin_unlock(vmf->ptl); } #endif pte_unmap(vmf->pte); @@ -4696,7 +4695,6 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) * validation through pte_unmap_same(). It's of NUMA type but * the pfn may be screwed if the read is non atomic. */ - vmf->ptl = pte_lockptr(vma->vm_mm, vmf->pmd); spin_lock(vmf->ptl); if (unlikely(!pte_same(*vmf->pte, vmf->orig_pte))) { pte_unmap_unlock(vmf->pte, vmf->ptl); @@ -4767,8 +4765,10 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) flags |= TNF_MIGRATED; } else { flags |= TNF_MIGRATE_FAIL; - vmf->pte = pte_offset_map(vmf->pmd, vmf->address); - spin_lock(vmf->ptl); + vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, + vmf->address, &vmf->ptl); + if (unlikely(!vmf->pte)) + goto out; if (unlikely(!pte_same(*vmf->pte, vmf->orig_pte))) { pte_unmap_unlock(vmf->pte, vmf->ptl); goto out; @@ -4897,27 +4897,16 @@ static vm_fault_t handle_pte_fault(struct vm_fault *vmf) vmf->pte = NULL; vmf->flags &= ~FAULT_FLAG_ORIG_PTE_VALID; } else { - /* - * If a huge pmd materialized under us just retry later. Use - * pmd_trans_unstable() via pmd_devmap_trans_unstable() instead - * of pmd_trans_huge() to ensure the pmd didn't become - * pmd_trans_huge under us and then back to pmd_none, as a - * result of MADV_DONTNEED running immediately after a huge pmd - * fault in a different thread of this mm, in turn leading to a - * misleading pmd_trans_huge() retval. All we have to ensure is - * that it is a regular pmd that we can walk with - * pte_offset_map() and we can do that through an atomic read - * in C, which is what pmd_trans_unstable() provides. - */ - if (pmd_devmap_trans_unstable(vmf->pmd)) - return 0; /* * A regular pmd is established and it can't morph into a huge - * pmd from under us anymore at this point because we hold the - * mmap_lock read mode and khugepaged takes it in write mode. - * So now it's safe to run pte_offset_map(). + * pmd by anon khugepaged, since that takes mmap_lock in write + * mode; but shmem or file collapse to THP could still morph + * it into a huge pmd: just retry later if so. */ - vmf->pte = pte_offset_map(vmf->pmd, vmf->address); + vmf->pte = pte_offset_map_nolock(vmf->vma->vm_mm, vmf->pmd, + vmf->address, &vmf->ptl); + if (unlikely(!vmf->pte)) + return 0; vmf->orig_pte = ptep_get_lockless(vmf->pte); vmf->flags |= FAULT_FLAG_ORIG_PTE_VALID; @@ -4936,7 +4925,6 @@ static vm_fault_t handle_pte_fault(struct vm_fault *vmf) if (pte_protnone(vmf->orig_pte) && vma_is_accessible(vmf->vma)) return do_numa_page(vmf); - vmf->ptl = pte_lockptr(vmf->vma->vm_mm, vmf->pmd); spin_lock(vmf->ptl); entry = vmf->orig_pte; if (unlikely(!pte_same(*vmf->pte, entry))) {