From patchwork Fri Jun 14 01:51:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13697715 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 B26BDC27C7B for ; Fri, 14 Jun 2024 01:54:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 687F96B009D; Thu, 13 Jun 2024 21:52:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 638036B00A0; Thu, 13 Jun 2024 21:52:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FFD86B00A2; Thu, 13 Jun 2024 21:52:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 306B86B009D for ; Thu, 13 Jun 2024 21:52:28 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A20F41203E0 for ; Fri, 14 Jun 2024 01:52:27 +0000 (UTC) X-FDA: 82227819534.11.7B9BC91 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf09.hostedemail.com (Postfix) with ESMTP id BE25E14000C for ; Fri, 14 Jun 2024 01:52:25 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ki6lGXwu; spf=pass (imf09.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718329944; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oHYSOK8Z4m4YeRSSbyiRoNr7hsC5jb5TLSRL1KlNI3w=; b=zx8MO9MZIBjpCMT0bWdvMvZEVI9fOD/a+5jzQ2FLsak6+dm0mrUBJT2Q5UgGaJOfQK6bAa nrNgGIT8EHxoDvipKdteU0r5SpQl2OC84hNVw26mIsmZZd8RhkESnAay7HH3BHFXAcDxcb by2gOdikExBfTYH/DN81tfNCakkyU/c= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ki6lGXwu; spf=pass (imf09.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718329944; a=rsa-sha256; cv=none; b=Vil7ZiS7rPmd5M/Ij0OsGNubqgEq5Ym9VAi4bzrLo6QzIAeto2pWXlNqYLoHeelRAOuStD mVjkCQrcaIVbxs39mxeGBjFJMObBIRARcKL8/fqO5y+8PpnFkosugg/1MlAb9E5+0+Y6Eu 8zBEOM6rwX93eIqasGFGqblIE3Ugdg8= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-705c0115192so1493038b3a.1 for ; Thu, 13 Jun 2024 18:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718329944; x=1718934744; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oHYSOK8Z4m4YeRSSbyiRoNr7hsC5jb5TLSRL1KlNI3w=; b=Ki6lGXwuO5CK2pZNblssPMqopgtxqrJ+x8zUHqVnw1MRWQmCtIOVot8GrojpscfCEo e11GFlEnK/F1V7ZuyA3RitG2qmqAPqA9vMl8vpPKFezjJBVgY35DnorwpXmM0JR3EOgM jQLdNMjJqBTim+E/F2P+HlaqqulcK96CJRKHbT7anv5M+9tsSEUfCZuYeaxXq7O+LR2N VD7NPK/Bi5TUl8J0D/rEGcDWV9g/dfWZIAAE1C+5jOfyzneFzxVflEqeQv6nrnykSuCq l/YEDgadAfwH7cgPgEcLUsi1lXIfWKhvTRYeOII3r0nHDNk8JvQtE295d+5q9Kz7DCqx 9Gaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718329944; x=1718934744; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oHYSOK8Z4m4YeRSSbyiRoNr7hsC5jb5TLSRL1KlNI3w=; b=isvW5/S/DWHkMtbtFPBDhQEcWfPShcvZ3hprOVEt3XKlYFu8Tpa49e+cHLnCd5VY/Q Ah/92rAi6frkxmwb+dLcVSGqP/4g7Pu5lWKzMt1SS9zWCpX3/2LPr8koyrYBi32FjmiG +Ai2j8tuB1H6P3Hptc2JwIhXoxKRNheT2BiWn2Ri84H0g/NuAQ9HQpBO78/nKgxThvcY poo6LR9tNc4MInVjTBCzN+acjJD8AdLf7LGXCsEDMFGSJgYLidFVm2WPUMFVszHE2PPj RxCDat9/QXUovIaEpGOskSzM85o073zbnmeGBGUS7IJizhEv3lnzV+7HsM+Mvwi6foDX bIFQ== X-Forwarded-Encrypted: i=1; AJvYcCVjW/Bx6rlma3/V1+sewXZ7o1/wMdUtZIE06jUQ2cmJnyq9j8QUvca+SB2hK8Ymhxhk6RegOzW4qJ6EFzfqnHilhVU= X-Gm-Message-State: AOJu0YyPmrjdreDJ6dVx2MbBlf44RtYTZed84/LbeIOWTDuBtkDrVJfb iYxx+seoKFcxshyCzbf1HKtv+F01MIKYcxoaIOFOAdVNkltfdVFY X-Google-Smtp-Source: AGHT+IETJKQrVb03Zu4RAVjG/Fn0yAZeYe0tcBOczpJ9Oj2zKKIy6GQvO0xxxOPWMdvyD7IL203kLg== X-Received: by 2002:a05:6a20:3d89:b0:1b5:d10a:1b70 with SMTP id adf61e73a8af0-1bae7d840cfmr2048147637.11.1718329943752; Thu, 13 Jun 2024 18:52:23 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::304f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-705cc96d4c3sm2000912b3a.59.2024.06.13.18.52.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 18:52:23 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: willy@infradead.org, sj@kernel.org, baolin.wang@linux.alibaba.com, maskray@google.com, ziy@nvidia.com, ryan.roberts@arm.com, david@redhat.com, 21cnbao@gmail.com, mhocko@suse.com, fengwei.yin@intel.com, zokeefe@google.com, shy828301@gmail.com, xiehuan09@gmail.com, libang.li@antgroup.com, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lance Yang Subject: [PATCH v8 2/3] mm/rmap: integrate PMD-mapped folio splitting into pagewalk loop Date: Fri, 14 Jun 2024 09:51:37 +0800 Message-Id: <20240614015138.31461-3-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240614015138.31461-1-ioworker0@gmail.com> References: <20240614015138.31461-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: BE25E14000C X-Stat-Signature: wx3a88196967j4aasyxkfffzhoti9mhs X-Rspam-User: X-HE-Tag: 1718329945-282720 X-HE-Meta: U2FsdGVkX18tqTI809FDshG7SMR/ZktoFaphPIiHxJMvZlG1ktg0lbtz8ALuHaM/pSCyvep3hcuvOfDFaR49uXX/ehHWEqkzlvEQiwrj+JVkeDwKznPSxkLwbjeZePXiqgV2/lqrDIHDgb6cYPD6nHV5xopWkZh0w2+ocudOPkPNkE/Iev9Vhxv4KBpbZ6Ha9ef5cPKGavRsvUGwbKcgzXbJc5xJTmJZTN9/QWK5taks8ro80GHrDWge7LIHbgULgBiVGtLHljbA0hwnhpvWA2DMBgjkhF383BGidvD5pcY6c21vs4AVT6AcVHABBhaJqB1a4J/QzklFgChp8i2DDHGjzndeGGGO0TCUgjWCtOX2o/A9UXwFTAvcwL9mHEpEwxttak8yxFIUWoDSfHfKwMFtn7nDQ8FTldpSC2TEzuzTIIw3oveb0SKXpz9DwJRKf0iNWChNkEhE94jz+bP2aZ67/IJIFfasrmZpKTjRXKhzfMvwaiNg4JmCayFhOIuAdVKP2PpoR3E3rxEGtsKsUM+suEUDwZE+/7ZmJijm439I147bI6SHcy+QkMIw2g/QFvQAPoTOdaq0vO0hmtptaaOqrdBKLfR4N+aIQWjFhrxGhttpS/YjEQsNdKcHmTRjb1abt7VcEQEsiJnx7eng8245wfEJxPVn82leldnALDHelbkYW1hJqrl9mLCbcanIhyTH8aUW/9DWu0I5eIaC+NvCMttgC6hFvTD2nAgnSjTOfhcdF1pWTDgLaFFBmqqPrCtMi2/O48vqGw/4ADLZataVMfiBW0NrNF2N6Ddu1xkBsjMtyt4c/FES31tC/HZitaquRmb9Tjequx1XPu8cGF5ewPsTAefH/pRF9eDWzpNsPoINm65Qyscbar9WGHtiXemQkk1XIBzm1WliGbdJ9ZlDPN5S+7QCP2jGLLhYvRLYtQ1fz0yKjWFkBbsMRb7xTa1y9jy4mxQ/KXoRtRE fLgqU+RB 9k5D7z9FcXSLL3+OY38EXytcPqtfQ3sDy68pgkCXKwk7Ndj9A9MPCa4LHSL/otvmk+R0/IuqsyzI/XarH/gfGtgFr4fIlpB4NiWh+eqXNbCT/uPvlTN7tt2y7wQTMxj1QWYQdBX+LJXjqJ608zFjh2fjgIeAyfxhZnMPRxcCcS6SSWtJj+Q9+8e4deelS0COfXFXwSumLcxEmHp8LehguWzKddap5NxmTe+YnkcKaEM/v1m7Vz8A8nnFTA6GhIeW6jzK2kOU3VLWj9KWrpqayuM9hPUeD6JbPjcgeW7ZpWMZ8aq7wOA03aAz7elHyBWlcY7qL0b0WYacX8Jdr7uWAwSG7LCPlYSnIqTRvhuQ95eU6JI4uWq8f/9sUsNmVoBDOjV3MaOQITrlDXLXxJpZPDu3AazXkqvioYQtY 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: List-Subscribe: List-Unsubscribe: In preparation for supporting try_to_unmap_one() to unmap PMD-mapped folios, start the pagewalk first, then call split_huge_pmd_address() to split the folio. Suggested-by: David Hildenbrand Suggested-by: Baolin Wang Signed-off-by: Lance Yang Acked-by: David Hildenbrand Acked-by: Zi Yan --- include/linux/huge_mm.h | 6 ++++++ include/linux/rmap.h | 24 +++++++++++++++++++++++ mm/huge_memory.c | 42 +++++++++++++++++++++-------------------- mm/rmap.c | 21 +++++++++++++++------ 4 files changed, 67 insertions(+), 26 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 7ad41de5eaea..9f720b0731c4 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -428,6 +428,9 @@ static inline bool thp_migration_supported(void) return IS_ENABLED(CONFIG_ARCH_ENABLE_THP_MIGRATION); } +void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, + pmd_t *pmd, bool freeze, struct folio *folio); + #else /* CONFIG_TRANSPARENT_HUGEPAGE */ static inline bool folio_test_pmd_mappable(struct folio *folio) @@ -490,6 +493,9 @@ static inline void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long address, bool freeze, struct folio *folio) {} static inline void split_huge_pmd_address(struct vm_area_struct *vma, unsigned long address, bool freeze, struct folio *folio) {} +static inline void split_huge_pmd_locked(struct vm_area_struct *vma, + unsigned long address, pmd_t *pmd, + bool freeze, struct folio *folio) {} #define split_huge_pud(__vma, __pmd, __address) \ do { } while (0) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 0fd9bebce54c..d1c5e2d694b2 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -703,6 +703,30 @@ static inline void page_vma_mapped_walk_done(struct page_vma_mapped_walk *pvmw) spin_unlock(pvmw->ptl); } +/** + * page_vma_mapped_walk_restart - Restart the page table walk. + * @pvmw: Pointer to struct page_vma_mapped_walk. + * + * It restarts the page table walk when changes occur in the page + * table, such as splitting a PMD. Ensures that the PTL held during + * the previous walk is released and resets the state to allow for + * a new walk starting at the current address stored in pvmw->address. + */ +static inline void +page_vma_mapped_walk_restart(struct page_vma_mapped_walk *pvmw) +{ + WARN_ON_ONCE(!pvmw->pmd && !pvmw->pte); + + if (likely(pvmw->ptl)) + spin_unlock(pvmw->ptl); + else + WARN_ON_ONCE(1); + + pvmw->ptl = NULL; + pvmw->pmd = NULL; + pvmw->pte = NULL; +} + bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw); /* diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 70d20fefc6db..e766d3f3a302 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2582,6 +2582,27 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, pmd_populate(mm, pmd, pgtable); } +void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, + pmd_t *pmd, bool freeze, struct folio *folio) +{ + VM_WARN_ON_ONCE(folio && !folio_test_pmd_mappable(folio)); + VM_WARN_ON_ONCE(!IS_ALIGNED(address, HPAGE_PMD_SIZE)); + VM_WARN_ON_ONCE(folio && !folio_test_locked(folio)); + VM_BUG_ON(freeze && !folio); + + /* + * When the caller requests to set up a migration entry, we + * require a folio to check the PMD against. Otherwise, there + * is a risk of replacing the wrong folio. + */ + if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || + is_pmd_migration_entry(*pmd)) { + if (folio && folio != pmd_folio(*pmd)) + return; + __split_huge_pmd_locked(vma, pmd, address, freeze); + } +} + void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long address, bool freeze, struct folio *folio) { @@ -2593,26 +2614,7 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, (address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE); mmu_notifier_invalidate_range_start(&range); ptl = pmd_lock(vma->vm_mm, pmd); - - /* - * If caller asks to setup a migration entry, we need a folio to check - * pmd against. Otherwise we can end up replacing wrong folio. - */ - VM_BUG_ON(freeze && !folio); - VM_WARN_ON_ONCE(folio && !folio_test_locked(folio)); - - if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || - is_pmd_migration_entry(*pmd)) { - /* - * It's safe to call pmd_page when folio is set because it's - * guaranteed that pmd is present. - */ - if (folio && folio != pmd_folio(*pmd)) - goto out; - __split_huge_pmd_locked(vma, pmd, range.start, freeze); - } - -out: + split_huge_pmd_locked(vma, range.start, pmd, freeze, folio); spin_unlock(ptl); mmu_notifier_invalidate_range_end(&range); } diff --git a/mm/rmap.c b/mm/rmap.c index 2d778725e4f5..dacf24bc82f0 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1642,9 +1642,6 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, if (flags & TTU_SYNC) pvmw.flags = PVMW_SYNC; - if (flags & TTU_SPLIT_HUGE_PMD) - split_huge_pmd_address(vma, address, false, folio); - /* * For THP, we have to assume the worse case ie pmd for invalidation. * For hugetlb, it could be much worse if we need to do pud @@ -1670,9 +1667,6 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, mmu_notifier_invalidate_range_start(&range); while (page_vma_mapped_walk(&pvmw)) { - /* Unexpected PMD-mapped THP? */ - VM_BUG_ON_FOLIO(!pvmw.pte, folio); - /* * If the folio is in an mlock()d vma, we must not swap it out. */ @@ -1684,6 +1678,21 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, goto walk_abort; } + if (!pvmw.pte && (flags & TTU_SPLIT_HUGE_PMD)) { + /* + * We temporarily have to drop the PTL and start once + * again from that now-PTE-mapped page table. + */ + split_huge_pmd_locked(vma, pvmw.address, pvmw.pmd, + false, folio); + flags &= ~TTU_SPLIT_HUGE_PMD; + page_vma_mapped_walk_restart(&pvmw); + continue; + } + + /* Unexpected PMD-mapped THP? */ + VM_BUG_ON_FOLIO(!pvmw.pte, folio); + pfn = pte_pfn(ptep_get(pvmw.pte)); subpage = folio_page(folio, pfn - folio_pfn(folio)); address = pvmw.address;