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 88736C433EF for ; Mon, 9 May 2022 15:31:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 86A1D6B0072; Mon, 9 May 2022 11:31:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81A466B0073; Mon, 9 May 2022 11:31:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6BACB6B0074; Mon, 9 May 2022 11:31:11 -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 597FF6B0072 for ; Mon, 9 May 2022 11:31:11 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2336E211EF for ; Mon, 9 May 2022 15:31:11 +0000 (UTC) X-FDA: 79446593142.24.B695F0D Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf19.hostedemail.com (Postfix) with ESMTP id 8EBE41A00A4 for ; Mon, 9 May 2022 15:31:02 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A4D501F8BF; Mon, 9 May 2022 15:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1652110268; h=from:from:reply-to: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; bh=igEnia1tol6glVUoyn10KI3rw75C75d7JZ9YLtfjPjQ=; b=QHi7ODxi6sV1GnUBYfFXpN2LvnelDKO8MGmi0P2SP2UFND2Q4G97+JRiqAebDgCb4+aqSG EWJSGCuJCIMLtHmTx64+lwvi9vT0XlsqQ0eIhMq/cRCjEn1kj5MEktxbt1RjshrgFWViZr yJaMVoje7iD7w5OJ/kDRGbmPDVu3UE0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1652110268; h=from:from:reply-to: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; bh=igEnia1tol6glVUoyn10KI3rw75C75d7JZ9YLtfjPjQ=; b=9pGE77TIQOxARadLqLQXaLJUtFIWzEX+aLRKug6Hh28AJdm02uCApsyISgCTm9HTepwYbS DExFi3yQkApP2kCw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 637EA132C0; Mon, 9 May 2022 15:31:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id hJaRF7wzeWIsHQAAMHmgww (envelope-from ); Mon, 09 May 2022 15:31:08 +0000 Message-ID: Date: Mon, 9 May 2022 17:31:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Content-Language: en-US To: Yang Shi , kirill.shutemov@linux.intel.com, linmiaohe@huawei.com, songliubraving@fb.com, riel@surriel.com, willy@infradead.org, ziy@nvidia.com, tytso@mit.edu, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org References: <20220404200250.321455-1-shy828301@gmail.com> <20220404200250.321455-7-shy828301@gmail.com> From: Vlastimil Babka Subject: Re: [v3 PATCH 6/8] mm: khugepaged: move some khugepaged_* functions to khugepaged.c In-Reply-To: <20220404200250.321455-7-shy828301@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=QHi7ODxi; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=9pGE77TI; dmarc=none; spf=pass (imf19.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 8EBE41A00A4 X-Rspam-User: X-Stat-Signature: f47zd18hhmcjksf44kpc6jw813ksdboo X-HE-Tag: 1652110262-956312 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: On 4/4/22 22:02, Yang Shi wrote: > To reuse hugepage_vma_check() for khugepaged_enter() so that we could > remove some duplicate code. But moving hugepage_vma_check() to > khugepaged.h needs to include huge_mm.h in it, it seems not optimal to > bloat khugepaged.h. > > And the khugepaged_* functions actually are wrappers for some non-inline > functions, so it seems the benefits are not too much to keep them inline. > > So move the khugepaged_* functions to khugepaged.c, any callers just > need to include khugepaged.h which is quite small. For example, the > following patches will call khugepaged_enter() in filemap page fault path > for regular filesystems to make readonly FS THP collapse more consistent. > The filemap.c just needs to include khugepaged.h. This last part is inaccurate in v3? > Acked-by: Song Liu > Signed-off-by: Yang Shi I think moving the tiny wrappers is unnecessary. How about just making hugepage_vma_check() not static and declare it in khugepaged.h, then it can be used from khugepaged_enter() in the same file and AFAICS no need to include huge_mm.h there? > --- > include/linux/khugepaged.h | 37 ++++++------------------------------- > mm/khugepaged.c | 20 ++++++++++++++++++++ > 2 files changed, 26 insertions(+), 31 deletions(-) > > diff --git a/include/linux/khugepaged.h b/include/linux/khugepaged.h > index 0423d3619f26..6acf9701151e 100644 > --- a/include/linux/khugepaged.h > +++ b/include/linux/khugepaged.h > @@ -2,10 +2,6 @@ > #ifndef _LINUX_KHUGEPAGED_H > #define _LINUX_KHUGEPAGED_H > > -#include /* MMF_VM_HUGEPAGE */ > -#include > - > - > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > extern struct attribute_group khugepaged_attr_group; > > @@ -16,6 +12,12 @@ extern void __khugepaged_enter(struct mm_struct *mm); > extern void __khugepaged_exit(struct mm_struct *mm); > extern void khugepaged_enter_vma_merge(struct vm_area_struct *vma, > unsigned long vm_flags); > +extern void khugepaged_fork(struct mm_struct *mm, > + struct mm_struct *oldmm); > +extern void khugepaged_exit(struct mm_struct *mm); > +extern void khugepaged_enter(struct vm_area_struct *vma, > + unsigned long vm_flags); > + > extern void khugepaged_min_free_kbytes_update(void); > #ifdef CONFIG_SHMEM > extern void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr); > @@ -33,36 +35,9 @@ static inline void collapse_pte_mapped_thp(struct mm_struct *mm, > #define khugepaged_always() \ > (transparent_hugepage_flags & \ > (1< -#define khugepaged_req_madv() \ > - (transparent_hugepage_flags & \ > - (1< #define khugepaged_defrag() \ > (transparent_hugepage_flags & \ > (1< - > -static inline void khugepaged_fork(struct mm_struct *mm, struct mm_struct *oldmm) > -{ > - if (test_bit(MMF_VM_HUGEPAGE, &oldmm->flags)) > - __khugepaged_enter(mm); > -} > - > -static inline void khugepaged_exit(struct mm_struct *mm) > -{ > - if (test_bit(MMF_VM_HUGEPAGE, &mm->flags)) > - __khugepaged_exit(mm); > -} > - > -static inline void khugepaged_enter(struct vm_area_struct *vma, > - unsigned long vm_flags) > -{ > - if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags)) > - if ((khugepaged_always() || > - (shmem_file(vma->vm_file) && shmem_huge_enabled(vma)) || > - (khugepaged_req_madv() && (vm_flags & VM_HUGEPAGE))) && > - !(vm_flags & VM_NOHUGEPAGE) && > - !test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) > - __khugepaged_enter(vma->vm_mm); > -} > #else /* CONFIG_TRANSPARENT_HUGEPAGE */ > static inline void khugepaged_fork(struct mm_struct *mm, struct mm_struct *oldmm) > { > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index b69eda934d70..ec5b0a691d87 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -556,6 +556,26 @@ void __khugepaged_exit(struct mm_struct *mm) > } > } > > +void khugepaged_fork(struct mm_struct *mm, struct mm_struct *oldmm) > +{ > + if (test_bit(MMF_VM_HUGEPAGE, &oldmm->flags)) > + __khugepaged_enter(mm); > +} > + > +void khugepaged_exit(struct mm_struct *mm) > +{ > + if (test_bit(MMF_VM_HUGEPAGE, &mm->flags)) > + __khugepaged_exit(mm); > +} > + > +void khugepaged_enter(struct vm_area_struct *vma, unsigned long vm_flags) > +{ > + if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) && > + khugepaged_enabled()) > + if (hugepage_vma_check(vma, vm_flags)) > + __khugepaged_enter(vma->vm_mm); > +} > + > static void release_pte_page(struct page *page) > { > mod_node_page_state(page_pgdat(page),