From mboxrd@z Thu Jan 1 00:00:00 1970 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 4D7DDC3DA4A for ; Wed, 14 Aug 2024 08:09:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C47636B0085; Wed, 14 Aug 2024 04:09:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF72F6B0088; Wed, 14 Aug 2024 04:09:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A983C6B0089; Wed, 14 Aug 2024 04:09:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 86E7C6B0085 for ; Wed, 14 Aug 2024 04:09:20 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2E710A7F6B for ; Wed, 14 Aug 2024 08:09:20 +0000 (UTC) X-FDA: 82450126080.12.805EB7B Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf15.hostedemail.com (Postfix) with ESMTP id 4581EA002E for ; Wed, 14 Aug 2024 08:09:18 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Xax0MyFY; spf=pass (imf15.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723622887; 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=37oHXzv1vWgVfvyci6NXVgh8uUW+FtKN9bgTbkcfqjw=; b=ekNN61HGCr1ikI5YovduBP336CtcOifGvIJRRWoezYKERfYsAnQa8KbTUxSl+XDzgE4765 y0VS/j3/EEl3yWCeXewku575pyOXabigMhTlx73olN14Ch1a3BtkC8uqYaDG9TGNKhByNw nFEwVl5EhhqANdFfNk+sO4iUEldMIxU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723622887; a=rsa-sha256; cv=none; b=nQJQAQqEwxUftDxLzRb6NFZ2abkUobkCsN3gMGp0ht83wD4E4VnCakJSYOVPkYGw0d8CcL A43Pf9R+dYCZRlUMKKPV/u+eXTwjPmulYxcCvRaPoi0qZlZbhWfUv0mAtUzg3xBZNDLsKa ikSGpiqA60pNOQt5TjarkxDf+bf5nKk= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Xax0MyFY; spf=pass (imf15.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1fd640a6454so49544335ad.3 for ; Wed, 14 Aug 2024 01:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723622957; x=1724227757; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=37oHXzv1vWgVfvyci6NXVgh8uUW+FtKN9bgTbkcfqjw=; b=Xax0MyFY2LlWy/OQBjeIF2OiN6FmMp0gcPpAvgF4ND17YYYrxaRad0NMymR+b0DXU9 W7yfP77DFeMyL9qjq5n9os47QQqQkYI/mG5bQGpG1dZKfJwmnHZooYUeIJQhxi2KABGo 79D5WjWDauIDfc3aTyJG68OmZlpICHHutRUPRgcXz/bzZU9v8J0h7oLFkReqrqDIjo1O nXxiiMEV0MdAoAmlCjccBzl7o74NJk7yb1tu1xkubMCCDb4fh+/Mh6fPWNZEqQrV5d+k 6kjBLKGhgvQWUhiOuq200ojPoxdg3qCI8zGy/hVga9SpNPfADWt+rBRPxTlcMqjw44+P XnNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723622957; x=1724227757; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=37oHXzv1vWgVfvyci6NXVgh8uUW+FtKN9bgTbkcfqjw=; b=vkokb6nEiCsZHSoorE3Zv2DhsM9devZS9KvoU5MQc5kNaSdsDqnCQpt00Ud2BKv/Ez RQDcb5miB+e/v8PMG8ObvAHPPPwfG8e1NfWBSyyEKEg1r4h14cucij3aI8qMbyB9fd1+ XG34jY5636bShZKXj/UehEyeiU46ncogq9tTNjzTThnsU/jThiU8KLUFPN7qfpi8LA5h FzAtdR7+HFaZJs4uLTffwvpydD+FaKUuSwNEW07qNmnEGSNV/NzZ0d85XAgw4+CgQmjx AC9+0TN7Y5pWNXLw/4Ddl72YbvI/xTtrGH/VTFEfGUBquye5U5pF7l2KioTc8AT40d9O igtA== X-Forwarded-Encrypted: i=1; AJvYcCWGBKC8wbzs008LmQRdpUOglNL+cyvCIGJSPIPZBx55ymsAQdwmPjwSqNhur3tBqJelInoHszxLoB/Rx8GTyJV9hqQ= X-Gm-Message-State: AOJu0Yy+BWO6MAp9mMBDBr43XpGcQ8gXs7DzxTCL/kQ+RKUdaoDeGFKj Zi0iMpiJXrMmTFfhj7ftK6DlQU/VXDvoCt7Y5zaGyzMqJCBhfzqx X-Google-Smtp-Source: AGHT+IG7aon1+lVeRD7X2n0PFqqeR3pEbCgpMc9AOTnlPovkqRuRYZjLtQ8wJIEDR9mo4iBU+mwKlg== X-Received: by 2002:a17:903:35cf:b0:1fd:91b1:7883 with SMTP id d9443c01a7336-201d63abef6mr24922655ad.14.1723622956728; Wed, 14 Aug 2024 01:09:16 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201cd12ecb1sm24708325ad.11.2024.08.14.01.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 01:09:16 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: baolin.wang@linux.alibaba.com Cc: akpm@linux-foundation.org, baohua@kernel.org, corbet@lwn.net, david@redhat.com, ioworker0@gmail.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, ryan.roberts@arm.com, v-songbaohua@oppo.com Subject: Re: [PATCH v4] mm: Override mTHP "enabled" defaults at kernel cmdline Date: Wed, 14 Aug 2024 20:09:01 +1200 Message-Id: <20240814080901.87898-1-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4581EA002E X-Stat-Signature: ey99mj5n6nmyoj3dhjjzagmaz9ruapnf X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1723622958-11753 X-HE-Meta: U2FsdGVkX1+tzIBEn1k3m+CRbrLz84IHlISTKysuCxmX4eY5/uKDMqqS3Bt4iIIsIg+qkKXYjyEQ17/Bso2BF3yg7DH/DyhW9nkW9hFi/1A0K91swbpww9HPYCECIidLID3+jIs9iKqwvEzdVDDflPfB9UUtvgP4hf7i5Yp8FmjSHijsl/huSwlM6z6ZhLdcUBWHheXlT4a1IHtVnp4n7RKuZOY5p7FyWLD9cE2YVXZWUzvLxKdYmLooydoQtLByGfwOdJSuMsEyfDDGRwPRFD/xAI0MhAUQa3WXD2ZF+1IUKHMODFxRIQltZTUsATCeqizTxTIGnGKCnlwcQXl4jgD5fKgwHmKVpihLOtvWYsAM1qfRBGySI4jLLXBeV/Cqi5Rye6cQfabUGrLeJ6qJqYj2WbtwPXGlzZbxgf1KPPtkUfgbA5hIGvXh06fKiIeWrrDRA4G9R5tod7RMsCfiguMtm5nC/f2Df5Mb0GTVrngkY2bfi56GsyCyWsbLaRj0r7W3rvjyJwvBwX9rz4d0+xrLDDDss9srJ3HP9PCk97C+Hkvgl4HMOjdddOY7sIaxTijQGnKKqvqWcxKMXTw3sQrSYPRwrLoFHnQyXeGFbLIYcEoYxESseMUfIX9eT5kuu99giKNPwelI9r7dFC+PmivdjYwfXzICRekcsMEzDjifrt1eF+OMrCD6vv82ggIgNQFpDC7Ruj3OoXZjCgJnM4N5qURB7NtQakb0aEZreyCPFzKsoox6eKrHcHXCLnetFN4QbzMiKt1izFLlfg8aANMFuwqWubRxLitU+tiHOvW+JCot1SrYw8xET3vNUpMHQx+jTN/rU060kgMzTn6wbjSGvyvDrPiCHG01YuHfYyC7XreSQV2j6TFeQEYckHz9LoBrBi9hZnQSPGjkOstPhxFf/Set26NkIWqTlRVmwn8td9i2hLDL2w8/CP/Muxv/LihKEPpaREJ41n4vxpC eO0W6ZtQ PLGJ9aIF3ZCXZ2AhC3ogw6tonVfJg4ZOSxlLgj05LPaa6kxOTAj/4Z4+qx+srrLOcjndJ9WVHLdkqQEsw/ZJK2WbkbUSfY59PDcDMCNm3nBTWLOPFvZi6zsPINt5DwHIxAXRYivYprU3rHCnRHF3o+bljbXkPI6B9FAhxgwumn4Bf1W2+E7Bx5jmhtCENLD/Q7vFh1lypIztpeihjaqE8LlZsQ8PTaK8bJRcyTpdnuc84rI/ySJZrc1p8GWL7FFNDS1g1MU+6wanIypkZhEv9mTc/I3yd/QCXLNaHJzkWYTSNBswByd58m7bKJkVEnB7PzXlrMkzq2nyAKZD8sFOwfOber71ANQqWU5E8mJZJUtZsDw1o7PO1dcZt3oJyDjtnN2g5aSBjZZys7cxY/wXZwwa8bpAqEWA4vzTQ/a241uDrAzAR4cbJ4Mdn4ISUk1JC+/lWIoz9Q8l8f5MlTBx4SX7lX6IiClpOGmu51vfi/rD4RRBj+z+SZ5tcKTc5xgIrIN0UFd4N9xHCYt3myX7gSMoKQPOzvZpSg3tQHiBDpOZqE4k= 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: On Wed, Aug 14, 2024 at 7:53 PM Baolin Wang wrote: > > > > On 2024/8/14 10:02, Barry Song wrote: > > From: Ryan Roberts > > > > Add thp_anon= cmdline parameter to allow specifying the default > > enablement of each supported anon THP size. The parameter accepts the > > following format and can be provided multiple times to configure each > > size: > > > > thp_anon=,[KMG]:;-[KMG]: > > > > An example: > > > > thp_anon=16K-64K:always;128K,512K:inherit;256K:madvise;1M-2M:never > > > > See Documentation/admin-guide/mm/transhuge.rst for more details. > > > > Configuring the defaults at boot time is useful to allow early user > > space to take advantage of mTHP before its been configured through > > sysfs. > > > > Signed-off-by: Ryan Roberts > > Co-developed-by: Barry Song > > Signed-off-by: Barry Song > > LGTM. Feel free to add: > Reviewed-by: Baolin Wang > Tested-by: Baolin Wang > Thanks, Baolin! > Just a small nit as below. > > > --- > >   -v4: > >   * use bitmap APIs to set and clear bits. thanks very much for > >     David's comment! > > > >   .../admin-guide/kernel-parameters.txt         |  9 ++ > >   Documentation/admin-guide/mm/transhuge.rst    | 37 +++++-- > >   mm/huge_memory.c                              | 96 ++++++++++++++++++- > >   3 files changed, 134 insertions(+), 8 deletions(-) > > > > diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt > > index f0057bac20fb..d0d141d50638 100644 > > --- a/Documentation/admin-guide/kernel-parameters.txt > > +++ b/Documentation/admin-guide/kernel-parameters.txt > > @@ -6629,6 +6629,15 @@ > >                       : poll all this frequency > >                       0: no polling (default) > >   > > +     thp_anon=       [KNL] > > +                     Format: ,[KMG]:;-[KMG]: > > +                     state is one of "always", "madvise", "never" or "inherit". > > +                     Can be used to control the default behavior of the > > +                     system with respect to anonymous transparent hugepages. > > +                     Can be used multiple times for multiple anon THP sizes. > > +                     See Documentation/admin-guide/mm/transhuge.rst for more > > +                     details. > > + > >       threadirqs      [KNL,EARLY] > >                       Force threading of all interrupt handlers except those > >                       marked explicitly IRQF_NO_THREAD. > > diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst > > index 7072469de8a8..528e1a19d63f 100644 > > --- a/Documentation/admin-guide/mm/transhuge.rst > > +++ b/Documentation/admin-guide/mm/transhuge.rst > > @@ -284,13 +284,36 @@ that THP is shared. Exceeding the number would block the collapse:: > >   > >   A higher value may increase memory footprint for some workloads. > >   > > -Boot parameter > > -============== > > - > > -You can change the sysfs boot time defaults of Transparent Hugepage > > -Support by passing the parameter ``transparent_hugepage=always`` or > > -``transparent_hugepage=madvise`` or ``transparent_hugepage=never`` > > -to the kernel command line. > > +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. > > + > > +Alternatively, each supported anonymous THP size can be controlled by > > +passing ``thp_anon=,[KMG]:;-[KMG]:``, > > +where ```` is the THP size and ```` is one of ``always``, > > +``madvise``, ``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 > > +to ``never``:: > > + > > +     thp_anon=16K-64K:always;128K,512K:inherit;256K:madvise;1M-2M:never > > + > > +``thp_anon=`` may be specified multiple times to configure all THP sizes as > > +required. If ``thp_anon=`` is specified at least once, any anon THP sizes > > +not explicitly configured on the command line are implicitly set to > > +``never``. > > + > > +``transparent_hugepage`` setting only affects the global toggle. If > > +``thp_anon`` is not specified, PMD_ORDER THP will default to ``inherit``. > > +However, if a valid ``thp_anon`` setting is provided by the user, the > > +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``. > >   > >   Hugepages in tmpfs/shmem > >   ======================== > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > > index 1a12c011e2df..c5f4e97b49de 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; > > +static bool anon_orders_configured; > >   > >   unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, > >                                        unsigned long vm_flags, > > @@ -737,7 +738,10 @@ static int __init hugepage_init_sysfs(struct kobject **hugepage_kobj) > >        * disable all other sizes. powerpc's PMD_ORDER isn't a compile-time > >        * constant so we have to do this here. > >        */ > > -     huge_anon_orders_inherit = BIT(PMD_ORDER); > > +     if (!anon_orders_configured) { > > +             huge_anon_orders_inherit = BIT(PMD_ORDER); > > +             anon_orders_configured = true; > > +     } > >   > >       *hugepage_kobj = kobject_create_and_add("transparent_hugepage", mm_kobj); > >       if (unlikely(!*hugepage_kobj)) { > > @@ -922,6 +926,96 @@ static int __init setup_transparent_hugepage(char *str) > >   } > >   __setup("transparent_hugepage=", setup_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); > > +     order = fls(size >> PAGE_SHIFT) - 1; > > Nit: using get_order() seems more robust? Yes. I agree get_order() is better: diff --git a/mm/huge_memory.c b/mm/huge_memory.c index c5f4e97b49de..0f398d0dbaad 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -933,7 +933,7 @@ static inline int get_order_from_str(const char *size_str) int order; size = memparse(size_str, &endptr); - order = fls(size >> PAGE_SHIFT) - 1; + order = get_order(size); if ((1 << order) & ~THP_ORDERS_ALL_ANON) { pr_err("invalid size %s(order %d) in thp_anon boot parameter\n", size_str, order); > > > +     if ((1 << order) & ~THP_ORDERS_ALL_ANON) { > > +             pr_err("invalid size %s(order %d) in thp_anon boot parameter\n", > > +                     size_str, order); > > +             return -EINVAL; > > +     } > > + > > +     return order; > > +} > [snip]