From nobody Tue Feb 10 07:40:43 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 3F3732BFC73 for ; Sun, 4 Jan 2026 05:41:48 +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=1767505310; cv=none; b=YG7PYpG3cB0nLJH4lTXT4pV3BJ1gRq48BLPfg/wnb/htLrDxYsB/fhzwDdTdR2BECQibqgTfsccoMYMTNw2cufiI4IdoWg0buM51C4H/uUXJ850pZEvRPGCo0MHG1xb31VbuyTq6iwvmlnr/V2alHxSudHdhstXAbgjhHNU3Ie0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767505310; c=relaxed/simple; bh=shcEAb+9YNdzsOxwpOc4hx66paPDoqZDRqqII1oMoPM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hS+F/6kCYChg8w8L7yQptXNilX6rIA/OYkt/pxgHIoF5o/NlxnRWHvZJeRBaXqxuDEz9EHRYih7/8yhjbOhYPCLVl/T5ce909OXUI0a2rPuaKqRin4/dHH1nTnwbh2xFiL5HYj/qqlLpr/nUANAFAYRTYJtnN8r1ExlOdSUAyS8= 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=Jd8uJ6qv; 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="Jd8uJ6qv" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7b8eff36e3bso20445321b3a.2 for ; Sat, 03 Jan 2026 21:41:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767505308; x=1768110108; 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=YE9pc/4tAvhZsZXrRzmjeNPdx2fm0i699jC8cyE+mak=; b=Jd8uJ6qvzuT05culh3UdZDSuQpBpUwbORb5/5qL3ejWYJg7BxIXPM/lxQYCPXGXg2E fm6iGdGuloTuc3zNFycp92x/78fGB63wr9Rt1k8I/XVlEH7dRfq3wwr5SqkKXCNITay0 GzXQ1MO7knWCvFv9lvrGaqwidIX/kYsYkjiTfDRGOVeGmPDjlS1qnI2Ypxq1LsQcguGd MQ+XZfGSqoC5TsP39Wp8BMKONNRqsc7d7zPkB47TlYBNb5CALhypUEZI0uGXMhR33qC4 uEMhSopRnzbsKjSVb/AHFVdFePOluZ+HW+JQKAHJYDdAacYZVE+lNQliVypGI3abq0FX Wm9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767505308; x=1768110108; 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=YE9pc/4tAvhZsZXrRzmjeNPdx2fm0i699jC8cyE+mak=; b=g3QYB14DbQ+URvt1Llv+C1h0OhvG5q1lfSY8rBhE3DW6fL+WGYJr8QfWHF6skle/DZ Zk7KcbpLDxRV6nDl23JdGV+Pmg4ev//d42Q5eLt2KfgpIXhhmkXn6deuSvntr5tQ5ztY oqsTanpCrCVc+uLHoqwh3XGD7GzsrMhXhvN/QYmi/EEljIz20Ip0iADw1L2tgAFEEURN m6wHLGzCYKZ52ttVQnTtcrnb7bPQpNeOt7t/t54T99+Kp//a228/S6mTXTfv792LfpLs oF1ZdsJa8v1wfYVhd815fsCwsblevK0M3jvEEVs319qQWosZc2xqBc3Hy/cswUidWG39 EzRw== X-Forwarded-Encrypted: i=1; AJvYcCUhHEAvFXq9sYnmN1Xmwh1yT44Ol8aD5sNlVtYOTlWlGVwQeVNwypxWPihtnveLICmnrMXUrPCMrRLhMKw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2rJrtat8+gdgoqnINrZhOoM5v27yRe/6Vg6VO5yALeoL0tUh0 iHpPmekhA2CtOGp6zXsIUZjwdrhfs/4Hjf8gXugLIew+eyODKFHr1eIC X-Gm-Gg: AY/fxX6mAzj5z9k9+zxP0iLOfr+0qbrHc0kgS0u591nEdR2xf7wB+ccS9rQMFRq/Psz KpSY8W91Sq5uwt/PdHU6xHyVcWSvWs8coRSMlFYL4nHSakYRWVO0+mAg9k9C9Oi9Y/l+/JGgyTO tNH9s9efBSSi0twRvjVsotFHADmhw+lGI1hliqTPe7ynfF+wPaTJ7DFhEEianrniPQMvdCwqQPY L/SOayixEsUER3Wb4GEVSDm03Uzw6LWy3/wFmX/4URVlj48gYF4GaHL2IRkmObcE5L5sN2f3nTb 0Lx7B5chpAgeb16br7RUMyMT1VkPW5+uNJXv07rQ9DrEr+0e4gVntjZ+7K7G61I2jcBWXLRYbDR w2/0XojrqyL9t5o5MWttC6NbtBzR+Tgony6C/SaR3nU3De1RoA4444PMJbaLDb/biOdk8nHJwgB BR0PTHNmFkK8iEZSYBK/jSyIEkW9kR X-Google-Smtp-Source: AGHT+IF7QgKeDTmtbweC8O75d3jf2oErQKa2BZ42N85Bzgsk9GFBi54QbRbc4L6KqI2F4q+/nYahLA== X-Received: by 2002:aa7:9906:0:b0:7ff:da9b:bd82 with SMTP id d2e1a72fcca58-7ffda9bbf79mr28733868b3a.40.1767505308352; Sat, 03 Jan 2026 21:41:48 -0800 (PST) Received: from localhost.localdomain ([121.232.80.251]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7b31c479sm44378305b3a.24.2026.01.03.21.41.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jan 2026 21:41:48 -0800 (PST) From: Vernon Yang X-Google-Original-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, richard.weiyang@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vernon Yang Subject: [PATCH v3 2/6] mm: khugepaged: refine scan progress number Date: Sun, 4 Jan 2026 13:41:08 +0800 Message-ID: <20260104054112.4541-3-yanglincheng@kylinos.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260104054112.4541-1-yanglincheng@kylinos.cn> References: <20260104054112.4541-1-yanglincheng@kylinos.cn> 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" Currently, each PMD scan always increases `progress` by HPAGE_PMD_NR, even if only scanning a single page. By counting the actual number of pages scanned, the `progress` is tracked accurately. Signed-off-by: Vernon Yang --- mm/khugepaged.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 9f99f61689f8..4b124e854e2e 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1247,7 +1247,7 @@ static int collapse_huge_page(struct mm_struct *mm, u= nsigned long address, static int hpage_collapse_scan_pmd(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long start_addr, bool *mmap_locked, - struct collapse_control *cc) + int *progress, struct collapse_control *cc) { pmd_t *pmd; pte_t *pte, *_pte; @@ -1258,23 +1258,28 @@ static int hpage_collapse_scan_pmd(struct mm_struct= *mm, unsigned long addr; spinlock_t *ptl; int node =3D NUMA_NO_NODE, unmapped =3D 0; + int _progress =3D 0; =20 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) { + _progress =3D HPAGE_PMD_NR; 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) { + _progress =3D HPAGE_PMD_NR; 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) { + _progress++; pte_t pteval =3D ptep_get(_pte); if (pte_none_or_zero(pteval)) { ++none_or_zero; @@ -1410,6 +1415,9 @@ static int hpage_collapse_scan_pmd(struct mm_struct *= mm, *mmap_locked =3D false; } out: + if (progress) + *progress +=3D _progress; + trace_mm_khugepaged_scan_pmd(mm, folio, referenced, none_or_zero, result, unmapped); return result; @@ -2287,7 +2295,7 @@ static int collapse_file(struct mm_struct *mm, unsign= ed long addr, =20 static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long ad= dr, struct file *file, pgoff_t start, - struct collapse_control *cc) + int *progress, struct collapse_control *cc) { struct folio *folio =3D NULL; struct address_space *mapping =3D file->f_mapping; @@ -2295,6 +2303,7 @@ static int hpage_collapse_scan_file(struct mm_struct = *mm, unsigned long addr, int present, swap; int node =3D NUMA_NO_NODE; int result =3D SCAN_SUCCEED; + int _progress =3D 0; =20 present =3D 0; swap =3D 0; @@ -2327,6 +2336,8 @@ static int hpage_collapse_scan_file(struct mm_struct = *mm, unsigned long addr, continue; } =20 + _progress +=3D folio_nr_pages(folio); + if (folio_order(folio) =3D=3D HPAGE_PMD_ORDER && folio->index =3D=3D start) { /* Maybe PMD-mapped */ @@ -2388,6 +2399,9 @@ static int hpage_collapse_scan_file(struct mm_struct = *mm, unsigned long addr, } } =20 + if (progress) + *progress +=3D _progress; + trace_mm_khugepaged_scan_file(mm, folio, file, present, swap, result); return result; } @@ -2470,7 +2484,8 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, int *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, + &progress, cc); fput(file); if (*result =3D=3D SCAN_PTE_MAPPED_HUGEPAGE) { mmap_read_lock(mm); @@ -2484,7 +2499,8 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, int *result, } } else { *result =3D hpage_collapse_scan_pmd(mm, vma, - khugepaged_scan.address, &mmap_locked, cc); + khugepaged_scan.address, &mmap_locked, + &progress, cc); } =20 if (*result =3D=3D SCAN_SUCCEED) @@ -2492,7 +2508,6 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, int *result, =20 /* move to next address */ khugepaged_scan.address +=3D HPAGE_PMD_SIZE; - progress +=3D HPAGE_PMD_NR; if (!mmap_locked) /* * We released mmap_lock so break loop. Note @@ -2810,11 +2825,11 @@ int madvise_collapse(struct vm_area_struct *vma, un= signed long start, mmap_read_unlock(mm); mmap_locked =3D false; result =3D hpage_collapse_scan_file(mm, addr, file, pgoff, - cc); + NULL, cc); 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