From patchwork Sun Oct 27 17:36:39 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: 13852709 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 AF9F8D13572 for ; Sun, 27 Oct 2024 17:58:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3760B6B009E; Sun, 27 Oct 2024 13:58:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FE8F6B00A0; Sun, 27 Oct 2024 13:58:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12BE96B00A2; Sun, 27 Oct 2024 13:58:53 -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 E57B66B009E for ; Sun, 27 Oct 2024 13:58:52 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id AD6494035F for ; Sun, 27 Oct 2024 17:58:40 +0000 (UTC) X-FDA: 82720142064.25.6552234 Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by imf14.hostedemail.com (Postfix) with ESMTP id 98910100013 for ; Sun, 27 Oct 2024 17:58:25 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=LWOACRw+; spf=pass (imf14.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=1730051851; a=rsa-sha256; cv=none; b=MVS5/dnnURXvawEk1NmQDeG+LtlIl2ac6NRG51mZwfYun9vUZMtAXEChnKdgLNEUGarVNM q0ABeT8Cxaf4Rqso4xweFJCvC+A/0lgJXLEfyy/zIARknTLApspQZyJXuyR5SZ9NjT6hAY 5xj011TgScgneeJuew7l9WOmKOF0nZc= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=LWOACRw+; spf=pass (imf14.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=1730051851; 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=EjvE5ECkO4a4IWIH2md5SXeAC7aZ8rGsxgHC6JRzPsc=; b=w+KdMq9mUIm5YulPxUD8lHCNIPw4C++NSarQUzbeHDzifiENcMnlokHHdcElMjp8Gjhx1x H2PreGE9WmXDG2SvdM1E6064ybY4tOvZZWYoi8qsa3djPK0oAIDKGlsjNPSY6m6L//EGyq 4rIQXPdHcwhaM7sgbcYcqdkgO0xtYlA= 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=EjvE5ECkO4a4IWIH2md5SXeAC7aZ8rGsxgHC6JRzPsc=; b=LWOACRw+dPktdCnjBVPNnav3wG J412nBd0B+W3uFXYRYz5YMfapM74Y+LsSfRSbsb1J0iKD+9MlPz/bJT71PTbbaN0oIS+57F4drsed IHASrgssG6FW3L2dR1Zle2wbESYJneUhGRsWbjgWvXVa0dIDIH6ueDJ1D0di1VYcDMQ6ssKtk9Xx6 QLZOHz+6NdPIDz57IsedMvnSginavJhCTEa/jJVF6rjGAqMBqIvJuScPDp88UCVwO0CFiQ92mVsE+ D4bs1vZDGXa/91LPiT3Y87ft+OUv6JU1u9Km17P5zrXoGboGG5GIuP8lWss4AZ+ZdeLPGkkWTwjOt +t2o+55g==; 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 1t57X9-00Fn6f-UU; Sun, 27 Oct 2024 18:58:36 +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 3/3] mm: shmem: override mTHP shmem default with a kernel parameter Date: Sun, 27 Oct 2024 14:36:39 -0300 Message-ID: <20241027175743.1056710-4-mcanal@igalia.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241027175743.1056710-1-mcanal@igalia.com> References: <20241027175743.1056710-1-mcanal@igalia.com> MIME-Version: 1.0 X-Stat-Signature: f6rg4impi6gaitrd1bp3md1ys5itcfsc X-Rspamd-Queue-Id: 98910100013 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1730051905-255187 X-HE-Meta: U2FsdGVkX1+GBHKX1ZLhehltVZobks1wCFI3kCcx56eJbNGekGijji9p4R5qeS0HPqSF1cPvUgZEH4rZvdzRJp0iP2rhGiohgegB/ovD94g2RiEvY0gHQyfgAxNO0qJcSElmKo1wThPma4LcdpzYRK1REba/r0DXVPuRvc381iC4kX9zVD+Kzft9TAA2Hu9Aabt/TxcUzplJdTk2PvpSAQUSAWhUwIGuz3qz6gK4JnInVG3QXvxLRVNX958w8OMnbXgKGM6apz5JO7d4Eb/PiEhs4XfGy+n81YG7dg0JtnROOFmLByjTaQ2bvwbaClylzyi9xVcLjCoc6g0FSYglu2lBsbBv0Dz3Ye3rMkNR6bHkv9as2CGNzGKhb+wCMG+yG7w1Ggb+UM+i9jSssfpJp3y3WE53yF2Nh/s8E4yiNKQZGqOG0aLAYB7H/BYA3ZTQcxx+ut8jd2vYLdC6rCY2EY86xakOlLpbsUq39KqsG1S0Q7qtSZ8Yd5qg1Ud6RL27epwEs+bPHLPr9LuqKvD7sXTazXiNZNGDm+PIMioQWm2OnUE7feuzPL6S5AjhS6H8zrs7ew5my2RA5LRgceeZK+XGXlMJYW651riB95FzajLXzvPy6MzmjdKb2LZAYlxC4ulQl7XtG5lV/nLMXaMd7jqdxDLUy4A6AE/nc9NZ+NaoI2iirf28IGjI6XGZ0d0Leo8yZXSYM6UY/ZVggqpy3kF1kQu5LCe6Jpwd8AILfUGNZL9NzzIjzhNsy8KjuCNMfcg6ta+5omgmH9n5mAbkejwcBj1Ws6uR++3+ZoXnfasNMdrEZM8phjNKRgqT6mx89Cs7yqe5U0s9a8uCqAwR/odNZ1MvDKdf5ghN1ypzhVgy0lfXmMMXmNPyOUfStMIck67o9sDkGvaQmyCcu44ozb7Rb18oSWbS1qr7N7z92TBOo3uwofjDkgydDB0FgiTLgmhcdkXRVuk+JRsDscq pCp96/oo 3y0VULqsG380fPSQn+fUNNtj3PEX+toau3AJ0E+GggRrd3wAI7JhlbI3e/ms0vRpkbz2aaMb1gcfI50AT5hn541lYDcWW9JE64n0vb6hupVs0/TNhCI8BI0hvbua4uLwA6pUvXWwv+uGTN/m/tr5/cLP2kDfE2C7eP2qTtbx+bMiZrkavIvIkEX4+bljwrul2riFd9HTGfurKJTMLk60y1kvSxq3RwvOsoCUcVNIaksDvau1s1b/pRARnDfQX01lM/3YBItqjHJagQ/d5nnnM96mXH0vpJ7Y//nqW00GX8B2OGrF9iyGOktRqjP7RplZTUKMRTA8i30CNx00= 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 ``thp_shmem=`` kernel command line to allow specifying the default policy of each supported shmem hugepage size. The kernel parameter accepts the following format: thp_shmem=[KMG],[KMG]:;[KMG]-[KMG]: For example, thp_shmem=16K-64K:always;128K,512K:inherit;256K:advise;1M-2M:never;4M-8M:within_size By configuring the default policy of several shmem huge pages, the user can take advantage of mTHP before it's been configured through sysfs. Signed-off-by: Maíra Canal --- .../admin-guide/kernel-parameters.txt | 10 ++ Documentation/admin-guide/mm/transhuge.rst | 17 +++ mm/shmem.c | 109 +++++++++++++++++- 3 files changed, 135 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index acabb04d0dd4..595fa096e28b 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6700,6 +6700,16 @@ Force threading of all interrupt handlers except those marked explicitly IRQF_NO_THREAD. + shmem_anon= [KNL] + Format: [KMG],[KMG]:;[KMG]-[KMG]: + Control the default policy of each hugepage size for the + internal shmem mount. is one of policies available + for the shmem mount ("always", "inherit", "never", "within_size", + and "advise"). + It can be used multiple times for multiple shmem THP sizes. + See Documentation/admin-guide/mm/transhuge.rst for more + details. + topology= [S390,EARLY] Format: {off | on} Specify if the kernel should make use of the cpu diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 9b5b02c4d1ab..47e7fc30e22d 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -332,6 +332,23 @@ allocation policy for the internal shmem mount by using the kernel parameter seven valid policies for shmem (``always``, ``within_size``, ``advise``, ``never``, ``deny``, and ``force``). +In the same manner as ``thp_anon`` controls each supported anonymous THP +size, ``thp_shmem`` controls each supported shmem THP size. ``thp_shmem`` +has the same format as ``thp_anon``, but also supports the policy +``within_size``. + +``thp_shmem=`` may be specified multiple times to configure all THP sizes +as required. If ``thp_shmem=`` is specified at least once, any shmem THP +sizes not explicitly configured on the command line are implicitly set to +``never``. + +``transparent_hugepage_shmem`` setting only affects the global toggle. If +``thp_shmem`` is not specified, PMD_ORDER hugepage will default to +``inherit``. However, if a valid ``thp_shmem`` setting is provided by the +user, the PMD_ORDER hugepage policy will be overridden. If the policy for +PMD_ORDER is not defined within a valid ``thp_shmem``, its policy will +default to ``never``. + Hugepages in tmpfs/shmem ======================== diff --git a/mm/shmem.c b/mm/shmem.c index 24cdeafd8260..0a7a7d04f725 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -136,6 +136,7 @@ static unsigned long huge_shmem_orders_always __read_mostly; static unsigned long huge_shmem_orders_madvise __read_mostly; static unsigned long huge_shmem_orders_inherit __read_mostly; static unsigned long huge_shmem_orders_within_size __read_mostly; +static bool shmem_orders_configured __initdata; #endif #ifdef CONFIG_TMPFS @@ -5013,7 +5014,8 @@ void __init shmem_init(void) * Default to setting PMD-sized THP to inherit the global setting and * disable all other multi-size THPs. */ - huge_shmem_orders_inherit = BIT(HPAGE_PMD_ORDER); + if (!shmem_orders_configured) + huge_shmem_orders_inherit = BIT(HPAGE_PMD_ORDER); #endif return; @@ -5174,6 +5176,26 @@ struct kobj_attribute thpsize_shmem_enabled_attr = #if defined(CONFIG_TRANSPARENT_HUGEPAGE) +static inline int get_order_from_str(const char *size_str) +{ + unsigned long size; + char *endptr; + int order; + + size = memparse(size_str, &endptr); + + if (!is_power_of_2(size)) + goto err; + order = get_order(size); + if (BIT(order) & ~THP_ORDERS_ALL_FILE_DEFAULT) + goto err; + + return order; +err: + pr_err("invalid size %s in thp_shmem boot parameter\n", size_str); + return -EINVAL; +} + static int __init setup_transparent_hugepage_shmem(char *str) { int huge, ret = 0; @@ -5206,6 +5228,91 @@ static int __init setup_transparent_hugepage_shmem(char *str) } __setup("transparent_hugepage_shmem=", setup_transparent_hugepage_shmem); +static char str_dup[PAGE_SIZE] __initdata; +static int __init setup_thp_shmem(char *str) +{ + char *token, *range, *policy, *subtoken; + unsigned long always, inherit, madvise, within_size; + char *start_size, *end_size; + int start, end, nr; + char *p; + + if (!str || strlen(str) + 1 > PAGE_SIZE) + goto err; + strcpy(str_dup, str); + + always = huge_shmem_orders_always; + inherit = huge_shmem_orders_inherit; + madvise = huge_shmem_orders_madvise; + within_size = huge_shmem_orders_within_size; + p = str_dup; + while ((token = strsep(&p, ";")) != NULL) { + range = strsep(&token, ":"); + policy = token; + + if (!policy) + goto err; + + while ((subtoken = strsep(&range, ",")) != NULL) { + if (strchr(subtoken, '-')) { + start_size = strsep(&subtoken, "-"); + end_size = subtoken; + + start = get_order_from_str(start_size); + end = get_order_from_str(end_size); + } else { + start = end = get_order_from_str(subtoken); + } + + if (start < 0 || end < 0 || start > end) + goto err; + + nr = end - start + 1; + if (!strcmp(policy, "always")) { + bitmap_set(&always, start, nr); + bitmap_clear(&inherit, start, nr); + bitmap_clear(&madvise, start, nr); + bitmap_clear(&within_size, start, nr); + } else if (!strcmp(policy, "advise")) { + bitmap_set(&madvise, start, nr); + bitmap_clear(&inherit, start, nr); + bitmap_clear(&always, start, nr); + bitmap_clear(&within_size, start, nr); + } else if (!strcmp(policy, "inherit")) { + bitmap_set(&inherit, start, nr); + bitmap_clear(&madvise, start, nr); + bitmap_clear(&always, start, nr); + bitmap_clear(&within_size, start, nr); + } else if (!strcmp(policy, "within_size")) { + bitmap_set(&within_size, start, nr); + bitmap_clear(&inherit, start, nr); + bitmap_clear(&madvise, start, nr); + bitmap_clear(&always, start, nr); + } else if (!strcmp(policy, "never")) { + bitmap_clear(&inherit, start, nr); + bitmap_clear(&madvise, start, nr); + bitmap_clear(&always, start, nr); + bitmap_clear(&within_size, start, nr); + } else { + pr_err("invalid policy %s in thp_shmem boot parameter\n", policy); + goto err; + } + } + } + + huge_shmem_orders_always = always; + huge_shmem_orders_madvise = madvise; + huge_shmem_orders_inherit = inherit; + huge_shmem_orders_within_size = within_size; + shmem_orders_configured = true; + return 1; + +err: + pr_warn("thp_shmem=%s: error parsing string, ignoring setting\n", str); + return 0; +} +__setup("thp_shmem=", setup_thp_shmem); + #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #else /* !CONFIG_SHMEM */