From patchwork Sat Jul 13 13:24:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13732411 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 B37A2C3DA42 for ; Sat, 13 Jul 2024 13:24:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 004156B0088; Sat, 13 Jul 2024 09:24:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DAC036B008C; 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 9E3F86B0089; Sat, 13 Jul 2024 09:24:40 -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 4E2CC6B008A for ; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0157080F05 for ; Sat, 13 Jul 2024 13:24:39 +0000 (UTC) X-FDA: 82334799120.23.C7AAB48 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by imf18.hostedemail.com (Postfix) with ESMTP id 172B91C0023 for ; Sat, 13 Jul 2024 13:24:35 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=h5PSJvOv; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 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=1720877031; 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=Tf+iCn9J1tf0mbYcwxtjryzLvO9qhkxHYDxVzJSYovE=; b=NVIt1KJEjjXVSiT1apB6oBFrIaX9vu+tybGKlzvnnBJVfsosfzuDh42lNfSHoPbENLhQqW p5AmckdJWIpJ3mt0sqE6KelTsMzFv+G7EfYv4QOuuUQEA34GgNzGOlJW1YDVhOZu+qBhFq nRJTd0sGYLTQ9F3ArVJ7AfWkHLwlcMk= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=h5PSJvOv; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 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=1720877031; a=rsa-sha256; cv=none; b=qMyRqbvNNWOBmaoJnx+SxdRWHjuX2+z1scFajf03eizqLkciEeBfgIZuX0Z7RBlXQ0gyR3 yuuk2lJ8QqYkvVEA07cwU/2nzGKkAHYGwo86WACWGXWZ54z99cXFTUeavrgEm1egokWmKR VJ7GPHqO4xjytf7T83hk9gwVbf+0vwM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1720877071; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Tf+iCn9J1tf0mbYcwxtjryzLvO9qhkxHYDxVzJSYovE=; b=h5PSJvOvFx7aRU9or2dU3jdHePS07eeCDhiFwCWyE/IEW3q/6OX3b+8leVCzOo5+JfOu9WZMzwdpNGY+zaU8TGTLnl09WaaFR3aaxeSYGDA9B2/7vRSEEDO2WGbO3ksUIizBzNtZNOWDYrgsG9ONnkIowD3Lb7z66lRTE66zBH0= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067113;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAR.kD7_1720877069; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAR.kD7_1720877069) by smtp.aliyun-inc.com; Sat, 13 Jul 2024 21:24:30 +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 2/3] mm: shmem: rename shmem_is_huge() to shmem_huge_global_enabled() Date: Sat, 13 Jul 2024 21:24:21 +0800 Message-Id: <26dfca33f394b5cfa68e4dbda60bf5f54e41c534.1720755678.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: rspam06 X-Rspamd-Queue-Id: 172B91C0023 X-Stat-Signature: 4ztzd6teg4ubdgrqcntzue7f7axjupcz X-Rspam-User: X-HE-Tag: 1720877075-273517 X-HE-Meta: U2FsdGVkX197+3TVRkrH5QlG/srsIK5LNN5HcD8Yqy46Al/SvcKanp3s3V0uf6i/4zJWcROiiP0p5ltSGbs++mYVUleLpLMbb6ew4rjYohqdSkFojj3TqA9ek27o8c9wfEBActjmhC5/m7jrHWexKCgHlPUmKwvbdEbeTxQsBL5nOKW+ups9FAEKqVPmcfKQDYAGoWIBWQ7rYWigWZUSzpIhHqv0Poq7h7bm7nZGfykwd81ubJvb42H2hsJxhbD8G+VGykOWRIgMxUDXM6FxLq5dEb2mtKqHuKGYFnImMru6QkEj5h5yvKnqWJIlznkRbOjCTRIR2NSviTL16mhntx7bTjTEqOHABQvgcoeERje8ACONpk1likAozh1WYKBupQOzMZXDneVA2f898Fr6j3TxTIpTFvu69u05KBXmNr6eeKczeD6YDC0YvnniNTDARrUCKvUnQOPIm5/fmbonnFzxTHqphkmAGJB1owKjsFi6VBrVxHkuR0EdCHq4KcNlDMiYVgSsDEQN7tFfqnkSb8RGYyfkT+xQD0aaZ+nxDEM5V2NkzvmAQ+73ncDexIF3GHALVn70WJXNY20bAUPD/rSHJmKChkfuEcuFSEDEBn7KYwQ9RkNqi/t9NMqhjOzkUHB5gZckM7WAQOnXoktSHbla/b1ESRDu6Q/wfG8H/+lFDL/qlVDATvdTbWBZBbjMVresT33RC/R5/Qowx/sRh9yiO+n8eg/5G1CDYSjHBjLswJHOE2ZLAKo9Sfx6i4utkI28H4MIZctBZhp/PJoJQGsSq58vB8Yha6ceFVhel1TZ/q3gHQ1kmlRY+FhFz3YSsRHtyCb6iNgOLlt8nLfMGVwr0+Di+S6jskk5gKR0LOYdR/OOLczyMyblKRApAs5oT+WZMFJqDNvqkUZ/65308///QGUh0e6I0513JvkNLZRvPKyrEQt0Cgx8Hom1Jeg0f6bP55Lb35kjLl9gP9E DmOZ5EFx LzetLc2LzH2f/8NA/W5ayFR+ILtFwt53mqh3fKm/N/01m5D7m+enbEYEwiB9bd9gsN8QRCXhWLeKA+I3rSPmijtCdyzuS29o3SUqCeLMrslmylspNrzX7xX51olXLrX3MM2Cq4DE7esDJcXfdkT1a1RME4hO4Y0tihTxBHPTqpNnhoWE2bnVFCIne/lB2jI9mr9qsN6l8dYnByHgqnVUGBibGj+Dep0QvwZ/I3/nKOUB0s29UQ+b1f96PzK4pIaMZyBnOmm7+5YbI4NcYFxluF/KHlQ== 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: The shmem_is_huge() is now used to check if the top-level huge page is enabled, thus rename it to reflect its usage. Signed-off-by: Baolin Wang Reviewed-by: Ryan Roberts Acked-by: David Hildenbrand --- include/linux/shmem_fs.h | 9 +++++---- mm/huge_memory.c | 5 +++-- mm/shmem.c | 15 ++++++++------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 1d06b1e5408a..405ee8d3589a 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -111,14 +111,15 @@ 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_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, - struct mm_struct *mm, unsigned long vm_flags); +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); #else -static __always_inline bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, - struct mm_struct *mm, unsigned long vm_flags) +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; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f9696c94e211..cc9bad12be75 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -152,8 +152,9 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, * own flags. */ 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); + 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; diff --git a/mm/shmem.c b/mm/shmem.c index db7e9808830f..1445dcd39b6f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -548,9 +548,9 @@ static bool shmem_confirm_swap(struct address_space *mapping, static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; -static bool __shmem_is_huge(struct inode *inode, pgoff_t index, - bool shmem_huge_force, struct mm_struct *mm, - unsigned long vm_flags) +static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + bool shmem_huge_force, struct mm_struct *mm, + unsigned long vm_flags) { loff_t i_size; @@ -581,14 +581,15 @@ static bool __shmem_is_huge(struct inode *inode, pgoff_t index, } } -bool shmem_is_huge(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, unsigned long vm_flags) { if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) return false; - return __shmem_is_huge(inode, index, shmem_huge_force, mm, vm_flags); + return __shmem_huge_global_enabled(inode, index, shmem_huge_force, + mm, vm_flags); } #if defined(CONFIG_SYSFS) @@ -1156,7 +1157,7 @@ static int shmem_getattr(struct mnt_idmap *idmap, STATX_ATTR_NODUMP); generic_fillattr(idmap, request_mask, inode, stat); - if (shmem_is_huge(inode, 0, false, NULL, 0)) + if (shmem_huge_global_enabled(inode, 0, false, NULL, 0)) stat->blksize = HPAGE_PMD_SIZE; if (request_mask & STATX_BTIME) { @@ -2153,7 +2154,7 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, return 0; } - huge = shmem_is_huge(inode, index, false, fault_mm, + 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))