From mboxrd@z Thu Jan 1 00:00:00 1970 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 72183D1A431 for ; Sat, 12 Oct 2024 03:38:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 065226B00A0; Fri, 11 Oct 2024 23:38:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 014766B00A1; Fri, 11 Oct 2024 23:38:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1E3B6B00A3; Fri, 11 Oct 2024 23:38:30 -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 C156C6B00A0 for ; Fri, 11 Oct 2024 23:38:30 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D38B8121B83 for ; Sat, 12 Oct 2024 03:38:25 +0000 (UTC) X-FDA: 82663542738.11.1FEA4CF Received: from out30-118.freemail.mail.aliyun.com (out30-118.freemail.mail.aliyun.com [115.124.30.118]) by imf03.hostedemail.com (Postfix) with ESMTP id D0D8C20005 for ; Sat, 12 Oct 2024 03:38:25 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=oZGjDUqD; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf03.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.118 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728704195; a=rsa-sha256; cv=none; b=2wcwBkzl5/Ps5tw0VOFsUtVNuwXDmFTrcct8Ene2jqafOGLGkm0D9Iy1QMCn7flys2XyE6 Ahl2KJ34Sorb4KJgaZkhvJt0mVise7Ol8XhWGvGtko6KbCyo9yr1nwGg4NRC7Jug/tbDlE 16F94i1elnosb87unAOKobuCsdHXkTU= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=oZGjDUqD; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf03.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.118 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728704195; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BoRaZhyUByzrbQ0Jn7j7Ze3qj7/bv/xSzEgkM+ugIZE=; b=WSu4ioDQJy/g2hkrySl9EdYTWezxbw7WxnTe4Np0RseU9Sl7NdApxHI/vbsHPi7etRudEn VdiuXFnDSLGf+Mqdezdp2g4j34Y5Dshvj1llGQ7PuNDQ2I1HMxBREOYH4EssjF9jQ/FSIz MdJamuyVuwfjxk2sWphIbtQQgNmLpLA= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1728704304; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=BoRaZhyUByzrbQ0Jn7j7Ze3qj7/bv/xSzEgkM+ugIZE=; b=oZGjDUqD9Dm6oF2PAj4f6IjQjoTkYR4JjbV0T+O9z8uDqSXB9flBpzw2IZ/7jcxtX3oscXJIzWdiQNrF47TIqj68q+ywFpdiP1OA9HvuYpFCppggibIZrE3F6KOnklEZQIHIDZ0RGk3x3UXIJ5qpHYDS+1Va8olgVxXXW3EykH4= Received: from 30.39.170.112(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WGtsq-X_1728704302 cluster:ay36) by smtp.aliyun-inc.com; Sat, 12 Oct 2024 11:38:23 +0800 Message-ID: <43154696-1ef2-4a30-b168-6b9f4db20aef@linux.alibaba.com> Date: Sat, 12 Oct 2024 11:38:20 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 3/3] mm: shmem: remove __shmem_huge_global_enabled() To: Kefeng Wang , Andrew Morton Cc: Hugh Dickins , David Hildenbrand , Barry Song , Ryan Roberts , Matthew Wilcox , linux-mm@kvack.org References: <20241010061024.1846220-1-wangkefeng.wang@huawei.com> <20241010061024.1846220-4-wangkefeng.wang@huawei.com> From: Baolin Wang In-Reply-To: <20241010061024.1846220-4-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: D0D8C20005 X-Stat-Signature: b1nxo54z96drub5ujunu6s6fywa15uq6 X-Rspam-User: X-HE-Tag: 1728704305-712004 X-HE-Meta: U2FsdGVkX18J+t4DFZ76d4B6rYcVNfI80fxYdet7znani5W0XCbT29tzhU9eMJHi+dPAWEyhlGleAhc+s18Qsjy+HgAHnBImFCkCsqaFjWg8tjVxBhFnOcUnPIdmvVDwZsNYOnx5vpCV/9YMKQLQRHx1PHgxrWawqaUQF3nO6ooIDE8hlTy33KZMbVdkzp4/dU9GW1zjVlnuq09CdkAOtDobyqbTm9MZHaQPKoJtUw+8qPwyu7swdsCTr7GlwQawX7KHJCIF74I1nFs9T8pExLZ/o8fI5aKGGXUe1NyOcuSSuli33dt6q+yyt0RG/JGLuE/UA8UuM/LbXq+Q3vf8UsCH2g51OYfrl3Jcly/3lGXae2dE3lHNWbvMUApv/tCZPv7aSRHrdp2Y87z9II2Z8zSciBwSwZ6aOI4zJLA+mOklnouGjlk5MX1VSdUIQAWErGVAETJWOP5iiAPDAZxsp2x+u2BENfo/In3Nu4ZPd5dnnaWDoMZu5t/wUbmqhR0MntHAziMRofpmc6dM5cTHD0cTVMbxsUo4anaVaTCjIHt5Z8Jk/9oVupgi/2f1hd0OiDmsj7O4W7RNGQCPuiKrRpeHTXxVZ4gebKlcZcDIrgKvZOnnn4FNXEVqFgrsTlBZSdt959NjsxCMzSeactJ9oq9aZwM3PI1+2g6rVb7TDuFtp94jjaVzIzVfXUeKjdI2ouZMQpWRBTZb9TEnTWD6iTs0Do0ZWD80xJ5cjv/BeDz0en88gLtL88K1v5cxpvRBaps5K0bkUhvoOYDzeHGELiSXPPaup2bqAJZrZlTjyU9Cy+WNxGWf7anaTIpfz/pZL1YAbtYU85w/Vkb4Z2M8AgG5CxKq2XI5exLqDJAzSGiSmZD8cz/au6X9zXeQI5hoAI8PJGrfyl08YizmddmVBIlsR0/O4i87lpmTENyuEq2FAlNBVfei74njURJXE3+9AjWkiGneXueCm+veLXD fAGinhQb znUrpy127N2oj2YJDSx+ab7Ga6BPqTLWdsXwypj+xAVpVWh5YvJ3ltomDnJm8peZxojrRzB9Tm/O0BIsMnjMhEyuDWDBxnsXLRdj1ousrjOuytBjQqyiocLOsABxWsyNjsKWZiM5u6gVoVvhGsDfFe9E0KTyFo7Rz/xJEXEma/C6Gkd5N6IYTE44M13yc0TIFhV1q+jV+RZSYFzgl5GeCbypKEOYlQrxIbxa8PtpMpFB62ycSfc6AcVJSxho0LUYADU8JeV1vH6O10zDQXkhcf+icNMoGgZdHJOL9g/6jCnHsxApFhRG4vV1DCO3LwJ6d5LGRmKLkERiwEAT7TpbmtX0Oxw== 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: On 2024/10/10 14:10, Kefeng Wang wrote: > Remove __shmem_huge_global_enabled() since only one caller, > and remove repeated check of VM_NOHUGEPAGE/MMF_DISABLE_THP > as they are checked in shmem_allowable_huge_orders(), also > remove unnecessary vma parameter. > > Signed-off-by: Kefeng Wang LGTM. Thanks. Reviewed-by: Baolin Wang > --- > mm/shmem.c | 33 ++++++++++----------------------- > 1 file changed, 10 insertions(+), 23 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 34a31e7e527c..36ac51d55867 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -548,17 +548,15 @@ 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, > - loff_t write_end, bool shmem_huge_force, > - struct vm_area_struct *vma, > - unsigned long vm_flags) > +static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, > + loff_t write_end, bool shmem_huge_force, > + unsigned long vm_flags) > { > - struct mm_struct *mm = vma ? vma->vm_mm : NULL; > loff_t i_size; > > - if (!S_ISREG(inode->i_mode)) > + if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) > return false; > - if (mm && ((vm_flags & VM_NOHUGEPAGE) || test_bit(MMF_DISABLE_THP, &mm->flags))) > + if (!S_ISREG(inode->i_mode)) > return false; > if (shmem_huge == SHMEM_HUGE_DENY) > return false; > @@ -576,7 +574,7 @@ static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, > return true; > fallthrough; > case SHMEM_HUGE_ADVISE: > - if (mm && (vm_flags & VM_HUGEPAGE)) > + if (vm_flags & VM_HUGEPAGE) > return true; > fallthrough; > default: > @@ -584,17 +582,6 @@ static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, > } > } > > -static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, > - loff_t write_end, 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, write_end, > - shmem_huge_force, vma, vm_flags); > -} > - > #if defined(CONFIG_SYSFS) > static int shmem_parse_huge(const char *str) > { > @@ -772,8 +759,8 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, > } > > static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, > - loff_t write_end, bool shmem_huge_force, > - struct vm_area_struct *vma, unsigned long vm_flags) > + loff_t write_end, bool shmem_huge_force, > + unsigned long vm_flags) > { > return false; > } > @@ -1170,7 +1157,7 @@ static int shmem_getattr(struct mnt_idmap *idmap, > generic_fillattr(idmap, request_mask, inode, stat); > inode_unlock_shared(inode); > > - if (shmem_huge_global_enabled(inode, 0, 0, false, NULL, 0)) > + if (shmem_huge_global_enabled(inode, 0, 0, false, 0)) > stat->blksize = HPAGE_PMD_SIZE; > > if (request_mask & STATX_BTIME) { > @@ -1687,7 +1674,7 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, > return 0; > > global_huge = shmem_huge_global_enabled(inode, index, write_end, > - shmem_huge_force, vma, vm_flags); > + shmem_huge_force, vm_flags); > if (!vma || !vma_is_anon_shmem(vma)) { > /* > * For tmpfs, we now only support PMD sized THP if huge page