From nobody Fri Jul 10 23:56:02 2026 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DAD5146D50 for ; Mon, 13 May 2024 07:47:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715586476; cv=none; b=h6uXJaX6GM7S4AXmwC/n5xnhlrpIIdSBtPDwJ2P/RXCyadrC5JcPueR5tD51L7TSgr6o+e1Gu8YtebIPiDXAApMRbh+54E4W/142p2H2/15WYuu+iyQ98nmvydl9I8GPCKKKO7vWFT7pzo8ED6HbmcHrXaySmoF5qvUzhOuY3BU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715586476; c=relaxed/simple; bh=w+SWe0CjxDy05oILGpGi77r8YDWsD/ip9mkRGbM1fGY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=b2xcqOaQFnoaZN9z6Yu74L+O5GwsiRi+toScljHcdyj0qgDzHAj/8FseWmKFWVoF+eH4geW6eV/x2HmuLUZPFSAXS2XZo622xCTW7fvxwR54kTQMzfN0xS5k6LRZpF9ijxM/AVGLZRh+lVepkCx8uiKt8UnfoMn/hXWEsCshduY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nM7YNwBA; arc=none smtp.client-ip=209.85.167.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nM7YNwBA" Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3c99a70250cso1624269b6e.1 for ; Mon, 13 May 2024 00:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715586474; x=1716191274; darn=vger.kernel.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=CRqSGx+LZLYZmMM1dtm6DE8QjEfHEddJV2Al3d0Qb2M=; b=nM7YNwBAIoDmMPBJd2OLizA6GozkpW64DM7w3wVSDZJ3EJtLzQ8oatR01ql/oV+caw bujH7p1Odelr0BzM7sUYiTj2V+yNRZ0k9tl2o2NRkZFERDLV4K22Co5kUQt5lUyEeFCg h5mwS/AITmffUNipK+TpHC+re6AqbrnkuFFuaMbLHzx44sSb2W8fJbHfQ4y+7Fpk/r/v jk3Ypx3xzV/UXZHK2BvpC7cfcmLlCkshYkH88h86VqpoRNkRv+oh6NJy56EWjx5A2+3R 9xBCznMqnB9IJ2ebb0lKHBCZHgkY5cuylFZDe5Q0E/sh07R/c9erfkbbVKFYzyBIx6oP gq+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715586474; x=1716191274; 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=CRqSGx+LZLYZmMM1dtm6DE8QjEfHEddJV2Al3d0Qb2M=; b=Hef3Njh3Phj/cXzPuvdPnXpQ4GZgScmCGMekryxEI9GxZSdPZkH39vFYHa/FdfkSoD pCX6kTD2gHj+qnNEUfSHn5XI7SahRdIN19zS7l0My2lC2oJwDun/8zhg6zXMY6zvPlZp 3H/xfSTv6DSfmw0tl5rdQ2Lr1NK8giqspM7M7YkIOWGoD0UmHYtewKj2KnJhKINepdUJ WGsGQYaWw/uE3piaVa2dyBL/K088yPwDROh8K4KM+ep8ytPYE9pDIiRLEibDmgC4UGD5 K084pAWzWwcrkN7gkHf08EZ/2dvr59UFbaaAiB4On2BklwNCXFxyoC1BnURPFsYc7vLA NfqA== X-Forwarded-Encrypted: i=1; AJvYcCWqBEwK/mVNTroW2+0KiMrBLZXuSHzf4QDjlOBxwgxOap4yLEEmcxmuNgDMvz9EgHQE7yyMm+JUQddU7ZnIDcmuCoWKLh3NyUOgkBOt X-Gm-Message-State: AOJu0Yxh9mmlBg6ObgvqkRaFEptjSYU1qehD0tz22heDTOKmYXWyFZ0t MgUKXYVmRUBIkK8Eb5KsYP8uh/5mWJRi9s7UcdnySDkt3b+bXRy0 X-Google-Smtp-Source: AGHT+IGY+Awn4udMPhFiQz9yDb+p0ggUx+6DZOemAXrpevayvvkrNDj+S4e4smtqNCGCuoBLk6sOgQ== X-Received: by 2002:a05:6808:3099:b0:3c7:5146:c4e5 with SMTP id 5614622812f47-3c9970b0ff3mr11673420b6e.41.1715586474027; Mon, 13 May 2024 00:47:54 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::304b]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm7008967b3a.13.2024.05.13.00.47.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 00:47:53 -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 RESEND v5 1/4] mm/rmap: remove duplicated exit code in pagewalk loop Date: Mon, 13 May 2024 15:47:09 +0800 Message-Id: <20240513074712.7608-2-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240513074712.7608-1-ioworker0@gmail.com> References: <20240513074712.7608-1-ioworker0@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce the labels walk_done and walk_done_err as exit points to eliminate duplicated exit code in the pagewalk loop. Reviewed-by: Zi Yan Signed-off-by: Lance Yang Reviewed-by: Baolin Wang --- mm/rmap.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index e8fc5ecb59b2..ddffa30c79fb 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1679,9 +1679,7 @@ static bool try_to_unmap_one(struct folio *folio, str= uct vm_area_struct *vma, /* Restore the mlock which got missed */ if (!folio_test_large(folio)) mlock_vma_folio(folio, vma); - page_vma_mapped_walk_done(&pvmw); - ret =3D false; - break; + goto walk_done_err; } =20 pfn =3D pte_pfn(ptep_get(pvmw.pte)); @@ -1719,11 +1717,8 @@ static bool try_to_unmap_one(struct folio *folio, st= ruct vm_area_struct *vma, */ if (!anon) { VM_BUG_ON(!(flags & TTU_RMAP_LOCKED)); - if (!hugetlb_vma_trylock_write(vma)) { - page_vma_mapped_walk_done(&pvmw); - ret =3D false; - break; - } + if (!hugetlb_vma_trylock_write(vma)) + goto walk_done_err; if (huge_pmd_unshare(mm, vma, address, pvmw.pte)) { hugetlb_vma_unlock_write(vma); flush_tlb_range(vma, @@ -1738,8 +1733,7 @@ static bool try_to_unmap_one(struct folio *folio, str= uct vm_area_struct *vma, * actual page and drop map count * to zero. */ - page_vma_mapped_walk_done(&pvmw); - break; + goto walk_done; } hugetlb_vma_unlock_write(vma); } @@ -1811,9 +1805,7 @@ static bool try_to_unmap_one(struct folio *folio, str= uct vm_area_struct *vma, if (unlikely(folio_test_swapbacked(folio) !=3D folio_test_swapcache(folio))) { WARN_ON_ONCE(1); - ret =3D false; - page_vma_mapped_walk_done(&pvmw); - break; + goto walk_done_err; } =20 /* MADV_FREE page check */ @@ -1852,23 +1844,17 @@ static bool try_to_unmap_one(struct folio *folio, s= truct vm_area_struct *vma, */ set_pte_at(mm, address, pvmw.pte, pteval); folio_set_swapbacked(folio); - ret =3D false; - page_vma_mapped_walk_done(&pvmw); - break; + goto walk_done_err; } =20 if (swap_duplicate(entry) < 0) { set_pte_at(mm, address, pvmw.pte, pteval); - ret =3D false; - page_vma_mapped_walk_done(&pvmw); - break; + goto walk_done_err; } if (arch_unmap_one(mm, vma, address, pteval) < 0) { swap_free(entry); set_pte_at(mm, address, pvmw.pte, pteval); - ret =3D false; - page_vma_mapped_walk_done(&pvmw); - break; + goto walk_done_err; } =20 /* See folio_try_share_anon_rmap(): clear PTE first. */ @@ -1876,9 +1862,7 @@ static bool try_to_unmap_one(struct folio *folio, str= uct vm_area_struct *vma, folio_try_share_anon_rmap_pte(folio, subpage)) { swap_free(entry); set_pte_at(mm, address, pvmw.pte, pteval); - ret =3D false; - page_vma_mapped_walk_done(&pvmw); - break; + goto walk_done_err; } if (list_empty(&mm->mmlist)) { spin_lock(&mmlist_lock); @@ -1918,6 +1902,12 @@ static bool try_to_unmap_one(struct folio *folio, st= ruct vm_area_struct *vma, if (vma->vm_flags & VM_LOCKED) mlock_drain_local(); folio_put(folio); + continue; +walk_done_err: + ret =3D false; +walk_done: + page_vma_mapped_walk_done(&pvmw); + break; } =20 mmu_notifier_invalidate_range_end(&range); --=20 2.33.1 From nobody Fri Jul 10 23:56:02 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 262A6146D50 for ; Mon, 13 May 2024 07:48:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715586482; cv=none; b=o3FUl1rYf/BayOIELTklUG1vMdIg7HJLyGSvtGuImIP1eRXFyidrYOeIjDIhXOE85MQ0Ift2bE3DoA6sjuwddq8izRBdpsyzDhwpSrgakVbzFydxDhw3dxdm9DnhrvK+K8lg9oDgP374iqQV6aNkIdIn+9g64fRKo/qjfU/AlW4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715586482; c=relaxed/simple; bh=m8kCWF+iFQvI3coxrWVJ4qOZShVff4EWXPdFeXxO6lg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dedUT/QLZz6aV8OREUGeE1018TAeqDJPFkLJjqIqYLg/Fq56O7JwdsDOFTGqcyue/iTXiCHUsl5vhRXkbE88V+G1LD28SXDJTDoZJBJl2DAEK30lQOVt8nQZ+o1atJv8rny5vVUW2atUkw5HCh1jBnEK12gMiyoeWzboVQaWQL8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aB9Gjcez; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aB9Gjcez" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6f5053dc057so536318b3a.2 for ; Mon, 13 May 2024 00:48:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715586480; x=1716191280; darn=vger.kernel.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=VW0xsCDY7mre2haGnv0Xg6zNVS1x+avy2x5g7mykcSU=; b=aB9GjcezXIQuUsJ4w/rGYE53vOWAVmuj1x5X5ltFJcN270NXvwfh2NxB+z/+E5H09Z hZ6z4yaHdFUBd+4ntTZzpSYyyMB82U9v+ALtuaalCIZLRcJ1hqMqZnipreIM4nb79fsw 8SAivPuYT4RSRhiUJeAGu3VGWjIiiEPVHlIj/2JaZgzgO9Mgd3bh7XKioYCgZRFVsChf 0+APIA0+Yycpz8jT3ULQwqTNXWqikY1RbiYtalkXS1Q86JHlBE0P24Xc7nX6dZhsh1uc 5HUNl4Oj4iP7+t07Qemvn1zdtorxpokh62EnE6I0V4pWqdAE6wciYfNUbsv4SqYYgQwT RIqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715586480; x=1716191280; 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=VW0xsCDY7mre2haGnv0Xg6zNVS1x+avy2x5g7mykcSU=; b=wwRoJPzK6TgcE9Ky6UCi4pWECIjZbT6fENUUbOdbScX6ikU2e8Ox/5/55mDkaS109e BKhnqtChZsZFEx9Mr/qihutTdnmCpHTZhYLUGR0UnJ2t2nQu6qjKaCgYVyiBEOZejkE5 OZ3w9CCu8+RkyCwD83tqsQX+zY+Xo2aba6oWyOMluiBgGhzvjayzUlu5s5KnJ62jMwMs AXdUS6GD7/IOLHDi14L9lDaqQzxiT5hyj4ipxavajZvCgrQjl/cFotIVib5Kc9IgPCIX zbGXTZ0TqlxOS5I7799p3RdYdaSet7YIRthHm9TEJ1odewSFSBtGZ8Q8u219GZY4jvp8 RkzQ== X-Forwarded-Encrypted: i=1; AJvYcCWcT+/2S8p2E33P1WOsD2lotkBfw5XRhCvVRiOR9DkfhZOdzVt9E8Rrz/b9HT6BejwpOlthnceENIiemzqJ/w7v+8zAziUfHSPjqGQC X-Gm-Message-State: AOJu0Yy73Hc2G4C2ncOZnT8DkcCco4/LsUhXhLdvZEsSOKUBwhEzAri/ Ch7351BypB4MXAEbefFPzfhSvH+w1ZL/dJxdy4HTc/9efnEZ21L2 X-Google-Smtp-Source: AGHT+IEIpuabuqonhYE79on+MmpCBMiXOyD1MynjuJ+zgMt6P3Xc90pOg4tUdHHFiZ9X3J2Nmmenng== X-Received: by 2002:a05:6a00:4f8f:b0:6ea:d114:5ea1 with SMTP id d2e1a72fcca58-6f4e02cae54mr13273237b3a.17.1715586480465; Mon, 13 May 2024 00:48:00 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::304b]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm7008967b3a.13.2024.05.13.00.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 00:48:00 -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 RESEND v5 2/4] mm/rmap: integrate PMD-mapped folio splitting into pagewalk loop Date: Mon, 13 May 2024 15:47:10 +0800 Message-Id: <20240513074712.7608-3-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240513074712.7608-1-ioworker0@gmail.com> References: <20240513074712.7608-1-ioworker0@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Lance Yang --- include/linux/huge_mm.h | 6 ++++++ mm/huge_memory.c | 42 +++++++++++++++++++++-------------------- mm/rmap.c | 23 ++++++++++++++++------ 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index c8d3ec116e29..9fcb0b0b6ed1 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -409,6 +409,9 @@ static inline bool thp_migration_supported(void) return IS_ENABLED(CONFIG_ARCH_ENABLE_THP_MIGRATION); } =20 +void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addre= ss, + pmd_t *pmd, bool freeze, struct folio *folio); + #else /* CONFIG_TRANSPARENT_HUGEPAGE */ =20 static inline bool folio_test_pmd_mappable(struct folio *folio) @@ -471,6 +474,9 @@ static inline void __split_huge_pmd(struct vm_area_stru= ct *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) {} =20 #define split_huge_pud(__vma, __pmd, __address) \ do { } while (0) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 317de2afd371..425272c6c50b 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2581,6 +2581,27 @@ static void __split_huge_pmd_locked(struct vm_area_s= truct *vma, pmd_t *pmd, pmd_populate(mm, pmd, pgtable); } =20 +void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addre= ss, + 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 !=3D 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) { @@ -2592,26 +2613,7 @@ void __split_huge_pmd(struct vm_area_struct *vma, pm= d_t *pmd, (address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE); mmu_notifier_invalidate_range_start(&range); ptl =3D 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 !=3D 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 ddffa30c79fb..4c4d14325f2e 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1640,9 +1640,6 @@ static bool try_to_unmap_one(struct folio *folio, str= uct vm_area_struct *vma, if (flags & TTU_SYNC) pvmw.flags =3D PVMW_SYNC; =20 - 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 @@ -1668,9 +1665,6 @@ static bool try_to_unmap_one(struct folio *folio, str= uct vm_area_struct *vma, mmu_notifier_invalidate_range_start(&range); =20 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. */ @@ -1682,6 +1676,23 @@ static bool try_to_unmap_one(struct folio *folio, st= ruct vm_area_struct *vma, goto walk_done_err; } =20 + 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, range.start, pvmw.pmd, false, + folio); + pvmw.pmd =3D NULL; + spin_unlock(pvmw.ptl); + pvmw.ptl =3D NULL; + flags &=3D ~TTU_SPLIT_HUGE_PMD; + continue; + } + + /* Unexpected PMD-mapped THP? */ + VM_BUG_ON_FOLIO(!pvmw.pte, folio); + pfn =3D pte_pfn(ptep_get(pvmw.pte)); subpage =3D folio_page(folio, pfn - folio_pfn(folio)); address =3D pvmw.address; --=20 2.33.1 From nobody Fri Jul 10 23:56:02 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AADF5146D66 for ; Mon, 13 May 2024 07:48:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715586488; cv=none; b=cb2wQkThtDFFMoMDQpo9/nKyAGyrw+E0mgJKz7Tz7cBkLgqvHx5PqQ+U8qEQTOWj5C0B9li8C4Bg2TyghFKF0nY32MiNMcu/ZwuXO+SCVDSTR9M5sIvvsL734uR5B8UwOWAlU7iwgaF7Nw5hnyfpb4XjItmFlAbgFlCckEDYmbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715586488; c=relaxed/simple; bh=LVB2t4hgTGzc+6gDjDH8VhApIuASOYTgUThH5iWUziQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EYoE6Cszacf+OtTFL3NbGgI2nWE49ZwvbMKO1wWmDyhiMP+05HfU3IGgsyPgOL4+leNjgZMG/sUglrDhHZkNIgFv/FrOzkOaDXZomWkWt9ZU7N9Ie/GM9x4laMd/LQViKNGl6ZQkk3Mhlq5iG8c8txjuwLUAtELOqPvnoAkj1hs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jKF2Ff0W; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jKF2Ff0W" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6f467fb2e66so3626615b3a.1 for ; Mon, 13 May 2024 00:48:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715586487; x=1716191287; darn=vger.kernel.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=d2aMd7RSjLCt9aorWWhiNJrgbBDqFo4vIbYySyvRoqM=; b=jKF2Ff0WZPWRrdxB2ov0xTz8MUGzvdASzOVjLD6d761pjJGDCxRnUE6xATosuFCXFk OQC2+1bNp+MYnVNg/3ttBa1bG7fIMq5F7cRlMWH/AIhW4+TgtUIHOKBWQFyDCd//xMMp c9uNMxI4uMKfJ1Msu8eUAUeppv1IV0sC+BH7yRHfPYU7rUm0itBYvszJXZ8T3xBJZVNJ 4fBzyznrE8/p08zJxrTuQRWnQ93SaeFvaUINESS7aGYQm/krPfG5hf8wGxiLOKjUbOA7 NgpCMKzWpoug5d59ZqWsjUUkxoa83Q5cIqqKjghWfp3jZ2/MZxmTYkdljaMKhHzQlHfd XXSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715586487; x=1716191287; 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=d2aMd7RSjLCt9aorWWhiNJrgbBDqFo4vIbYySyvRoqM=; b=INbFy8hh6guiaoVA6VnZEJ++zdUyaIdQUtsKt3jIqnZaFTX1RWRG5NjVxozyr8jqDv 0i6Bv5PN4RZWCvni7pP9uiI65PDDI+eu3c6nEHX6waHwzsfilugKJwWP/Z6i+vVpviUR oeFzC5rNgU5lQBcw+13B2wCCMp7/MfphJ48AcyrmAjJJkNqBUqpmqGpdZX5sQ9sNlhdj NWq54FQgteFtnV955aF6io9UE5x08GH3aVrWlS+uVqz2XKsvv/1B1DfY+8K82LFzzVwh OISnRCitFZXMiKLibaKGZNnF775Inv5O12hTl4v81ZG193DaWW9miHMcCI4QG8a2hVnm C95g== X-Forwarded-Encrypted: i=1; AJvYcCUZKj75g4DfwT+8m55BQFhSgb0a9oYT/MaMpER58f68qLvaF7Z64knHDkhIMej4n0948X5DtDCC2/58iyNu8PwlLzw4M8YULmgZvxVq X-Gm-Message-State: AOJu0YxVGpb7GyCNgnfsC0eFrTbbczuRj7FpcC8YXelMsezdE+Jpwb78 pr1P/tUX2JJUR2lJy0sZKcs7E/EHLiooH9iCck42E4xKmu4Oxj+q X-Google-Smtp-Source: AGHT+IFpk9hHf0b9JsRoNRMxoqauhjaBA5WO539N9iC0llVow5ZRKrgoRxRAavfqAmqPSX2Tdv4EqQ== X-Received: by 2002:a05:6a00:2195:b0:6ec:f28b:659f with SMTP id d2e1a72fcca58-6f4e02988b7mr11861591b3a.3.1715586487009; Mon, 13 May 2024 00:48:07 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::304b]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm7008967b3a.13.2024.05.13.00.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 00:48:06 -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 RESEND v5 3/4] mm/mlock: check for THP missing the mlock in try_to_unmap_one() Date: Mon, 13 May 2024 15:47:11 +0800 Message-Id: <20240513074712.7608-4-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240513074712.7608-1-ioworker0@gmail.com> References: <20240513074712.7608-1-ioworker0@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The TTU_SPLIT_HUGE_PMD will no longer perform immediately, so we might encounter a PMD-mapped THP missing the mlock in the VM_LOCKED range during the pagewalk. It's likely necessary to mlock this THP to prevent it from being picked up during page reclaim. Suggested-by: Baolin Wang Signed-off-by: Lance Yang --- mm/rmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/rmap.c b/mm/rmap.c index 4c4d14325f2e..08a93347f283 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1671,7 +1671,8 @@ static bool try_to_unmap_one(struct folio *folio, str= uct vm_area_struct *vma, if (!(flags & TTU_IGNORE_MLOCK) && (vma->vm_flags & VM_LOCKED)) { /* Restore the mlock which got missed */ - if (!folio_test_large(folio)) + if (!folio_test_large(folio) || + (!pvmw.pte && (flags & TTU_SPLIT_HUGE_PMD))) mlock_vma_folio(folio, vma); goto walk_done_err; } --=20 2.33.1 From nobody Fri Jul 10 23:56:02 2026 Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A98161474D1 for ; Mon, 13 May 2024 07:48:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715586496; cv=none; b=kMv888chqziSXVqGyg1UICiItYweZjdLdkwgaHHFnzZA+jlSSa+tjUHcL6tZUWt+a+mrl1VJDFvproP9qQc9xLfiCNf/vFAZTRmeBtA4PolsLmBFK0SmCa5iF1Ea7/UI6uQPNJJl4oIvFZiGqb5A2ahzSOokTNzYHBLbqGhmtGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715586496; c=relaxed/simple; bh=8oylBjrPA3UkDtruPJmckDAw7S/IjFxo/+MNRa/XCig=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=C9Q6CHkcnh0tmiNUzbmBn9dkD8Wonbkz9iW5nPbjbMHQXpuu/ZgMpt4IeMa1ksIV+qJkhlOFVrE6DSCb1jqAQbRtuxtYmhNdFX9K/tCAFxmOcUUiaEq2QyCphOhCvRVEtnll/NElMDqUmccfB0iA7AWl/i5ETM3wTWZITsKL2i0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lw21qV9d; arc=none smtp.client-ip=209.85.160.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lw21qV9d" Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-23ee34c33ceso2732258fac.3 for ; Mon, 13 May 2024 00:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715586494; x=1716191294; darn=vger.kernel.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=oHDREbDidUboYr6GnUNHG4W7oH+tz8aegBIo3ouG4XE=; b=lw21qV9diH8KeXZSM2qvhPAaVM7e7M3dt9V5s9uWCICbt4L6KqSsy4HxSpGCWF9uFG yRVm/Oao0SEvfdqAeNOuHJnWqWBkb8y+jYNoqCdm2FY3UqjZA1ewmwYnlCrflxq8LsOG iPPiZKTNOV0psOOTQF2G3O0rOIKyxbtbIBc6r7JcpnFJai9/HnxNA+qGlj9kfeu+PWbr RQiThL0ZgVsQLwyPDzk3PbPcZbjarysIU+dY9EQI2X9UKkMLJfJhCJ5FS3CSk6RlmD9x VGBTQncSPBlE12rnAFcmnqGDAI1I0PfljIK6pHX3X/xlKuir78EOtX/43/qPiEDyWg3T iH9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715586494; x=1716191294; 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=oHDREbDidUboYr6GnUNHG4W7oH+tz8aegBIo3ouG4XE=; b=A9YLIwCW2Zoh4bupSAuRAeeWne7WHc9FwLScZF9q+vkCUBy9324lcKKKuLrxnbM4L5 R+W4QagPy9pPe3ZajFLPkXVjjvBWNs5N25QAYdQhuDsZ1RyxmpVPj0DHAblVRwM/4DRx PlFBqSn2iCuSurOeO4zTR7MyNSa6T6yIM+5hDbnT0wd97XWSxlyk/Byc+vnjCQwwrYLA ICk1AAkhpBiZKpe8VugfE/LFnDj5dD42cb0ru23R7qX+CtLjMnMKQIpbb4O+Q/G+9XB/ SjkfHWVZ3BJhbgbqmMxIQi7viS2i1lR2X32UUP4BsmHDt+kSdoeD1NK9Wf4KHGA6fQXd VxVg== X-Forwarded-Encrypted: i=1; AJvYcCXKtwkqwD75U83ElTJ5yJ/YVHHM8Nx1upXpaV61q/QWxI3BCF59WBzIn+c9+E4Et9TCGv+gx8bqwglVPVAHPS5U+OsEZEOFPIu59Ldg X-Gm-Message-State: AOJu0YwDRUhpeUMDTJbhzXHS45AzeFUGq+7unbFUnUPmFafK0b3Jvbha LW9TfE39/wdWuDJVkb7AQ27e3FTLwLQgQ4eGXumDkPxoRuUUpicE X-Google-Smtp-Source: AGHT+IGWP4QQxcq2qCQ2sZa1iPOyt28+tz+E8mRQ1zmnhWzt3PbQUI3aIYx7WgDuIqeI+fL5E7v2Ug== X-Received: by 2002:a05:6871:a9c3:b0:23e:b42a:49d with SMTP id 586e51a60fabf-24172f67492mr11117705fac.43.1715586493775; Mon, 13 May 2024 00:48:13 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::304b]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm7008967b3a.13.2024.05.13.00.48.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 00:48:13 -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 RESEND v5 4/4] mm/vmscan: avoid split lazyfree THP during shrink_folio_list() Date: Mon, 13 May 2024 15:47:12 +0800 Message-Id: <20240513074712.7608-5-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240513074712.7608-1-ioworker0@gmail.com> References: <20240513074712.7608-1-ioworker0@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When the user no longer requires the pages, they would use madvise(MADV_FREE) to mark the pages as lazy free. Subsequently, they typically would not re-write to that memory again. During memory reclaim, if we detect that the large folio and its PMD are both still marked as clean and there are no unexpected references (such as GUP), so we can just discard the memory lazily, improving the efficiency of memory reclamation in this case. On an Intel i5 CPU, reclaiming 1GiB of lazyfree THPs using mem_cgroup_force_empty() results in the following runtimes in seconds (shorter is better): Suggested-by: David Hildenbrand Suggested-by: Zi Yan -------------------------------------------- | Old | New | Change | -------------------------------------------- | 0.683426 | 0.049197 | -92.80% | -------------------------------------------- Suggested-by: Zi Yan Suggested-by: David Hildenbrand Signed-off-by: Lance Yang --- include/linux/huge_mm.h | 9 +++++ mm/huge_memory.c | 75 +++++++++++++++++++++++++++++++++++++++++ mm/rmap.c | 31 ++++++++++------- 3 files changed, 103 insertions(+), 12 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 9fcb0b0b6ed1..cfd7ec2b6d0a 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -411,6 +411,8 @@ static inline bool thp_migration_supported(void) =20 void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addre= ss, pmd_t *pmd, bool freeze, struct folio *folio); +bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr, + pmd_t *pmdp, struct folio *folio); =20 #else /* CONFIG_TRANSPARENT_HUGEPAGE */ =20 @@ -478,6 +480,13 @@ static inline void split_huge_pmd_locked(struct vm_are= a_struct *vma, unsigned long address, pmd_t *pmd, bool freeze, struct folio *folio) {} =20 +static inline bool unmap_huge_pmd_locked(struct vm_area_struct *vma, + unsigned long addr, pmd_t *pmdp, + struct folio *folio) +{ + return false; +} + #define split_huge_pud(__vma, __pmd, __address) \ do { } while (0) =20 diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 425272c6c50b..3ceeeb2f42d4 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2687,6 +2687,81 @@ static void unmap_folio(struct folio *folio) try_to_unmap_flush(); } =20 +static bool __discard_trans_pmd_locked(struct vm_area_struct *vma, + unsigned long addr, pmd_t *pmdp, + struct folio *folio) +{ + struct mm_struct *mm =3D vma->vm_mm; + int ref_count, map_count; + pmd_t orig_pmd =3D *pmdp; + struct mmu_gather tlb; + struct page *page; + + if (pmd_dirty(orig_pmd) || folio_test_dirty(folio)) + return false; + if (unlikely(!pmd_present(orig_pmd) || !pmd_trans_huge(orig_pmd))) + return false; + + page =3D pmd_page(orig_pmd); + if (unlikely(page_folio(page) !=3D folio)) + return false; + + tlb_gather_mmu(&tlb, mm); + orig_pmd =3D pmdp_huge_get_and_clear(mm, addr, pmdp); + tlb_remove_pmd_tlb_entry(&tlb, pmdp, addr); + + /* + * Syncing against concurrent GUP-fast: + * - clear PMD; barrier; read refcount + * - inc refcount; barrier; read PMD + */ + smp_mb(); + + ref_count =3D folio_ref_count(folio); + map_count =3D folio_mapcount(folio); + + /* + * Order reads for folio refcount and dirty flag + * (see comments in __remove_mapping()). + */ + smp_rmb(); + + /* + * If the PMD or folio is redirtied at this point, or if there are + * unexpected references, we will give up to discard this folio + * and remap it. + * + * The only folio refs must be one from isolation plus the rmap(s). + */ + if (ref_count !=3D map_count + 1 || folio_test_dirty(folio) || + pmd_dirty(orig_pmd)) { + set_pmd_at(mm, addr, pmdp, orig_pmd); + return false; + } + + folio_remove_rmap_pmd(folio, page, vma); + zap_deposited_table(mm, pmdp); + add_mm_counter(mm, MM_ANONPAGES, -HPAGE_PMD_NR); + if (vma->vm_flags & VM_LOCKED) + mlock_drain_local(); + folio_put(folio); + + return true; +} + +bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr, + pmd_t *pmdp, struct folio *folio) +{ + VM_WARN_ON_FOLIO(!folio_test_pmd_mappable(folio), folio); + VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio); + VM_WARN_ON_ONCE(!IS_ALIGNED(addr, HPAGE_PMD_SIZE)); + + if (folio_test_anon(folio) && !folio_test_swapbacked(folio)) + return __discard_trans_pmd_locked(vma, addr, pmdp, folio); + + return false; +} + static void remap_page(struct folio *folio, unsigned long nr) { int i =3D 0; diff --git a/mm/rmap.c b/mm/rmap.c index 08a93347f283..e09f2141b8dc 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1677,18 +1677,25 @@ static bool try_to_unmap_one(struct folio *folio, s= truct vm_area_struct *vma, goto walk_done_err; } =20 - 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, range.start, pvmw.pmd, false, - folio); - pvmw.pmd =3D NULL; - spin_unlock(pvmw.ptl); - pvmw.ptl =3D NULL; - flags &=3D ~TTU_SPLIT_HUGE_PMD; - continue; + if (!pvmw.pte) { + if (unmap_huge_pmd_locked(vma, range.start, pvmw.pmd, + folio)) + goto walk_done; + + if (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, range.start, + pvmw.pmd, false, folio); + pvmw.pmd =3D NULL; + spin_unlock(pvmw.ptl); + pvmw.ptl =3D NULL; + flags &=3D ~TTU_SPLIT_HUGE_PMD; + continue; + } } =20 /* Unexpected PMD-mapped THP? */ --=20 2.33.1