From patchwork Tue Jul 2 02:34:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bang Li X-Patchwork-Id: 13718905 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 A09ADC2BD09 for ; Tue, 2 Jul 2024 02:38:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 311936B008A; Mon, 1 Jul 2024 22:38:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2C0FE6B008C; Mon, 1 Jul 2024 22:38:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B1226B0092; Mon, 1 Jul 2024 22:38:02 -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 F32186B008A for ; Mon, 1 Jul 2024 22:38:01 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9BBF8141828 for ; Tue, 2 Jul 2024 02:38:01 +0000 (UTC) X-FDA: 82293252762.29.F4D8808 Received: from out0-208.mail.aliyun.com (out0-208.mail.aliyun.com [140.205.0.208]) by imf04.hostedemail.com (Postfix) with ESMTP id 667FB40004 for ; Tue, 2 Jul 2024 02:37:58 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=1GxGAz3S; dmarc=pass (policy=quarantine) header.from=antgroup.com; spf=pass (imf04.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.208 as permitted sender) smtp.mailfrom=libang.li@antgroup.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719887863; a=rsa-sha256; cv=none; b=RX4nS6iBFuJtuuAlu2IC4y9Ger6/hcsnaS1r/VyR3G5LxGoujGIc4xHLhzwimSqbjQ07cY EuijdCjhE9Y2HLs1hESqH1JchyWCY8+JhHFrUL6N8WgunQcQ1uoKGgXt5jCEWj2qg5TVhb KmZ+tM8fSeXxd5/bLkTzhoDzPqwykuA= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=1GxGAz3S; dmarc=pass (policy=quarantine) header.from=antgroup.com; spf=pass (imf04.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.208 as permitted sender) smtp.mailfrom=libang.li@antgroup.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719887863; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=24NgFMDS5S3jO5/FabpLcvF++s2Y5El1WGn9ifWoN/4=; b=WrsEyGj7ixNO0kkBGhz0T8EQxYN9M8fLxo/Jr8QVEnEEIAS76NaQ1rrdIIkQHOtoktxCag zmyU0RjRzEgw7n1JK+mdZ+SNZo1t08/Esy/9XAfLj6/GuNqQKQUnEhb4YRgEGnXi6MUhFr +AXWKCYB/qxXSSskYRa/oqV2d8Nhz4E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antgroup.com; s=default; t=1719887875; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=24NgFMDS5S3jO5/FabpLcvF++s2Y5El1WGn9ifWoN/4=; b=1GxGAz3SPPmrKqAg1B29gEAVKeniRaFegmcKlSk1x6dZcwqXD0BgIWhypR+rnBv7DkjR7Yk6U7g7WyWJw7IqIQ8CDxdAPd79UIlQ5oAzk85hNWElkj4narvtkDm0emNebFSy0YUDRFuP1wk5+8jTa3vSLCTQeIlisCZdKr5GJQQ= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033070021176;MF=libang.li@antgroup.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---.YEjSGUT_1719887873; Received: from localhost(mailfrom:libang.li@antgroup.com fp:SMTPD_---.YEjSGUT_1719887873) by smtp.aliyun-inc.com; Tue, 02 Jul 2024 10:37:54 +0800 From: "Bang Li" To: ughd@google.com, akpm@linux-foundation.org Cc: , , , , , , , , "Bang Li" Subject: [PATCH v2] mm: thp: support "THPeligible" semantics for mTHP with anonymous shmem Date: Tue, 02 Jul 2024 10:34:01 +0800 Message-Id: <20240702023401.41553-1-libang.li@antgroup.com> X-Mailer: git-send-email 2.19.1.6.gb485710b MIME-Version: 1.0 X-Rspamd-Queue-Id: 667FB40004 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 91qn8fqb5c1n7tti5oygbx81qknm1zhh X-HE-Tag: 1719887878-253816 X-HE-Meta: U2FsdGVkX187MiTBYBFJgwQx/UwNpuZlKWvoxbtCyuf4pMyRZWc/WXLNJoKKhOt30KxIRyQ2l7OwHqwYKrSdAgR05RpB8ZIdsMaZAJBCtXJEaKOp52lLxK+FKi4W97xR9ya4SAtr2IxtFzc5mHIMrqtCDP2SPHaSF6XCRK/coyCamEUlck+9ZL0qLLos6b5/62fKzXWZMz3mLg7RiByKn8ALoV1g2CQ8UxrT1AKpmeqvaGy1OsTbr9Gg9SoYqa928phIDJaMT9G/xroKzVqlSbP6rGElWK146zzXLGTQWtZu8c0WGxQupjUODcjMW39G3ZvPOkqsBbC6w2xaaFIXu2Skl8iZ9AB2AODONg0zQXjaawh8QjUeTa9fNqKY7ebULc06BMjQGgbDRqghwgu8p9SBPT5hctnH+nefQIXsgYb6xin0vmwvAMURSrZPEwmWYBBA6Nza0SXNrd3kw+3Fq8QKxu2365RXamfu2suv0nCaUTmEUK6AhVDnsJt6m64cMuzqUApbGJsv9rqBg3aLfQ2xCQRt9vAgvTwzqo5BCii+eQGtUzQDlu/dlj4dZuB7xU8ay1sKNbw4qFmY9FpWm4b/SEbzDQ08MBsRocZYeeAauG/jcbO0dL6s1SeCSRWtGFJRR+z/r5xXI8YtzbNOilaUBQoDuvqTQrMCTRzT8zFXSncPaI12Ff7xiMREXRYD6+/KqbiJzecOzK5MAX2Npamx9MMxq+5z7wVQxIbJ96wqf6cN91jwLCDElqzrxMxCHaEmbfMM7upZY9HKDht3+PoRGOfrroEyAc2xnkwGBH317VNBuReCF3NER7VaZ/5gb+HcrGEKoPzBElAladQdb8pDebxsJka1StAsfr2HpNL3ljnEmrxX4hnZ0CC4knQtNuvDzyeIvxzwy0z6oXqHNnF2Z7Q5w13l+Gbb/0/zgGaKyVtGNLUQ1hvYthoscNIY57Mn0wZhrc2S0+nVpJ4 sZWXckVu wAGhyS2T71K6U7l/JfFYl6Y6TbRkJLlRYBGpI88rC5G9Zbava7IcOrx7IfQB9N7Ksz2rB5xWzBbwmPK1gjQ9nqRD7dv/mT8OWMoVs1+p2M4r4McMOoLmMTjh8lD25On5XdfP3ZpVWDLCi0Gj5BDm3NZqJzNJ+LlUI18HNapxckNmwb/2TV3ib5NZK7FO6zB+/rWk7wZ0bUqe2UwpcppSGBe6TIpF5y4FG+ps2F7mw+pjNiQE/6K8sKpagunFQGNkTTwpC9bOu5tCD9k9GFtw401kvCfk6bW551R/mNQLM4oBkbOdGxOAOLU/O3A== 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: 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; + return shmem_allowable_huge_orders(file_inode(vma->vm_file), + vma, vma->vm_pgoff, global_huge); + } 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)