From mboxrd@z Thu Jan 1 00:00:00 1970 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 DDD3BC83F17 for ; Mon, 14 Jul 2025 00:33:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 69DC86B009B; Sun, 13 Jul 2025 20:33:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6760C6B009D; Sun, 13 Jul 2025 20:33:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 516926B009C; Sun, 13 Jul 2025 20:33:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 45B086B0095 for ; Sun, 13 Jul 2025 20:33:19 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0BE111603F4 for ; Mon, 14 Jul 2025 00:33:19 +0000 (UTC) X-FDA: 83660996118.13.0402851 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 548E580005 for ; Mon, 14 Jul 2025 00:33:17 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DeBa6xmA; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752453197; 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=8XYjQgrSq6pcFRDifP+lw5lo9L5pdXPfNpmr8WR3ZHA=; b=ZaERsRHZ1nDkSPVcy3RdRMjSLCTR/M2pPQ8H2W8bK269svZv3JAIH7s+uLW/vFDLKM5wPD s7pR3i1LiYb6mkN9DSHdYvVifkUU3QlQVlXRz6tBdvf83g2HPX73RVSIR/qHXEwpiUJrir og11pWH3jnYpw5rw6YQ4lf7SxfkjnPw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752453197; a=rsa-sha256; cv=none; b=TIxf5MMjAyIzzTUoqsVr9eJlAGnpLxiRlVYeh+HoYDVm5hsAxSziLpRjRQP9oCu369U5EM 6cvXsvxCrAewVWQS6bkSzD0TFL0+koCeFrW693M/xatlqScpQ0T3Ql0fkm+0TUmcJ4/964 L6JOjuj8v1DpiKX25wxlo7/M7bwKiEQ= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DeBa6xmA; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752453196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8XYjQgrSq6pcFRDifP+lw5lo9L5pdXPfNpmr8WR3ZHA=; b=DeBa6xmAgLtuXQkQcz4WESjMOlWgRfVcvGnjypoC49UdCxb8ebnHFZfFV2wqTgi5+SlQbG WqQ9U3PjzQuBPZg7tKn/usn4fbT30AWtM+rtXav06EIbsPJBH6gqDM1rRHMv22NxdjVq0F r6Sy+kxaVFwD27rQBRXohDvDGiOvf04= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-380-A-aSyBGYPCa4VksPuDZ-Vg-1; Sun, 13 Jul 2025 20:33:14 -0400 X-MC-Unique: A-aSyBGYPCa4VksPuDZ-Vg-1 X-Mimecast-MFC-AGG-ID: A-aSyBGYPCa4VksPuDZ-Vg_1752453190 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 506131800290; Mon, 14 Jul 2025 00:33:09 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.9]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D088F30001A1; Mon, 14 Jul 2025 00:32:55 +0000 (UTC) From: Nico Pache To: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: david@redhat.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, ryan.roberts@arm.com, dev.jain@arm.com, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, akpm@linux-foundation.org, baohua@kernel.org, willy@infradead.org, peterx@redhat.com, wangkefeng.wang@huawei.com, usamaarif642@gmail.com, sunnanyong@huawei.com, vishal.moola@gmail.com, thomas.hellstrom@linux.intel.com, yang@os.amperecomputing.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, raquini@redhat.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, tiwai@suse.de, will@kernel.org, dave.hansen@linux.intel.com, jack@suse.cz, cl@gentwo.org, jglisse@google.com, surenb@google.com, zokeefe@google.com, hannes@cmpxchg.org, rientjes@google.com, mhocko@suse.com, rdunlap@infradead.org, hughd@google.com Subject: [PATCH v9 02/14] introduce collapse_single_pmd to unify khugepaged and madvise_collapse Date: Sun, 13 Jul 2025 18:31:55 -0600 Message-ID: <20250714003207.113275-3-npache@redhat.com> In-Reply-To: <20250714003207.113275-1-npache@redhat.com> References: <20250714003207.113275-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Stat-Signature: 3zj6asyrib5zazthua8prbi9ujw7xcfw X-Rspamd-Queue-Id: 548E580005 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1752453197-121294 X-HE-Meta: U2FsdGVkX19KgS0rt5cK5VMQhbN3gPdt0ec7r/3uz5dvRaMvXnxC+B5cPU4qJkbFJEd6VVvRf8LWMB3q8bGg2Utm1JG0dRKb206Gceie6St/HGfsSvgsNX1v/NLiXkKWjR/PgkIe1Aun/7qQtJ5dI2MdrdsSM0pxZI+pqCfxovgOc57rh0wxfx/SX6ZJYKGPqV/GxnS2+pSio1y+MSyCN4X/W9OVEPMnYSQKesUw0JicYb9kvVrYyWUrRY75utPf10Im2vw99ctlUEQ03QD8vl3sa0vUyuPDssRK/LyhSxtlAoQk5SA1Wg9RKzQgjyC1r5kQhAn6cTJ8KyvGLdXmais4qjLI2DvtTB8tklhWG0BqiI/zl+Gx3V5udPcAv0XQnm+mZWtvI4uXUhFF4xZMckTFGuDWiQDxLWkx4lOSYFx2QWta9GieeuhpHnUvaBL+5cf0ODoGC909CjudC4hCKBM8WLjxrTs0rVNrdta6Qty+4NDypDjw/a9tN7v58pBdveklNo1xfFZuJ7TTcaUGH1bSrBnmYDFGvcqaNmzH2DiXru9uoYtyJQVVLLn1z+/iMPXutigFZqaBQGXcLbKFQJ5CHQpJ8yeOv9VDoeU8kbHxT/HsHEc/DXxfaxV9s2DvsWx7n5tPCTtYVOL5/MefGh0EP11yViNjY/hxT9PJ/0NnJT6BjRruMByFoh+MXl03ubqNyuLzJuXX1QPfzsJBcPXZv/qJuODtWuRm40AmdkcTvarQJM9/oVKN54E4tEaRH1l8smD67pG0+DV6eU/LxdY5tHzUw5jQ78aOqUfqGYjlRdDOLgJxDyKO64QuxlD5BxaWLXGmZvEbFwUIZY10+P7o1qrw41YWPeBI0h9IqBNcWqNG1iUZVRQaSWApXDGK1ivgAvtNigpF0dxt10SehXVSE1VBuaa8YDxBdzzrsFdp1DIcY0ioP071XlUKgGSTFfj7inmyAeT3fqG9mBd azBaa0w3 PuDQazFsoLnAtdfN5k83R74/r+ogEfm8Vdn6mAtKtbM+E2urJTiBwb5qAkLnGzp9mRRYDGs/l2UXVqt/q31FdX0PrtuAA3Q5t/5ndMBBissZjRWSh28vpHZSn/hIfRs4FloIsroJ+0FvCaF36aLehONqordEuY1PMQGjLyxeY3Sd+RTAnbQeY2RyMHBZ0EuyrRBFHymukvIE/9GEr9LZXA0YEC157hWowFBuAZ9ScamE2LhlXfMfQu81/lph4uiP2Kd2o2DuYCONazQOZY2gfZxkGDdnyuepH+NzRk7le/COjZNUPvrw0uo5IMIcOFSF3IfytaVTCND/Fdi4CgtwgwtsIGr0HLyCq7FB41RsDosQBpAbUzJfQG9LRw17ySU4q+j+t/PqAR++oos2lrcmHxQ6rssuKXqGIL3bsW2+NPrrVYScnFmjMN+JlQgGB4VKK+odthCs1lwyFc3XjgBbhkfBCHMs2YI2dOiTu 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: The khugepaged daemon and madvise_collapse have two different implementations that do almost the same thing. Create collapse_single_pmd to increase code reuse and create an entry point to these two users. Refactor madvise_collapse and collapse_scan_mm_slot to use the new collapse_single_pmd function. This introduces a minor behavioral change that is most likely an undiscovered bug. The current implementation of khugepaged tests collapse_test_exit_or_disable before calling collapse_pte_mapped_thp, but we weren't doing it in the madvise_collapse case. By unifying these two callers madvise_collapse now also performs this check. Reviewed-by: Baolin Wang Signed-off-by: Nico Pache --- mm/khugepaged.c | 95 +++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index eb0babb51868..47a80638af97 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2362,6 +2362,50 @@ static int collapse_scan_file(struct mm_struct *mm, unsigned long addr, return result; } +/* + * Try to collapse a single PMD starting at a PMD aligned addr, and return + * the results. + */ +static int collapse_single_pmd(unsigned long addr, + struct vm_area_struct *vma, bool *mmap_locked, + struct collapse_control *cc) +{ + int result = SCAN_FAIL; + struct mm_struct *mm = vma->vm_mm; + + if (!vma_is_anonymous(vma)) { + struct file *file = get_file(vma->vm_file); + pgoff_t pgoff = linear_page_index(vma, addr); + + mmap_read_unlock(mm); + *mmap_locked = false; + result = collapse_scan_file(mm, addr, file, pgoff, cc); + fput(file); + if (result == SCAN_PTE_MAPPED_HUGEPAGE) { + mmap_read_lock(mm); + *mmap_locked = true; + if (collapse_test_exit_or_disable(mm)) { + mmap_read_unlock(mm); + *mmap_locked = false; + result = SCAN_ANY_PROCESS; + goto end; + } + result = collapse_pte_mapped_thp(mm, addr, + !cc->is_khugepaged); + if (result == SCAN_PMD_MAPPED) + result = SCAN_SUCCEED; + mmap_read_unlock(mm); + *mmap_locked = false; + } + } else { + result = collapse_scan_pmd(mm, vma, addr, mmap_locked, cc); + } + if (cc->is_khugepaged && result == SCAN_SUCCEED) + ++khugepaged_pages_collapsed; +end: + return result; +} + static unsigned int collapse_scan_mm_slot(unsigned int pages, int *result, struct collapse_control *cc) __releases(&khugepaged_mm_lock) @@ -2436,34 +2480,9 @@ static unsigned int collapse_scan_mm_slot(unsigned int pages, int *result, VM_BUG_ON(khugepaged_scan.address < hstart || khugepaged_scan.address + HPAGE_PMD_SIZE > hend); - if (!vma_is_anonymous(vma)) { - struct file *file = get_file(vma->vm_file); - pgoff_t pgoff = linear_page_index(vma, - khugepaged_scan.address); - - mmap_read_unlock(mm); - mmap_locked = false; - *result = hpage_collapse_scan_file(mm, - khugepaged_scan.address, file, pgoff, cc); - fput(file); - if (*result == SCAN_PTE_MAPPED_HUGEPAGE) { - mmap_read_lock(mm); - if (hpage_collapse_test_exit_or_disable(mm)) - goto breakouterloop; - *result = collapse_pte_mapped_thp(mm, - khugepaged_scan.address, false); - if (*result == SCAN_PMD_MAPPED) - *result = SCAN_SUCCEED; - mmap_read_unlock(mm); - } - } else { - *result = hpage_collapse_scan_pmd(mm, vma, - khugepaged_scan.address, &mmap_locked, cc); - } - - if (*result == SCAN_SUCCEED) - ++khugepaged_pages_collapsed; + *result = collapse_single_pmd(khugepaged_scan.address, + vma, &mmap_locked, cc); /* move to next address */ khugepaged_scan.address += HPAGE_PMD_SIZE; progress += HPAGE_PMD_NR; @@ -2780,35 +2799,19 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start, mmap_assert_locked(mm); memset(cc->node_load, 0, sizeof(cc->node_load)); nodes_clear(cc->alloc_nmask); - if (!vma_is_anonymous(vma)) { - struct file *file = get_file(vma->vm_file); - pgoff_t pgoff = linear_page_index(vma, addr); - mmap_read_unlock(mm); - mmap_locked = false; - result = hpage_collapse_scan_file(mm, addr, file, pgoff, - cc); - fput(file); - } else { - result = hpage_collapse_scan_pmd(mm, vma, addr, - &mmap_locked, cc); - } + result = collapse_single_pmd(addr, vma, &mmap_locked, cc); + if (!mmap_locked) *lock_dropped = true; -handle_result: switch (result) { case SCAN_SUCCEED: case SCAN_PMD_MAPPED: ++thps; break; - case SCAN_PTE_MAPPED_HUGEPAGE: - BUG_ON(mmap_locked); - mmap_read_lock(mm); - result = collapse_pte_mapped_thp(mm, addr, true); - mmap_read_unlock(mm); - goto handle_result; /* Whitelisted set of results where continuing OK */ + case SCAN_PTE_MAPPED_HUGEPAGE: case SCAN_PMD_NULL: case SCAN_PTE_NON_PRESENT: case SCAN_PTE_UFFD_WP: -- 2.50.0