From nobody Thu Apr 2 15:41:46 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 7C1782F6192 for ; Sat, 21 Feb 2026 09:39:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771666800; cv=none; b=MTBNIPX3zsNHu068aDWJZVquX9R5vNN9OjBrNuuJ1p4ZbppRkLMGRJa+a2yEgDWBO3KbnNcozFgnrXE9q/WN4C1hy15/jJjx2q7r2vGEBamwOUxFxwf0hHDKot9CIbqrObSszlZ0MIg4CMj3mNeIKYw4EMwjqLhllHFGmYHMGIo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771666800; c=relaxed/simple; bh=MuOppxHTXWhTZdWc0VDsZZC1NCGM+gxAgSHNnjZR0KI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LwU/1il+uv1U7snO+9JsmYNjnh+rCW9CS1mf122FSrOKSlPDjt/X2QFB/mfi6DI8fVbCAt2xJy1GuB89vgODzwMlMxZwtttf7veXPHfmwXQ6MRWb50fYXUGML/KyJnYYeLRxodpcEG9nCtcl7kgqFyyjlGBKcOvoTlE7ROmhin0= 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=Y4SsUaOp; arc=none smtp.client-ip=209.85.210.182 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="Y4SsUaOp" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-8217f2ad01eso2887596b3a.2 for ; Sat, 21 Feb 2026 01:39:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771666799; x=1772271599; 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=FhfMK34w+7c74FDll4ied9faGONb5ohZzrn5WysTLck=; b=Y4SsUaOpdcphci+Exa4yN3hYeapdosC2kRFrjPvBiUp9Hh8N8//7QIxlguM0GurpHZ GekDxCjXqwrOdG6ikwZ8WRbD+8BPu8d4BT9ONhQVazEkvJTfLzGNeVFyTS3KXjtsnbGi L7kP0aAG4+FO55MvFz4iyUqLb+D0k5Kl4oANlHL44tmSrUpLAOjkKK1/bz06C5itZtt5 Z5dPbgrljLU/fVwniIQVzJJdyhLcxWXZBBi2SPhCGMxt6REv0hA8aj3DDPhfNJa4cXdQ +WUOt6/RdPWqWU/3keE/TC7VGzcd55uTxubIFLIpgUynqk9CofEEkbk+gnP3DSr8/GEm 7/qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771666799; x=1772271599; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FhfMK34w+7c74FDll4ied9faGONb5ohZzrn5WysTLck=; b=eTUUqnop9FTLAoL0noEoGJOaYepNpbEWA4C0KkGroTnJfu8q/zyfs7RMqQZWaWbdRg sAF7ZHv2tQee2awWHinzgbUfoGTB9o8VKeITQMhgBcdO4CO+ih5G0p0BieXXMbN51KoQ B/nW9CtMxRTE0RyVB53ujrBK+deOHE1mbn14alX/x4SKlEmEJXamhE7mXyCAonPD9KCj qG8+gnWIjUu9hl0ycE6uiWM5F7dZpE5OIsTJ+XlqPq2BIlUh3D0vlUxYL5ILdIH7JzJR jPRVn5CNT51Pl9mfAQ9IP7lpqFjeW44mdY5WntoNJE5T1PP4z+Ehiwx/ItiZLr9TAcGK yDuQ== X-Forwarded-Encrypted: i=1; AJvYcCXLl/DkNveKTu0s4/doUADGOm1/xJWxEGho6fbdHgFEkFtANwyZSgOsob3i4VYwBZx1td7pBj9266UJKXM=@vger.kernel.org X-Gm-Message-State: AOJu0YzviABM1LMWs8+oV72LS9x4Ftoyv53hL44Ej6b5imiRIgfq89I0 aLCPpatYWbIE353KIqTQQpdZuFWyZvRtYXCz433VVPQtKN8y4M0g2gct X-Gm-Gg: AZuq6aK4qGIucxvwylq86ezcYLsiR6uaoU9REcqbJVEgLT9vhI1L6O7uLkyQxs6A7Zk DBm2818bIrOfM9lCQRMoESmaJTFyaTPZylIKTKX5HrmgWan10v2QuriMlCwhGGrcLanJhlqNuPv yaVoBb7S93G7uGhRm4TIVwJTa41l1nJcWmE3sMWXIxg45zrgwr0Ejd3a2vqdHR8ovW8YwMtgtRR M6g80PElmXEJvoiLIqfFoq1suHV0QTSiaNxDlnUljPJnogx2+NyqfXTeg86GgU+yVugXRg4Rro6 6Pqx9w/bg2r2Pa/IquD1GTLYiCA16bexHPCciXYPe9HPwr1ChNaBDp7lI+UII7JU5ziHqSmlMfE cQuQqx5tzMbjkbPZ2IHskKcxfmAqaWuNgvcrCZUVhTzvHm1/eHGusN7rzxdmDVpw3kLfXEc6y7S mthhbZLLqB2fjrugjYquAbOJPcNrZrrx6IpA== X-Received: by 2002:a05:6a00:2913:b0:7e8:4433:8fb4 with SMTP id d2e1a72fcca58-826daa82a8dmr2231143b3a.60.1771666798773; Sat, 21 Feb 2026 01:39:58 -0800 (PST) Received: from localhost.localdomain ([49.79.21.101]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-826dd8ba11bsm1761708b3a.50.2026.02.21.01.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Feb 2026 01:39:58 -0800 (PST) From: Vernon Yang To: akpm@linux-foundation.org, david@kernel.org Cc: lorenzo.stoakes@oracle.com, ziy@nvidia.com, dev.jain@arm.com, baohua@kernel.org, lance.yang@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vernon Yang Subject: [PATCH mm-new v8 2/4] mm: khugepaged: refine scan progress number Date: Sat, 21 Feb 2026 17:39:16 +0800 Message-ID: <20260221093918.1456187-3-vernon2gm@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260221093918.1456187-1-vernon2gm@gmail.com> References: <20260221093918.1456187-1-vernon2gm@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" From: Vernon Yang Currently, each scan always increases "progress" by HPAGE_PMD_NR, even if only scanning a single PTE/PMD entry. - When only scanning a sigle PTE entry, let me provide a detailed example: static int hpage_collapse_scan_pmd() { for (addr =3D start_addr, _pte =3D pte; _pte < pte + HPAGE_PMD_NR; _pte++, addr +=3D PAGE_SIZE) { pte_t pteval =3D ptep_get(_pte); ... if (pte_uffd_wp(pteval)) { <-- first scan hit result =3D SCAN_PTE_UFFD_WP; goto out_unmap; } } } During the first scan, if pte_uffd_wp(pteval) is true, the loop exits directly. In practice, only one PTE is scanned before termination. Here, "progress +=3D 1" reflects the actual number of PTEs scanned, but previously "progress +=3D HPAGE_PMD_NR" always. - When the memory has been collapsed to PMD, let me provide a detailed example: The following data is traced by bpftrace on a desktop system. After the system has been left idle for 10 minutes upon booting, a lot of SCAN_PMD_MAPPED or SCAN_NO_PTE_TABLE are observed during a full scan by khugepaged. From trace_mm_khugepaged_scan_pmd and trace_mm_khugepaged_scan_file, the following statuses were observed, with frequency mentioned next to them: SCAN_SUCCEED : 1 SCAN_EXCEED_SHARED_PTE: 2 SCAN_PMD_MAPPED : 142 SCAN_NO_PTE_TABLE : 178 total progress size : 674 MB Total time : 419 seconds, include khugepaged_scan_sleep_millisecs The khugepaged_scan list save all task that support collapse into hugepage, as long as the task is not destroyed, khugepaged will not remove it from the khugepaged_scan list. This exist a phenomenon where task has already collapsed all memory regions into hugepage, but khugepaged continues to scan it, which wastes CPU time and invalid, and due to khugepaged_scan_sleep_millisecs (default 10s) causes a long wait for scanning a large number of invalid task, so scanning really valid task is later. After applying this patch, when the memory is either SCAN_PMD_MAPPED or SCAN_NO_PTE_TABLE, just skip it, as follow: SCAN_EXCEED_SHARED_PTE: 2 SCAN_PMD_MAPPED : 147 SCAN_NO_PTE_TABLE : 173 total progress size : 45 MB Total time : 20 seconds SCAN_PTE_MAPPED_HUGEPAGE is the same, for detailed data, refer to https://lore.kernel.org/linux-mm/4qdu7owpmxfh3ugsue775fxarw5g2gcggbxdf5psj7= 5nnu7z2u@cv2uu2yocaxq Signed-off-by: Vernon Yang Reviewed-by: Dev Jain --- mm/khugepaged.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index e2f6b68a0011..61e25cf5424b 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -68,7 +68,10 @@ enum scan_result { static struct task_struct *khugepaged_thread __read_mostly; static DEFINE_MUTEX(khugepaged_mutex); =20 -/* default scan 8*HPAGE_PMD_NR ptes (or vmas) every 10 second */ +/* + * default scan 8*HPAGE_PMD_NR ptes, pmd_mapped, no_pte_table or vmas + * every 10 second. + */ static unsigned int khugepaged_pages_to_scan __read_mostly; static unsigned int khugepaged_pages_collapsed; static unsigned int khugepaged_full_scans; @@ -1231,7 +1234,8 @@ static enum scan_result collapse_huge_page(struct mm_= struct *mm, unsigned long a } =20 static enum scan_result hpage_collapse_scan_pmd(struct mm_struct *mm, - struct vm_area_struct *vma, unsigned long start_addr, bool *mmap_locked, + struct vm_area_struct *vma, unsigned long start_addr, + bool *mmap_locked, unsigned int *cur_progress, struct collapse_control *cc) { pmd_t *pmd; @@ -1247,19 +1251,27 @@ static enum scan_result hpage_collapse_scan_pmd(str= uct mm_struct *mm, VM_BUG_ON(start_addr & ~HPAGE_PMD_MASK); =20 result =3D find_pmd_or_thp_or_none(mm, start_addr, &pmd); - if (result !=3D SCAN_SUCCEED) + if (result !=3D SCAN_SUCCEED) { + if (cur_progress) + *cur_progress =3D 1; goto out; + } =20 memset(cc->node_load, 0, sizeof(cc->node_load)); nodes_clear(cc->alloc_nmask); pte =3D pte_offset_map_lock(mm, pmd, start_addr, &ptl); if (!pte) { + if (cur_progress) + *cur_progress =3D 1; result =3D SCAN_NO_PTE_TABLE; goto out; } =20 for (addr =3D start_addr, _pte =3D pte; _pte < pte + HPAGE_PMD_NR; _pte++, addr +=3D PAGE_SIZE) { + if (cur_progress) + *cur_progress +=3D 1; + pte_t pteval =3D ptep_get(_pte); if (pte_none_or_zero(pteval)) { ++none_or_zero; @@ -2279,8 +2291,9 @@ static enum scan_result collapse_file(struct mm_struc= t *mm, unsigned long addr, return result; } =20 -static enum scan_result hpage_collapse_scan_file(struct mm_struct *mm, uns= igned long addr, - struct file *file, pgoff_t start, struct collapse_control *cc) +static enum scan_result hpage_collapse_scan_file(struct mm_struct *mm, + unsigned long addr, struct file *file, pgoff_t start, + unsigned int *cur_progress, struct collapse_control *cc) { struct folio *folio =3D NULL; struct address_space *mapping =3D file->f_mapping; @@ -2370,6 +2383,12 @@ static enum scan_result hpage_collapse_scan_file(str= uct mm_struct *mm, unsigned } } rcu_read_unlock(); + if (cur_progress) { + if (result =3D=3D SCAN_PTE_MAPPED_HUGEPAGE) + *cur_progress =3D 1; + else + *cur_progress =3D HPAGE_PMD_NR; + } =20 if (result =3D=3D SCAN_SUCCEED) { if (cc->is_khugepaged && @@ -2448,6 +2467,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, enum scan_result =20 while (khugepaged_scan.address < hend) { bool mmap_locked =3D true; + unsigned int cur_progress =3D 0; =20 cond_resched(); if (unlikely(hpage_collapse_test_exit_or_disable(mm))) @@ -2464,7 +2484,8 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, enum scan_result mmap_read_unlock(mm); mmap_locked =3D false; *result =3D hpage_collapse_scan_file(mm, - khugepaged_scan.address, file, pgoff, cc); + khugepaged_scan.address, file, pgoff, + &cur_progress, cc); fput(file); if (*result =3D=3D SCAN_PTE_MAPPED_HUGEPAGE) { mmap_read_lock(mm); @@ -2478,7 +2499,8 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, enum scan_result } } else { *result =3D hpage_collapse_scan_pmd(mm, vma, - khugepaged_scan.address, &mmap_locked, cc); + khugepaged_scan.address, &mmap_locked, + &cur_progress, cc); } =20 if (*result =3D=3D SCAN_SUCCEED) @@ -2486,7 +2508,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, enum scan_result =20 /* move to next address */ khugepaged_scan.address +=3D HPAGE_PMD_SIZE; - progress +=3D HPAGE_PMD_NR; + progress +=3D cur_progress; if (!mmap_locked) /* * We released mmap_lock so break loop. Note @@ -2809,7 +2831,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsi= gned long start, mmap_locked =3D false; *lock_dropped =3D true; result =3D hpage_collapse_scan_file(mm, addr, file, pgoff, - cc); + NULL, cc); =20 if (result =3D=3D SCAN_PAGE_DIRTY_OR_WRITEBACK && !triggered_wb && mapping_can_writeback(file->f_mapping)) { @@ -2824,7 +2846,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsi= gned long start, fput(file); } else { result =3D hpage_collapse_scan_pmd(mm, vma, addr, - &mmap_locked, cc); + &mmap_locked, NULL, cc); } if (!mmap_locked) *lock_dropped =3D true; --=20 2.51.0