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 E2755C3DA61 for ; Mon, 22 Jul 2024 02:41:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 472F66B0082; Sun, 21 Jul 2024 22:41:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4231E6B0083; Sun, 21 Jul 2024 22:41:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EAE36B0085; Sun, 21 Jul 2024 22:41:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 1283A6B0082 for ; Sun, 21 Jul 2024 22:41:36 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 72089161416 for ; Mon, 22 Jul 2024 02:41:35 +0000 (UTC) X-FDA: 82365837750.30.F630F7F Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) by imf11.hostedemail.com (Postfix) with ESMTP id A8F8E40009 for ; Mon, 22 Jul 2024 02:41:32 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=BytW8+On; spf=pass (imf11.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 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=1721616071; a=rsa-sha256; cv=none; b=o/F6E2Rpfu5ptlMZNA6BLsp4CQor9TdG7841ubQluoD8VoK7DI2URgSLGMlr4yEEAVFz/m ZqwIKzD8uzlUMic85Yils0kEG/MJ+2d75yGi+lgMiy9XycYEh82hL2eAhPwv1w7niow+IM 5tQyHUKrOOHV8QJm5cw0t8k/hScgTNU= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=BytW8+On; spf=pass (imf11.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 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=1721616071; 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=MDu4lboHE5IBLMlTXv0+WLMrtUvTsp5YiapPNShBuAk=; b=4r81pZk44iDWdwNBYD68UDaJm6Cq7ui+dsmNUrnnsOEQMSi6F1GCsyro07LVb74uohXvh4 hKHcitCwOnkrpj30Db/GY13Z15KPTAtd+Qltd/IFPjGY6d+6XAfjWdEOOP6wDqOfqZrpmq X9iY6JOa6FI6AwF8hzXkMVoGvYjaZco= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1721616090; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=MDu4lboHE5IBLMlTXv0+WLMrtUvTsp5YiapPNShBuAk=; b=BytW8+OnAyUiXh6Zc/7YTIHP5RjFzbzTZIJJ5lq6DV6F3PP3fGxBHHsfNd7+fF9/7hHwQWVaPsPDfRItCo6hAQX1yd/Au2wRoqaiDCGdp3g8FZ33206TIYY5UjbiMdEo/kng5ggYz/zSsLJJF582U73GCwlabicKdKYPCtEfJzQ= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R181e4;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=10;SR=0;TI=SMTPD_---0WAyFM2g_1721616075; Received: from 30.97.56.74(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAyFM2g_1721616075) by smtp.aliyun-inc.com; Mon, 22 Jul 2024 10:41:28 +0800 Message-ID: Date: Mon, 22 Jul 2024 10:41:14 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 3/3] mm: shmem: move shmem_huge_global_enabled() into shmem_allowable_huge_orders() To: Ryan Roberts , akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, 21cnbao@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <16dad33282617ecb90a3f466b35273b10be68d21.1720755678.git.baolin.wang@linux.alibaba.com> From: Baolin Wang In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: 8hnmnprx1tiyjn557c3n4djgs8jyzjqs X-Rspamd-Queue-Id: A8F8E40009 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1721616092-228135 X-HE-Meta: U2FsdGVkX19TqyxH2mm8VjWq4HygAzfqdMrT8mBc2j+zykZIznK0dwy76UcA5VC9hs/v8PdsQW6HKoqv4gxwf8dPLZypUEtptmW1ONgDD/c0q0f+yiclbFNmjbVnHsBgM1AcnZDYkgeeGzRpV0z/+Ix9RqWO8qoIxZ81erJmupEXU9M+Joca5t2UlrF5D0DH4BmvjF1JLzN7x6ILtGsaQfuaQ9tbJnQsvP8mpqDQLr/DShj4/wYoGJhQQCcufCe/WRRIdQv/4A4IgCdW+mKsnUPZ0uozql6Y7/SteU11VaiUo2GhUBfwMDX5vl4bW3twTbBFeTv6RsooJR1Qs/DhrNePWJrMPpkxdfI25hr+646Ifil6wBGHuIG1HNc3TC+4DwI+M7RnxvVjnDtHt2qLcN3Qn6zkP67Zsyvc5d7g87b5iqoFdTG25jaI9DUIsbgMhbvCsA3P2cKK7WE8cyll32sj/LRHJj2OGwtrw+bgJnjZyv8c54u7DFTg1hpoxzWBDKzo6tv6iKNlI9KZd8/AfN43gDF0JUf8EjZCNx+Lubq05GOvJi3TUI+S0Fvh+01g9lRv8CuM0dVhN4zxl+TDXbG4PybBMOqlIS5V0KGxs5I9rm9RnPsAwbh8i/NT1TSeRVhuqFw5SoDVK0u0Xw3/vS4geLxfWmasGFvmIE0cDWk+Xeye+cZrkxoIkLdb12vLHWK/wGPMiZCsLN+jpt4ii4fr3j9zRGD6aRWwtV04MxUFdEuTCcrkzbaaS1mm+lx73fsEO4gIBTXpKGudMk9vyW8Lh1cvjsh3OkQu4YRegunrvmFXSzej22NqeQP/0V+vKChgDr8DVUbNKMPjvhreKUr+akcEjT2XnlLXa+MOboqCrFeLuFwXyXvBVM99BO5lYMe0JCqipTURoEC2FG9jFnZFXdced8EucNi94RKhAZqBcCaOZzp7ooVFI/ncJQWW2Q+bsVsFS1iHvHhaISP 8rbLCUKz 7WckYR2fF5VRZZpmJmIzne8idO72h1E7v80zKBvInydFk7ZPOHZF/zyMQ9OGdGNE1hxB2/lNzqMDVqts0dYb1qJKTiPlZnFKn9UhfhwVjxuM1UgglsNY8x8K6FhZUMWZaObfIUfrJ6AL8XTUfsFiphmL1RfMjyJlEKo/sF1RY8KMgopXKXScQksHGXvdXTKW5hCyhuTuPqo+DPmTfVsml8yb2D+SwIvw9wZ1IZ5bJw8DfAOUymDcgkW7dHa1r+iz6n7udNqDO9zn7ANFeemTMqKJsYgBbHzrcQFW0ON+o/BYin3CpAUH1nqVdJrHrUUoOUNnBg6MF9pPv1W4M/FZZIFT2yFm2HqgY1IuH 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: (Sorry for the late reply due to my vacation.) On 2024/7/15 21:36, Ryan Roberts wrote: > On 13/07/2024 14:24, Baolin Wang wrote: >> 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 > > one nit below, but either way: > > Reviewed-by: Ryan Roberts > >> --- >> 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; > > nit: rather than deriving the fault_mm here, I wonder if its cleaner to just > pass vma to shmem_huge_global_enabled()? shmem_huge_global_enabled() is just > using it as a guard to access vm_flags, which you can just as easily do by > testing the vma for non-NULL. And you can access mm flags with vma->vm_mm->flags > after testing the vma too. Make sense to me, and will do in next version. Thanks for reviewing.