From patchwork Mon Apr 14 22:24:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14051094 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 50DA2C369B2 for ; Mon, 14 Apr 2025 22:25:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5CA3B2800AC; Mon, 14 Apr 2025 18:25:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5AB7B2800A7; Mon, 14 Apr 2025 18:25:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CC9C2800AC; Mon, 14 Apr 2025 18:25:57 -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 1A2502800A7 for ; Mon, 14 Apr 2025 18:25:57 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4B767B9F36 for ; Mon, 14 Apr 2025 22:25:58 +0000 (UTC) X-FDA: 83334083196.01.EF6D6FA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 8CC4DC0002 for ; Mon, 14 Apr 2025 22:25:56 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="dxU6xZ/4"; spf=pass (imf28.hostedemail.com: domain of npache@redhat.com designates 170.10.133.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=1744669556; 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=FwpqttvBCnxGqGYUL3sPRwZ5zL6bMm0W6vYtJG5uftA=; b=XqBQrnKAxVAcxgWSAqtazFPrCRSDkRUlBysJi7sEDIrKRQJhyEFdCqShjymctZJyC0NggB jgHSzDhtWGN31anajDyuBuK15rAXHplKqsD4guw82uG1o6m6Orh/axEI8/3raCuOpHE3OZ hCfdnUHh2+ADzqIlz5ga5/5QOjHTINQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744669556; a=rsa-sha256; cv=none; b=aXoYHjRQ91+GeBamsslVc91VE3G/MqaiBjCNivaSrcBJj6FYFYIKQ5RidtyNOGvTlzzAYL aAr7HsycVuQCVMgjm3V3oe2H2J5UqIa/vA5DZEMAset2Hy9/8KgnWS+/Adpzz2wcHsym65 1oN6/lKrYxco6aJS3JRdJgloXqgohCw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="dxU6xZ/4"; spf=pass (imf28.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744669555; 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=FwpqttvBCnxGqGYUL3sPRwZ5zL6bMm0W6vYtJG5uftA=; b=dxU6xZ/4qztslGsKfTuzKdyelxH0T6L2vzURU4n/LIm0OhspR8DxlROEw67+blEIHFh3Xp gX8p/rAJkSlT5bOarqXNDG0eCgJc2oKAYzN6TOGKkSO7gbEuiZGePImRk8GxgGOxdj1fi5 Hua0kiOyLRf1N+2k/PHYa7NrAQ0CMMI= 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-154-__A_VGTmMayXFMB3zUZXyg-1; Mon, 14 Apr 2025 18:25:51 -0400 X-MC-Unique: __A_VGTmMayXFMB3zUZXyg-1 X-Mimecast-MFC-AGG-ID: __A_VGTmMayXFMB3zUZXyg_1744669540 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 CB0AA1809CA6; Mon, 14 Apr 2025 22:25:39 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BD70C180B488; Mon, 14 Apr 2025 22:25:24 +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, shuah@kernel.org, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ioworker0@gmail.com, ziy@nvidia.com, wangkefeng.wang@huawei.com, dev.jain@arm.com, mhocko@suse.com, rientjes@google.com, hannes@cmpxchg.org, zokeefe@google.com, surenb@google.com, jglisse@google.com, cl@gentwo.org, jack@suse.cz, dave.hansen@linux.intel.com, will@kernel.org, tiwai@suse.de, catalin.marinas@arm.com, anshuman.khandual@arm.com, raquini@redhat.com, aarcange@redhat.com, kirill.shutemov@linux.intel.com, yang@os.amperecomputing.com, thomas.hellstrom@linux.intel.com, vishal.moola@gmail.com, sunnanyong@huawei.com, usamaarif642@gmail.com, mathieu.desnoyers@efficios.com, mhiramat@kernel.org, rostedt@goodmis.org Subject: [PATCH v3 1/4] mm: defer THP insertion to khugepaged Date: Mon, 14 Apr 2025 16:24:53 -0600 Message-ID: <20250414222456.43212-2-npache@redhat.com> In-Reply-To: <20250414222456.43212-1-npache@redhat.com> References: <20250414222456.43212-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 8CC4DC0002 X-Stat-Signature: oxhwqpujxsbr9nxrkpyrz8psfmmip9wj X-HE-Tag: 1744669556-174875 X-HE-Meta: U2FsdGVkX19RNKSuC0m39QEmthlggJp6DjcpYabf4JXx3jTYess8RIqZDWQRw4OzM58DO2pOogXtgpVzoOXIUPeaAagzNuwf/+A4Z9gl7QavDoBRrpfa0pYQ09Rm3F6v21DPgaPQ4jdu/Mf1dmY6zXDAJa5zGQGO/A4PPBjg0ixOhvVui2gaWPe/1OFAiaEzkFmswPJKO9b+wlBtXxSHN7EcQ7gO7fiKguG+Z62jMAmcGnH+NVzahvP0F8IC7tNkHl0KY1r2IjjH/BsUAWYrshzBFWHvK+YDqYOZAebOSA99Z6qxwoyTJztQ+RwoUmhjZUEhKbY6rog7pTrdQmuP2GVY5SPlvOWa3/uD67mmB82v3aHeyiIetcWxkSH5JfJ/brWn0KXgtd4cd0TLQjYEpdn3RGFidKF3MGJ8/YKz/OpB9DlVuv6cwdqpSmx0q5lSL3E+NW1GDwa45mKEMISDBasEHj82w3uwY0NPkupE/VALajPNqgcs3pQBlMAmRP0LP52N+CRy1EVOl8uXXjHdeoFI2n8ffFYuQk3NEnGHJrqhbfL1Tp6GmmN3rDdBpPrlQH/P1HFKLmOMkhcacDJPDlWFyKYDOPMqWD/kLMqAIAAiz3NlVDRcE48ZUSLC9SCxJv0joWdRakmqTdcQc0LD3hE0SpVLgjr5abBxVisK7htqjPf9WrFUjbqonkiF/WQolsRQQMhSZu7SSEXPHpDJwrXsY1v0JM9kpxVVJs8y+GUDcr1jyL2qlqf8/iI6IVx+ZXnYKZlZMtb6wjZKJwFKk48wYEzK8rL19ZwKwRZydXFl7cGIoXzVwNw6CIJ6GpZ55wt/QkXFu6Exy+sIgn85TpeLGSsRibHDAvlURrSWeT4N2K0P5+xwqUZvYbXH9+dcgkopVv4N7dRo2i7vNenG3pJhWfuvmRXSQkX3bJ9KII1toLL+1qSpZknIv43ATqdEDI6VE/ItoYXJTpEND+G TkOCSSdu 6VUvlnG6Gl/S6KdFkl50FM826RBnCQPfcRrj9o5SknNjJrPpUQt+/LGpB9spH2SerzxA56I592bdZ6Fq3ojEY86CcEGzOgqSA1jhkhwLZ9DSgMHxNOf3UXJgTSCnB7BwMmNyLB1uKJ+Sv75mdaM/56z+TbYntrNDvkR38UtNH2MrJYO1qSU5eRItDJgtuqgyyw+2eM1KlrCGhXZWQFognJGkQ2XUvtqvXoG3C7vqKVMLng7my/dqZvGfBwfrH3ArDdH4Ici+1332xMfWk+gGYbbOEbHHWVAQFuNA70rltWvirF9Xds3Ud/93vDF9G5IFAHjF0rlGhM+VDs9hzXrixMcGuZ7Gz4UaR2bgy89ntmcGEXDY9+/8DrMtjYBmV/1GkIuwvofRAMV2g2FwD90GIbnaMNQ== 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 95be9d266eff..b154bd11bd93 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: 14051095 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 AFF97C369B8 for ; Mon, 14 Apr 2025 22:26:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2240A2800AD; Mon, 14 Apr 2025 18:25:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F197C2800A7; Mon, 14 Apr 2025 18:25:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D69BD2800AD; Mon, 14 Apr 2025 18:25:57 -0400 (EDT) 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 B96302800A7 for ; Mon, 14 Apr 2025 18:25:57 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BB4F9AF74A for ; Mon, 14 Apr 2025 22:25:58 +0000 (UTC) X-FDA: 83334083196.03.66FC5EE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 0373640007 for ; Mon, 14 Apr 2025 22:25:56 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cxeHqMNC; spf=pass (imf04.hostedemail.com: domain of npache@redhat.com designates 170.10.133.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=1744669557; 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=CV9IGBx6ODvRJHViy9uocxS1JFT5Dwo7ktLvhKvEEnw=; b=5JSw4cmvPe2cQjYc1oQwduTbm67GV3nIOxuRsoi/AWsZdsZbLo29liVPcX7kZRHxxvV0L2 gzKZofbAb7jy1SpVbeMiCy7XIleUE0wZA0r6rUJcQKqsbqez7QTmdgcuXg+P+dRwUvAB6C JIg9MJrSBo9u+nRgj7O8tAQN3zfLqGQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744669557; a=rsa-sha256; cv=none; b=qHOpSjWRRoeUSeF7CY9C5D9eVUlZKxoRtq2RU5IJ3zBq4dYok1iZWi7yxDwy2/tmbz7e+T ncwjjcZgDA5E67f2xPpMbw5n1AMmYYpeLAv+c89IAIIizXTPU1LTt1w6JCe74GbeHiDxSp MLchtfI26b/AiIHiqm1M3RLKUCuHHcY= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cxeHqMNC; spf=pass (imf04.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744669556; 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=CV9IGBx6ODvRJHViy9uocxS1JFT5Dwo7ktLvhKvEEnw=; b=cxeHqMNCcrFJOOunmJYDnJL4hEPk4VRUjAZU075SMj4gKa8EY8dmkc2qVakUG2S6A44eSX RaQcBogHkikw3WVEPFfKgILMHQg4cRC8fEK8yUDKPMAY6rDm042NfzBPdQHXv36AltnRe9 L0fbbyxxs8T3QdttQDAiFvtfQzEaAtM= 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-10-qe0rroeyNIqL-m90P1mikQ-1; Mon, 14 Apr 2025 18:25:53 -0400 X-MC-Unique: qe0rroeyNIqL-m90P1mikQ-1 X-Mimecast-MFC-AGG-ID: qe0rroeyNIqL-m90P1mikQ_1744669549 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 1EC0F1956087; Mon, 14 Apr 2025 22:25:49 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 29B63180B486; Mon, 14 Apr 2025 22:25:39 +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, shuah@kernel.org, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ioworker0@gmail.com, ziy@nvidia.com, wangkefeng.wang@huawei.com, dev.jain@arm.com, mhocko@suse.com, rientjes@google.com, hannes@cmpxchg.org, zokeefe@google.com, surenb@google.com, jglisse@google.com, cl@gentwo.org, jack@suse.cz, dave.hansen@linux.intel.com, will@kernel.org, tiwai@suse.de, catalin.marinas@arm.com, anshuman.khandual@arm.com, raquini@redhat.com, aarcange@redhat.com, kirill.shutemov@linux.intel.com, yang@os.amperecomputing.com, thomas.hellstrom@linux.intel.com, vishal.moola@gmail.com, sunnanyong@huawei.com, usamaarif642@gmail.com, mathieu.desnoyers@efficios.com, mhiramat@kernel.org, rostedt@goodmis.org Subject: [PATCH v3 2/4] mm: document (m)THP defer usage Date: Mon, 14 Apr 2025 16:24:54 -0600 Message-ID: <20250414222456.43212-3-npache@redhat.com> In-Reply-To: <20250414222456.43212-1-npache@redhat.com> References: <20250414222456.43212-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Stat-Signature: ra1rxse139juc6f3zux4yn38ze7kb8hw X-Rspam-User: X-Rspamd-Queue-Id: 0373640007 X-Rspamd-Server: rspam08 X-HE-Tag: 1744669556-792124 X-HE-Meta: U2FsdGVkX19IGOIMiMnxXbFzxfMh3By3t5QFoNsq+w5iSl3Q2VBH0TUDAChypL722dFYGeyWrFDjSjCw16KJE2V90t02ZgIopPSNkeRy/pnC+Jgpu81sMuVtYM75Zhbzxpco9xl3f7A2TeTc7Dume0YuvkFMH/QpGAjq85d+aHpaybJoKRUKN6U4HmQweb11sliVsLx9I38KIU6qciSDgWwXCtfKZ8EUiic8RIxuyYwJ4NwFY39/Xjcq1BLug+j3CBk9ZCSMkGLeqiysFwr0Ty1bXnigofyp/q+Vy1yL6KB9lhckP8mB1QJDmeZSm14agG1YKf6YE0SxNfKdFwTQpZ03BPZLV7LoPnxl0QZ8DOTuktOccPbshnGnXqOPBACMNzKFbESREaTccQYBKaQp36ZLTBLcHFDNp6yeLmyWkrBqNmZsbh0jWzdKBLPxUaxcoQ3s583ojMc6+PZOoIb/WnwSlVbjtj8ZTRfsuT2CvzNdsu5XOindAwNeWu5WUKdNqmqDOzl8wVgJzpbBsZBebAY27ZJmasTq5Lw3e0rrJzUOU0aT/4I3XEkErCS0E2mp99TWHOhfw+mwbVF4VsOG7q0NpHyaeIrbDiIRiXQOxaHh6fyju5RBqDKkAfHE1VXTo5n3lnPIznBFz3FLG6J3Re+Xf6wuBTST85zDE28IIXb74bU+yZQEMXbPk6Y+S8U0aRWd9bV6JYrbMRGSw0mBkax9z+HUPrm75YB9kRC60EEKO4ENq7J/JxBPIbCWhUcJGRQhwXREemMUr/A8eFdWIh1QSVX2qs2n92IZaGKc9/U4hb/9qtJsEPJPQCV1XnZGmt1vANiX7kKpVLXdeOUAR9KERT3HeI4NOjKfj8WxlSZfgDY1iIj2WPzXlzb7R4OJByVfp1ysEkatwEB98nDsGS/gBzKgKTCqN2g2HrC8iVow8jUEk5E34VNk/aftBhLUXPk8rvZRkHooKvrjtwO Zvw5Dza8 QyS7nSHPy+Z/Vs1wlfxqtOOi9beq27b2/K/wcFt//XcwdoqurTYP3B3fVYYr9r7FhSos4iEriA6JxdKuHiNIBQSlAU++uE6mhTsUKDI0zYA3uX+zM4lB/+PNYDYiT+bVGEp1ZFmsPK5qAeec+aJsPhyRK0vIc8gvmDRF1NZtU/F1oRYIq7xiTLna4XMF1/rIevzSKHfAuq9PJIyIXQszHhtVQeMBUSwZ2PYKx/L2IJcK0e9KlvHChAqzYFqogqp1aLWEanoaoHecbe0kKgfEYH3KTD7GVCwEeRx0rV8598xaFmKBLJGWyni82aFzcT2Vwd9dSL5/kRIXjGuj5RSOBWyOPuF6Pj6rS7dOURNxVO9YZHDdnCZoIqyXrQROTkT2y/vSHOiRk0Ny1fkDqIuhKF0Jkc8CJsFJ0SuApBwRrARA2j0vIxd1BwZtTUg== 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 --- 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 f0d4e78cedaa..d3f072bdd932 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 (ie. 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), defered 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 @@ -281,7 +295,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:: @@ -306,14 +321,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 Mon Apr 14 22:24:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14051096 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 77E4CC369B2 for ; Mon, 14 Apr 2025 22:26:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E40D2800C0; Mon, 14 Apr 2025 18:26:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76B5A2800A7; Mon, 14 Apr 2025 18:26:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E8C02800C0; Mon, 14 Apr 2025 18:26:08 -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 3BCBF2800A7 for ; Mon, 14 Apr 2025 18:26:08 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 2BFFF14072F for ; Mon, 14 Apr 2025 22:26:09 +0000 (UTC) X-FDA: 83334083658.11.9C639C7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 5D98B4000F for ; Mon, 14 Apr 2025 22:26:07 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=M2q+9Eop; spf=pass (imf12.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=1744669567; 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=msAh24K3udJPuo4uQvhJ2pQGaWpK+tApAzBqCKFUhws=; b=5mQgv+39j4Wr2ZiLSx4qNRnOuUMWKmCzwwaQXPKK5pAO0oGNpeM0YaWvaE4Zc57c9RzP5J 9NF0PoyGQbaVMvFYNTpq8QpWrJKxu+Tns23QCWUS2CBTlbGHaK1VcUkOxBKWZqDqVCC6Om CY0KERYlUtqQ8rsNVcG6zWhY8tN6y18= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744669567; a=rsa-sha256; cv=none; b=R4vSSDB0Ekw2ufmFZlyc9UYA7HGhnuZQcutltlQjVZw0HGgakePR/YWN8ullbQtxRoUkxN CMiuxJ5xpqksFZ4FTQ08z8oult7rOvL/urfnkLiWcWYHz62F4DQZwzrC/fby9iaE5WIXaS pfbL8Y9+1eI64KaUnwIxLHefyM2i8Yo= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=M2q+9Eop; spf=pass (imf12.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744669566; 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=msAh24K3udJPuo4uQvhJ2pQGaWpK+tApAzBqCKFUhws=; b=M2q+9EopNxmYB3k6QxFy6ehQEHZZY84RPL+navpaeylp41RZIhpRycxY7TxgeQKRrsfjCi trUS6bQDRXiXXx74FQITEAKu9Ibx3F2djF7Ba64gzwI9ge8mk69izefZ+ZVhgN/UUqMt8H c8XeVJCys4k/SiKwujMOOSj1iIW6UXk= 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-689-7XVIjlpZMYCFtk_dDexsxw-1; Mon, 14 Apr 2025 18:26:02 -0400 X-MC-Unique: 7XVIjlpZMYCFtk_dDexsxw-1 X-Mimecast-MFC-AGG-ID: 7XVIjlpZMYCFtk_dDexsxw_1744669558 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 20A611956087; Mon, 14 Apr 2025 22:25:58 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6E187180B487; Mon, 14 Apr 2025 22:25:49 +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, shuah@kernel.org, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ioworker0@gmail.com, ziy@nvidia.com, wangkefeng.wang@huawei.com, dev.jain@arm.com, mhocko@suse.com, rientjes@google.com, hannes@cmpxchg.org, zokeefe@google.com, surenb@google.com, jglisse@google.com, cl@gentwo.org, jack@suse.cz, dave.hansen@linux.intel.com, will@kernel.org, tiwai@suse.de, catalin.marinas@arm.com, anshuman.khandual@arm.com, raquini@redhat.com, aarcange@redhat.com, kirill.shutemov@linux.intel.com, yang@os.amperecomputing.com, thomas.hellstrom@linux.intel.com, vishal.moola@gmail.com, sunnanyong@huawei.com, usamaarif642@gmail.com, mathieu.desnoyers@efficios.com, mhiramat@kernel.org, rostedt@goodmis.org Subject: [PATCH v3 3/4] khugepaged: add defer option to mTHP options Date: Mon, 14 Apr 2025 16:24:55 -0600 Message-ID: <20250414222456.43212-4-npache@redhat.com> In-Reply-To: <20250414222456.43212-1-npache@redhat.com> References: <20250414222456.43212-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Stat-Signature: mk4xrz3uf5zddp483orpek8e1dfx3am1 X-Rspam-User: X-Rspamd-Queue-Id: 5D98B4000F X-Rspamd-Server: rspam08 X-HE-Tag: 1744669567-818969 X-HE-Meta: U2FsdGVkX1+IDssN7ZSdGKmknhXBRPrB8bZNDDniVOD2t2X73XeEHzdPkE1fH+UOuWudhL95avpjL/9rMFEyJdiQZrntR+0SAdvrPSzPT/C6GjtIC3v8Uc1orxb8wt61dSb5tLDENta8Ls7IdAZXUXUvNqdTP1/mUCLhJSnytS6ITVKBtlYCm/8CS5igjCBTYlKgaXDLNcsppQBmd4F76V6ltopbVFH4Id/BJLcblc9qgURghWaOYvH/t5BboMO3wq8kmhmmabq/+Fh6R2Bkl4nnsBBjYMmCGWcLREHGAbhPqWBu6P6mxx4G9kjfPkxw9yHpeSaiSuE9pZcQcWPy/3IEyUSJlCCYyMyozCb5iHR44E3MvY+fLx3YmU8IfBairv7i06d8DalEkp8mRZn6hRxn191vKj3QJllB9QZNetE6eXp4hXnj0jpvZ6Vu2ia7X+iF2e2cNn9Rhyrkk5uCn8k+INabzc18doGEiTPUcLuMekcWKt6JVsKvIwKRbQXq8KhpR7Ahc2+sTo92zOLv8YcMpXhKDNn/dInvqHcjH0TzPbe6NRMePndYsPfTo10bbjAx9zEdtOuzB4ii4U0IfwNpkxrEBm/KulZBgaxGcFPnC+TE0iMHAAaraT0kSpx6HbTI7dVdVTfgkuOoQ1ViAJJ42C1TRq2FK0PFSGXwdNA9fLwc4C9cfTnYbUNywostDsIo8bAhbOj7PiY5K1YmGYbjhoOCcvH7WwJ99y90g/h5W+QtgtSBMXTQoTwwsERnix3YYJb5cx6mJ9DsK245XWydUhCdDYJEp9jzCfcmxZEMwwIH3tymdOyNwkIFuEfdKJfhorbbIQIdQDInkMP9gXi8I4W+HunbXdp3Gdetd4mE4Nhgf1d+OsN7Rj7Qb3kJE9bzvX4ejhmWbwHdVADTDN2ASwtJXkvIWdb+8JR3aK8qOkNpsYUTI0JenFGhjRRmYyCsbDULUW0D9B0lWJU TwfzniGk 27xO0IcZEreJctuu0C3XB5Bk3zyv7fIcI95jzcTgXDnsdFZgZdkAxi4GFi3L9j8MXCVtwR2JBE4KuwwK7C7+ifiO8TIXl/NDcTHAa4P8WlR1deO5XHKYBl5kwNuuE78zkxV/5+zvNAxHGuLb0+ldMDoyrdIn2zy3FUeC9lLHItGZcH7tvs96ew7dYXoWauIkXi1CLc4TXtD8bu6U5Rlawp6Ds496XZ40PjMYfsXKit2VP6sKZjwulWWXus8a0aWqgmA+51Jx4kBhgtRNHUipttpxZ9fq5aFi5f15zAU+BkYMRpzkKUHeK6oxv/hgB9B4JXD3J1+mYjXF/V/gENzr3bSjJe6znYgJaG83T8hfw9I/7TpK7C0ONWeOK26IOEg5bjvI/zwidsCH+/i4x5Jt8gV3ybA== 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 b154bd11bd93..fe6e8dd68100 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 4eee0001e0fa..30ea898d4ce6 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 d35abae76c93..1123a2225d6f 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 Mon Apr 14 22:24:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14051097 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 0C3B1C369B5 for ; Mon, 14 Apr 2025 22:26:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D2FB2800E1; Mon, 14 Apr 2025 18:26:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 034652800A7; Mon, 14 Apr 2025 18:26:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA0362800E1; Mon, 14 Apr 2025 18:26:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BA3612800A7 for ; Mon, 14 Apr 2025 18:26:17 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id F0820AF7EB for ; Mon, 14 Apr 2025 22:26:18 +0000 (UTC) X-FDA: 83334084036.08.A246CFC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 4CE5D40005 for ; Mon, 14 Apr 2025 22:26:17 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cZlXAO6g; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf12.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=1744669577; a=rsa-sha256; cv=none; b=YCcJ/azhMtLhRHulYljCQcJWIev7+4JAeRE6Uzj0sLR0oC6yie1kJoD5kJCLVMOCuZhm8s yjEQxvMU1qbP0LJqsgjtCI86MFcZPb27xsM4YE1pXzY7B4W4ayk7o08WNCehoskwGnn3i/ Ut1s1azLIDDW8QkuAEmuqBb1tDDB5V4= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cZlXAO6g; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf12.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=1744669577; 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=tTm4NcAMEdVxSip2o/F5RcOzYJjbnXyjKvKG6rLOMxXX1upPo4o29IxQwKWBNeOohnXzQx CxjVD9uFLfms9yY+zYBgdzhLD34fJvNNCHaAlfuhQ79x9JqlYDaV47GZPRDm7j0XIhCO71 ccIUt1BRRLRHsWxQRtD2VGCuaeOpYgQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744669576; 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=cZlXAO6gekbvLSIQEYUIslG+KBGBHGdP1oLOq7ZLomls7e9bkdr3Anlzb95nNo6v+IG5kz pZFT6WIIMVCR2J67qUjhu0GzblnTT/2vqjsnPJvOcGCNBDG5pC43aXXvOBQz79coXvvgB9 /FenLo9w/yF0rFXNcEkhIymhbOmZ3B0= 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-447-XdkNGvy2OZa1MtxhAwhYsA-1; Mon, 14 Apr 2025 18:26:11 -0400 X-MC-Unique: XdkNGvy2OZa1MtxhAwhYsA-1 X-Mimecast-MFC-AGG-ID: XdkNGvy2OZa1MtxhAwhYsA_1744669567 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 1D0AE1800262; Mon, 14 Apr 2025 22:26:07 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6EB1B180B486; Mon, 14 Apr 2025 22:25:58 +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, shuah@kernel.org, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ioworker0@gmail.com, ziy@nvidia.com, wangkefeng.wang@huawei.com, dev.jain@arm.com, mhocko@suse.com, rientjes@google.com, hannes@cmpxchg.org, zokeefe@google.com, surenb@google.com, jglisse@google.com, cl@gentwo.org, jack@suse.cz, dave.hansen@linux.intel.com, will@kernel.org, tiwai@suse.de, catalin.marinas@arm.com, anshuman.khandual@arm.com, raquini@redhat.com, aarcange@redhat.com, kirill.shutemov@linux.intel.com, yang@os.amperecomputing.com, thomas.hellstrom@linux.intel.com, vishal.moola@gmail.com, sunnanyong@huawei.com, usamaarif642@gmail.com, mathieu.desnoyers@efficios.com, mhiramat@kernel.org, rostedt@goodmis.org Subject: [PATCH v3 4/4] selftests: mm: add defer to thp setting parser Date: Mon, 14 Apr 2025 16:24:56 -0600 Message-ID: <20250414222456.43212-5-npache@redhat.com> In-Reply-To: <20250414222456.43212-1-npache@redhat.com> References: <20250414222456.43212-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 4CE5D40005 X-Stat-Signature: fq3i89wja9dybqjwapqrhz9iym4q98tp X-HE-Tag: 1744669577-632065 X-HE-Meta: U2FsdGVkX1+1Zl56/e1BDp5muIWz1gnof3qAxfKiI2fMvUD0IPqwr5dDwkG1rPlbX+U83o9B2IjQEF3gNKp4NPELcI+krvNOAxZGpwB92ukf9FWBq53NlnzIajV2feTI4TJzqjsfI2zCTjQ02r71LYOFiZfotAGcY1W8sKn/0wrmJvDKh4I3Z3MAkwyzy8BxegUwbKMk9yRBw4DPZ20YhheYvv+cQkhyKwPw2G7Dzr3WVU9/Rxt49Dcg2q0osw/tBcixdujAVgMkB1lNJoF4SZYeNUOjhEschNNqjpq98lT12wgmdtFUxRvlOCGwqxTIJ6WwdI5KVbK0D+Mu0rH/rq2TguoQBj0ZwOzjAj53r/kQvOsiiuGrPiKXzeaA79YVjCqLOM/66+kT5A+oKN1Ru5DyzeZMUcd1ZQ+jsOWISus+zwCvpc46OI4QbqRAioxgPqiu5C0aCoQ6+Rr4rT+oTVvfofFakfYRqKiVtRR6zZPTB4/e4351TRfTb0ohDAx189MLCgSxqXOmJeblh9bH4hKPqZ0TB2IJjG5sktPvLQgRDkHUT8uuwNJaX1k5HEn9il65FFziDzTCakp/PrtbEqEqb9AtMG6ENVDQ0EqIuPSX+fvzYotWQiFoscJGzxzwLz77DifZo/HUYwSN7RM1VlK4RRV+foXm4ZzYSkre7orApl8q+RhIIAvIkeFHpdH0i2D2A0Y+pVIaC3eF60TIBoQjfrWrxlP32C/dwUNio9CZNV0Ifj+V7z/M4NaiCW0S2Hqf9r0zNO/+C6jU8vy+q6XDMjSUQO0rl6JoUl8ytE8q78dt0vf+9OqV4cXlqQjFsDNGEiwfX84hMZMm+KgYXBXdgINJ/sgd6+Ev2gb2tWMyGp0VmqhJVxXChM9rAX6FJZ4tVMD1azTsYHAJ3lTnDVPGubm+ydJ5OtAFmgpxmDX0RqxzCUUkkk8GYaj3pCon1Rjrp3zpk/QT5Oa7SgZ fTw3g5ci G0OGgu12yVj5kc3d9aG5nI2nslx10U414Shn3ZRmwpvJ/P1P2SYCTLIN1luI+ClwhK2VeBr3hPB43aZo77t4LN+lRWKyen/ibEhroNeJfy2ao3vwhLJ3y6hGskXEcJLnblFY+ 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 {