From patchwork Tue Feb 11 11:13:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13969519 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 716FDC0219D for ; Tue, 11 Feb 2025 11:14:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8F4D6B0088; Tue, 11 Feb 2025 06:14:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E41776B0089; Tue, 11 Feb 2025 06:14:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D07876B008A; Tue, 11 Feb 2025 06:14:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B46D26B0088 for ; Tue, 11 Feb 2025 06:14:27 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3FB08141497 for ; Tue, 11 Feb 2025 11:14:27 +0000 (UTC) X-FDA: 83107405374.01.E6CB558 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf22.hostedemail.com (Postfix) with ESMTP id 32E05C0006 for ; Tue, 11 Feb 2025 11:14:25 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.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=1739272465; 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=0B/BjYfM1rmrtdkSfDBfxUUAPl8sbglM5IrY/T7IWKY=; b=Wvcc+jhqwvYKpoA61IHUxfFeIUv8O4i1MM1kImSHtxkJi2eMK/D/aFAYNV4qeAP8dpTPOZ KIrAluvX1FPuZwLZuKRDnWP01yl8MS3PMXH7/9H4vAx/xjBqJgBSDM35AyVbk9rS19HA8e /pjBJp9teC+khb1t7wjIk5J9nAWK/c8= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.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=1739272465; a=rsa-sha256; cv=none; b=0c1tRazYPrG7znEA6Df/QJmZKUQMZMUs8aVPYpxlD+sUymux5fWBm2VUEn9phXglIjWnjk qraUYBJmyy75h5Sum0teNm+AWe4EtrEiN69VN1EPFdAQjR3itngyFzaiIuy3SfWXAvAWqh 9/bCvy+fV9BqlitGye9j/aTgt4IonxU= 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 DC9E113D5; Tue, 11 Feb 2025 03:14:45 -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 8E5383F5A1; Tue, 11 Feb 2025 03:14:15 -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 04/17] khugepaged: Generalize __collapse_huge_page_isolate() Date: Tue, 11 Feb 2025 16:43:13 +0530 Message-Id: <20250211111326.14295-5-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-Server: rspam08 X-Rspamd-Queue-Id: 32E05C0006 X-Stat-Signature: tgd1t9kgyshobkyny4wkf8kfrgx4xs1r X-HE-Tag: 1739272465-919572 X-HE-Meta: U2FsdGVkX1/Kf3ldicCBPg4NHTA8VG4f2gpj9GxIEDsTRgTVyqA+QkxFCyrsNk3qRPyrtsOgLHeyIMwT9Y/cBvtobtQyOfWMVLMBgP4iatwjZu0wAyOCs5KLeIadPzWIv1swG+5jHEMgMeHKX+iKW2p4mVdxybxMxkcFmq3P7D1cztOH0Zc7LjUH8EwKag5IpFuzKbn9OpQ4Y7QssgIkY9CVpZO3DZo/NQGOn7pLyrAc762AT5xRY1AzA0IzUEK4GFx0TKlGnljba0NW5fip2nmEzZChVh2ANtaR2Run7J7O5X20aMY24iSfZQiNH6i13Fa8KPs/kqvV7e++2tucgC5nE2r0+faz+z3ZQuRbbBdbkydHVx00j/Lyl3qMo8sPaWJ8zBXJ8+Eg9yeWwEFDq1NDDoVlN5tMKHSSr6a277t9PsaGb/KlKiiMafkgiiRUJaMSJ/oBVF1rMM0m73/cbCEuZddF8FEtAM1CKP4B5iYAuJlXjjWeMiDeacR7oRxQ8SetvZZYDIoPbgrllsH9o5QueDELSdbFmMXmSjb+RKlvOBZfYC5BZUcBV9nJ9pZHdkkzdRX3lII0fHXiv80yA7T1+ru6Bbss64q6r8L/vP7JJzXxt8oiIevUFZC388eXpv8x0ogk4QYswbEqwECVy6TBq3yjn2b37bQtEKEk0j+Pye38MDTUQo/brqb2Fm7Wxoyuctcg0rac3kPuoFe+e4jDRIXA2gRkrS0fNoZ0CyYsQC72vF1+Y/0NBIo9cjioAFOWY4TnF13rl3Uc51FAVGAsjvnxIUXfQK8aPr4j3U85Oz155fn31bq/XsxwlrJSpQZVQxcVsw4JaGt3pJU4GmVaDyYn+1qZR84j16Jc6eeuGVd9u7GGIKhXXakvDVgA0Xjr6DJAoL+TRtqyMJKXw04Lp9gWHjVAGWNzZ/Yjnfmtn1DheRwti7yYJkXDNXLXnSorfGkYoSpxizRBJvL BloFb0i/ UBd7j3/A11J4lHsU36sRS/Rb4BSkO/ONN+WQeetMZ8s2d56DCESqVmhpKXVrR6SPKBpTw6dX5ABfeOI5i1wOTBBGfDexk3xoU/iPvQqJkxoCAIPCIpLnJTyX+46RWD5qUKyWfkAg4sQz2TgOPoNXH1wKkUSD9tiiuf4/AUzif5FKPFEpq6TMYbTpmiOvPM4IiK5WPug8th9Ob9eNaMXwsdhjwbWfUS4BOwvEUbFZQKmRWgrvqIUZwKPerD0UuHUw8SRQvHDMPFMFw9T3Byj5uDbXwRQ== 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: Scale down the scan range and the sysfs tunables (to be changed in subsequent patches) according to the scan order, and isolate the folios. Signed-off-by: Dev Jain --- mm/khugepaged.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 221823c0d95f..0ea99df115cb 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -565,15 +565,17 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, unsigned long address, pte_t *pte, struct collapse_control *cc, - struct list_head *compound_pagelist) + struct list_head *compound_pagelist, + int order) { - struct page *page = NULL; struct folio *folio = NULL; pte_t *_pte; int none_or_zero = 0, shared = 0, result = SCAN_FAIL, referenced = 0; bool writable = false; + unsigned int max_ptes_shared = khugepaged_max_ptes_shared >> (HPAGE_PMD_ORDER - order); + unsigned int max_ptes_none = khugepaged_max_ptes_none >> (HPAGE_PMD_ORDER - order); - for (_pte = pte; _pte < pte + HPAGE_PMD_NR; + for (_pte = pte; _pte < pte + (1UL << order); _pte++, address += PAGE_SIZE) { pte_t pteval = ptep_get(_pte); if (pte_none(pteval) || (pte_present(pteval) && @@ -581,7 +583,7 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, ++none_or_zero; if (!userfaultfd_armed(vma) && (!cc->is_khugepaged || - none_or_zero <= khugepaged_max_ptes_none)) { + none_or_zero <= max_ptes_none)) { continue; } else { result = SCAN_EXCEED_NONE_PTE; @@ -597,20 +599,19 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, result = SCAN_PTE_UFFD_WP; goto out; } - page = vm_normal_page(vma, address, pteval); - if (unlikely(!page) || unlikely(is_zone_device_page(page))) { + folio = vm_normal_folio(vma, address, pteval); + if (unlikely(!folio) || unlikely(folio_is_zone_device(folio))) { result = SCAN_PAGE_NULL; goto out; } - folio = page_folio(page); VM_BUG_ON_FOLIO(!folio_test_anon(folio), folio); /* See hpage_collapse_scan_pmd(). */ if (folio_likely_mapped_shared(folio)) { ++shared; if (cc->is_khugepaged && - shared > khugepaged_max_ptes_shared) { + shared > max_ptes_shared) { result = SCAN_EXCEED_SHARED_PTE; count_vm_event(THP_SCAN_EXCEED_SHARED_PTE); goto out; @@ -1201,7 +1202,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, pte = pte_offset_map_lock(mm, &_pmd, address, &pte_ptl); if (pte) { result = __collapse_huge_page_isolate(vma, address, pte, cc, - &compound_pagelist); + &compound_pagelist, HPAGE_PMD_ORDER); spin_unlock(pte_ptl); } else { result = SCAN_PMD_NULL;