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 A09E1C433F5 for ; Mon, 9 May 2022 23:01:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 38EE76B0072; Mon, 9 May 2022 19:01:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 33D8D6B0073; Mon, 9 May 2022 19:01:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 204FB6B0074; Mon, 9 May 2022 19:01:09 -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 0B1B06B0073 for ; Mon, 9 May 2022 19:01:09 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D4ED061509 for ; Mon, 9 May 2022 23:01:08 +0000 (UTC) X-FDA: 79447727016.23.8925361 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by imf02.hostedemail.com (Postfix) with ESMTP id 7F791800AA for ; Mon, 9 May 2022 23:01:01 +0000 (UTC) Received: by mail-pj1-f41.google.com with SMTP id w17-20020a17090a529100b001db302efed6so628254pjh.4 for ; Mon, 09 May 2022 16:01:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=3wjTsNgGTbqo93VZ7WQqIzRo69K2ztIE7VB0kIveUIY=; b=eY+nTpoTAV6KdH3sGRJea6nsfkhY13HP2V4UXtQDdotoGLN5KdBvZahtliZEkzzW1+ McZAwGMb7ns2pBZEtLMTJvkJ1Q5tQxnFzxv6JxRpiVPMH45QIQc3qEujkqLNQljSxK47 M5qcukTNsPQR09Ltlk0JwSKgRp3EmDJ0ENOMm6dEPHsDyDSRfvcu8VxXZY/lVHcIrBbI oSs07nf7dLuRtr5uogbOTDL8VJEtpvFftwjieqMG82CT9KygoNShDB/8LBtb4Kbe47qe CNZOyAk5b76VB8WhgeFZPEwreIjv0c7cdIGWvsELGC/zYfvwOO/HaE9G1MYlVhMhJ0eG IIbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=3wjTsNgGTbqo93VZ7WQqIzRo69K2ztIE7VB0kIveUIY=; b=WprkuG8XFfZNlcjYYyv+tmHh7i+VHMxBFXBuWCTd8MdmeV5FSKrNUCbNB7CrVmaG5H vdH9EtMw2J0bvIwjHcgwifDeqsAXthyxerXbPln5kZn0E7zLmRCknw1tQ3MmubuJjXME /zX+9Wz2mRWTf6RYnPB58bqNQJRKLjixkEbn6cNN4ZwdU5FahRsloIVCeD3HsyK4mn5L Bzo7pICJPu9qOrKfgOcTCufZHEzYXy8I7UchiV9fSh14NoOMgecSjiEiKARIzU5OxLiW V75bysP1ElhQPbso/J7ERDArq+bmSWRUVym8US84UHnXvhcoxrRjXFsb2Q9YoitgAWzm 5+Lw== X-Gm-Message-State: AOAM531gHVPjo/611AsYisjTzFiSpbPLJbW1P6zGdy2GMqSQI7QWIaBL snjmJdNsbvAi+62fXjrKMPlP8z7E2YrE2NhIotw= X-Google-Smtp-Source: ABdhPJwIXcYLr+1eT3XpbjjUvzOolBCzj0C2kDIT7os3945SAliOl2gaPLsAZWDMuLENaMYMZSkrmAImliZfTx0UM8E= X-Received: by 2002:a17:90b:1b52:b0:1dc:54ea:ac00 with SMTP id nv18-20020a17090b1b5200b001dc54eaac00mr28624845pjb.99.1652137267310; Mon, 09 May 2022 16:01:07 -0700 (PDT) MIME-Version: 1.0 References: <20220404200250.321455-1-shy828301@gmail.com> <20220404200250.321455-7-shy828301@gmail.com> In-Reply-To: From: Yang Shi Date: Mon, 9 May 2022 16:00:54 -0700 Message-ID: Subject: Re: [v3 PATCH 6/8] mm: khugepaged: move some khugepaged_* functions to khugepaged.c To: Vlastimil Babka Cc: "Kirill A. Shutemov" , Miaohe Lin , Song Liu , Rik van Riel , Matthew Wilcox , Zi Yan , "Theodore Ts'o" , Andrew Morton , Linux MM , Linux FS-devel Mailing List , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 7F791800AA X-Stat-Signature: e9wikxaxeepyy634gbzha1w3idxgxb3u Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=eY+nTpoT; spf=pass (imf02.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.41 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-HE-Tag: 1652137261-182568 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 Mon, May 9, 2022 at 8:31 AM Vlastimil Babka wrote: > > 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? Yeah, thanks for catching this. Since the patch will be reworked, so the commit log will be reworked as well. > > > 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? Sounds good to me, will fix it in v4. Thanks for reviewing and acking the series. > > > --- > > 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), >