From patchwork Tue Feb 11 00:30:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 13968635 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 29EBFC02198 for ; Tue, 11 Feb 2025 00:31:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92ABD28000A; Mon, 10 Feb 2025 19:31:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8DA47280008; Mon, 10 Feb 2025 19:31:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72C9928000A; Mon, 10 Feb 2025 19:31:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 51962280008 for ; Mon, 10 Feb 2025 19:31:26 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A422043F72 for ; Tue, 11 Feb 2025 00:31:25 +0000 (UTC) X-FDA: 83105784930.28.5ABEC0A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf22.hostedemail.com (Postfix) with ESMTP id CDBCAC0007 for ; Tue, 11 Feb 2025 00:31:23 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S7bQXmR6; spf=pass (imf22.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739233883; 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=SA9DDRGRHuqABtbetLeril2muYd34wgOB7Djw56jQ5Y=; b=JCo8FIA4IffVSo8+1CE4tqYIZe3db+v3GI2LhKp4Ajc7T6vOXzSxv2cMhV45BghJVLh4pt 4Gl62qUuQ2VN9DzVwdWJ+a5KVFBlRFxj4Zf0TFZJtiX1u535H2+oCNS0uSLMeWaE64fBnq jTvMGeU9IwjaAqvMf0/yP1FyVbmSOBo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739233883; a=rsa-sha256; cv=none; b=lZpQLl6FIiQx3U+J4owR6/VZsi8r+JGSOfqw34m71MBEY2kCLKOxwilhsVWF1X5d2qEQcR Fjmt6qvJZkDV5yr+p2xjghawTImH1PFxOOo9b1DQJA5rIJuxKMg+X6uni+Dku1h2qGM/fI T7XiJ8J3boLOXyYUqmowb4pPv8OYYP8= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S7bQXmR6; spf=pass (imf22.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739233883; 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=SA9DDRGRHuqABtbetLeril2muYd34wgOB7Djw56jQ5Y=; b=S7bQXmR6D8EEmNMYivAQiMsfdjCYhaKvTF5jOzLm7N9UFV3yQAs+t8+dJGBV+hqWG8jVoC DX0pBvC43AkdKjCG8dVsgHr5hTHmlxnvYqTmvhxDl8x1dYT3j/qQjohl1kTqdzy4dN8ycP L2nj4PJ/ZUn0EnaUtvfsFmlGOrh+eII= 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-646-E4IQmJcXNUSEkjimazaj8w-1; Mon, 10 Feb 2025 19:31:19 -0500 X-MC-Unique: E4IQmJcXNUSEkjimazaj8w-1 X-Mimecast-MFC-AGG-ID: E4IQmJcXNUSEkjimazaj8w Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 93D131800874; Tue, 11 Feb 2025 00:31:14 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.129]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EA485180035E; Tue, 11 Feb 2025 00:31:04 +0000 (UTC) From: Nico Pache To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org Cc: 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, willy@infradead.org, kirill.shutemov@linux.intel.com, david@redhat.com, aarcange@redhat.com, raquini@redhat.com, dev.jain@arm.com, sunnanyong@huawei.com, usamaarif642@gmail.com, audra@redhat.com, akpm@linux-foundation.org, rostedt@goodmis.org, mathieu.desnoyers@efficios.com, tiwai@suse.de Subject: [RFC v2 1/9] introduce khugepaged_collapse_single_pmd to unify khugepaged and madvise_collapse Date: Mon, 10 Feb 2025 17:30:20 -0700 Message-ID: <20250211003028.213461-2-npache@redhat.com> In-Reply-To: <20250211003028.213461-1-npache@redhat.com> References: <20250211003028.213461-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspam-User: X-Rspamd-Queue-Id: CDBCAC0007 X-Rspamd-Server: rspam07 X-Stat-Signature: stj1baofca5r8kya8jfsx7r1t6wh9oyg X-HE-Tag: 1739233883-482581 X-HE-Meta: U2FsdGVkX198Bh5DCOqgg12TatDmoZdVl7uMntqyi5yi9Fh+x8LQxaWU7FO+6SzAl0yuaM57fgcZhv0PLmVxtFi3LSscAGsfQiDzskoGt2QBCoLJHTnFPb27IfoztpOwkeb4hfeprd+b3iPzX4CrataOGkpY80zm0eDHSWutxgO6qrmRvRKDCV7lEPCHu9DWJy37MGXsHhKoiFSz1wjV4kzAm/L6qZwCRMlwRzDFZG9N1M1/NHwX/g+eWKIol5tQFNNwGOCDC6jXjDzK8ptYUXfAXhQFqh/A07CjXM5zu/p6C1kVCsMoozxG4DnndmgZTxRk8OGs9kdhN0NHzJUdrpVHYM13CBJaQXShLptCHs02JgBE3MaO64DS64bZsGTTwn/ffrOjZPzv5uWxedFVCAarjQh9/7tspFmVVTtw3ZUI1z4AZM+Hl3BPzdWNepn0hKSukI0d1ktde63XXpACMM6f8V3fTnUJeZkFv1QXPacPX/k9RdmHUKgHrtOtQ0KxNjdElZK+jYffPZoiOfCUi8UpK9hmbhRHuoZsMv2t0vhJpXP9Mx3RkplyPMZ4U118a1iIjGyteCV5wj2q6a596tBaGE1DpSxc89c7+0QYFqKXaSr5WljEFCzGHpok8pWy2ejiNeQcYoOvr6QQ1mYUylF6lTSHUnCltZcdyBqWzrvbLtFIjxCPnJ5+OGfck3fKiZpviAlDas7JQejOwLcjbUqPrWxKIwiIr0s3DKdTaexFr9PXTXI/ZSP4OWMynWo8M33VGeBxcoW2i6vjtpC/EqW+Ql0xUqCBtPwoY1R1OPfw9sTXywcA2BqXmM2VGAZ0aPgMOoWS8VVFCu6Gtu/zrcxMy7NuaRNMPVMoz0WoGKsMNMt9p94ONR2QRCeevdkVe5Mw7S5J8MM7LnE8WwpdF0+dk78rz4mpxq4F8NkjUUNHH10vglgF0yEmHg79SnXF8q1NAtdnvZpxajfrHXt KTciOFrO gT2h08W+/WlzqelPAGKrr+KwtVPr4P0HuTC3K2TmwOPaVCgtIi93njO1SFBbOcEa3Tp7aXW3fst1JQrsrHezcClpPJfeyxudR8cqREICfVBrEVmueO96rzcU0LdAwgr/ApmsjXP9ZTFP7B5FkMHIUnjbUZfSZIL94pgzmnSyTC7rYBqPV/IPmUXNPwx5TDmmHp+74grS8/+YBkxXwgoPKB9d+w6qij1Gk3L1YRDaaKN5HP6JBZ0sERaU/VyYfzwzeV3z7Z/ND+YiP3IQyxs+riZacXaLSUyjAyZE3YEdFeZeCP45vvIGLuVuSUIyhzAthU8hCqBO8QpQ5lyl1Fxm/2lA0n2/S21wIiwevUmb9P0SAXqZeFd4hsdh+UkFThl606O8Y0aB8bJxgi8oh9ds5ivb/nh9dHDoqIe6WXd1Y/GG6JH2qKZSmrbyf3vxGIQmaxd2u 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 | 96 +++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 5f0be134141e..46faee67378b 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2365,6 +2365,52 @@ 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 mm_struct *mm, + struct vm_area_struct *vma, bool *mmap_locked, + struct collapse_control *cc) +{ + int result = SCAN_FAIL; + unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; + + if (!*mmap_locked) { + mmap_read_lock(mm); + *mmap_locked = true; + } + + 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 (result == SCAN_SUCCEED || result == SCAN_PMD_MAPPED) + ++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) @@ -2439,33 +2485,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, + mm, vma, &mmap_locked, cc); /* move to next address */ khugepaged_scan.address += HPAGE_PMD_SIZE; @@ -2785,36 +2807,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, mm, 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: