From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3B194BFE9E for ; Wed, 16 Sep 2026 22:48:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789598936; cv=none; b=HFfo5kxsfK62x6u3iCbYD22EhdonCnLN8415KMupe4gAbeT+ah3byaaxDoGihyh3Qt0REEZUt5UEnf9oxnPKb3bZYhuyavGIQ7YLLLtIcLWFx+6Luuu+qxwBDXJuC8iie74YZzonggCvjEGnR+0tYMV4PMG1oIDbP5PInWl5ckA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789598936; c=relaxed/simple; bh=xJHJ8AdX9FcsSgOuAJd9cl8YNMeCagelNxjymIUrr14=; h=Date:To:From:Subject:Message-Id; b=tNlmr+Mum1XvdzYcpg5ySQ2M4Otnj5E5Jq5qlPVzzGpFeVLunzgmx4nPprnMfJB5g4HGXIjWdJENsSk4ezVnbpMiILK6zADeIOwDAWrptozHBrySxuSm+1yxMWpRFMtalqFZqGnpLxyJ9LHrcYZKCTOdy0w1GT+FzEbnZKNqqmQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=cXPtwn2a; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="cXPtwn2a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC2E11F00893; Wed, 16 Sep 2026 22:48:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1789598926; bh=qB6lamprfvMm05K0AtWYPTwwRMfxNoSpvTOeFHcjnmI=; h=Date:To:From:Subject; b=cXPtwn2aBPPg3Lks1QW7FuwKQYkMXFiIg8xUEKzq+xK4n0Lr1l6wINGPI5jypFMKF r/FcC+WIAhZgk54F8B27wDQil3yDMfVmc7oEat92qrCUKZaWuU+aefTNqLMwEDClfg cqmqyOUNwZ4q+VpOMFCpVtGIb0ZDtL4b1Vq0MJZg= Date: Wed, 16 Sep 2026 15:48:46 -0700 To: mm-commits@vger.kernel.org,kas@kernel.org,akpm@linux-foundation.org From: Andrew Morton Subject: + mm-khugepaged-count-collapses-where-khugepaged-makes-them.patch added to mm-unstable branch Message-Id: <20260916224846.CC2E11F00893@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: mm/khugepaged: count collapses where khugepaged makes them has been added to the -mm mm-unstable branch. Its filename is mm-khugepaged-count-collapses-where-khugepaged-makes-them.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-khugepaged-count-collapses-where-khugepaged-makes-them.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via various branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there most days ------------------------------------------------------ From: "Kiryl Shutsemau (Meta)" Subject: mm/khugepaged: count collapses where khugepaged makes them Date: Wed, 16 Sep 2026 10:31:29 +0100 collapse_single_pmd() bumps khugepaged_pages_collapsed for its caller, and tests cc->is_khugepaged to know whether it should: the counter belongs to the daemon, and MADV_COLLAPSE must not touch it. The daemon sees every result of every collapse it asks for, so it can keep its own counter without the shared path testing who called. Assisted-by: LLM Link: https://lore.kernel.org/20260916093145.4022188-3-kirill@shutemov.name Signed-off-by: Kiryl Shutsemau (Meta) Signed-off-by: Andrew Morton Reviewed-by: Zi Yan Reviewed-by: Baolin Wang Cc: Barry Song Cc: David Hildenbrand Cc: Dev Jain Cc: Jann Horn Cc: Lance Yang Cc: Liam R. Howlett Cc: Lorenzo Stoakes Cc: Ryan Roberts Cc: Vlastimil Babka --- mm/khugepaged.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) --- a/mm/khugepaged.c~mm-khugepaged-count-collapses-where-khugepaged-makes-them +++ a/mm/khugepaged.c @@ -2808,10 +2808,8 @@ static enum scan_result collapse_single_ mmap_assert_locked(mm); - if (vma_is_anonymous(vma)) { - result = collapse_scan_pmd(mm, vma, addr, lock_dropped, cc); - goto end; - } + if (vma_is_anonymous(vma)) + return collapse_scan_pmd(mm, vma, addr, lock_dropped, cc); file = get_file(vma->vm_file); pgoff = linear_page_index(vma, addr); @@ -2847,9 +2845,6 @@ retry: result = SCAN_SUCCEED; mmap_read_unlock(mm); } -end: - if (cc->is_khugepaged && result == SCAN_SUCCEED) - ++khugepaged_pages_collapsed; return result; } @@ -2926,6 +2921,8 @@ static void collapse_scan_mm_slot(unsign *result = collapse_single_pmd(khugepaged_scan.address, vma, &lock_dropped, cc); + if (*result == SCAN_SUCCEED) + khugepaged_pages_collapsed++; /* move to next address */ khugepaged_scan.address += HPAGE_PMD_SIZE; if (lock_dropped) _ Patches currently in -mm which might be from kas@kernel.org are mm-huge_memory-do-not-touch-frozen-folios-in-deferred_split_isolate.patch mm-huge_memory-dequeue-the-deferred-split-after-the-split-freeze.patch mm-huge_memory-add-folio_reset_partially_mapped.patch mm-khugepaged-drop-redundant-mm_struct-pin-in-madvise_collapse.patch mm-khugepaged-count-collapses-where-khugepaged-makes-them.patch mm-khugepaged-rename-mthp_present_ptes-bitmap-to-eligible_ptes.patch mm-collapse-add-collapseh-for-the-collapse-interface.patch mm-collapse-state-what-a-collapse-may-do-in-the-policy.patch mm-collapse-drop-the-collapse_possible-wrapper.patch mm-collapse-name-the-per-table-scan-reset-for-what-it-resets.patch mm-collapse-separate-scanning-a-pte-table-from-collapsing-it.patch mm-collapse-open-code-collapse_single_pmd-in-its-two-callers.patch mm-collapse-work-out-the-orders-a-vma-allows-once-per-vma.patch mm-collapse-declare-the-collapse-interface-in-collapseh.patch mm-collapse-implement-madv_collapse-in-madvisec.patch