From patchwork Wed Oct 30 12:58:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ma=C3=ADra_Canal?= X-Patchwork-Id: 13856488 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 8DB44D5CCA9 for ; Wed, 30 Oct 2024 13:03:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC5266B00C3; Wed, 30 Oct 2024 09:03:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D73626B00C4; Wed, 30 Oct 2024 09:03:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BBD046B00C1; Wed, 30 Oct 2024 09:03:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 909536B00C1 for ; Wed, 30 Oct 2024 09:03:54 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 45DF840CE4 for ; Wed, 30 Oct 2024 13:03:54 +0000 (UTC) X-FDA: 82730284560.09.272A702 Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by imf03.hostedemail.com (Postfix) with ESMTP id 7DB7F20013 for ; Wed, 30 Oct 2024 13:03:40 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=dZPbD1RG; spf=pass (imf03.hostedemail.com: domain of mcanal@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=mcanal@igalia.com; dmarc=pass (policy=none) header.from=igalia.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730293352; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=KhLqGBl5TV6NmgS4fHCrJuFzbGHnT6xMy1eOztxHavg=; b=bwYSWH7hP2seqtY+0+PI0RZpXScQREOkLwV3wrAIpDbDJUsZYz6+WJerSNXknj3fbElj71 yVheusBLQWzWvejo2fc81Xw7K0bgUNKM8FnCZEA0XvNPUDkf9aVzL0ZV2TjGe9a/AJvJuQ /t+YQWNMrON/UPy7VPc62uDam7LzoT8= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=dZPbD1RG; spf=pass (imf03.hostedemail.com: domain of mcanal@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=mcanal@igalia.com; dmarc=pass (policy=none) header.from=igalia.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730293352; a=rsa-sha256; cv=none; b=hYhOzNLfSla5LpDH1xzB7gZFVAZjpA2abwL0mErbF3FjAmmqDQiEMRTF8LtXvQvl86LIXq MwtAYej1mRPuhYUm0JxJjF1mihcRDV6H7FS3KmAyTg4Ad6cxPCyVOhCdWH80+vTjjc1MBe tpz6Gfl+A91rW8uNcF/iHGRsVfZ+T9A= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=KhLqGBl5TV6NmgS4fHCrJuFzbGHnT6xMy1eOztxHavg=; b=dZPbD1RG6pReVV1dOCJ0ApCQE/ KzEL6y45ASLkh2mZ6IeR+Eujl9rct/rDPOZ83WttX0a2JnM/jPkILvD+T0CS1O5Olxar+9Q2txQgR Hc7ff5FWE9Pv3eP/oubI1C816wuK+LM1F3z7HDPPRJo/k+ewyEHQW40C1eA5cWEtpV3PsS/v5kRiD bO3sCfaKSyrrA29QeAjdQavHF/2hKaiS/ivzOOj6tjZo2dBqaxqJwpuPLPi5p45fhnWqIMePahczs k9qHbvmOgJ0DYa8a/yr0tvRmLhev8Hz6lhBu/O1TWP2/vvH5kVvfJOf7dp5iTMUL0AntC/DQuow/r qeguRXuQ==; Received: from [187.36.213.55] (helo=morissey..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1t68MN-00H5h8-Qy; Wed, 30 Oct 2024 14:03:40 +0100 From: =?utf-8?q?Ma=C3=ADra_Canal?= To: Jonathan Corbet , Andrew Morton , Hugh Dickins , Barry Song , David Hildenbrand , Ryan Roberts , Baolin Wang , Lance Yang Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-dev@igalia.com, =?utf-8?q?Ma=C3=ADra_C?= =?utf-8?q?anal?= Subject: [PATCH v3 2/4] mm: shmem: control THP support through the kernel command line Date: Wed, 30 Oct 2024 09:58:56 -0300 Message-ID: <20241030130308.1066299-3-mcanal@igalia.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241030130308.1066299-1-mcanal@igalia.com> References: <20241030130308.1066299-1-mcanal@igalia.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 7DB7F20013 X-Stat-Signature: 8cuxnmc9o9c5bzrp6qxguswn84rd5dkt X-HE-Tag: 1730293420-629370 X-HE-Meta: U2FsdGVkX19gWVf0gk/1zt45ID73ZMm8QvP1Z+LO0GpiafP8TEhBk9DTV/Em9c7ET6rXiLivcIm6nEJK/MguVlbgHQc+WmpEARW8pbHlN57hCqOdG44hMHAuUJB7Vd9zduObuFKBaq0Wvsqum6OHS0hPgBebugwcxRRXmp/XNNDrb4ru2N85wXjFQWuQhVVwvNAI+3awsIBVdkAXi540Yu7ZRb037kCoXJlKY/qSuVMfxCaASI/B7l0YKDMJuKJKkc3qc9SpDw5m82qDuhCQYQ9puF8NGYC9ZKifwkcHMxXSvrXsRmQz5pEvMt1F6rcdTyS+IZ5P3QlBwo7ByUfO4Mj9xHliP/urAGs8SLKZlMYgcImziKg6YuGE3X4aOPf7I4mUdV4QNGBcMtn33tUuU7V7UWmQUrs6R2x0iQ9AHnIMysbVScCWq9IwtgUvX57LMgw3NliqK0ZMqhBKrj+xvoghWLdolS3tEQBg6yuUpodT44LLBqmzCP1dIIKqJnpU7EY2MV9i2rX5jG43G/rXKIWsjJOTiqNhcZtbBStGYG/DQAwUrM5akSr8yDN90ECpqztbUWrzOvbkgctb6gPqgKfRZ+CM5BhaoepXi2jdezBJEf72NsTTnPyQ3rth10KgO/Ftz+HXm2qNnxxYJcHWF/VWtbe94U5Cb9gXWDbuhlqzhgNyxpGY0FYzFW6xgpzvH3iRyt8+jLOJTIR8W/bHpRR9C6ABWzEy0KRgdvhqit/vl3fQEFMW8TRnIrpVc5xxA1HYmV/cAuioLwK7qUEQmrylG26g/EkQg4MazqSlMWJM58pZ0/QqYSTlHv0J1f5rewlBRuD22DtuuNJmuSJr2qbqABoQOtZGJzTEamaYxZFdL5U2lk5z0+5xvrwAosJx/IhgyFKiBM+5H6ZzYEUyonHDKKkx/NhJnf5CTPBnbwyXycr5GVFOaziULQr59ydsKo8VQjWH+40f24H5/mH GMGw7D6d hco6RO43woZAhA0Gp5BkX3zyRwM6LHGa/HkwNVjFl5/EPItjs63EVXfio2GZ5D/EsgVquJaUiu3eAxU2cbQ1JG+bunF7EKLfDPIgoZXJVAEca0eKvkASC+3nIQuGVVUyDnVWgS8WUjdnZjQ3N47SHuZvTuy4SzdPfhWJ+iV5AXcwpMomKuIz2QfuLRlGKKmKNP4QkMVPUbOM6sc0nh9ECJf+ZVZjiXs2NdCr/OUsJ87apZ4ZQ/1HVxx9LAvYKaRta+hC7YOoVgjz3TWoDlLlC9y51DG/5vl3LK/i4nzcDntYDp2l6Wwdaky2RKGtyUQn+ir70ql3ig/5Sjsg= 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 a new kernel command line to control the hugepage allocation policy for the internal shmem mount, ``transparent_hugepage_shmem``. The parameter is similar to ``transparent_hugepage`` and has the following format: transparent_hugepage_shmem= where ```` is one of the seven valid policies available for shmem. By configuring the default hugepage allocation policy for the internal shmem mount, applications that use shmem, such as the DRM GEM objects, can take advantage of mTHP before it's been configured through sysfs. Signed-off-by: Maíra Canal --- .../admin-guide/kernel-parameters.txt | 7 ++ Documentation/admin-guide/mm/transhuge.rst | 6 ++ mm/shmem.c | 72 +++++++++++++------ 3 files changed, 62 insertions(+), 23 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 1666576acc0e..acabb04d0dd4 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6926,6 +6926,13 @@ See Documentation/admin-guide/mm/transhuge.rst for more details. + transparent_hugepage_shmem= [KNL] + Format: [always|within_size|advise|never|deny|force] + Can be used to control the hugepage allocation policy for + the internal shmem mount. + See Documentation/admin-guide/mm/transhuge.rst + for more details. + trusted.source= [KEYS] Format: This parameter identifies the trust source as a backend diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 745055c3dc09..9b5b02c4d1ab 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -326,6 +326,12 @@ PMD_ORDER THP policy will be overridden. If the policy for PMD_ORDER is not defined within a valid ``thp_anon``, its policy will default to ``never``. +Similarly to ``transparent_hugepage``, you can control the hugepage +allocation policy for the internal shmem mount by using the kernel parameter +``transparent_hugepage_shmem=``, where ```` is one of the +seven valid policies for shmem (``always``, ``within_size``, ``advise``, +``never``, ``deny``, and ``force``). + Hugepages in tmpfs/shmem ======================== diff --git a/mm/shmem.c b/mm/shmem.c index 275251abd596..dfcc88ec6e34 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -582,24 +582,39 @@ static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, } } -#if defined(CONFIG_SYSFS) static int shmem_parse_huge(const char *str) { + int huge; + + if (!str) + return -EINVAL; + if (!strcmp(str, "never")) - return SHMEM_HUGE_NEVER; - if (!strcmp(str, "always")) - return SHMEM_HUGE_ALWAYS; - if (!strcmp(str, "within_size")) - return SHMEM_HUGE_WITHIN_SIZE; - if (!strcmp(str, "advise")) - return SHMEM_HUGE_ADVISE; - if (!strcmp(str, "deny")) - return SHMEM_HUGE_DENY; - if (!strcmp(str, "force")) - return SHMEM_HUGE_FORCE; - return -EINVAL; + huge = SHMEM_HUGE_NEVER; + else if (!strcmp(str, "always")) + huge = SHMEM_HUGE_ALWAYS; + else if (!strcmp(str, "within_size")) + huge = SHMEM_HUGE_WITHIN_SIZE; + else if (!strcmp(str, "advise")) + huge = SHMEM_HUGE_ADVISE; + else if (!strcmp(str, "deny")) + huge = SHMEM_HUGE_DENY; + else if (!strcmp(str, "force")) + huge = SHMEM_HUGE_FORCE; + else + return -EINVAL; + + if (!has_transparent_hugepage() && + huge != SHMEM_HUGE_NEVER && huge != SHMEM_HUGE_DENY) + return -EINVAL; + + /* Do not override huge allocation policy with non-PMD sized mTHP */ + if (huge == SHMEM_HUGE_FORCE && + huge_shmem_orders_inherit != BIT(HPAGE_PMD_ORDER)) + return -EINVAL; + + return huge; } -#endif #if defined(CONFIG_SYSFS) || defined(CONFIG_TMPFS) static const char *shmem_format_huge(int huge) @@ -5066,15 +5081,7 @@ static ssize_t shmem_enabled_store(struct kobject *kobj, huge = shmem_parse_huge(tmp); if (huge == -EINVAL) - return -EINVAL; - if (!has_transparent_hugepage() && - huge != SHMEM_HUGE_NEVER && huge != SHMEM_HUGE_DENY) - return -EINVAL; - - /* Do not override huge allocation policy with non-PMD sized mTHP */ - if (huge == SHMEM_HUGE_FORCE && - huge_shmem_orders_inherit != BIT(HPAGE_PMD_ORDER)) - return -EINVAL; + return huge; shmem_huge = huge; if (shmem_huge > SHMEM_HUGE_DENY) @@ -5171,6 +5178,25 @@ struct kobj_attribute thpsize_shmem_enabled_attr = __ATTR(shmem_enabled, 0644, thpsize_shmem_enabled_show, thpsize_shmem_enabled_store); #endif /* CONFIG_TRANSPARENT_HUGEPAGE && CONFIG_SYSFS */ +#if defined(CONFIG_TRANSPARENT_HUGEPAGE) + +static int __init setup_transparent_hugepage_shmem(char *str) +{ + int huge; + + huge = shmem_parse_huge(str); + if (huge == -EINVAL) { + pr_warn("transparent_hugepage_shmem= cannot parse, ignored\n"); + return huge; + } + + shmem_huge = huge; + return 1; +} +__setup("transparent_hugepage_shmem=", setup_transparent_hugepage_shmem); + +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + #else /* !CONFIG_SHMEM */ /*