From patchwork Mon Jul 22 05:43:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13738281 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 B35E4C3DA5D for ; Mon, 22 Jul 2024 05:43:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87D7D6B0088; Mon, 22 Jul 2024 01:43:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81EB96B0089; Mon, 22 Jul 2024 01:43:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C02D6B008A; Mon, 22 Jul 2024 01:43:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 463D86B0088 for ; Mon, 22 Jul 2024 01:43:34 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id CD8BEA1408 for ; Mon, 22 Jul 2024 05:43:33 +0000 (UTC) X-FDA: 82366296306.02.BDF4C9B Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) by imf19.hostedemail.com (Postfix) with ESMTP id D57D71A0009 for ; Mon, 22 Jul 2024 05:43:31 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="d/l2iALs"; spf=pass (imf19.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721626990; 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:in-reply-to:references:references:dkim-signature; bh=Vs/dizXu3sRF7w2mzo6J6uL+Sv07j1HZRmB25ivkki0=; b=rVpsqP0bQJ9lgsaQms/C8HshBwtDV8tMHU6rsjdr1UeYd3wLNQDzmgCtTn2jTdtI+7TUO0 Q7pTWUBMuzu6VF1l7Cv8oCFvSD9TtKeJfQcGhnctEX3XJT6yn+ggJBTPQuHrdWrcLEQYB/ vrV8vWjhuIt8UJb7gVlztSSRMVRBvGk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="d/l2iALs"; spf=pass (imf19.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721626990; a=rsa-sha256; cv=none; b=wzgPK7QhFFt6nc3Fb81znPJ5zrzBtbs0U3AtVgLl9PvbXI+Xw0Rs5pue7uWFFaRK1+iAW+ maljNOG8nqiVOpBYgllpFRP+rcdLPKEPlzwUY2rLOplbY6zZz7KzyvBKXl4iGU4FjtvOPd GyErM9CRXTjtMY47tmSCSrLZjryidsY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1721627008; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Vs/dizXu3sRF7w2mzo6J6uL+Sv07j1HZRmB25ivkki0=; b=d/l2iALsrZiVWSqoKxN5ZXfyp+OwgSPKP/+7JFGoB1FwHbTbaOb0jbOP5rRAxIuBis4i7dQ4tVA3D5da0b5vlrn2EB9I/gpY26sJP9rFSxtDWVMBtDYYLB37ev39sGVc7dLeqyQn6lAtjP4EVQ1Wh/MkstDW/1rsifbOjceSCBc= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R861e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033032019045;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAzW.hk_1721627006; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAzW.hk_1721627006) by smtp.aliyun-inc.com; Mon, 22 Jul 2024 13:43:27 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ziy@nvidia.com, ioworker0@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] mm: shmem: move shmem_huge_global_enabled() into shmem_allowable_huge_orders() Date: Mon, 22 Jul 2024 13:43:19 +0800 Message-Id: <8e825146bb29ee1a1c7bd64d2968ff3e19be7815.1721626645.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: D57D71A0009 X-Stat-Signature: bmr897zgcupe6jyuj4pqtp6yhaupozgs X-HE-Tag: 1721627011-346996 X-HE-Meta: U2FsdGVkX19S2NfP0dmYhwAsXLXeE6JBXGuCR0G/uUXlZvwvkITMBWoXa0baKWJ1HgSkqrtBfdp7k3nbFIzq1jSxuVnCBAW4qMWMYXTOxpN23iixgaXxDiarLjf1B+tc8Jda786QWDmu2tvV1RH9XzQYhyelZai6bpuCYD2hyaGe4ApIgja9OzXyxKcYHUw0Koi/keBDW5DwP0BOybqn7xxuOwahxPu2jRYfBRrSzwUKhvPDK0GSSoDE8cjlxkdnlYYpzNgj76DsgX2IONmnkFps4OlFVrW5e4joNXf/RbwB3kFg1BTd+FI5d/o8J/fZxd9dvlplzsAJ6YNjvYPqb43OptUOTPtKTo5TLvSUlFoBFiW5/ccmb0cikEdLaeCITQfFsehl1WPtNGQgKoVmVijaKAmAQM6qZFXcWmBKhi5SKH16qZ0oiMAeJzWXc+ZeNxvBGNj9Cf4d7RwEEzJI/HhgkD5zHoCslFwUHj4yLOg536di9H+U2RviKBaQIEzyAKq12ADhKFbn/iAuP2kFreklMA2K0mvrI7JwdfHhj3mrJLwrcIKTTaAsXmWcsGisO1c+gXW/sr9+BzH/0wEG4+ZjF69AErYFPeA4Xsr85wsjvq1bWmYdv80Q61wCUHlKlza+D+/okMBfROG7PN9CqEVSF5Famq5qcHUeMD/WFQOXcMnN4nMHA/b7IR1iD/P2auHIkAkcpmcNrkrns1sIs/03Mt3yTUOMQ4Xl1vZqWToYv4VtswECanjm43Fs/USTlZjg55TOsancI8nbHpwsgAPEbLM8FGqDVMSniqZd3FVHZ2GseQ1CMakYA5VTk36oeSTLdFPX25HmSuMgjecY7/BqHHZzuZ3XrdY2Q8xuXSVsCMcjXk1FitHOLzM9qKrYQRfN0gpubnNbELSfJD0zeK2vLmapbTeo1zGyl16eN4gZodXMtSXL27OQTFcMAGspYsD8a4jGQ3I29j9SzpE 7aGqUkeg JDjssxKz1Ty89KLyWhLQ6xZPq4Jv8ZVG394RumnEv10cXOoTEJZWyhVD2Zlf+lonhOseG3R97J/OWWxIxonec8CLhRwCIwGtz37CNnlGhpk5REVtfqCQctWkzKr2WwQKoNfi8ZIHx2GKn7jz7a4y8hpx5mHir5EGXF9YZAEsL8L3Yf+GErW4WSCDL5qs3nMP8IuHo6O8GYuLysneY9AFnEHEe4xdba2MKaf0joae1CWV7ixu61kYVVnhnZO07KluNBrvFqdiIH5EeRKO7uRf21YpDiiExihg+vd1g7MC/t1isnYGSw8KLJbtZbQ== 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: Move shmem_huge_global_enabled() into the shmem_allowable_huge_orders() function, so that shmem_allowable_huge_orders() can also help to find the allowable huge orders for tmpfs. Moreover the shmem_huge_global_enabled() can become static. While we are at it, passing the vma instead of mm for shmem_huge_global_enabled() makes code cleaner. No functional changes. Signed-off-by: Baolin Wang Reviewed-by: Ryan Roberts --- include/linux/shmem_fs.h | 12 ++-------- mm/huge_memory.c | 12 +++------- mm/shmem.c | 47 +++++++++++++++++++++++++--------------- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 405ee8d3589a..1564d7d3ca61 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -111,21 +111,13 @@ extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end); int shmem_unuse(unsigned int type); #ifdef CONFIG_TRANSPARENT_HUGEPAGE -extern bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force, - struct mm_struct *mm, unsigned long vm_flags); unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, - bool global_huge); + bool shmem_huge_force); #else -static __always_inline bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, - bool shmem_huge_force, struct mm_struct *mm, - unsigned long vm_flags) -{ - return false; -} static inline unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, - bool global_huge) + bool shmem_huge_force) { return 0; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index e8388ea33f50..e555fcdd19d4 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -159,16 +159,10 @@ 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)) { - bool global_huge = shmem_huge_global_enabled(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; + if (!in_pf && shmem_file(vma->vm_file)) return shmem_allowable_huge_orders(file_inode(vma->vm_file), - vma, vma->vm_pgoff, global_huge); - } + vma, vma->vm_pgoff, + !enforce_sysfs); if (!vma_is_anonymous(vma)) { /* diff --git a/mm/shmem.c b/mm/shmem.c index 1445dcd39b6f..db8f74cac1a2 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -549,9 +549,10 @@ static bool shmem_confirm_swap(struct address_space *mapping, static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, - bool shmem_huge_force, struct mm_struct *mm, + bool shmem_huge_force, struct vm_area_struct *vma, unsigned long vm_flags) { + struct mm_struct *mm = vma ? vma->vm_mm : NULL; loff_t i_size; if (!S_ISREG(inode->i_mode)) @@ -581,15 +582,15 @@ static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, } } -bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, - bool shmem_huge_force, struct mm_struct *mm, +static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + bool shmem_huge_force, struct vm_area_struct *vma, unsigned long vm_flags) { if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) return false; return __shmem_huge_global_enabled(inode, index, shmem_huge_force, - mm, vm_flags); + vma, vm_flags); } #if defined(CONFIG_SYSFS) @@ -772,6 +773,13 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, { return 0; } + +static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + bool shmem_huge_force, struct vm_area_struct *vma, + unsigned long vm_flags) +{ + return false; +} #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* @@ -1625,27 +1633,38 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) #ifdef CONFIG_TRANSPARENT_HUGEPAGE unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, - bool global_huge) + bool shmem_huge_force) { unsigned long mask = READ_ONCE(huge_shmem_orders_always); unsigned long within_size_orders = READ_ONCE(huge_shmem_orders_within_size); - unsigned long vm_flags = vma->vm_flags; + unsigned long vm_flags = vma ? vma->vm_flags : 0; /* * Check all the (large) orders below HPAGE_PMD_ORDER + 1 that * are enabled for this vma. */ unsigned long orders = BIT(PMD_ORDER + 1) - 1; + bool global_huge; loff_t i_size; int order; - if ((vm_flags & VM_NOHUGEPAGE) || - test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) + if (vma && ((vm_flags & VM_NOHUGEPAGE) || + test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags))) return 0; /* If the hardware/firmware marked hugepage support disabled. */ if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) return 0; + global_huge = shmem_huge_global_enabled(inode, index, shmem_huge_force, + vma, vm_flags); + if (!vma || !vma_is_anon_shmem(vma)) { + /* + * For tmpfs, we now only support PMD sized THP if huge page + * is enabled, otherwise fallback to order 0. + */ + return global_huge ? BIT(HPAGE_PMD_ORDER) : 0; + } + /* * Following the 'deny' semantics of the top level, force the huge * option off from all mounts. @@ -2081,7 +2100,7 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, struct mm_struct *fault_mm; struct folio *folio; int error; - bool alloced, huge; + bool alloced; unsigned long orders = 0; if (WARN_ON_ONCE(!shmem_mapping(inode->i_mapping))) @@ -2154,14 +2173,8 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, return 0; } - huge = shmem_huge_global_enabled(inode, index, false, fault_mm, - vma ? vma->vm_flags : 0); - /* Find hugepage orders that are allowed for anonymous shmem. */ - if (vma && vma_is_anon_shmem(vma)) - orders = shmem_allowable_huge_orders(inode, vma, index, huge); - else if (huge) - orders = BIT(HPAGE_PMD_ORDER); - + /* Find hugepage orders that are allowed for anonymous shmem and tmpfs. */ + orders = shmem_allowable_huge_orders(inode, vma, index, false); if (orders > 0) { gfp_t huge_gfp;