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 D94F1C3064D for ; Tue, 2 Jul 2024 08:18:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 482416B0089; Tue, 2 Jul 2024 04:18:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 431E86B008A; Tue, 2 Jul 2024 04:18:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 320156B0095; Tue, 2 Jul 2024 04:18:56 -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 15C536B0089 for ; Tue, 2 Jul 2024 04:18:56 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0090E82090 for ; Tue, 2 Jul 2024 08:18:54 +0000 (UTC) X-FDA: 82294111830.08.3D9FE01 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf26.hostedemail.com (Postfix) with ESMTP id DFE97140008 for ; Tue, 2 Jul 2024 08:18:52 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719908316; 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; bh=G9XbQSLWmwbCWeuNCuTwafTdo8oHRBLmtQ2KALWRSgE=; b=nCridrZUuoVI71rGw0jlPPgyTXF9BG1ErcPdB24kIebRvP83ImN9zk8iCupu3b6Bflpbeh 55ab/oF4G4IJ3yULef2LwUkWQYCUS8udNCsQ9o5mvD0MThG0DffHkFi131/ejHVadaRYVk glgVlnzr3ic41XUc5j0DfN/X8dzEGIo= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719908316; a=rsa-sha256; cv=none; b=qMxvbYVB+s2w6qRV9sOUQZoJKyXPPWJkJBXY6DqgzpP2QW39BeHvInLFrNhAC7KvhGB4g3 pSH39m/EJlKUHQXao1Uocqd0gmSxksxR3WvYKWfOjI/bCE9JykWHHdByhSnYkBcL11sP+q K83hBog5CZEPsTNx4kca5Md60prUb4Y= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D40B0339; Tue, 2 Jul 2024 01:19:16 -0700 (PDT) Received: from [10.57.72.41] (unknown [10.57.72.41]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4DCA03F766; Tue, 2 Jul 2024 01:18:50 -0700 (PDT) Message-ID: <507da6d0-77c5-46ca-8351-53b405ecb131@arm.com> Date: Tue, 2 Jul 2024 09:18:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] mm: thp: support "THPeligible" semantics for mTHP with anonymous shmem Content-Language: en-GB To: Bang Li , ughd@google.com, akpm@linux-foundation.org Cc: david@redhat.com, wangkefeng.wang@huawei.com, baolin.wang@linux.alibaba.com, ioworker0@gmail.com, ziy@nvidia.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20240702023401.41553-1-libang.li@antgroup.com> From: Ryan Roberts In-Reply-To: <20240702023401.41553-1-libang.li@antgroup.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: 7xe6g3uneapjno958ga5717anxxud518 X-Rspam-User: X-Rspamd-Queue-Id: DFE97140008 X-Rspamd-Server: rspam02 X-HE-Tag: 1719908332-491595 X-HE-Meta: U2FsdGVkX18HA3KMk8gZgcKxyhr4tFGGMxI5mlz0RSOe7mEw4RQxWXO0WGnNrL0C1qSWJftZF2hO+zeucJhsj6PBpjC9GYIQtpzi+QL5zGC6DfyFTNjVW1COtClrGcZLbsbRFdudlLPKOlbRQnAT/zK3HdTuaDs377dcVR65+zwqfAIdHesiEe+I516kl8L59yAHRp1Cv89M34hLvbQ0SvSJ45Xwjtp9v43b3kozfzHZnMJCvHHpS/X8ZStj45qVvwGYZspOVU23FYdENmrdO7R2anEzd3slfXc4uytSJwzEwiRwNpAbxwsaAyH2iK1VZdgEY+VGtOmaOUhLHpz5aOR7baJY3RiptmU3oQsGeM+jbj8gmpn72SDyvCRlsV8h4UxVpQh6o5K2pwyweseqvxekjx9D84G+oQvG6bZ+HCRuiXUFtNEtWclH8V//+XS7pyVHGyxyIbY3O/ciG3W3zHnBkxgflfTkxt8rN52Kvv+ukGICE7VfA+gbUtaAtuGumXZHLZxWXCJJH+i5HuJIyQL6aUHegctBj4ItgV4UR9766Q83rJYbyLD82o7mDXpgH8lmXZhhjBOuxwZy4bMMtEPWnN7GxnY4Nm7wKY6kxNtmRuzI4clGVwbPt9v7OxVyNNAwWi0uVJVO02sGyTgQozH1bYniNubRfWjmXZjohDsACHyn1zqB9L5GmQ99QmCVc/7Jk0EY+NkO96wxLF0UQZQHPWeEmol6RPG+UaEL4IkwHRq990ALyaeEI+Ay6o8PjIPd5hfRdEEXYZEcMp9vE2n3FkZ+j6/bwox9P1shV9zK44Q/JRwKpWqj9P8+XB44V7rUco9/r7ThgE3niyBOd5KhNK/K2ZzmMcSk9vtbqzDpqxULE784ehxBN60xXDjERnCUTypmaNKrDnzvdNt2JdJFw2G1tKW1GU+NeuuUkxdxAqboJ+TIcb60Wf7cnZPAAAI+UfCzJXF9e/IX5G0 p2mUKXWd 39Gn4IqA0Lxo74c5U3QSp2czbSCfy8hn4YAzv8vk6Jm8DMF8aWfDtGN4P5N/bBQd1Nj9LjMyylgEdZoNm6LAVQYkbbm1pb8k4Oh+IK9jr8DaT85mQ/N4/tUIM1pFiNlzRzfmKy+niKFqz+2Tjtg4OGcsVE5z90OEKBglvPbHkOd6vvMWplz8rx7AQtaLcODPODHdHQ0dAgYFFHN10RjbHmTLr3/bruSO18/0IdgktmBV4RAq5tOGNQi9LXH44WKc+NFTp7HkSCGPSz1I= 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 02/07/2024 03:34, Bang Li wrote: > After the commit 7fb1b252afb5 ("mm: shmem: add mTHP support for > anonymous shmem"), we can configure different policies through > the multi-size THP sysfs interface for anonymous shmem. But > currently "THPeligible" indicates only whether the mapping is > eligible for allocating THP-pages as well as the THP is PMD > mappable or not for anonymous shmem, we need to support semantics > for mTHP with anonymous shmem similar to those for mTHP with > anonymous memory. > > Signed-off-by: Bang Li > --- > Changes since v1 [1]: > - Put anonymous shmem mthp related logic into > thp_vma_allowable_orders() (per David) > > [1] https://lore.kernel.org/linux-mm/20240628104926.34209-1-libang.li@antgroup.com/ > --- > include/linux/huge_mm.h | 11 +++++++++++ > mm/huge_memory.c | 13 +++++++++---- > mm/shmem.c | 9 +-------- > 3 files changed, 21 insertions(+), 12 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index 212cca384d7e..f87136f38aa1 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -267,6 +267,10 @@ unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma, > return __thp_vma_allowable_orders(vma, vm_flags, tva_flags, orders); > } > > +unsigned long shmem_allowable_huge_orders(struct inode *inode, > + struct vm_area_struct *vma, pgoff_t index, > + bool global_huge); > + > struct thpsize { > struct kobject kobj; > struct list_head node; > @@ -460,6 +464,13 @@ static inline unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma, > return 0; > } > > +static inline unsigned long shmem_allowable_huge_orders(struct inode *inode, > + struct vm_area_struct *vma, pgoff_t index, > + bool global_huge) > +{ > + return 0; > +} > + > #define transparent_hugepage_flags 0UL > > #define thp_get_unmapped_area NULL > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index c7ce28f6b7f3..ea377bb4af91 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -151,10 +151,15 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, > * Must be done before hugepage flags check since shmem has its > * own flags. > */ > - if (!in_pf && shmem_file(vma->vm_file)) > - return shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff, > - !enforce_sysfs, vma->vm_mm, vm_flags) > - ? orders : 0; > + if (!in_pf && shmem_file(vma->vm_file)) { > + bool global_huge = shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff, > + !enforce_sysfs, vma->vm_mm, vm_flags); > + > + if (!vma_is_anon_shmem(vma)) > + return global_huge? orders : 0; nit: missing space before '?' > + return shmem_allowable_huge_orders(file_inode(vma->vm_file), > + vma, vma->vm_pgoff, global_huge); What's the rationale for splitting these functions into shmem_is_huge() and shmem_allowable_huge_orders()? Why not just have a single shmem_allowable_huge_orders() that tells you the answer? > + } > > if (!vma_is_anonymous(vma)) { > /* > diff --git a/mm/shmem.c b/mm/shmem.c > index d495c0701a83..aa85df9c662a 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1622,7 +1622,7 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) > } > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > -static unsigned long shmem_allowable_huge_orders(struct inode *inode, > +unsigned long shmem_allowable_huge_orders(struct inode *inode, > struct vm_area_struct *vma, pgoff_t index, > bool global_huge) > { > @@ -1707,13 +1707,6 @@ static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault > return orders; > } > #else > -static unsigned long shmem_allowable_huge_orders(struct inode *inode, > - struct vm_area_struct *vma, pgoff_t index, > - bool global_huge) > -{ > - return 0; > -} > - > static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault *vmf, > struct address_space *mapping, pgoff_t index, > unsigned long orders)