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 51595C3ABDA for ; Thu, 15 May 2025 03:04:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 54B7C6B00C3; Wed, 14 May 2025 23:04:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F9926B00DC; Wed, 14 May 2025 23:04:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34C666B00FF; Wed, 14 May 2025 23:04:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 126F06B00C3 for ; Wed, 14 May 2025 23:04:19 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 097CA5F726 for ; Thu, 15 May 2025 03:04:19 +0000 (UTC) X-FDA: 83443648638.15.5153D10 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 78C1080005 for ; Thu, 15 May 2025 03:04:17 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bsXktIlO; spf=pass (imf30.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747278257; 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=syVueP3EsNMt8QnyrnfxvyQxJqj9XQQFWMPiuMj2fdA=; b=wB5jHDP7o3K769H3JLabS1o/BGU7VbkgF3Px0etsytDgCkfjh0hrLnq+XFHsQERFF8fz7j eWR4ZdRSEnGGEvuHdtOIgaf8hsTxe7deSfJNSn9VoGDsZHiJyAMp7Yb+dCXHtHrLg2kYqE RwtckcLhwSo/yJzKCzvXMfkxDOzQMqs= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bsXktIlO; spf=pass (imf30.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747278257; a=rsa-sha256; cv=none; b=aDJQ1nhGOjKwg7pQrg1aXIV7rvrcyzRvEavb94tBHZ/4eReCVkSn8VrT45NiMkFDZjHah/ MLasqZglIWyRty93j/P5UST08NEPSZkWu1QVLjwJLRqIyyPI6DxP+eXAbwhMvmwRzdl7Jf xdsPRLYIhvuEDWD9MAqg6PHdg/v/c0E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747278256; 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=syVueP3EsNMt8QnyrnfxvyQxJqj9XQQFWMPiuMj2fdA=; b=bsXktIlOyc5dPxaT2Yl+tvr4vH1jCbMx+GscyPo6qmT2xkU3rtgdj+kP36I0ykj/3xoSn9 8sjuuwBKlXMtqw/6uy9xrrc0iTAZCTWcAZUMNb8f8JaMYy+m8miF6YRNv5UCaIexwEN+N+ C1cSuEIUCsnRcGgRwRB1i1KYQIa/tm0= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-156-t30ZdOrGMEipARm_TpzeRQ-1; Wed, 14 May 2025 23:04:12 -0400 X-MC-Unique: t30ZdOrGMEipARm_TpzeRQ-1 X-Mimecast-MFC-AGG-ID: t30ZdOrGMEipARm_TpzeRQ_1747278248 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3F5EB1956096; Thu, 15 May 2025 03:04:07 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 576D51800DB9; Thu, 15 May 2025 03:03:50 +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 Subject: [PATCH v6 02/12] introduce khugepaged_collapse_single_pmd to unify khugepaged and madvise_collapse Date: Wed, 14 May 2025 21:03:02 -0600 Message-ID: <20250515030312.125567-3-npache@redhat.com> In-Reply-To: <20250515030312.125567-2-npache@redhat.com> References: <20250515030312.125567-1-npache@redhat.com> <20250515030312.125567-2-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspamd-Server: rspam10 X-Stat-Signature: uecbpbinr8x8gknbuqf71izs9yzssswu X-Rspamd-Queue-Id: 78C1080005 X-Rspam-User: X-HE-Tag: 1747278257-917814 X-HE-Meta: U2FsdGVkX1+meyk0I4LnD1sD+9IB6GUtiEjPJDw2S6eU55SOnferhdAOkFUcdzvq2h/QJhkgqWnWR3iX9pOGA9/y2rAUgNPysdX/oyUBnRthnAXw0hkFmbNPgHkgCv4oUDTyi0R7pGVRya9+iL4R9KBoatVfcxWCXhb5Nc1amWAFMVFn6pVRv1PzD9IiPc7HcpxA94uWd8kzcar3unoUxodb1gVPZovGTDbugJtEIv1GwwxtotucRfS7gyZ+IzFiIEtKSM0QCFiV02KaH9LEPT9IWWygeUUcKCPwzONrqTRZooRUqIrSq9rRLlBITMRSrJ+CAwS47rtBV8NqUVdn4iyvUPu8NR2nuSoL4BQFI6y7XSQ+N+hBjFbEE6GtPttKu0hNQ34WDf4Dt4jH5oAH03bKcG+a96zr6BIG//FTlMNdT6aObNTV1ZzWEU3XZR1YJz2pn3RUH2IGKlX1dqKlLAbxtj7mQCQaaTqntgeQbPindkh9m+gfVbupTdWKPuDJaZV2Y8JOLofI/MjxeJcZu4+aRPEvkRNzD2ZkhzftUuTo0E0ye0pmN2E+MQx/Mz98Dxdob5gzeV8zsvFoxOH7cfmwvYdfVw1NABxGLnylwZereCllzG5COVJfMJ3Zuw+xN3fZ7C7Of5bZCvIS5Bz1aCojFPoCoF6qURPZR45A6HFbSJ568S29fS+EAu9pmcjDE7vr0mtWNCIMun/+XpY3O5sIILsp4XOWmqT43U0MjZlJ4IPmLToNXEVfrWr+BiJwGbE81zqDspTIvJJkrZOgfUuRuJPxv4zJ97nqK3E4pK71ZRiAe8XI76JUWsUCkydMUCJRBf4jHJm6lhnye4+LZo2ZkV09kpbrRzFbIExKsjPwTwpM4zVydus3C6Pq1RhngaTPXrQD9/B2ReAezBlqDdBICn+V2sM4M0pH0iQqvd5hLo/+Zil/pa+fqndHnnTDArppvajANjFqar6k/hI FJF/U+1O ZBASEFmU6PBmQdB3Sw/XigBJ4qSobVMOEw9sJPvYCTdfu8its33m0L7Qhi99wbDoq/uR62yp5ucG0Ce/Hsu0BKvkgfxrZaiVfcg9e/u5RIuWQIKg3j0biHqVQXhG/F6Ysuy/U9xSU6YOQg9MRDe8OHWfuuQ1CXCuFPEfWGP7aabjUKWAYpQuVmdkxcQ== 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 khugepaged_collapse_single_pmd to increase code reuse and create an entry point for future khugepaged changes. Refactor madvise_collapse and khugepaged_scan_mm_slot to use the new khugepaged_collapse_single_pmd function. Reviewed-by: Baolin Wang Signed-off-by: Nico Pache --- mm/khugepaged.c | 96 +++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 806bcd8c5185..5457571d505a 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2353,6 +2353,48 @@ static int khugepaged_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 khugepaged_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 (IS_ENABLED(CONFIG_SHMEM) && !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 = khugepaged_scan_file(mm, addr, file, pgoff, cc); + fput(file); + if (result == SCAN_PTE_MAPPED_HUGEPAGE) { + mmap_read_lock(mm); + *mmap_locked = true; + if (khugepaged_test_exit_or_disable(mm)) { + 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 = khugepaged_scan_pmd(mm, vma, addr, mmap_locked, cc); + } + if (cc->is_khugepaged && result == SCAN_SUCCEED) + ++khugepaged_pages_collapsed; +end: + return result; +} + static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, struct collapse_control *cc) __releases(&khugepaged_mm_lock) @@ -2427,34 +2469,12 @@ static unsigned int khugepaged_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 = khugepaged_collapse_single_pmd(khugepaged_scan.address, + vma, &mmap_locked, cc); + /* If we return SCAN_ANY_PROCESS we are holding the mmap_lock */ + if (*result == SCAN_ANY_PROCESS) + goto breakouterloop; /* move to next address */ khugepaged_scan.address += HPAGE_PMD_SIZE; progress += HPAGE_PMD_NR; @@ -2773,36 +2793,18 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, 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 = khugepaged_collapse_single_pmd(addr, vma, &mmap_locked, cc); + if (!mmap_locked) *prev = NULL; /* Tell caller we dropped mmap_lock */ -handle_result: switch (result) { case SCAN_SUCCEED: case SCAN_PMD_MAPPED: ++thps; break; case SCAN_PTE_MAPPED_HUGEPAGE: - BUG_ON(mmap_locked); - BUG_ON(*prev); - 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_PMD_NULL: case SCAN_PTE_NON_PRESENT: case SCAN_PTE_UFFD_WP: -- 2.49.0