From patchwork Thu Apr 17 00:02:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14054627 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 01CEBC369BD for ; Thu, 17 Apr 2025 00:06:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9AF64280137; Wed, 16 Apr 2025 20:06:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 937AA280132; Wed, 16 Apr 2025 20:06:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 78B43280137; Wed, 16 Apr 2025 20:06:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 54AAB280132 for ; Wed, 16 Apr 2025 20:06:53 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E8242C0FC8 for ; Thu, 17 Apr 2025 00:06:53 +0000 (UTC) X-FDA: 83341595106.07.808E48A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 26B244000A for ; Thu, 17 Apr 2025 00:06:51 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GvSIsseY; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744848412; a=rsa-sha256; cv=none; b=k6oNGORFPEwn7nJRds+s+etg1qJ90vwbbzcenH7fakIgMaROPwg35CIKRKDxiJy4jb4kly cX9Bai8KPkGKe/3tYWGHaLS0uU1baH6n0TfQSp9zwa4Qmq+5QsNMYOrxh16bjVHmtrfqES cACK9bBpcWxyVk2XN2Ek4CrPKgjgukY= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GvSIsseY; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744848412; 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=IpV3zuxCR2eY4+V1cO1t7OWP+UORQhBI3uuugTMEKsQ=; b=U4TR0u32+WQVRJwGoxYIJgFdnLbwsas3BCtIeruQpHFR2jndqY5DwfcyItpxqJqwPX82GY 0D7odVzIO1HMenbCnlVhd1eFCWg+igfFbcynu8JB5DwrevjZPTBOkly7luXKdXcBWwRMtn UBPW9W9tnLKqxHjWbmzIeIhfFzt+tfM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744848411; 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=IpV3zuxCR2eY4+V1cO1t7OWP+UORQhBI3uuugTMEKsQ=; b=GvSIsseYFu/2KaPCFzVuQifc3Zi+ezSrCnbhQW7VCxNC8XdHl2olfzyK5xNpvNt6nosVT5 evkV7Vo8b6DIlBTXv7XxrRfgLOFpnv4LfwiDQxCI7vo24XS81zxQ6YKvHVewb3c6vbCiBK 3UYJfXCNsGBEYLooYY1dzKNTF6GlBUU= Received: from mx-prod-mc-06.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-664-O-JFbqzDPICFF8BYyTu_uQ-1; Wed, 16 Apr 2025 20:06:49 -0400 X-MC-Unique: O-JFbqzDPICFF8BYyTu_uQ-1 X-Mimecast-MFC-AGG-ID: O-JFbqzDPICFF8BYyTu_uQ_1744848404 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7E94D1800264; Thu, 17 Apr 2025 00:06:44 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.34]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 96FDD180045B; Thu, 17 Apr 2025 00:06:36 +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, rdunlap@infradead.org Subject: [PATCH v4 05/12] khugepaged: generalize __collapse_huge_page_* for mTHP support Date: Wed, 16 Apr 2025 18:02:31 -0600 Message-ID: <20250417000238.74567-6-npache@redhat.com> In-Reply-To: <20250417000238.74567-1-npache@redhat.com> References: <20250417000238.74567-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 26B244000A X-Stat-Signature: gtjuwyw1oj7f57mrytojhtqzkcnaay75 X-Rspam-User: X-HE-Tag: 1744848411-891952 X-HE-Meta: U2FsdGVkX1+CPQkIw/ufGIXXCKBxDcf7KAyHjmML5Oso8jlkjDi40fnRhCOWWrw1oKWDrsr1U4dTJI7UMQ7sl9mTKme91aQKkCls9YvDti6znp38UntqXKVPHzu7odolH17iEp4IEoAGAROoAjDAemZUBnh38vJwdl0d/BkzMvLtY+JWqQ7ASYf8fLxjSXY0ObrW2iDRzlYHI0MHckmr5fDmlMvH4zi4QNHarceEtTFVVnYqnAP9rts7a1H2YrtGuV6p70hCshepYfY7ApSqq328fQr0zZhNw2IkAjmz/c6FBTVLi0UHeM6aG0ZzgLOLP0rMssgIfpETw+w65yXfNhyzUPQtxQExSB6Y9rl9gM4EhYfqB5jxlHI1FIsZ9fEAJs86FhdXTyUSz62VAOKOvz0ILWn5y9c/fairiFnEhNgzYsfNqkHWxWXgI4E34MiMhmf4IGXFVu0YmeG/LvVTDpUkBSHXXuAK92V8zOLwRQu+64AX/vDjMct3FWy0vs4CAIS1iSmzSKuwteBFGvbCWwxnWDI2iTJViu5dW5aqS8RQ4rjqzO3qtgb7ZK2zOxRGbwSPN+LVncxNvDv6wCMcYo4jbfYA7J8PsiVkBcFf07uudDWeAoTkWZ36lg+LIBTsh5gvpCwBY3jQ3BaCdE4931TVteTBjNhm+KCalwhTOXbCIRJAIR2ncUBTMED2Miw0OH5Rnk+hhQQbKnW4eq+y88leKrzu9uWpGt85UxUvTg6TxNeqpN9F8hvr5oGIXyAB431CgoKV9JLOS/HDemlhQWFHfRsKJC6TY9JYFWzKT1lMp7HmXPFfdNVlH7+z/MEN+bBxEdeUCrJU+RmVZq0b8ZS8nqbuvVBRAM0azMRukX5H4se1hm53O2ZcmR3CvslhuAg5CVutoKG094gs5lnCq++N0+LYkRztOKRgfsuDc4pzG4/iC1oPv+v49b5MbQH5sE7rsFgE2rf/IqygFNJ 93fcmIxH mlWWtlsrMtCPsfvaeg8ZJ8EYA2yLvWvqkrWa82JAO22O8OkvmejNQSA5FLpAIekH2bWsEsbmIBVjrjzoICMoTIo2vK7ef6g8D0ysWPLQIiKvbF0rcVfIpIGMfm1zCCKiuJxgxRMT5orRsAT+TwAEZeo0BXNlmABGXbumNdI6YWYt70hxV9urqALYv+1xGUdqNr/xCKXmNagxVlJRQ+GMRxm6qiJ6/ESYDUzbTNZPdaKvXEAgJKEPL0o3CeRdByN/Eadnf4c+a52sEIBiaWMo3uWKb7LJVspxa1lZVQxGG4G+e8jmT56fIzv5S48astEcF+lNzWXP0CDb4GuctbYK6FhOlUyQu62RgXR5EPzI1qJnFgeTx1tl+z4EQFa3u/rpzsvPBDd4T7yNqPTETMNcydyBOoY0Dg2kQ/HwKUBIDnGSUrIRgdzUHZwm/fqK6z4ZmBKsBG+hyZkxg4uuR8VpfvFR7UCoIlMNF0Cd2lRSHXd8dL5uaIVpM8+TuTWSyi6MlHwEL 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: generalize the order of the __collapse_huge_page_* functions to support future mTHP collapse. mTHP collapse can suffer from incosistant behavior, and memory waste "creep". disable swapin and shared support for mTHP collapse. No functional changes in this patch. Co-developed-by: Dev Jain Signed-off-by: Dev Jain Signed-off-by: Nico Pache --- mm/khugepaged.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 883e9a46359f..5e9272ab82da 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, + u8 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; + int scaled_none = khugepaged_max_ptes_none >> (HPAGE_PMD_ORDER - order); - for (_pte = pte; _pte < pte + HPAGE_PMD_NR; + for (_pte = pte; _pte < pte + (1 << 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 <= scaled_none)) { continue; } else { result = SCAN_EXCEED_NONE_PTE; @@ -609,8 +611,8 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, /* See hpage_collapse_scan_pmd(). */ if (folio_maybe_mapped_shared(folio)) { ++shared; - if (cc->is_khugepaged && - shared > khugepaged_max_ptes_shared) { + if (order != HPAGE_PMD_ORDER || (cc->is_khugepaged && + shared > khugepaged_max_ptes_shared)) { result = SCAN_EXCEED_SHARED_PTE; count_vm_event(THP_SCAN_EXCEED_SHARED_PTE); goto out; @@ -711,13 +713,14 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, struct vm_area_struct *vma, unsigned long address, spinlock_t *ptl, - struct list_head *compound_pagelist) + struct list_head *compound_pagelist, + u8 order) { struct folio *src, *tmp; pte_t *_pte; pte_t pteval; - for (_pte = pte; _pte < pte + HPAGE_PMD_NR; + for (_pte = pte; _pte < pte + (1 << order); _pte++, address += PAGE_SIZE) { pteval = ptep_get(_pte); if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) { @@ -764,7 +767,8 @@ static void __collapse_huge_page_copy_failed(pte_t *pte, pmd_t *pmd, pmd_t orig_pmd, struct vm_area_struct *vma, - struct list_head *compound_pagelist) + struct list_head *compound_pagelist, + u8 order) { spinlock_t *pmd_ptl; @@ -781,7 +785,7 @@ static void __collapse_huge_page_copy_failed(pte_t *pte, * Release both raw and compound pages isolated * in __collapse_huge_page_isolate. */ - release_pte_pages(pte, pte + HPAGE_PMD_NR, compound_pagelist); + release_pte_pages(pte, pte + (1 << order), compound_pagelist); } /* @@ -802,7 +806,7 @@ static void __collapse_huge_page_copy_failed(pte_t *pte, static int __collapse_huge_page_copy(pte_t *pte, struct folio *folio, pmd_t *pmd, pmd_t orig_pmd, struct vm_area_struct *vma, unsigned long address, spinlock_t *ptl, - struct list_head *compound_pagelist) + struct list_head *compound_pagelist, u8 order) { unsigned int i; int result = SCAN_SUCCEED; @@ -810,7 +814,7 @@ static int __collapse_huge_page_copy(pte_t *pte, struct folio *folio, /* * Copying pages' contents is subject to memory poison at any iteration. */ - for (i = 0; i < HPAGE_PMD_NR; i++) { + for (i = 0; i < (1 << order); i++) { pte_t pteval = ptep_get(pte + i); struct page *page = folio_page(folio, i); unsigned long src_addr = address + i * PAGE_SIZE; @@ -829,10 +833,10 @@ static int __collapse_huge_page_copy(pte_t *pte, struct folio *folio, if (likely(result == SCAN_SUCCEED)) __collapse_huge_page_copy_succeeded(pte, vma, address, ptl, - compound_pagelist); + compound_pagelist, order); else __collapse_huge_page_copy_failed(pte, pmd, orig_pmd, vma, - compound_pagelist); + compound_pagelist, order); return result; } @@ -1000,11 +1004,11 @@ 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) + int referenced, u8 order) { int swapped_in = 0; vm_fault_t ret = 0; - unsigned long address, end = haddr + (HPAGE_PMD_NR * PAGE_SIZE); + unsigned long address, end = haddr + (PAGE_SIZE << order); int result; pte_t *pte = NULL; spinlock_t *ptl; @@ -1035,6 +1039,12 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm, if (!is_swap_pte(vmf.orig_pte)) continue; + /* Dont swapin for mTHP collapse */ + if (order != HPAGE_PMD_ORDER) { + result = SCAN_EXCEED_SWAP_PTE; + goto out; + } + vmf.pte = pte; vmf.ptl = ptl; ret = do_swap_page(&vmf); @@ -1154,7 +1164,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; } @@ -1201,7 +1211,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; @@ -1231,7 +1241,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, result = __collapse_huge_page_copy(pte, folio, pmd, _pmd, vma, address, pte_ptl, - &compound_pagelist); + &compound_pagelist, HPAGE_PMD_ORDER); pte_unmap(pte); if (unlikely(result != SCAN_SUCCEED)) goto out_up_write;