From patchwork Mon Jul 22 05:43:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13738280 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 01D3CC3DA59 for ; Mon, 22 Jul 2024 05:43:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E0076B0083; Mon, 22 Jul 2024 01:43:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D92A6B0089; Mon, 22 Jul 2024 01:43:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 148B26B008C; Mon, 22 Jul 2024 01:43:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EA2C06B0088 for ; Mon, 22 Jul 2024 01:43:32 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8F23681541 for ; Mon, 22 Jul 2024 05:43:32 +0000 (UTC) X-FDA: 82366296264.17.579C1FA Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by imf01.hostedemail.com (Postfix) with ESMTP id 66FA540009 for ; Mon, 22 Jul 2024 05:43:30 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=VX3tETft; spf=pass (imf01.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 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=1721626988; 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=0R5gZULxFaFfXiCneasc1B0qQrqeZpO2sMKXtBQXAHQ=; b=5OC0X9wZ576ftkrmdZSVLX4gLO4i/1Zq+TjL7A/16cK4mBCPQQ01tGQTx49ZjkOL/M3BBo uoQMGHZdcG8uvq1eIrJGk2I8I7GLew6cYz1NoD4+4QdtQMDFgez9zmifj33xw/BEUn5WNx fU2eFuhPR/ijHZO36gmsCIX66OF1Ckc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=VX3tETft; spf=pass (imf01.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 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=1721626988; a=rsa-sha256; cv=none; b=AEtJ4OePacs2+nLatlHWAqR6Etgb7tvN8pfaTS4abDt52hUXZ0mZ8XfBr73bAWM05LGHDS 3Fo3tMV/MDYT/4Bf7K9ZeAivF/GGbWqx3KR05J797+mX5qzPDW7ZGEk9hw5zfDpl1DJPgP bqJuD7XR2a64sKQlnM5WZ93xITJ94pc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1721627007; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=0R5gZULxFaFfXiCneasc1B0qQrqeZpO2sMKXtBQXAHQ=; b=VX3tETft68JnLqMQ90bz9ii8s7dfzAo5Y1VfYBz/123/BBGQ4atByOXu8x6w3VeuctvidddSuMm7smVZSHayxsMO34HQSru6dTRTjL76EFCevjGV6XsSoCBMHbkyZhql82gDyECDCFil2YYpxIo4eBNRu8rhiY4KTgTxWO8cWYY= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033032014031;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAyvGdz_1721627005; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAyvGdz_1721627005) by smtp.aliyun-inc.com; Mon, 22 Jul 2024 13:43:26 +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 2/3] mm: shmem: rename shmem_is_huge() to shmem_huge_global_enabled() Date: Mon, 22 Jul 2024 13:43:18 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 66FA540009 X-Stat-Signature: pqmzgpadsney7bhxbc63xg7eszekza96 X-Rspam-User: X-HE-Tag: 1721627010-884932 X-HE-Meta: U2FsdGVkX1+5+3I3a944/tx/904lRXZDjFbJ55xKQXfSjgaBqlCRLqalEHNyUBgsHwUk5P/P6AxsTlVlB3qjB2N/b5vYNYL8OeIPX5bFLyt6v8jU5zYUb7y4xZgREMAQg2udrxVhnmk+LQ+2CqP8tKBOWwGfyYslQNLC2uN1xpAkIW+dgqj+ygKu6ukIB/HtkiNigt8d59bSSe++7FIp4InScDPxzw2TJ3/kKMDfxrpQBi/f57A9fsRyyc5VqPgF7vWka1TrDuSljcaFo3vlfZfSIdYWe/qRHbaLzeWlMii9v7taGpWBn5lxleQdrvIp60m5uGCiIH3wFOTmxQ8W6US2c9EAa+9+H5pA7baSjvJUjmZ8icXGWjJx9DtHNWqW6XjfWjFfQsWYHtUjKyB3LWeR8eVjR1aFWzTNMpqaJ7pLeR8gZ8YSG7jwNEGU3LEDP/LrxaZyWe9ZT6kfs+91oKswdybEpAdS/gX+wqCoyGhgDexqqpkcKqqLi5Uh0wwSieRiXJ535aknaNrA+ndwhXG0jM2/dXmA7QGVoBuOcGwnbDPD/omup7AVbC/jSJqt5COzhQnB8MAifUhIxwlOhe2OVfqpg8xsNpz7EuIdX2omkBc/tvd6I2GMgkMiZwAe2331qCbU2CRJLV3Po7zGnn2L+5WaPeV7Z3/qUZ1da4R17gG3tSr7ktonWIYGAyyVo5Z6SWGG9ceFRmygByB/0XLtsNKeAFuXoppwvJWmjeOAx0JWpuv7uQNYVvf2YXAav4cqYrPlwHq10m5FMHzrAvBZuK9/UeTBj7msXIYBMh3zmwAp1G/a0c1InQQ+2ZedMXSzFLP0Mnt9KMfyA7NVcCoGJ7tEHW+Na0w10qtw/wDct+aJfrV92t4ebVstukPyZq8ShXYs+9ZvkszVECUwG/iWb/Ad9Gzbc2LbZsbJ+046v4PIvJellUZIAxoeb9DsyauHHzQ2cwUkGhKxrOm Mzd9mGTM W6UAny23/LxkgrcM9VcnSTWWqvDVnLm2rmtz/4xvs/rI8VPh4bb2FQRn24i99sMF010mQNXM0Dkn4Wr/Uml/hDwCyHuX+o5SI/r1jQZ47ZIi/05NhWxyJg/KPR1xc1ioj0sipzgGL+Gj7T+XREngCKvwSA5iadngFW2dgC1IwQgJdIRJ6sGuMDDRuls4TmN2/tAgfTsSveemLpV9ik39T8NNFDYR+qq8JTAsWzWVsRAQSjUkvolqLYNqF1f61YyOqKyMLLReVMOIWnBv70LAsmi89iiHMYEH1zbwoG4IBLiK+80Q1yNzI147VnQ== 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 --- 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 f4be468e06a4..e8388ea33f50 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -160,8 +160,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))