From patchwork Tue Feb 11 11:13:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13969518 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 95C38C0219B for ; Tue, 11 Feb 2025 11:14:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0117D6B0085; Tue, 11 Feb 2025 06:14:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F02FF6B0088; Tue, 11 Feb 2025 06:14:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCAA46B0089; Tue, 11 Feb 2025 06:14:17 -0500 (EST) 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 C2A366B0085 for ; Tue, 11 Feb 2025 06:14:17 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 46908C155E for ; Tue, 11 Feb 2025 11:14:17 +0000 (UTC) X-FDA: 83107404954.17.383B70E Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf04.hostedemail.com (Postfix) with ESMTP id B1C2940007 for ; Tue, 11 Feb 2025 11:14:15 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf04.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=1739272455; a=rsa-sha256; cv=none; b=40hekq7xrHiqV8ONRV/vqVpN03Y8reIOLkzCCTC1U63UvvlsampNAH+1iuxzRtdc9EJEzP DAEwl0gR/Tzl+a0NdeuRC2yc8GzD83EYXR7O+Ql7uxjMCJwSIA4FgxUA29wf8BL+D0ncOf jhlh4X8DQqh8iKvcSVqEbhgKkwaju6c= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf04.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=1739272455; 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=BaWFRE1ZfuHe1+eG4gdr7Z9foWbt+F9JqvFVKB17XDA=; b=CUmXWZNdbiSh3OjpeiDtCFQHNrGzC6em6ODl29LRJKZkFLr5o+cBmw8LmbKz1ZZrxbcNGh uo5BKvVymqbpUZPYc910jIm+2u03JFSIqBNV6fUCDgCODUFLTPlLHMdxag3nX9R0uaKV35 us5EDNtKMNQNGA6nCJ2dUmYdW+5gNZs= 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 7D2761477; Tue, 11 Feb 2025 03:14:36 -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 61B503F5A1; Tue, 11 Feb 2025 03:14:05 -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 03/17] khugepaged: Generalize __collapse_huge_page_swapin() Date: Tue, 11 Feb 2025 16:43:12 +0530 Message-Id: <20250211111326.14295-4-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-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: B1C2940007 X-Stat-Signature: hfinfs5d8d6sy69xb5dgxern1x9gyzxh X-Rspam-User: X-HE-Tag: 1739272455-742793 X-HE-Meta: U2FsdGVkX19RM9szs2zL+Pm1ApeWf9pGawV8o2VfoIF7OupOEURrdqqeBvzF6zWpqLea0UM3KpVwNAboTIAk8Ulwu0VsPWN9PK38nLHHoDT+a3MtgnrV7xHpjYgUdGoh4CkQBI8cLGmVQ9Lt4SdJHHF7o6rlh0uCIKni9h13+FTBF/HOpUxEYK8zF6ZkmddSF79O0VAS7f9yWWaBM7/iFoRpVgfqZm/B0RW75b7cLxUSKdDkhZIQrSk3bOZa5aF/piuTKFewwKibYL35oVqSKMjL7yDYGhmCVNRmDsUbPH4xTRX8OW/pW9uvlusbXRpe8Wj+jc8RKO/El7BFUaKRnnUIiHkvyPPN+cCpa/SmnJbwnM1kkXAIFi+vQ8Be4uj7q/MCvuQCx2ZuHs76LtL522RiROcPZABHd+dkE4gL4ODKb5wGenTqF7HkZ4qlX5WkX9OqfR5TnsHpK4m4KUe50kPWOQLz6u2t4c1gWqU0d8W/QfTiD2ZkXoNNcrqYKy7llcGHH00ZURsgpXwi8J2CzmPCv92O4kYaoNLaqapQfiaeym3U6t7QW4vkzqBl2ZNX2isot5jhu2qrt6BlPGpAbXWdFiSQ2lfEnC2M4EPi/reiR0hVL6I35slED/CksOswaA8tRxF/f7suCzBsimfxRtNZ4CdRSgx1rSyMSWbDc87wdZwkyKg3PjRYroxWh61UkJKgypTgu9020g3d+lQsX6QMAJUGrN86dFJkEtbMXFfbQGRI6po+GnRMBp+5dFTXcZRXb44LJUDomUXTOk9W1JnGMG39oTF2jGn3JNGIC5xwzFkQ+5piBYr2ZTrBA2MvqYsUR4A7GIGPnboyKumkNqLQJB3cas87AfxhZnTxF1W3UC4gkFcPNwlhgMLKAWmtOtr5XOvVjoUidozw4MFehisfOcTuLW+Sr0dd2adaVmP9pegJ0+XQifzWt0ySRc5VC8bzYVyHPw4nvwAhIIy tVyOKH3Z 9q2r5T4dN9XCfoJchJqZUiExXt8UX+CzF6Q5KrTZ4bbVBVZJQD636FzqHcmMa38XoMMZSrYtEezb+5dTek7jsSZO2NVbuxIKNaRSck7CghoYzDhdVGEk/J+HfY3n2oPHg6LZPqk1DM7a7lVdwd0k/Ym7T4z+hmgKh/VxsvvMFgR5gIARPqlS5PlGq5RnVxInirzeD3U6UwJf68dDwibpMQRTfkqsjhLZjCAdCDBirD+P+5swnYRCBIYgE0agFh/vlKXIg8zZIUL7+dRkGn3GtngPbvg== 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: If any PTE in our scan range is a swap entry, then use do_swap_page() to swap-in the corresponding folio. Signed-off-by: Dev Jain --- mm/khugepaged.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 3d105cacf855..221823c0d95f 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -999,17 +999,17 @@ static int check_pmd_still_valid(struct mm_struct *mm, */ static int __collapse_huge_page_swapin(struct mm_struct *mm, struct vm_area_struct *vma, - unsigned long haddr, pmd_t *pmd, - int referenced) + unsigned long addr, pmd_t *pmd, + int referenced, int order) { int swapped_in = 0; vm_fault_t ret = 0; - unsigned long address, end = haddr + (HPAGE_PMD_NR * PAGE_SIZE); + unsigned long address, end = addr + (PAGE_SIZE << order); int result; pte_t *pte = NULL; spinlock_t *ptl; - for (address = haddr; address < end; address += PAGE_SIZE) { + for (address = addr; address < end; address += PAGE_SIZE) { struct vm_fault vmf = { .vma = vma, .address = address, @@ -1154,7 +1154,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, * that case. Continuing to collapse causes inconsistency. */ result = __collapse_huge_page_swapin(mm, vma, address, pmd, - referenced); + referenced, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) goto out_nolock; }