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 57291C7EE29 for ; Fri, 9 Jun 2023 01:45:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DA9D28E0003; Thu, 8 Jun 2023 21:45:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D80868E0001; Thu, 8 Jun 2023 21:45:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C487D8E0003; Thu, 8 Jun 2023 21:45:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B63858E0001 for ; Thu, 8 Jun 2023 21:45:12 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8229F80275 for ; Fri, 9 Jun 2023 01:45:12 +0000 (UTC) X-FDA: 80881516464.06.ECC4E68 Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by imf25.hostedemail.com (Postfix) with ESMTP id AD2D1A0009 for ; Fri, 9 Jun 2023 01:45:10 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=5nDVvDFD; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of hughd@google.com designates 209.85.219.177 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686275110; a=rsa-sha256; cv=none; b=zJf2ZJgLECPNlUh1Y+rLi3mTgr2yFXQ7phyb9YBN3FQD0Qi8eK3anNbgjT/99uF+FoYOE2 ANH9sh6bHd0qGibDQk4TPNs/wGejNojwBOEYlEupML98BqGM9BDsnRFPUoC7HkiLGSoTpn /yoghyvrE77yd4GTAE/jQ3wY8a2fVVU= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=5nDVvDFD; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of hughd@google.com designates 209.85.219.177 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=1686275110; 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=PpnVUezmgB3CPphipXOK7cLik0cXbOWYScvcnLo6CS87HiFdBVxo5nwZBDRIyLk6fQdkdr zceoF3Plkmgw8zdof1Uo8cQ04OouNiMxsQ2tgIZLwCe4I35bZt/NGelv14RbVmrDmfgIkE lUeFre6LGdblzKB3EAAucziBRHAQHF8= Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-bacf9edc87bso1268526276.1 for ; Thu, 08 Jun 2023 18:45:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686275110; x=1688867110; 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=5nDVvDFDj0TDSwA6VyREm/b7XZyfd9szkT+LB84tX5XiJW9/M17p2pjZw/Ek5jNCOs 40hFeMoNWqiJJMeNTMe2RktTogEBFqE0QPIaTtgF826N1Ako6QEnbFjFhp7dOZXF3sOJ aEBqtDp9A7OZ2dPSncNi3eN5NLAJGJkMJEjCptn2bKCi4uA/IGUtLDX3g50JH0sMPf9e MNUa9uUW/hKz7iJbU0zOzLOl/zU2VZeyofD7W99CMLPHI1iKGrA1iMdnkGcmDXd/BToo s3p4xYMOEA3jz65+/qIv9llP2GR7KuS7BRga3o0mZ9pxZSvUAyZQGkK0RDUXGGqfUJro ylKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686275110; x=1688867110; 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=JjlTPIjFySg8nOtoBfjWJW8pyak5nuBP73ROObo+Uo8MlgK1eRLz82ZrZVdtZdwdwU DrwhUkKrWKrtwaTwEsJh6XSciNMndBEdTQDPx31izwgq5l5WrctwHKxQ31HuhZUBLazK 0qrkNm6W9GQI1fn8gK55P1ogIyw9BwTPNG90Xv0wi0AWRv/BrWb1tisVskEGFdUido+t DzBZqnVG4ppK7Jf73pXa1LTMMZqkOIex6xNGuryNJpSAV+72TwHIQqS+zeHwcrEYj25d HLF60/UWNitvfAWbg0xCSOzvjX0AC85p3zdQEOkCMT4JLABb9MuhV61U3EXRMzt6FIHY r6vw== X-Gm-Message-State: AC+VfDwCXcV83F7qhzlG3CDwIT0Sf/lJ3uOOLMIglzr0uLo1DZFDwf5D Lh1BA/29HlGz9YsRTn2W3HQg9w== X-Google-Smtp-Source: ACHHUZ6uvLIOAAtIvmaYvvIxcZjU5faumO4qT6eMLe7uSTWFP55mTra/k3W0VJ0vPQcKSj3TeQZVPw== X-Received: by 2002:a81:8884:0:b0:569:74f3:fd07 with SMTP id y126-20020a818884000000b0056974f3fd07mr12140ywf.0.1686275109703; Thu, 08 Jun 2023 18:45:09 -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 d63-20020a816842000000b0055a7ff0a5cdsm303405ywc.27.2023.06.08.18.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 18:45:08 -0700 (PDT) Date: Thu, 8 Jun 2023 18:45:05 -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 29/32] mm/memory: handle_pte_fault() use pte_offset_map_nolock() In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: AD2D1A0009 X-Stat-Signature: igugqnpcctndzc37ngb9fhgiyioporu3 X-HE-Tag: 1686275110-549708 X-HE-Meta: U2FsdGVkX1/vpPX1c+Ka+Ze7xuixugEtNxTl+ZWArUYHytgUPzo+0SiFXNEmv6aAuZGHqqz+g+uk/bvfVqQQJK6G5FNw6rcv1iEzIgN/gzVWJ5Ca3rTggjq3+g0+cyXS7cHzy2JdkdT2dmZK09pZ4IZb+8hCXzcmDwysl25i2VQa6mn54aTCK4OwNnvNrtKZ1fQM31eXjvXjVmx+1m66XVuxKlqmDrlnu3yqhgatg+p9PK2JZSIqfAGUQcgkdXc/MRfK8gcZK57tEcpsjNfsGxCBOHcZ3c7cffFlu2wCyVjEFQlrmjH/35bkveXo4hw3oTpEicvXIOF0pNsC1vC9E6pOKgiNo8tn1ox0chTuf2CJcCk+K+Ec+1uCkZor+ENatVCo+jc7P20MTreu5zxdH50KMeFNhsMxWC07uNgZkNp1Z891jT4OErGksW9bQaifNxiEc3i1LvhqYW3BgE4XpkYY5CwkMCnRu0SOISCHKvZPFjsb6k5FLRCVcK6x2D+0CMuS+QttZJopi5PJKzhlUJ/Sit+yG0toXZe/SzKuImgQec6uunBIxfdwO44nDf12iJdPxRSQGgUXrWe4kt4S2YcKzHqtJzQ4JazdbPTOQyCjHS05EHdPI+fLJ10fzWJVnMXuzhAQmVhOw8PrwJyYEFemlMdwsSQ9a2my09sy4bPkJaLF9T1uSXu2IpOt/For4S212wNrZ7EmXZe2j9xCWSf9Gjd0KVThlQJa4uuF93vn8vik86VKoaiOMiWXeFkULLbA0IL0ObikVxDAZlsvM8gIepUZ9dmDR7ucLCdN/EOMiDH4WOsemZzktytXQQp5wd5a8pHIlgl/w6O2eX/NBm1v1WOaA6ddMZ2QH3qhTO+JjkkXO8hbcmHH12/RJlKIvANPRM1PEM4BiuwoOL0jAdluzfas7OASgbq3kkcVKki8KvLe8USfn+99jaM7D4kmKteb7G9kJQmv7w3hR5K dBlT+viR BYqHQHoq4ZmN9aCS2lXXUl7qFd0isBb+MWu+pT3VEHAU6HYAk7KDDqIEcMJreelXLymP1ZqNw2Uy1L0ziv5Nn7e6LoLvrFajpLSzF2e8mNNoa5IbP88C492L2gynYbMpTUk60VQSiB79qOSPTvEdrRhAosEEeb90GAWnZt4pmDiJ7/OVysSqDqVWWXRqCBypk8X6xW4gabTMp+zWBlj1hSba5P0Nc+C0mWmfvyX9ly6UgZ7DxGXDsnb3Ms9IARmp/l8EwT0FSW7wnspzCy4GC3a3xvDL1DKSMIxwLvZga2xabZHrgikFui+v24LdL2+FHbECNGcOf3LmZ5uhdYNKkzWMwZdKqkeaaudycYkkX5c3ISP8JrpbIRl12Bb7Ln7plYReF9AM9++eRIDtB9oNq9S6jNk8NeHQvZoNJgDvNufcufwNmeB1UqYpn3Q== 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))) { -- 2.35.3