From patchwork Thu Jul 11 05:42:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13730033 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 3BC13C3DA45 for ; Thu, 11 Jul 2024 05:43:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 34B056B0099; Thu, 11 Jul 2024 01:43:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 289146B0096; Thu, 11 Jul 2024 01:43:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E96E96B0099; Thu, 11 Jul 2024 01:43:13 -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 C20786B0096 for ; Thu, 11 Jul 2024 01:43:13 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2D2FCA20D1 for ; Thu, 11 Jul 2024 05:43:13 +0000 (UTC) X-FDA: 82326378666.09.EF6CA0F Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by imf16.hostedemail.com (Postfix) with ESMTP id 1FF91180005 for ; Thu, 11 Jul 2024 05:43:08 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=tZdeXgf0; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 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=1720676574; 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=0Boo5uT/JP5BRIYVD34l9RLdBtYpeg1U2eZ/tjL1aNJ/BQVnrRbr3wZc6thabY+RLUphOC YpHB8PKL//qMYJcvzsCrjZxCNmLfiBj1VPHZt+ZbijI7+Udp2x4coneII4Wg7qmeJv75FB lOXDflAsVU0sjoTCQn+B3bokoDrTvPA= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=tZdeXgf0; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 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=1720676574; a=rsa-sha256; cv=none; b=D0CLo2obQgeUM0TgbaQYg/nwwglORXvvl1jPSuWpirgz6k2sAiIRqvF6+d7B4HtS9/DHig knnAd76GDLBs3ZbrQ1ngsyxUNg5MVGaszNrcodA07/mc9cTxWKzD1eEqJvRlGS+gZMGu7s 8OtZxYSYpORNSUZLTAtjXAAXymCIJqA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1720676586; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Tf+iCn9J1tf0mbYcwxtjryzLvO9qhkxHYDxVzJSYovE=; b=tZdeXgf0HkI/o+oVSQe91492e1M9cdVWvG/A7fpJv2owDQ9VJkfyyINdW0EbK2ligSzuluCEC4dUdxOfhT9MUxgUpNKwBo4bzyfsts3O78jpKsoxPOODkjzL94wF3OdeSKgNp8MH5szUapkkqgdzqcqzHNBNjg9BIrRuQU7Z2Vg= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067111;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAImoHy_1720676583; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAImoHy_1720676583) by smtp.aliyun-inc.com; Thu, 11 Jul 2024 13:43:03 +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 2/3] mm: shmem: rename shmem_is_huge() to shmem_huge_global_enabled() Date: Thu, 11 Jul 2024 13:42:49 +0800 Message-Id: <26dfca33f394b5cfa68e4dbda60bf5f54e41c534.1720668581.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: 1FF91180005 X-Stat-Signature: ekm4nk1rxhcsmntrn4wx5cxdqg3m3kjq X-HE-Tag: 1720676588-135317 X-HE-Meta: U2FsdGVkX1+RLWDuRFdVtroznBdu/ryvfIpqEPlOU+jn/FquHwOIEm0COsxvUfN+5TaRHyUV9CAyABh8ESeL2p/7ddckoELewtfYwUbexev2SkQGVlkaDXB4GGMGuXIiXAUfSQS8TUzyL3BbORfJlAkOlCXZqJ6KP6P3bFPl3Lgm/B+1S1mfOHV+HR+D/yqyyEQXmN/eByXY/sM8iWb+6705CKecoTsEV2sY/5DGmUZ92ORXwrkLPEQNHBjYXDfz6Y1O0Zsj5xM/G/aaTx7+WNptIcG0rEGbgB8mSjkB7VQI6rXlgqF+jgTuM1HuwPFGr7trSCElm8FJO3iaO/PtgEWf45m/vS+z7M9FGsrTB9oalJa0VzFLhuUGE9yJdvts7m4K6WcaDBnlipqqTSVD8iM1PL94zytophIVBjdKJzOlbARw33Kza9XBx601aW1C8eO2qF5cwi4A2KC7cGGAJFmn5BnjTA7Wd82xfpPkFbjMN8NKCeVN2G3v4j759zHypj0t1hRyC84+2YRbIHxp2AEkIMkXs2OFHudEePi0t0bvPBc3q379YRFj6hD8c2Dp7qqmf0fOZ0GGV7hvTxSa1iEbF2iu8cxluiIC4IrU7csQM+2dGSAkIbxMgRteBE3R1bgWG4/QcwIGs454bYdVTcPv3QUJELbp1VfpcFVUDZlbSNLIhYcHNlFMPDOHqX8xkflzcvydqvktxS8FD9UTnedR0S4Yabv1XXu74QERFk1kfSpVBFuNqmlY2/O9Jl0Z1psn8A2wValZvxbCuQRDzBei+1OmiKxsZtxWtLDjYfDtN7rDoyY8acrlpdJxUuHZpt7SFI1eHTWXszhu09jXzvsqAJN6BBU8/jgzWbBlManFOsNwTCLWJcjf1LpS3bF3xDrZsKpfDt9RIT1aos2RnD2zVmk8k5w6GGgbLAyKY8pqs0Odznua5qroY2JAIWZO8ZS1KECx3VabT1dhyR8 69VtR103 IejbuggHLv4wZyjCm/IkG0/1ez8SSp8q/SKMJvYKt1NfR1uiyAWAn9c6F/LBqqywrxLKOLkICbQNTXxTPBv41k2GfJNFvJKTk3DtvVjJOVGph55LRlJbsjlAyTI9Ek/AIAGBFpnnepWIi9glOVt/mX3ojCYT7De3m6cyJqt2EsvWTYgOlxpR7kDz7tQT/gW7RcXdjEMCzFlIdkZXUTPsdGWbF0x6dKJnaMvmfqlD9f0dSowjRsdaiJht73JKcFhibM113PxgINWYza3Ai8wg0ind7bStiyA3T+zz0 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 --- 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))