From patchwork Thu Apr 17 00:18:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14054662 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 8CD33C369BD for ; Thu, 17 Apr 2025 00:20:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ABE3728013A; Wed, 16 Apr 2025 20:19:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A6DA628001A; Wed, 16 Apr 2025 20:19:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89F8028013A; Wed, 16 Apr 2025 20:19:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 681B328001A for ; Wed, 16 Apr 2025 20:19:59 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6109F121051 for ; Thu, 17 Apr 2025 00:19:59 +0000 (UTC) X-FDA: 83341628118.18.6C9E2BA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id A9C971C0009 for ; Thu, 17 Apr 2025 00:19:57 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WQkwKPnX; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf21.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744849197; a=rsa-sha256; cv=none; b=y7FrBA/3zSVrTl8i+ghif0pZzs174i6E0CcZJkNu4qP8UZUsJheR3wIGEoAvAZv7yC72O0 XpweeG7oahy69mjZnnswLZ8k7SmvSzXnh/0bAshzVkEAUAbqNuXkvfYm2s6/0lWqxXwtOw qOgqLoMPq49dTXQqprL4Afrk9SOyMXE= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WQkwKPnX; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf21.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1744849197; 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=TogelAChT0Lle1lPUcX0qAHNME6QhHVdPZc+FHgLuX8=; b=uPbuZfiqOyL3QCaH90cA43LD695i0AtUNHKD4jxJGkFJYF+rLG5kDL1exIL2wllh5tsgQD uTjVO0wHpNSyahNTmvIfUslTmFU/C/RGqEZL1G/Oy7MCMIa/26I6yDMzFiV9rnBNzXXXAj tBprCSZh5jrLoXZVtwaGpyZgl/RpCFg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744849197; 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=TogelAChT0Lle1lPUcX0qAHNME6QhHVdPZc+FHgLuX8=; b=WQkwKPnX1RETDYsTwYlKAQ2bNj7WRjZo8CVlA9wP2R8Wti5q9hRo88rd0rQGs09bBzjrCN QNLGtcUmNCcb9GT4VTH1IYhw9X6/fp1jh4HmZHfh26J8H/bijGUnO8fTeRBAvkkLIx2Whb 95Fkukb5Te6gjUJLtwD3i8Al8ilPXCo= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-611-gkc1jhT1M-iRXEJasmR8WA-1; Wed, 16 Apr 2025 20:19:52 -0400 X-MC-Unique: gkc1jhT1M-iRXEJasmR8WA-1 X-Mimecast-MFC-AGG-ID: gkc1jhT1M-iRXEJasmR8WA_1744849188 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A88101956087; Thu, 17 Apr 2025 00:19:47 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.34]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2E1A619560B8; Thu, 17 Apr 2025 00:19:38 +0000 (UTC) From: Nico Pache To: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@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, shuah@kernel.org, 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 1/4] mm: defer THP insertion to khugepaged Date: Wed, 16 Apr 2025 18:18:43 -0600 Message-ID: <20250417001846.81480-2-npache@redhat.com> In-Reply-To: <20250417001846.81480-1-npache@redhat.com> References: <20250417001846.81480-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: A9C971C0009 X-Stat-Signature: z981odcyrpx48h7347kiomkeoygudxeh X-Rspam-User: X-HE-Tag: 1744849197-521525 X-HE-Meta: U2FsdGVkX18kpzondc76a4P24fMx+nrVvAgNi09L/fpHwMt+L1ydwvbBOuPDVSlVnsG/KuKZgNd/RxE1lYA1UhN4jULmoSxGQNnTRvSQ/wy4StYYp4AObnf/h97EOS8RxqFK5SQJALr0km3LUo3nJgyjIp8mxaBaoL8xsQZ1vbtjHEv4GbdGHDwhCHFuyyzxXgjhObboRnOkV8ugK2cDbXHqKkKkP2ttbvcZ78fau4o0SP9rZx5TAKCBZR44RVcCPnTKzlsWnoS0FJ6Wbaejkw/fZq2MeGSKwqTVwil0gj790b9erpjZRqjjZmZNzUScx599IUavKKT7RnUc6+iVGLIkadNfPKyRPpv0KwaF1RqYQhaQKUGQSrbrF0P3n+C5Bo0h49QA6W85ubyru8z1QDIivkBdci6eKMEv9J+BneLx1VfX1uHTAnLIqS4ruAVqXgrYn56WUAev6/25Tyl0m8gruY+UOvZzq804OE56AR0Rmy20i1pD2vWgCXmSKwDm+/cLlvhisn+Ls6toPcmoKHk2vYZfgqsYWgTyG0xHUztfi7yGZSPfTbjnpiCLgUQ/OnnYRljfNm+nqRzZ3Npofctw3znMOWE82uS0GH4BS80NAFJQ2uq4O+Yx9t2Rhn0bjwztUNcrkF3DxrbgzCLHrPr1e3XAomwbn5Gqtgk5xf+mJvoIrrNTzGTvmlph5itlEF9fvEjBoWABDVFMS+YOQlSN/pjeZ5XA5Lo0zwyaY1H+Dk82a6W8vdFiiAv83RxW9kcNNwWzWkrfrAn3D2llCHQsfLFcaJpaHXPShepbFmTrISUhmdjp43+ZDdbYApHQTFzM5c7nbne7eJnmauX3BNgGinPTg9l5NRHnY6X4qFHeech6RPWqkX/KWVYPedYY9SF/FaH8THKwaXStCIcLRcozxK3Y2sS0wQK64GwC9SBnfmv7cLw72dKmn2MXLS9+XyNVET2i3YQ1SRxQuzv HSyomd2h aiY36WC+deO3y65jWVSOehQDVLEPyFj023JuwDSFFdY22SqWcS0H5oqhotUtd7CJ5+Qzy24WbNF6wXKZ02h+FTFroIf44iFExdTCEbcyhCKHWAr2U7vUKNJ/YRtmkypCHthhgnqMiIX/SkDpPSlwUG3vpVYWm6/PJtHaAp6q20Ozf7Gp+olIG849c4htcYdf+SH7DP+nfJaQKhMVaOS3Fzxlx+j6FeXMh7wMmuM0kIyHD96x0q/4EQ4HE4LHSws0mqB7LAALRcAcHpA3DSaOFh6zi87Nbm8A9NKMOKDb0TGkpq69fDhyfUTfL8GnaOoDz/aXSGl+DjUS7Xkv+koqURFDrHRUURkAKMnKHK++DMvEiglzptG0yMWfQ1FCi2UnDgt2gAPYwglGz6lKNPZlUzhxIkw== 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: setting /transparent_hugepages/enabled=always allows applications to benefit from THPs without having to madvise. However, the pf handler takes very few considerations to decide weather or not to actually use a THP. This can lead to a lot of wasted memory. khugepaged only operates on memory that was either allocated with enabled=always or MADV_HUGEPAGE. Introduce the ability to set enabled=defer, which will prevent THPs from being allocated by the page fault handler unless madvise is set, leaving it up to khugepaged to decide which allocations will collapse to a THP. This should allow applications to benefits from THPs, while curbing some of the memory waste. Co-developed-by: Rafael Aquini Signed-off-by: Rafael Aquini Signed-off-by: Nico Pache --- include/linux/huge_mm.h | 15 +++++++++++++-- mm/huge_memory.c | 31 +++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 782d3a7854b4..b88cc3154ec0 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -48,6 +48,7 @@ enum transparent_hugepage_flag { TRANSPARENT_HUGEPAGE_UNSUPPORTED, TRANSPARENT_HUGEPAGE_FLAG, TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG, + TRANSPARENT_HUGEPAGE_DEFER_PF_INST_FLAG, TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG, TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG, @@ -186,6 +187,7 @@ static inline bool hugepage_global_enabled(void) { return transparent_hugepage_flags & ((1< X-Patchwork-Id: 14054663 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 C781EC369BD for ; Thu, 17 Apr 2025 00:20:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 04E2228013B; Wed, 16 Apr 2025 20:20:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F17CA28001A; Wed, 16 Apr 2025 20:20:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D6ABF28013B; Wed, 16 Apr 2025 20:20:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B50E128001A for ; Wed, 16 Apr 2025 20:20:08 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C199DC0FD9 for ; Thu, 17 Apr 2025 00:20:08 +0000 (UTC) X-FDA: 83341628496.10.B049ABE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf07.hostedemail.com (Postfix) with ESMTP id F17B440005 for ; Thu, 17 Apr 2025 00:20:06 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=X4j02s5F; spf=pass (imf07.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744849207; 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=T90LCrJZAPUEyLfMWog/+6biSrJXKfE1zcoM8kFo7hQ=; b=KpQdgi2S9gT56RUw2OXFyAhblI5ovKnwXKXmBnNtHwXcbrx6cAA7EDXdWDR1mWIqTmAjel cixZEhpj4ANfMts9S0lsYsbXNjyTRiZXA7wObw2hxCOfYQ3zkxqaiMU1nMXPuVu1XMtPNZ ICx/VNxhPphDN+ChOp+V608THlMvGkc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=X4j02s5F; spf=pass (imf07.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744849207; a=rsa-sha256; cv=none; b=BTgEF6ZxJnRRq7O8P39Eub8K8+aXu0RbxoH32ovS7U4kcGlN1L4axHppbknen9QGVDB5Bg NwdRfgY7To6qWcacLyD1qW8+HL+IJGmhClGgswY/fCwZN0wISY73tQ7fJz/2EhzicddjB9 20Y8DAmRIpAsg4DvkUZjuC1cdVDf5+I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744849206; 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=T90LCrJZAPUEyLfMWog/+6biSrJXKfE1zcoM8kFo7hQ=; b=X4j02s5FUvnrUb60dX8DoTDfWnI9nQ4avwXubD6txVhSSNGNFESClw1YHIkMKLtFsiIbbw lJbT/5QPM044adF+sLMbZB+54iVnZw87+fiJXacpOf47rPbXfjw4fkhGJvTmt+aIUjlhUo 61fySweIntKG+6O4/pFpRrwpI7zW4EY= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-687-wmrC2r89NbChm7BLbFOqFA-1; Wed, 16 Apr 2025 20:20:01 -0400 X-MC-Unique: wmrC2r89NbChm7BLbFOqFA-1 X-Mimecast-MFC-AGG-ID: wmrC2r89NbChm7BLbFOqFA_1744849198 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6B223195609F; Thu, 17 Apr 2025 00:19:57 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.34]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 06E0C19560A3; Thu, 17 Apr 2025 00:19:47 +0000 (UTC) From: Nico Pache To: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@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, shuah@kernel.org, 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 2/4] mm: document (m)THP defer usage Date: Wed, 16 Apr 2025 18:18:44 -0600 Message-ID: <20250417001846.81480-3-npache@redhat.com> In-Reply-To: <20250417001846.81480-1-npache@redhat.com> References: <20250417001846.81480-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: F17B440005 X-Stat-Signature: 93issfx947g3yu5o69g7rmy93wsdnwe7 X-HE-Tag: 1744849206-583270 X-HE-Meta: U2FsdGVkX1/x3zFo1dRhqU3K+yIMXhGf0bOJT2CjfCfMO+A3XlCnPkVMHzaOvkHzYR7WdSx2z1Q0A3ya7Lp8xZHrdjRwozpyZPu/Mvpw5U2upoc7tmPETENedHt3KLMYOdZ52OHg6XDQfInbIm0DeIor/cFJJE218AqCvAMM4FEbciB5JK3Y326SF7KN2UUOzBR606b4yuIyMdrqGzK5C/TEoBovt6sBE453I0Ahis8Ck/cf87A+hLSyr++pYh/MxCI2P1AvtIaHUWlYShekuR5H+706NSuTL/UZMVmD5qChvblmS7K9bqnRQWkNkD9pvIBgPEVvgax+lSPdVz8x91oWEuClvd8j3xdRFja6MzKnVXCawMA3+RSKrypXhsAQLkempdwtZQ7pgPDpBEdyphl7qXmVQKiDmrVT6SrlLUSE44plxcWgkmOmcpzXmJlqCH91Tye1W6qIDB1F/Z4ka/s4R62AKEXnM8BZCadJ9xT3kI6y5SMxw3+ZXP92uEYwu8Uk7qZ8D5xptPOQvmswSa+rZ17kkPHk94Lk/x5YoS1NCmhnd4CaOsW5XuMsuj39+XEo4KwIYcY+i19fuJL29nwl2rG8cFEfICe7jXCpgL/wQcScc7zwEAHf3Y/miks+dVGJYePTuX1oMp0S9jkpnN/4ilBffrsYH5cWHg8OG+97cIsHiGiu7famt06aetIe6mc+BYmFThoshd82rnEaFKqUuTB3vy0ApcaJIwDNCrW2K/t8NmjV3CeYNDJvdhIluB2F1Ux3coqNCCcdJdrPQst8gPpGW8+uLbgG5t1/XTaamsx1uxX9YV6yMDXMGuaaYY2jg8b0/GRAnXlkNDSGjl2i8boiZw5F2Xqfp3Mtx40JP5EEN4nqbAKnT8Vw6xx8wtjGUz4WzeOexfpY8Mpgxz7VhFFg0yAD+mXCV9Pnx+01jEVa/KBOJ0YwlHD/ciN5mf4lYksSi4tCf4DvFlp XU34N7UU d3c2wTG/OOcr4if7PO6/5Yb/bDr+DJDdzaQGucOLtwfBlEz/1tq20PAvhnE/uxZbB1wjxDKRZA63TItPTPxfvKZiYmm/s5Kb40BRkwKScZnSNjwRvjpJvjihWftF6A0JOMnv46h6CTJjmQ7mLKwpm874347nzCaGLMz8ZkzuX0JRpbUUGWqMLt7kkHkmAJ2+iD7FpOPRBS3WbKCKscAqC7OWQxAQZy8NR8h0lKmTbKXJbFpD6YpCXR4Cw5O1/Fjlps3ffsjSsNd2/0xWcE0lGpSxF1jNuO3DjlQtYRagJ5mrwaZEYRspnpdwQ15FJe3BZb+TWePFhWbdfkX3vq/pTF7JTxawo0Kpn+tPaKAAh870bCGR6+6kZbCd7XN1z8M8UZBXganmAahoaBnQXMDFxzJOz5Qg0wF5VDF7fEr5vREA9vb/PCW9rY1kXwQ== 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 new defer option for (m)THPs allows for a more conservative approach to (m)THPs. Document its usage in the transhuge admin-guide. Signed-off-by: Nico Pache Reviewed-by: Bagas Sanjaya --- Documentation/admin-guide/mm/transhuge.rst | 31 ++++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 06814e05e1d5..38e1778d9eaa 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -88,8 +88,9 @@ In certain cases when hugepages are enabled system wide, application may end up allocating more memory resources. An application may mmap a large region but only touch 1 byte of it, in that case a 2M page might be allocated instead of a 4k page for no good. This is why it's -possible to disable hugepages system-wide and to only have them inside -MADV_HUGEPAGE madvise regions. +possible to disable hugepages system-wide, only have them inside +MADV_HUGEPAGE madvise regions, or defer them away from the page fault +handler to khugepaged. Embedded systems should enable hugepages only inside madvise regions to eliminate any risk of wasting any precious byte of memory and to @@ -99,6 +100,15 @@ Applications that gets a lot of benefit from hugepages and that don't risk to lose memory by using hugepages, should use madvise(MADV_HUGEPAGE) on their critical mmapped regions. +Applications that would like to benefit from THPs but would still like a +more memory conservative approach can choose 'defer'. This avoids +inserting THPs at the page fault handler unless they are MADV_HUGEPAGE. +Khugepaged will then scan the mappings for potential collapses into (m)THP +pages. Admins using this the 'defer' setting should consider +tweaking khugepaged/max_ptes_none. The current default of 511 may +aggressively collapse your PTEs into PMDs. Lower this value to conserve +more memory (i.e., max_ptes_none=64). + .. _thp_sysfs: sysfs @@ -109,11 +119,14 @@ Global THP controls Transparent Hugepage Support for anonymous memory can be entirely disabled (mostly for debugging purposes) or only enabled inside MADV_HUGEPAGE -regions (to avoid the risk of consuming more memory resources) or enabled -system wide. This can be achieved per-supported-THP-size with one of:: +regions (to avoid the risk of consuming more memory resources), deferred to +khugepaged, or enabled system wide. + +This can be achieved per-supported-THP-size with one of:: echo always >/sys/kernel/mm/transparent_hugepage/hugepages-kB/enabled echo madvise >/sys/kernel/mm/transparent_hugepage/hugepages-kB/enabled + echo defer >/sys/kernel/mm/transparent_hugepage/hugepages-kB/enabled echo never >/sys/kernel/mm/transparent_hugepage/hugepages-kB/enabled where is the hugepage size being addressed, the available sizes @@ -136,6 +149,7 @@ The top-level setting (for use with "inherit") can be set by issuing one of the following commands:: echo always >/sys/kernel/mm/transparent_hugepage/enabled + echo defer >/sys/kernel/mm/transparent_hugepage/enabled echo madvise >/sys/kernel/mm/transparent_hugepage/enabled echo never >/sys/kernel/mm/transparent_hugepage/enabled @@ -282,7 +296,8 @@ of small pages into one large page:: A higher value leads to use additional memory for programs. A lower value leads to gain less thp performance. Value of max_ptes_none can waste cpu time very little, you can -ignore it. +ignore it. Consider lowering this value when using +``transparent_hugepage=defer`` ``max_ptes_swap`` specifies how many pages can be brought in from swap when collapsing a group of pages into a transparent huge page:: @@ -307,14 +322,14 @@ Boot parameters You can change the sysfs boot time default for the top-level "enabled" control by passing the parameter ``transparent_hugepage=always`` or -``transparent_hugepage=madvise`` or ``transparent_hugepage=never`` to the -kernel command line. +``transparent_hugepage=madvise`` or ``transparent_hugepage=defer`` or +``transparent_hugepage=never`` to the kernel command line. Alternatively, each supported anonymous THP size can be controlled by passing ``thp_anon=[KMG],[KMG]:;[KMG]-[KMG]:``, where ```` is the THP size (must be a power of 2 of PAGE_SIZE and supported anonymous THP) and ```` is one of ``always``, ``madvise``, -``never`` or ``inherit``. +``defer``, ``never`` or ``inherit``. For example, the following will set 16K, 32K, 64K THP to ``always``, set 128K, 512K to ``inherit``, set 256K to ``madvise`` and 1M, 2M From patchwork Thu Apr 17 00:18:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14054664 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 96D86C369BD for ; Thu, 17 Apr 2025 00:20:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC41228013E; Wed, 16 Apr 2025 20:20:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C9B3128001A; Wed, 16 Apr 2025 20:20:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3B8D28013E; Wed, 16 Apr 2025 20:20:19 -0400 (EDT) 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 936BC28001A for ; Wed, 16 Apr 2025 20:20:19 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 77527160AE4 for ; Thu, 17 Apr 2025 00:20:19 +0000 (UTC) X-FDA: 83341628958.01.DE990B0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id B22FB18000D for ; Thu, 17 Apr 2025 00:20:17 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S0Cyl2y4; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744849217; a=rsa-sha256; cv=none; b=RhQ7tfEIrglq0EoS5VdvhGOtSHIv2Kibtsn94K0DKrZWrBR0fuFTZEGN7wYLKN0tASr+wB xZARR/CzaPm/jhKThUC7bhzjGx0THmhqemBmg/WUiZOAOWIZbl0/a6LMLkM3eg0UHZqsy/ c3ZPYfLdWEbu5ZGufT7Cev17h60bAIg= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S0Cyl2y4; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1744849217; 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=m/aa301+ZC5m1Jmr7HKjW+aJT0ZB78SKeCvyWSDZD8g=; b=hpZ2xuCrD2e3w++9+hCYDGCfRvOP1aSWtERjhNhFtDry05LNlrsZ8hCHSfNWoD3KLdMOTm b0kRkIQRBCX9FikVVzczWqaY8KQFbaAf9GrUOXhxlSqQLRmapIFj4OapijjlLalY8qVPB5 IG78cEaY/3ivAkdtIiFpcPtKEKibidY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744849217; 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=m/aa301+ZC5m1Jmr7HKjW+aJT0ZB78SKeCvyWSDZD8g=; b=S0Cyl2y47s10laxzfZNCR5yGKr7aglroNoMeEIcsF7JZwLuWhk43U+IYZtyg9NZLRP2tgP QQENREY4yZB6Tdnnmww0Xs2ism/oPUicp4UaSC2PBthFeyov32dNnDGwfp8wjQajZKEj+J BGSJhKnnxCRBR/nIKrnpkC+HoSnYWhE= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-195-XyJ2qnAJPimeKMMSR_u8JQ-1; Wed, 16 Apr 2025 20:20:12 -0400 X-MC-Unique: XyJ2qnAJPimeKMMSR_u8JQ-1 X-Mimecast-MFC-AGG-ID: XyJ2qnAJPimeKMMSR_u8JQ_1744849208 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CED4019560BB; Thu, 17 Apr 2025 00:20:07 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.34]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BEB1519560B9; Thu, 17 Apr 2025 00:19:57 +0000 (UTC) From: Nico Pache To: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@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, shuah@kernel.org, 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 3/4] khugepaged: add defer option to mTHP options Date: Wed, 16 Apr 2025 18:18:45 -0600 Message-ID: <20250417001846.81480-4-npache@redhat.com> In-Reply-To: <20250417001846.81480-1-npache@redhat.com> References: <20250417001846.81480-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspamd-Queue-Id: B22FB18000D X-Stat-Signature: q7x6zzixsxr48j6wrn19goccyjg4oxcn X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1744849217-415903 X-HE-Meta: U2FsdGVkX1/Ue1wVKAioFa8Xx2goL1Kaa5LWWReELOVBcinHY9eWK77jdnN73j66Z0++Kkrx4CgN/dt2yf2YyNW7N5DzO6SR7+SPh9kJ7qilMf+fqVpYvgj7lXbi5qtgZMcUTSGi3Av4NsprJ1vo1iyMG9bw7RU3ElUtOHZzPZoSvC9OP0rb+nRPVUuZvtf/YCiIRnqES3cF6MAO/niUGdL3LqwcErU+WgbQzdnqOgIMomc/w2DkK5Ni/xu8BuicHcAwEg9+KVZa2Tcg2nR0ifSBwswSEtuVrWbBGJgAf/g0t6r3xd1Ft2gRPNyes37BhlBnq0Lh5d1HH716Rm9KM1VzlQQJC6UMrpUdq4aVOqncQod2DEZUVcxEg9QK3vWRHYRIB03E/dUXCaFER5GwfrW+zH/cb+LS3+5oySnoFJZf0CvBd1Da3tke51YBjsmY6I3pqbNh1zapJbaeuzG2i2rYoKQR542JEVjVC/38a+pjkXQgdKajOlq+dB5DfYOEUMGPD7xvFdrAfZvGb8NUsDWSeDR7iLuW3eD0eiO6lZB9tbFcxNLxbscxufXnF1rlraVTuf14C3J7TbfASy8do6mEKOj6+IqekgjPksFk6KKCjbguA4sc/zr9EbGHatFXKolG6pX6SvCWNB/Epq/Rwx52tfchQ5yhnFQJ4eqbMlr/OD0eNIqEq0pXyp1WX6eEi6FRzR/b45kvxqjD43saKMCajcCeO12z8mIfGplgJG5xk9wF97u5w67bK+73LJe2kkuJM3Gvy+5dyJhMok8tfXt39efkCRx5TXV/dTVgCqbxhGy2be46MLIT4lzbWsv/el3Dcwo2mHQDZ24INlEew8QFxbeaQYP2IFZV+SMTQMydUYm9SSY4Mgk8qT/wt0G/hmgGxwLp0yo2RWCpdeLPfB0ZD+24yUx8M+UTemPfR0lnKpFl098Di8ZWu0eWygywkcYqCGfXKiMUVRVy5be YOtdZ0BM YdUJcnY6xXFBpk/MlFDO6VoIeyS8tPhQVBOGKWNAkxBThK547RRKtAF7fJNBwR5/b1qENP8TzEKWgtP3EMiCxFretNl67ue7dVkHHvMpNsoR1ZYkbypU3FiVoTHxthWx0haIbI5ooSYI++VBdcvVDN/PWbrgbmpzBXasbu1J550GQheCqEbABhe/QulWJ3TKdBvMtZG3KkeApBJ6Ry69YL7LoxGVTysafjoLhPTDNV4Qk6jEWzRnAgoGtu3Qe/wI49NydS9HVLuEr5pzCoHePlZzdI2rj26KSt5dISrbj2T8DLX3krAuP67nJwO3S8OoNYwDIQQt0I5OSQxtssCZIVSNZfc5A0o00gVRrFdVLHD//x4YZpqAqjkNxtc6EB3l+oL3aGX8yH3lJR2StnPbYlBIzQQ== 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: Now that we have defer to globally disable THPs at fault time, lets add a defer setting to the mTHP options. This will allow khugepaged to operate at that order, while avoiding it at PF time. Signed-off-by: Nico Pache --- include/linux/huge_mm.h | 5 +++++ mm/huge_memory.c | 38 +++++++++++++++++++++++++++++++++----- mm/khugepaged.c | 10 +++++----- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index b88cc3154ec0..a4c87d80badc 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -96,6 +96,7 @@ extern struct kobj_attribute thpsize_shmem_enabled_attr; #define TVA_SMAPS (1 << 0) /* Will be used for procfs */ #define TVA_IN_PF (1 << 1) /* Page fault handler */ #define TVA_ENFORCE_SYSFS (1 << 2) /* Obey sysfs configuration */ +#define TVA_IN_KHUGEPAGE ((1 << 2) | (1 << 3)) /* Khugepaged defer support */ #define thp_vma_allowable_order(vma, vm_flags, tva_flags, order) \ (!!thp_vma_allowable_orders(vma, vm_flags, tva_flags, BIT(order))) @@ -182,6 +183,7 @@ extern unsigned long transparent_hugepage_flags; extern unsigned long huge_anon_orders_always; extern unsigned long huge_anon_orders_madvise; extern unsigned long huge_anon_orders_inherit; +extern unsigned long huge_anon_orders_defer; static inline bool hugepage_global_enabled(void) { @@ -306,6 +308,9 @@ unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma, /* Optimization to check if required orders are enabled early. */ if ((tva_flags & TVA_ENFORCE_SYSFS) && vma_is_anonymous(vma)) { unsigned long mask = READ_ONCE(huge_anon_orders_always); + + if ((tva_flags & TVA_IN_KHUGEPAGE) == TVA_IN_KHUGEPAGE) + mask |= READ_ONCE(huge_anon_orders_defer); if (vm_flags & VM_HUGEPAGE) mask |= READ_ONCE(huge_anon_orders_madvise); if (hugepage_global_always() || hugepage_global_defer() || diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 568ae2363959..f10d307091d8 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -81,6 +81,7 @@ unsigned long huge_zero_pfn __read_mostly = ~0UL; unsigned long huge_anon_orders_always __read_mostly; unsigned long huge_anon_orders_madvise __read_mostly; unsigned long huge_anon_orders_inherit __read_mostly; +unsigned long huge_anon_orders_defer __read_mostly; static bool anon_orders_configured __initdata; static inline bool file_thp_enabled(struct vm_area_struct *vma) @@ -505,13 +506,15 @@ static ssize_t anon_enabled_show(struct kobject *kobj, const char *output; if (test_bit(order, &huge_anon_orders_always)) - output = "[always] inherit madvise never"; + output = "[always] inherit madvise defer never"; else if (test_bit(order, &huge_anon_orders_inherit)) - output = "always [inherit] madvise never"; + output = "always [inherit] madvise defer never"; else if (test_bit(order, &huge_anon_orders_madvise)) - output = "always inherit [madvise] never"; + output = "always inherit [madvise] defer never"; + else if (test_bit(order, &huge_anon_orders_defer)) + output = "always inherit madvise [defer] never"; else - output = "always inherit madvise [never]"; + output = "always inherit madvise defer [never]"; return sysfs_emit(buf, "%s\n", output); } @@ -527,25 +530,36 @@ static ssize_t anon_enabled_store(struct kobject *kobj, spin_lock(&huge_anon_orders_lock); clear_bit(order, &huge_anon_orders_inherit); clear_bit(order, &huge_anon_orders_madvise); + clear_bit(order, &huge_anon_orders_defer); set_bit(order, &huge_anon_orders_always); spin_unlock(&huge_anon_orders_lock); } else if (sysfs_streq(buf, "inherit")) { spin_lock(&huge_anon_orders_lock); clear_bit(order, &huge_anon_orders_always); clear_bit(order, &huge_anon_orders_madvise); + clear_bit(order, &huge_anon_orders_defer); set_bit(order, &huge_anon_orders_inherit); spin_unlock(&huge_anon_orders_lock); } else if (sysfs_streq(buf, "madvise")) { spin_lock(&huge_anon_orders_lock); clear_bit(order, &huge_anon_orders_always); clear_bit(order, &huge_anon_orders_inherit); + clear_bit(order, &huge_anon_orders_defer); set_bit(order, &huge_anon_orders_madvise); spin_unlock(&huge_anon_orders_lock); + } else if (sysfs_streq(buf, "defer")) { + spin_lock(&huge_anon_orders_lock); + clear_bit(order, &huge_anon_orders_always); + clear_bit(order, &huge_anon_orders_inherit); + clear_bit(order, &huge_anon_orders_madvise); + set_bit(order, &huge_anon_orders_defer); + spin_unlock(&huge_anon_orders_lock); } else if (sysfs_streq(buf, "never")) { spin_lock(&huge_anon_orders_lock); clear_bit(order, &huge_anon_orders_always); clear_bit(order, &huge_anon_orders_inherit); clear_bit(order, &huge_anon_orders_madvise); + clear_bit(order, &huge_anon_orders_defer); spin_unlock(&huge_anon_orders_lock); } else ret = -EINVAL; @@ -1002,7 +1016,7 @@ static char str_dup[PAGE_SIZE] __initdata; static int __init setup_thp_anon(char *str) { char *token, *range, *policy, *subtoken; - unsigned long always, inherit, madvise; + unsigned long always, inherit, madvise, defer; char *start_size, *end_size; int start, end, nr; char *p; @@ -1014,6 +1028,8 @@ static int __init setup_thp_anon(char *str) always = huge_anon_orders_always; madvise = huge_anon_orders_madvise; inherit = huge_anon_orders_inherit; + defer = huge_anon_orders_defer; + p = str_dup; while ((token = strsep(&p, ";")) != NULL) { range = strsep(&token, ":"); @@ -1053,18 +1069,28 @@ static int __init setup_thp_anon(char *str) bitmap_set(&always, start, nr); bitmap_clear(&inherit, start, nr); bitmap_clear(&madvise, start, nr); + bitmap_clear(&defer, start, nr); } else if (!strcmp(policy, "madvise")) { bitmap_set(&madvise, start, nr); bitmap_clear(&inherit, start, nr); bitmap_clear(&always, start, nr); + bitmap_clear(&defer, start, nr); } else if (!strcmp(policy, "inherit")) { bitmap_set(&inherit, start, nr); bitmap_clear(&madvise, start, nr); bitmap_clear(&always, start, nr); + bitmap_clear(&defer, start, nr); + } else if (!strcmp(policy, "defer")) { + bitmap_set(&defer, start, nr); + bitmap_clear(&madvise, start, nr); + bitmap_clear(&always, start, nr); + bitmap_clear(&inherit, start, nr); } else if (!strcmp(policy, "never")) { bitmap_clear(&inherit, start, nr); bitmap_clear(&madvise, start, nr); bitmap_clear(&always, start, nr); + bitmap_clear(&defer, start, nr); + } else { pr_err("invalid policy %s in thp_anon boot parameter\n", policy); goto err; @@ -1075,6 +1101,8 @@ static int __init setup_thp_anon(char *str) huge_anon_orders_always = always; huge_anon_orders_madvise = madvise; huge_anon_orders_inherit = inherit; + huge_anon_orders_defer = defer; + anon_orders_configured = true; return 1; diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 38643a681ba5..f9faff6917d3 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -491,7 +491,7 @@ void khugepaged_enter_vma(struct vm_area_struct *vma, { if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) && hugepage_pmd_enabled()) { - if (thp_vma_allowable_order(vma, vm_flags, TVA_ENFORCE_SYSFS, + if (thp_vma_allowable_order(vma, vm_flags, TVA_IN_KHUGEPAGE, PMD_ORDER)) __khugepaged_enter(vma->vm_mm); } @@ -955,7 +955,7 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, struct collapse_control *cc, int order) { struct vm_area_struct *vma; - unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; + unsigned long tva_flags = cc->is_khugepaged ? TVA_IN_KHUGEPAGE : 0; if (unlikely(khugepaged_test_exit_or_disable(mm))) return SCAN_ANY_PROCESS; @@ -1430,7 +1430,7 @@ static int khugepaged_scan_pmd(struct mm_struct *mm, bool writable = false; int chunk_none_count = 0; int scaled_none = khugepaged_max_ptes_none >> (HPAGE_PMD_ORDER - KHUGEPAGED_MIN_MTHP_ORDER); - unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; + unsigned long tva_flags = cc->is_khugepaged ? TVA_IN_KHUGEPAGE : 0; VM_BUG_ON(address & ~HPAGE_PMD_MASK); result = find_pmd_or_thp_or_none(mm, address, &pmd); @@ -2550,7 +2550,7 @@ static int khugepaged_collapse_single_pmd(unsigned long addr, { int result = SCAN_FAIL; struct mm_struct *mm = vma->vm_mm; - unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; + unsigned long tva_flags = cc->is_khugepaged ? TVA_IN_KHUGEPAGE : 0; if (thp_vma_allowable_order(vma, vma->vm_flags, tva_flags, PMD_ORDER)) { @@ -2635,7 +2635,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, break; } if (!thp_vma_allowable_order(vma, vma->vm_flags, - TVA_ENFORCE_SYSFS, PMD_ORDER)) { + TVA_IN_KHUGEPAGE, PMD_ORDER)) { skip: progress++; continue; From patchwork Thu Apr 17 00:18:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14054665 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 B3A77C369BD for ; Thu, 17 Apr 2025 00:20:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2AF7280143; Wed, 16 Apr 2025 20:20:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D006028001A; Wed, 16 Apr 2025 20:20:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BEFBA280143; Wed, 16 Apr 2025 20:20:28 -0400 (EDT) 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 A303C28001A for ; Wed, 16 Apr 2025 20:20:28 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AF735121023 for ; Thu, 17 Apr 2025 00:20:28 +0000 (UTC) X-FDA: 83341629336.15.5C129A8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id F0C58A0013 for ; Thu, 17 Apr 2025 00:20:26 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CgZXLE3q; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744849227; a=rsa-sha256; cv=none; b=twD3sY0hOdOhdgnHwydikV59mkSwV2bmZi82XuFVRVSXIq1dxIR2MZrXT+oFL9PD9ZtNtS ZqCzroUL2M2odp7kUcE2n+kCNtY2hC4cfuZRrsXefJb6NLT6b8N54QS09vUS5vuKuX4NcY XhcJZC/4aHRJ8sNGBn3jlLaZHXFcdX8= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CgZXLE3q; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1744849227; 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=7n76Fvpmfa8LN30y0qvCHdYcw71Um4Eimev9X0oBxqU=; b=Zfw+4SbYCvm7+0Aoz4JyhPkpK9l7MrT1QxrbWH6oa0piXkNSZ8tDeFCNvDiVBV3jYI/q2n uVdflgRQ5lz2UyaPeQ7xfKAz4lrS9WKLQ0pP6BaaGlRPkLLr10uXOzoONByFOU0zTCYB// vxUzuHDyfTrj2PcJdHpu9wIhscWbUxM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744849226; 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=7n76Fvpmfa8LN30y0qvCHdYcw71Um4Eimev9X0oBxqU=; b=CgZXLE3qY8WCt61qOofSHv+8od8AKJMQxXN3Ks8eocAWVVg4cuL+diwyVXZrmgvyeEABj6 DFdHqip0sILgNTJuoYdrP4rLK2QmNl9ila79NG6lNCQxmm5W71fZm5L5PwrCEI5rBjLxeF 9+wr8aWp3HDkS7JEQF0UTiP71AFo3Jw= 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-533-CvnZAHuzPYSmoVkEBRTivg-1; Wed, 16 Apr 2025 20:20:22 -0400 X-MC-Unique: CvnZAHuzPYSmoVkEBRTivg-1 X-Mimecast-MFC-AGG-ID: CvnZAHuzPYSmoVkEBRTivg_1744849219 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 9A02A1800264; Thu, 17 Apr 2025 00:20:18 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.34]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3796119560A3; Thu, 17 Apr 2025 00:20:08 +0000 (UTC) From: Nico Pache To: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@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, shuah@kernel.org, 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 4/4] selftests: mm: add defer to thp setting parser Date: Wed, 16 Apr 2025 18:18:46 -0600 Message-ID: <20250417001846.81480-5-npache@redhat.com> In-Reply-To: <20250417001846.81480-1-npache@redhat.com> References: <20250417001846.81480-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: F0C58A0013 X-Stat-Signature: onoiswzn6wgtxqaiomy98b34a78f5c7r X-Rspam-User: X-HE-Tag: 1744849226-60788 X-HE-Meta: U2FsdGVkX19bbUXmVJDmmjDKxmBChmxHp7hqRBoabkDRj4Zo00K5RyXd9IaNpTy0eGpzqpdpO2lJO5OjNDUtpjbgWyBGNIpLMQqLywCMfS9Twg2T9j/Uc2Y8dK4tuElWj82Cn9bwhoh1hfmTmbiad2H1dRgcvNSt6iBL6bHkdPrAe7OMbnT7KipkMEJTZ+4rTG/yDk/f4ySjR0V+rntE/u7bj2nyy97bpl+HNNTYPWPp0u0Apl+kgrvknptp3/4ByQgCdLY4eAJ6d8VLJblkZfHedjBqcJDNumukEK6PFsgeqA6yPvIKE+YMQNBqBmoc8St8/rmPc4jVQbUDhGVnb2J5PdoviOfGauqxF2Mhmi95F/2i1X6tWJCKLGgjlREV0AY/jHHyVJZephef1TG9BKBf7A9jm5MLT4Od/cf/2hOiOy9pSjdVx8ZARUwtSXYNsN11ynXXfa6amFIlkcfLhoAETeUngJKZNhZmNep4SgS1srn6+Fhcm2y34d1myDxu2OTkHaxrqcRozBRm5WmNajIGkwgPex8PeDkyYZ7eGC0a/c80k2g1q1Ol6YM7WJBtxupxjzJ7zSGOXiuJ9flvwRW7noYWGRnQneaDKY8P7XnKLM5kZZVegRlQHoQLmwtMxcXDlxnUYDUkLpCEGrPrLIvclm8T54UnqXkmseytOWMJokLRlAJKrrG9OA1IoQ876VELUdM6BkFqpiL53BYn7uPEzsci8rSs5PpRgacXa/ZdPgs/DqHW9/yDXjWMv1n10ihA4mZpKCX0zX0vm4Dw/xFlR7/Nnr7yfnkfFcMxfI0EB4IvW+JkX5/mhBUxK6ZoczR//3ZXe2NyXWNforcAvowPMY05R0AYu3TzBUuNhBq0GLVEXaIKULOxiiT0xplsCBxSmLZ5eJD4ezbFeb1eukxhQBumScULJUGfDl0GPpolkUxUL4mgWl/3r/GCuwupFCbDE49jlz/aV+VqsOC Q7g+DLKz bnrYKgTj7yRZgSWa4bvQXeFK6k4S5K/MVStWucXqtAqxhcp7A0lqeFKd6rCkCoGjeAH3X5FHO3/vPFFq22ISTW22wCmkCHk0nOZ6Sukriq3Rbx7m5LuKoieHZ2TimIhsMyGqGvfkjqgRn7rwI5pI3DMnyXSc6+NoybZNJdRi9n2231TJaEHm+SuO2/VxRIoP/YF0fzU6ig+zFsIBePYnk/2XQSDNoa8NILghgZ3YF/r9EIdBGB2JHQkYUdhH2DcCpqYjjj7UoCADHpNgRY8rRMJv5oZVOmI/NF4mH0TKR6gHhm3baf+vPE2tKfXT4oIuIOSIbOV/KuuNpjBXn1Z/lD+PINoB1Ogux6OtI6k1x9/x9NqQrCxwXCcxCHp3WGxsnbjwsGLpzaAV5BdofIG7IfqaQ/uobS6b6S3rzhkmWONezrjw= 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: add the defer setting to the selftests library for reading thp settings. Signed-off-by: Nico Pache --- tools/testing/selftests/mm/thp_settings.c | 1 + tools/testing/selftests/mm/thp_settings.h | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/testing/selftests/mm/thp_settings.c b/tools/testing/selftests/mm/thp_settings.c index ad872af1c81a..b2f9f62b302a 100644 --- a/tools/testing/selftests/mm/thp_settings.c +++ b/tools/testing/selftests/mm/thp_settings.c @@ -20,6 +20,7 @@ static const char * const thp_enabled_strings[] = { "always", "inherit", "madvise", + "defer", NULL }; diff --git a/tools/testing/selftests/mm/thp_settings.h b/tools/testing/selftests/mm/thp_settings.h index fc131d23d593..0d52e6d4f754 100644 --- a/tools/testing/selftests/mm/thp_settings.h +++ b/tools/testing/selftests/mm/thp_settings.h @@ -11,6 +11,7 @@ enum thp_enabled { THP_ALWAYS, THP_INHERIT, THP_MADVISE, + THP_DEFER, }; enum thp_defrag {