From patchwork Fri Nov 1 16:54:06 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: 13859616 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 F3FAFE6F070 for ; Fri, 1 Nov 2024 16:58:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 918466B0083; Fri, 1 Nov 2024 12:58:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C7C66B0098; Fri, 1 Nov 2024 12:58:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 741B76B0099; Fri, 1 Nov 2024 12:58:08 -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 566EA6B0083 for ; Fri, 1 Nov 2024 12:58:08 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0A421C0AB2 for ; Fri, 1 Nov 2024 16:58:08 +0000 (UTC) X-FDA: 82738133142.15.0A4B04A Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by imf28.hostedemail.com (Postfix) with ESMTP id 7D6A5C0016 for ; Fri, 1 Nov 2024 16:57:37 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=p6BC5Tlk; dmarc=pass (policy=none) header.from=igalia.com; spf=pass (imf28.hostedemail.com: domain of mcanal@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=mcanal@igalia.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730480123; 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=O29dCXx+phviG21mQhq8obCWSt3spMP5spSqVzL91xU=; b=eKG8s/JvmYBmVx4Di3lt2qqg4HlPxLCuIndAQltSGnDwz50jpE/OzGjm83dZ+m4g55ABZ7 fdZDflj6lHrM2zIwInKTwkUBdsidnMzqEUf03q5PNEEEiRuwGE8KP4xmzC03lhS6ZGZz/c AcVKW4DHXQVAsaTBX0c8SHNB4JjOovw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=p6BC5Tlk; dmarc=pass (policy=none) header.from=igalia.com; spf=pass (imf28.hostedemail.com: domain of mcanal@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=mcanal@igalia.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730480123; a=rsa-sha256; cv=none; b=VcgXze2RGPtJci3kSBhXhHR6LwruBG30o0VpPrf0yHh3oO7+b5HqFNEXjDf2xM6Q1MmrH4 TZMqgHOLcOat52Ap4pZRewNGqBJpngsRTqxVWS3M+guI+rIaP23Cv6mpWWo0shk/A5uGy3 eBDAZKA6axaDmFG2YjmLXRabU6jFadg= 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=O29dCXx+phviG21mQhq8obCWSt3spMP5spSqVzL91xU=; b=p6BC5TlkYl1DzocJbUreIvt+mi QUQiD0X/QqVmAhFfPnCZ0DyuPHPVxcnHzKJTX/fRHHEJVi+LWZZniaI6ZUEQdH8tf44MPaga+ZUMj ySQK/up940WgZ4PCL+0aZt81SPtTbPe9oEzbihUalr1uYIZZFReb3bpLOXAeFNZ9JsRkI95c639/U /OFsyRR2hq+0+T2EIGYWzWIuN4F98W+cBP3IYlg93OwCFZc3dXF5e1VnCLHa2O6CuPiXolUXFD4wJ KDoQlnKnfojnzTuBXLo/muxVEAlqtrxx68QdYsqySbyJyb+eU8uTTvBcDO/fQF6iKZeuwehieC/M0 9f2QG4Iw==; 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 1t6uyD-000VPu-14; Fri, 01 Nov 2024 17:57:57 +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, dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-dev@igalia.com, =?utf-8?q?Ma=C3=ADra_Canal?= Subject: [PATCH v5 2/5] mm: shmem: control THP support through the kernel command line Date: Fri, 1 Nov 2024 13:54:06 -0300 Message-ID: <20241101165719.1074234-4-mcanal@igalia.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241101165719.1074234-2-mcanal@igalia.com> References: <20241101165719.1074234-2-mcanal@igalia.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7D6A5C0016 X-Stat-Signature: ranq4gy75grgn774dggt95ktzkdgwf4u X-Rspam-User: X-HE-Tag: 1730480257-345745 X-HE-Meta: U2FsdGVkX1/kj+7juHK5gS8PkHZY5xc5qKKrWBmkQ+wPmc5wrize2RsG5LOfxQX4VTbzVBlEGto5YYfRped2pUMIyAedRAfBx/tLBQWaBWmXm1LZz41QsV8Lctr7cBDv7c/KmePS3Q/nXOMYqXxWhupFaMuR/J+y2O0+4StrQlxnxMAX16UDQhp8HlSRcbkIWuGCaHj8t4Erp2Ijg4CyOy45nULtEsED+zY3Tsz0P9drvvUZtM62jI7aJqhbK7D72NvDrCMTf9+HKuUjv5RW6vS2JO7wEfBVsydvqHDLREb43t4uKoBSIuUyCXYlPvfjIE2faSo/3wyXrCXuWjCnSBaGzXNdM7+qgWTozpCYVmiLHxtvzCu2zxcV4+PEY3V6A/pVN7qc3uMekENjo5Uc++vBYW3OSSNJjxmb3Jp8GHVtglmyYxxjQPa6/cLBM6OKoyS50NmC9mp7iOoljfnpE4YeTXu0vDZWXsmxrxJyuOZ328WfMNcCKx1xnGzC1HHks1zWDQc44NU6BnuFwou2Ks4zQWpmkvChm10kNEeZXNAMhc+j5GAuitexgQ7cNIZcIYXhzEbtlrVFIK9wHAy68NzzoJ0kd7nWuqWsBsv59kLwtObe5lQSGUWsiX6Yu00Y3W7U2qZlDE+vugFJO51keV9ItHARMXP4xuAaQ1hCSmx6jrwT3KVRnbUaXqvny6gQC4m5NSHx5LIPLVCWoV0xQQTcU2peCr6asau8oJasvKXbNRMGyZztMbkMk4AoJm00HTc20amrS++K4TdAKqK4yTvnGXXH+4U4lgZywM8DR6ubCDHUO7FcWjQTXOiAn0DF4P2KUsKccTlm9wKMnnfE0w2TYLr1wCuFjoibsESrNzA6YunYr4GZpHn7cpzIZ9rZmmT743m/8pOYIQhGOJbO5P/Maw7t8yyy5JoNWtlU62JWMOR7o27GaEU3j9diaN3s9UojrDxcR5OKZhz1ybl 0ZYEauxz FG3TKk2cMY/E0gTqhEyvLEiPVA4pC6avXPddGy5XK1EdMM/QV3naeGuhAnz65BpAj9Fg5F/0gFmKBzbkKGjLYxeX4MQprp1paUXMMVQP0vsNLv09tAbQ9RSb8huXVrkNdETDIoVM2yn+9ZNOjartVKBH462NWsmzxnkM8/+c5ZxAyFDuSknh8PuAZFqBLc/D4vlgivGbYoTQWRQBJrylQPaiOCuuBeGutfuASSaT/0s1vxRzSzWZAKb/hqgSy+WStjlsSiY7631+trZ7ycwbUL2Ps2a+2/FDEikTTwmkJD3nWNO+VCyiIMSh2yGe8LsNInJtNMHdjMqpolFElwp8Guw4b1dHsEdBNLECHslTlYM4coS5kz3IgtWskXBsQWjlrtaO5 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. Configuring the default huge page allocation policy for the internal shmem mount can be beneficial for DRM GPU drivers. Just as CPU architectures, GPUs can also take advantage of huge pages, but this is possible only if DRM GEM objects are backed by huge pages. Since GEM uses shmem to allocate anonymous pageable memory, having control over the default huge page allocation policy allows for the exploration of huge pages use on GPUs that rely on GEM objects backed by shmem. Signed-off-by: Maíra Canal Reviewed-by: Baolin Wang Acked-by: David Hildenbrand --- .../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 abdf10a1c7db..9c6f6da612c4 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 */ /*