Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 24 Jun 2019 16:01:24 -0700
From:   Ira Weiny <ira.weiny@intel.com>
To:     Pingfan Liu <kernelfans@gmail.com>
Cc:     Linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>,
        Mike Rapoport <rppt@linux.ibm.com>,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        John Hubbard <jhubbard@nvidia.com>,
        "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
        Christoph Hellwig <hch@lst.de>,
        Keith Busch <keith.busch@intel.com>,
        Mike Kravetz <mike.kravetz@oracle.com>,
        LKML <Linux-kernel@vger.kernel.org>
Subject: Re: [PATCHv2] mm/gup: speed up check_and_migrate_cma_pages() on huge
 page
Message-ID: <20190624230123.GA24567@iweiny-DESK2.sc.intel.com>
References: <1561349561-8302-1-git-send-email-kernelfans@gmail.com>
 <20190624044305.GA30102@iweiny-DESK2.sc.intel.com>
 <CAFgQCTuMVdrjkiQ5H3xUuME16g-xNUFXtvU1p+=P4-pujXcSAA@mail.gmail.com>
 <CAFgQCTshH=FsJbdf49wD=fgJzvbEqzEW--F3oon1aLc64r=u7w@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAFgQCTshH=FsJbdf49wD=fgJzvbEqzEW--F3oon1aLc64r=u7w@mail.gmail.com>
User-Agent: Mutt/1.11.1 (2018-12-01)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Jun 24, 2019 at 01:34:01PM +0800, Pingfan Liu wrote:
> On Mon, Jun 24, 2019 at 1:32 PM Pingfan Liu <kernelfans@gmail.com> wrote:
> >
> > On Mon, Jun 24, 2019 at 12:43 PM Ira Weiny <ira.weiny@intel.com> wrote:
> > >
> > > On Mon, Jun 24, 2019 at 12:12:41PM +0800, Pingfan Liu wrote:
> > > > Both hugetlb and thp locate on the same migration type of pageblock, since
> > > > they are allocated from a free_list[]. Based on this fact, it is enough to
> > > > check on a single subpage to decide the migration type of the whole huge
> > > > page. By this way, it saves (2M/4K - 1) times loop for pmd_huge on x86,
> > > > similar on other archs.
> > > >
> > > > Furthermore, when executing isolate_huge_page(), it avoid taking global
> > > > hugetlb_lock many times, and meanless remove/add to the local link list
> > > > cma_page_list.
> > > >
> > > > Signed-off-by: Pingfan Liu <kernelfans@gmail.com>
> > > > Cc: Andrew Morton <akpm@linux-foundation.org>
> > > > Cc: Ira Weiny <ira.weiny@intel.com>
> > > > Cc: Mike Rapoport <rppt@linux.ibm.com>
> > > > Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
> > > > Cc: Thomas Gleixner <tglx@linutronix.de>
> > > > Cc: John Hubbard <jhubbard@nvidia.com>
> > > > Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
> > > > Cc: Christoph Hellwig <hch@lst.de>
> > > > Cc: Keith Busch <keith.busch@intel.com>
> > > > Cc: Mike Kravetz <mike.kravetz@oracle.com>
> > > > Cc: Linux-kernel@vger.kernel.org
> > > > ---
> > > >  mm/gup.c | 19 ++++++++++++-------
> > > >  1 file changed, 12 insertions(+), 7 deletions(-)
> > > >
> > > > diff --git a/mm/gup.c b/mm/gup.c
> > > > index ddde097..544f5de 100644
> > > > --- a/mm/gup.c
> > > > +++ b/mm/gup.c
> > > > @@ -1342,19 +1342,22 @@ static long check_and_migrate_cma_pages(struct task_struct *tsk,
> > > >       LIST_HEAD(cma_page_list);
> > > >
> > > >  check_again:
> > > > -     for (i = 0; i < nr_pages; i++) {
> > > > +     for (i = 0; i < nr_pages;) {
> > > > +
> > > > +             struct page *head = compound_head(pages[i]);
> > > > +             long step = 1;
> > > > +
> > > > +             if (PageCompound(head))
> > > > +                     step = compound_order(head) - (pages[i] - head);
> > >
> > > Sorry if I missed this last time.  compound_order() is not correct here.
> > For thp, prep_transhuge_page()->prep_compound_page()->set_compound_order().
> > For smaller hugetlb,
> > prep_new_huge_page()->prep_compound_page()->set_compound_order().
> > For gigantic page, prep_compound_gigantic_page()->set_compound_order().
> >
> > Do I miss anything?
> >
> Oh, got it. It should be 1<<compound_order(head)

Yea.

Ira

> > Thanks,
> >   Pingfan
> > [...]