From patchwork Sat Jul 13 13:24:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13732409 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 6CF73C3DA45 for ; Sat, 13 Jul 2024 13:24:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A39A46B0083; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 999766B0093; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6877E6B0083; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3A2F86B0088 for ; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D80CAA3EF3 for ; Sat, 13 Jul 2024 13:24:39 +0000 (UTC) X-FDA: 82334799078.03.03CEDDD Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf06.hostedemail.com (Postfix) with ESMTP id 19013180015 for ; Sat, 13 Jul 2024 13:24:34 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=RbTK9CIg; spf=pass (imf06.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 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=1720877042; 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=Q6qMaXIaTDYvJfprl3aijdTJlnnyWcHY799Vnupoh5o=; b=0KLmTUSog8HsVYScLhOl+tWRiEwjcyVlvndM2NC5jUJb9yNIF/AA7XEbrM9sHh8Iks0C3G ohX7ztyRewNRg/7otKUJaZ7Km2paZZjq1+wwzwFoKp6CfDUp7/DCzNRpo4YF82N62KXS0H toOljtP/gchNbbiiUdVbZ1PSvXwK41I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720877042; a=rsa-sha256; cv=none; b=LlF4jRvUiEOiVoz9xQ+s1cxN4cLZCxVd5qgbqYbfkJNh72bXaWkKtlJkC6NebFn20AsnDh DK8bQTzfo5HrYM3nkmJzgB/OWb/V/qULPHO0mXUt80NlvnFi8t0movehJeNp/Z1MmlFXQ1 HgzFgOsNThbPhV55U7J3oZTC82980e4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=RbTK9CIg; spf=pass (imf06.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1720877072; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Q6qMaXIaTDYvJfprl3aijdTJlnnyWcHY799Vnupoh5o=; b=RbTK9CIg8a98a66riFWIVYJEGtymoqhicvFe7sZwSM/EBZQNu7gKKtCXTF+AZzSyWUwI66wEfTPy+JKNcxvhdCUyTUQIpCDrtbmfEsf8QXGS77oGm3PS0EqmZML74zEwaYshsi5WbjNuAZpjMzsBtjSZR0SxmfRY+EgZRQLUnOE= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R601e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045220184;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAQzACU_1720877070; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAQzACU_1720877070) by smtp.aliyun-inc.com; Sat, 13 Jul 2024 21:24:31 +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 v2 3/3] mm: shmem: move shmem_huge_global_enabled() into shmem_allowable_huge_orders() Date: Sat, 13 Jul 2024 21:24:22 +0800 Message-Id: <16dad33282617ecb90a3f466b35273b10be68d21.1720755678.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: jpbx93fg45hocrjqbtpto4eq1k6d3tdu X-Rspamd-Queue-Id: 19013180015 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1720877074-641484 X-HE-Meta: U2FsdGVkX1/3t/dbsAKMp4a4qsrVwm0aNJZ/LBNvlbS3cN7Ez2C72KzcB9RssDgt1wvhDkgLQoOe+MDq+0ZXr7+GKhKIx96GLXnkpi8CaEGKMR4N1rBnytgj7Du1ltTdTWmKoZw0ca+ac9j0T3ehG9U7R20+cXXgmNXKhHUDiA5nbjyjIn2vmbWXFKeb7miqREH8SsRlSZLfkHX7zLYvDn4+diaSiT28GyTnRdeK0YCbRXhG3kRGYW53hWCuX6Q65x3S4SRq5sftilQjPHptXGl1npqmUThqG1C9rAp5oW2HML5OJkHxd6RQ8cjyzIYtW2maAMSWjRgMGKGWHtzbNJPSNlsFNmwPez+0uCti0pbDLHk9mPTLeFYoDcC72LRKTjEO7NFHbgiwj5eqtiL1iNCvNKf4O4oQnMp2CTrZVYe1o8rISev/LiJ7rSSq6MYxKZSTVTg/MMg1SYPcxhFIwVRnALVU4J9V5aDZejF+kRO0/EWXt8LIE/OYQ31pqtXCywxjIWNyASvWbxgireKlFW5pdhEzoqOiKE0/eSGXRhEqb2IVPuDjFSTCa8uWaZFWXMHK9/XtCQViyo891cflEAa7afdlsKnAzK4a7Dn4EHS2Mpy/aSRKDCoDOMhCSF37oKxkU/DBV0XyZ2UHNT6Dq5Q/VGGT880hQ6US2lVZWWzrBnmoEW+ay2Oh7atJDiKNi5K5W7cbDMz4xyDPdFTjk73etNXOJEjj+00JRAB4w6CU6YJyYrIsmnbkemXm0UsbX2RMjcsVNZd9f/gp0QfB7O/z3Ozln1SJ986AtXEY6v9vMazsQcSDUwrgzR0qG0uPoCq/dSkqw4BpvQpi/Ul2xVVfDmmCBJNoI+ZCZKBgXQZnXkWh7gbpkNpUnL7Yi0GWTkH0soZBV7Wy1VQKtRF0/RX32AJtYdsAxjiL9/i7+ZYIF9qJaBKKt49Kl9sGgFyzvqYdrLIYfgll1po3G9T pCDd4WiN vsA+TdhJ0EScanOHbUs87StEMzCxj7EmC+kW286X9kR3R/ND9t1N8D/4B3J/4SboBLQ0BeP/YmWsYF99Baw1ZCv8r9l3bX4EbHFmZF3fJgvkcRQ7AgDRTljQ0zCePDXdO0mn3v6QPszL+nF/YkPq9j+pcW1wTQKgTxmRS5SQTm7MYB7Y9YkfIbdtME1Cmz5NsKBcnISP0d70eXFufREE3FTrj+GS7+e++k7GUIXreVdI3kZV67NSYB2M/9w== 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. No functional changes. Signed-off-by: Baolin Wang Reviewed-by: Ryan Roberts Acked-by: David Hildenbrand --- include/linux/shmem_fs.h | 12 ++---------- mm/huge_memory.c | 12 +++--------- mm/shmem.c | 41 ++++++++++++++++++++++++++-------------- 3 files changed, 32 insertions(+), 33 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 cc9bad12be75..f69980b5b5fc 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -151,16 +151,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..4d274f5a17d9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -581,7 +581,7 @@ static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, } } -bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, +static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force, struct mm_struct *mm, unsigned long vm_flags) { @@ -772,6 +772,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 mm_struct *mm, + unsigned long vm_flags) +{ + return false; +} #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* @@ -1625,27 +1632,39 @@ 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; + struct mm_struct *fault_mm = vma ? vma->vm_mm : NULL; /* * 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, + fault_mm, 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;