From patchwork Tue Feb 11 11:13:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13969525 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 DDC98C0219B for ; Tue, 11 Feb 2025 11:15:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 604FC6B0089; Tue, 11 Feb 2025 06:15:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 58E376B009A; Tue, 11 Feb 2025 06:15:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 407E76B009B; Tue, 11 Feb 2025 06:15:51 -0500 (EST) 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 2004A6B0089 for ; Tue, 11 Feb 2025 06:15:51 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 846664BCB3 for ; Tue, 11 Feb 2025 11:15:48 +0000 (UTC) X-FDA: 83107408776.22.F13C542 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id A90CB1A0002 for ; Tue, 11 Feb 2025 11:15:46 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739272546; a=rsa-sha256; cv=none; b=rIQSjGBzPDx8bC+spkx9pEvuadJQDZTKA/J088zOpV5iS9Lu/LvwiyvtU9im4MW2eqzRmM /yGdDdpPo1LIY3tLio8o9Uuaqrt5yEve80D9n5ZPkZEfk9G+qkorFb0BsoclCnPXzSJWJi DhBhQ7xvlheD/aP5prp2dQ0bRdUeAOk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739272546; 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; bh=HrjpiOlY2x1k+HdVgKeBXcgeGJ6kMifIq2ZuufMPTg8=; b=5t349GfPsJy1C6LiaGOAf12WRN04rV4JwONdDCXCjdvdPOJ3CjurmpavR3NHuEanM4skis E3uRX7f5kEdnxn4uvry3qn+Q/wvXBzSoS5Gqw9MqGRoZn1bnso9bFeD/ASTb/qCDbHJXNi Rsc/8eKWPoXEuzRKai4boyzTGBvrRHU= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 87B9413D5; Tue, 11 Feb 2025 03:16:07 -0800 (PST) Received: from K4MQJ0H1H2.emea.arm.com (K4MQJ0H1H2.blr.arm.com [10.162.40.80]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1289E3F5A1; Tue, 11 Feb 2025 03:15:36 -0800 (PST) From: Dev Jain To: akpm@linux-foundation.org, david@redhat.com, willy@infradead.org, kirill.shutemov@linux.intel.com Cc: npache@redhat.com, ryan.roberts@arm.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, jack@suse.cz, srivatsa@csail.mit.edu, haowenchao22@gmail.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ziy@nvidia.com, jglisse@google.com, surenb@google.com, vishal.moola@gmail.com, zokeefe@google.com, zhengqi.arch@bytedance.com, jhubbard@nvidia.com, 21cnbao@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dev Jain Subject: [PATCH v2 12/17] khugepaged: Enable variable-sized VMA collapse Date: Tue, 11 Feb 2025 16:43:21 +0530 Message-Id: <20250211111326.14295-13-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250211111326.14295-1-dev.jain@arm.com> References: <20250211111326.14295-1-dev.jain@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: A90CB1A0002 X-Rspamd-Server: rspam12 X-Stat-Signature: wea1iqpziru91eoqfuikeixs6ca6hjrh X-HE-Tag: 1739272546-85875 X-HE-Meta: U2FsdGVkX18hU8XQWKH/IFfaWABht75/6DryisM5keBsWJiOrg+ProT7EJuBpUtgF11/OyzJtqL2UxHxeKUm6t6dlmN6eAQ8PvDaIZKGrdTnahFZQ/0VTZd/oonBsmNWn3TXf35cpVFZf0pPmU94Cq2jk8RUeE/hN3vUkQjD+CxX1GzuG+KSUVer6T0n6DV1TBSQqCgAjD6HgKpzOrn7G7sSaXpEH3EXvNKs5jjJXAuH9WR0xrGlrGjjg1zQ6zQRjOlEpe5H8qRNPzLhmZCHMy+Q4CfXCkegiaNVVDts2uX2DAcIXy5Fm/5MGw4odl8LdAbwfPWRtyVaJo9KOTBQ3pPnXSZyGaugUXrLySfHu9GZWFEAJVUbcsWepxEMyOYz0Ay7ks76VkLuem3gk2K5N2nRMAQYRxuH3y3XGEXNddiwBd0nG8WYLCA3KRVQapg47igusQxUeVuh2WfvI4zGi/N7pKlYqP9K7Qwmq0W2KXeaXzlYxJcmn2aEblSLnWBvo2lU6ziu+wTR15iCHi/C3PojKuXlVMtd8xiD6uPlU745nZHbgqgwNtRlTo57hV5KUc7mJOJiKd/NN0brR6UCDII4BQNjwsV3yKbjiRWqkfDs8nmCsK39enluUQ9YEPYsnVXCaBBmd5Lj5hzQ88teEbedlnlNUVCV0bUQUKqbCCOJJnLW+roGSoAhfKIWpeg4y08kxvZwgVGTgVAk1xFrrLFwfbhiXmrYyEh6rBH4C2ebVEEXlX/0/3M4G9LWFRPozPExbhIC+oVsxQZBe1j8Ho3PDMt7edvZmrFtkHJRCmKdlY9at/JA50qqsG8Xou5inoatjA49EXJ8WHb6+qEAKXCd12tW+jBO8gMofUsJ5lK4qhhbH6urOnI6DvaI1Rw0cxSer+5avoTllq7GHmUlr+Ia6GcsL/JvLxmSC9VNFpqqDH1eyLq4TicTBN7dVzZDUYUyf0vy1Zz1tay7s4C +xjI0svD lgxTb38ESnUJ94bb6wkHNjPLrqW+TKLLJOSMn2kydooGF0T1nvP1jB7thkOFJ7fwGvgbtAmefR4Y5ARno1APLWFxF1qi9ztCHkrMpljyHqXTpGJCdqHUTPjUBWVydfNVfIoHYDk7QjMiU1xGvqoPRmf64a3OKJ/p4ZXQrBXRlGj1nqWIH/eGoUX0PH6AwSkW2CiiDDv1IAYP2tMpCLUYYg2aeS5XnsvaANoBx 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: Applications in general may have a lot of VMAs less than PMD-size. Therefore it is essential that khugepaged is able to collapse these VMAs. Signed-off-by: Dev Jain --- mm/khugepaged.c | 68 +++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 37cfa7beba3d..048f990d8507 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1413,7 +1413,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, static int hpage_collapse_scan_pmd(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, bool *mmap_locked, - struct collapse_control *cc) + unsigned long orders, struct collapse_control *cc) { pmd_t *pmd; pte_t *pte, *_pte; @@ -1425,22 +1425,14 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, unsigned long _address, orig_address = address; int node = NUMA_NO_NODE; bool writable = false; - unsigned long orders, orig_orders; + unsigned long orig_orders; int order, prev_order; bool all_pfns_present, all_pfns_contig, first_pfn_aligned; pte_t prev_pteval; - VM_BUG_ON(address & ~HPAGE_PMD_MASK); - - orders = thp_vma_allowable_orders(vma, vma->vm_flags, - TVA_IN_PF | TVA_ENFORCE_SYSFS, THP_ORDERS_ALL_ANON); - orders = thp_vma_suitable_orders(vma, address, orders); orig_orders = orders; order = highest_order(orders); - - /* MADV_COLLAPSE needs to work irrespective of sysfs setting */ - if (!cc->is_khugepaged) - order = HPAGE_PMD_ORDER; + VM_BUG_ON(address & ((PAGE_SIZE << order) - 1)); scan_pte_range: @@ -1667,7 +1659,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, decide_order: /* Immediately exit on exhaustion of range */ - if (_address == orig_address + (PAGE_SIZE << HPAGE_PMD_ORDER)) + if (_address == orig_address + (PAGE_SIZE << (highest_order(orig_orders)))) goto out; /* Get highest order possible starting from address */ @@ -2636,6 +2628,9 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, struct mm_struct *mm; struct vm_area_struct *vma; int progress = 0; + unsigned long orders; + int order; + bool is_file_vma; VM_BUG_ON(!pages); lockdep_assert_held(&khugepaged_mm_lock); @@ -2675,19 +2670,40 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, progress++; break; } - if (!thp_vma_allowable_orders(vma, vma->vm_flags, - TVA_ENFORCE_SYSFS, THP_ORDERS_ALL_ANON)) { + orders = thp_vma_allowable_orders(vma, vma->vm_flags, + TVA_ENFORCE_SYSFS, THP_ORDERS_ALL_ANON); + if (!orders) { skip: progress++; continue; } - hstart = round_up(vma->vm_start, HPAGE_PMD_SIZE); - hend = round_down(vma->vm_end, HPAGE_PMD_SIZE); + + /* We can collapse anonymous VMAs less than PMD_SIZE */ + is_file_vma = IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma); + if (is_file_vma) { + order = HPAGE_PMD_ORDER; + if (!(orders & (1UL << order))) + goto skip; + hend = round_down(vma->vm_end, PAGE_SIZE << order); + } + else { + /* select the highest possible order for the VMA */ + order = highest_order(orders); + while (orders) { + hend = round_down(vma->vm_end, PAGE_SIZE << order); + if (khugepaged_scan.address <= hend) + break; + order = next_order(&orders, order); + } + } + if (!orders) + goto skip; if (khugepaged_scan.address > hend) goto skip; + hstart = round_up(vma->vm_start, PAGE_SIZE << order); if (khugepaged_scan.address < hstart) khugepaged_scan.address = hstart; - VM_BUG_ON(khugepaged_scan.address & ~HPAGE_PMD_MASK); + VM_BUG_ON(khugepaged_scan.address & ((PAGE_SIZE << order) - 1)); while (khugepaged_scan.address < hend) { bool mmap_locked = true; @@ -2697,13 +2713,9 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, goto breakouterloop; VM_BUG_ON(khugepaged_scan.address < hstart || - khugepaged_scan.address + HPAGE_PMD_SIZE > + khugepaged_scan.address + (PAGE_SIZE << order) > hend); - if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) { - if (!thp_vma_allowable_order(vma, vma->vm_flags, - TVA_ENFORCE_SYSFS, PMD_ORDER)) - break; - + if (is_file_vma) { struct file *file = get_file(vma->vm_file); pgoff_t pgoff = linear_page_index(vma, khugepaged_scan.address); @@ -2725,15 +2737,15 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, } } else { *result = hpage_collapse_scan_pmd(mm, vma, - khugepaged_scan.address, &mmap_locked, cc); + khugepaged_scan.address, &mmap_locked, orders, cc); } if (*result == SCAN_SUCCEED) ++khugepaged_pages_collapsed; /* move to next address */ - khugepaged_scan.address += HPAGE_PMD_SIZE; - progress += HPAGE_PMD_NR; + khugepaged_scan.address += (PAGE_SIZE << order); + progress += (1UL << order); if (!mmap_locked) /* * We released mmap_lock so break loop. Note @@ -3060,7 +3072,9 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, fput(file); } else { result = hpage_collapse_scan_pmd(mm, vma, addr, - &mmap_locked, cc); + &mmap_locked, + BIT(HPAGE_PMD_ORDER), + cc); } if (!mmap_locked) *prev = NULL; /* Tell caller we dropped mmap_lock */