From patchwork Mon Apr 14 22:05:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14051078 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 C8E97C369B5 for ; Mon, 14 Apr 2025 22:06:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58876280096; Mon, 14 Apr 2025 18:06:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 51211280080; Mon, 14 Apr 2025 18:06:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B466280096; Mon, 14 Apr 2025 18:06:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 19A89280080 for ; Mon, 14 Apr 2025 18:06:54 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 852E959DBA for ; Mon, 14 Apr 2025 22:06:54 +0000 (UTC) X-FDA: 83334035148.21.E5EAEFD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 9D05B1C000D for ; Mon, 14 Apr 2025 22:06:52 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RmbvotYD; spf=pass (imf20.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=1744668412; 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=9MTkX1RX/ny0MCuDb2FWl5HwPLjUZ89TaZAF8jSCc7I=; b=KFDKyLHnv/p2Bvrgm2JheicDCuS/MeMERTYJim++3QNnunt/8TFO04+fwSBSDTADshm9xE tcwD2QaZHyE7ECx/blGXwt4kkWxmfSAX9z2IqjbNf9xxsjl3CB34LuevQZo/1eK+hOPKcu hvslsC8bLWVg/LyT1d51X753vr07uJA= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RmbvotYD; spf=pass (imf20.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=1744668412; a=rsa-sha256; cv=none; b=AY4MpvUMIYlkyx4o1iDcP8QacEYCpRBXNW9Um/wlE7Qmplk0N8Qsip3kLpRMwh5R7iBZgQ 6Exvxj2aRIymqKxGaUBTzdmqhMxEBKdPDvgcWA3CS4cCCl+JExLcISCFe1kULWLIayrAbn m55+CpaKh+uG5MbxbhyvPn4GUMhxSSQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744668412; 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=9MTkX1RX/ny0MCuDb2FWl5HwPLjUZ89TaZAF8jSCc7I=; b=RmbvotYD9Ha/auw21/jwmFECEFyh0xMF2mAwa7tsv+cJ8jr8aQBpIVT9UhfCl9j+nMfQVo tR2Y27LZlK5SjHWcRqxNhqWkVMTBkMQdJn2wp/HynVpTaeSJvDJZeVIDXrnNMcmGZlLCyt ZqqVyFJbPF/wK+IILcWplfIdlMA9mW4= Received: from mx-prod-mc-08.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-76-_vzZmv-ZOWO2_nutODPE1Q-1; Mon, 14 Apr 2025 18:06:47 -0400 X-MC-Unique: _vzZmv-ZOWO2_nutODPE1Q-1 X-Mimecast-MFC-AGG-ID: _vzZmv-ZOWO2_nutODPE1Q_1744668403 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 097AB1800EC5; Mon, 14 Apr 2025 22:06:42 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B62EB1955BC1; Mon, 14 Apr 2025 22:06:32 +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: akpm@linux-foundation.org, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ziy@nvidia.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, dev.jain@arm.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 Subject: [PATCH v3 01/12] introduce khugepaged_collapse_single_pmd to unify khugepaged and madvise_collapse Date: Mon, 14 Apr 2025 16:05:46 -0600 Message-ID: <20250414220557.35388-2-npache@redhat.com> In-Reply-To: <20250414220557.35388-1-npache@redhat.com> References: <20250414220557.35388-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9D05B1C000D X-Stat-Signature: djbpwk95gr531ddmji4oh61a3cpok7ax X-HE-Tag: 1744668412-460357 X-HE-Meta: U2FsdGVkX180tKAcHZomog+WuX8zKXejCtXVabARrNt+ehYppLRwTYiEkCmHjUWFIkyqPCS5hehGKAlhWpL4PkOPv1UgbPeUvWPWcsdfi9mkSD65My1M9jhEdkBAX3Kpc4PWo3jULqXySiAFNRPvN07ti84IF4Xlz6kdl1npgmWiHf5NDrGcVBcehkB3idEwVSeFNM/YZVixnOW5Xmo+wGFm+mGcN7YACrA6px+k1ozk6yi1PIVgKPrsk6DZkdFdIAhwZmJFzLVUAS+FB2GeuWsOeC01EaN2uJrZk1t0ttz9VHDyOhJhkPHylTnTxqMGfe5e5E9y5EOweh5cUVXzpMfG88vtDyedbRTqJDsx9uIXWezldrkFRVZiXlEPsyJZF4yxmWx8DnnsYx71tEqAUAxPyN2RbHa40kVd3sopKJ0KlVnKhGmTQTlWYeSOTXXjK5CD78yjTvoR6Jug9kyYM5MYExWr/lPvzKNThT6QkkE3Y02bkSN2jiAoLEbXUCxDv3tqb6HPGhLhKsn7P2nuETQcVhSfFmW3KzRPHlYU2k0hez8iA8G7kEsG1zxIBNghj1qJgSZEOpk8bHumUv56E7rEggleJqo67X5PWZljsnSLoIee3MTOQf9aV2UW9BTEfQCUUkj4moOOlG5YKtPOUNXIMoq1grEDw8ARWq6Agialfch89p7Q1HxsY57wQRTDAWMlI+q9lLZqHo/V+DksHZ9XIpGm8ifWIT7Jb+zfw7u5M67R6rlYf1ofFLwIdP61axFgEcMLjfKcm67n99pzI0HBEO6z6p7x+yrB5iGsOuCfNDqJBg40qen5sGxU60LWjMdkqwWOFQXDXvD1SPsKxKscXCw19hNd4MapP1a09cko2ILbaJmXatt7kNiGnMvIweHdgxI1g/7cL8bPq8Lvdh2k23pggBus+8zG5oKgs2z5KFeiTLToBFBTfoobWxMstX86OzdN+bBTkLn3gZg RoBEDf06 a17yJN091ArR800QhoF41eDh5KLg9Zgim00SCYRYaJc3foR7gnA2MSE/RDdxtAoyJr32Q5Y7kawr0o1WocY2GrQS5zog+ruHVbts++xakZbKoRU84JhAQiped6MS87nZuXKByeqBDLOKyPwO65flV/2feU+Hg/O72MfIUr9LQVuAes+cYdV4En/2vVnq/ef+/pPaZD+skUh0T85vFpct8E5Y1A7WcYbvuyhDH9X2l2OXfjfWG41j0WZ2QtMHKLkzYRxtT5UH000yclAgAPltjueAyR5uomeSGFWCK1//ton/M82olhjW5LFacPNMz47xinCfcrlOrhdO13OA5zVU2hp5SKdZBRjPF4o7MtECEH+M33Y9wpSjwbT+gfuaYngn8VBpYtBIf7Sd5WBi0VnMBCv3Een+3cP7dcYreaebfOzxVHkYz+D1q8I5ENCLVUAHA9TSM9p2YiWYVrL4= 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. Signed-off-by: Nico Pache --- mm/khugepaged.c | 92 ++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index cc945c6ab3bd..c23d80ed9c9c 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2363,6 +2363,48 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, } #endif +/* + * 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; + unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; + + if (thp_vma_allowable_order(vma, vma->vm_flags, + tva_flags, PMD_ORDER)) { + 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 = hpage_collapse_scan_file(mm, addr, file, pgoff, + cc); + fput(file); + if (result == SCAN_PTE_MAPPED_HUGEPAGE) { + mmap_read_lock(mm); + if (hpage_collapse_test_exit_or_disable(mm)) + goto end; + result = collapse_pte_mapped_thp(mm, addr, + !cc->is_khugepaged); + mmap_read_unlock(mm); + } + } else { + result = hpage_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 khugepaged_scan_mm_slot(unsigned int pages, int *result, struct collapse_control *cc) __releases(&khugepaged_mm_lock) @@ -2437,33 +2479,9 @@ 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 (IS_ENABLED(CONFIG_SHMEM) && !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); /* move to next address */ khugepaged_scan.address += HPAGE_PMD_SIZE; @@ -2783,36 +2801,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 (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 = 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: