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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BD1EC43331 for ; Sat, 28 Mar 2020 01:09:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 374D0206F6 for ; Sat, 28 Mar 2020 01:09:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ovFSqBoK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 374D0206F6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C6EF46B0010; Fri, 27 Mar 2020 21:09:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C21A76B0032; Fri, 27 Mar 2020 21:09:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B35F66B0036; Fri, 27 Mar 2020 21:09:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0078.hostedemail.com [216.40.44.78]) by kanga.kvack.org (Postfix) with ESMTP id 97AF06B0010 for ; Fri, 27 Mar 2020 21:09:52 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 764F9181AD0A5 for ; Sat, 28 Mar 2020 01:09:52 +0000 (UTC) X-FDA: 76642989024.15.deer62_734856651f33c X-HE-Tag: deer62_734856651f33c X-Filterd-Recvd-Size: 8454 Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Mar 2020 01:09:52 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id e5so13607238edq.5 for ; Fri, 27 Mar 2020 18:09:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=oywFlXkpECcbU8r3G346Xkwhx0P/bQHXz/zk7kN32ng=; b=ovFSqBoKd0wRBeT84kbfutSS9+6vH+PbxJ/vACOA/FZ1t+Rp4BhunGNaWhJzQGuzwJ JWNNdgm33e+wttmPMBUz17vrltb5C7Itb1U/nHB75Mqhj+INEt4LHR3CvEKlmbHewsCe l/+H5DASwMZr9Q/sn9MWL8Cr8rKxwMlQlbFH1Wcn8njzh+OvXbAugr88jucEDaIfx8cU jk8CCulyyr9s06hXqg0cSUxjJPzPoX9lla88cSK6QToyBrLpCtZPZ88uNZLlNWTqk/a0 wBeERsYVNjlWw+f50GEEUDvE/mDTlwXzOm3DVRw1AqbDZriv+f0+qzKjbLcBQkivw9+/ WTwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=oywFlXkpECcbU8r3G346Xkwhx0P/bQHXz/zk7kN32ng=; b=nV99BLa9ej45Vs5AOq0ePRBxUVljIf4nqCeSwXdu3RNEbMekylyzKpaCBEBVySf3yD FYgwWX8dZhrgTcOapL3YJG8/4+fCzuhzTxiRaJyXoItBpIVeAyX4P0eN3HURNfArr+it VTf1yDsocniDq4uxYNlao27lrBGJdmU7dWo7wxpqphko5cmBRM3jQAH4Anrm3+WbCzaX GglPtFq2rdA/VF+HQGbcNtfcXI77+NFW90aGV3QI0qRoPbK9iteLUc+pSjCzPXCbDINg u/j+E+BC75p/+GxramDZJuLMJq+bAKa09D0y/hJoAxTP0PnhZSl814S7YWkIZo6IpRyT L2bQ== X-Gm-Message-State: ANhLgQ0Oh3ryGcq6mgJFgAw3M0KIZzX4f6Vr36duKLUkvFhCeRJjuc20 TmfrFajzABLAEzMqyslRNhP4eAKUPd8yyd0BFmE= X-Google-Smtp-Source: ADFU+vv3peC08Yn2tgacy2h+ClB4pfZzrudknI0uEuZ0N4TWCRPQEwOvHlo2PNRSPch9lbRA1a1BlPt0gjd85Mg2mvM= X-Received: by 2002:a50:930e:: with SMTP id m14mr1738617eda.256.1585357790797; Fri, 27 Mar 2020 18:09:50 -0700 (PDT) MIME-Version: 1.0 References: <20200327170601.18563-1-kirill.shutemov@linux.intel.com> <20200327170601.18563-6-kirill.shutemov@linux.intel.com> <20200328003424.kusu2xnhnlbmnfzl@box> In-Reply-To: <20200328003424.kusu2xnhnlbmnfzl@box> From: Yang Shi Date: Fri, 27 Mar 2020 18:09:38 -0700 Message-ID: Subject: Re: [PATCH 5/7] khugepaged: Allow to collapse PTE-mapped compound pages To: "Kirill A. Shutemov" Cc: Andrew Morton , Andrea Arcangeli , Linux MM , Linux Kernel Mailing List , "Kirill A. Shutemov" Content-Type: text/plain; charset="UTF-8" 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 Fri, Mar 27, 2020 at 5:34 PM Kirill A. Shutemov wrote: > > On Fri, Mar 27, 2020 at 11:53:57AM -0700, Yang Shi wrote: > > On Fri, Mar 27, 2020 at 10:06 AM Kirill A. Shutemov > > wrote: > > > > > > We can collapse PTE-mapped compound pages. We only need to avoid > > > handling them more than once: lock/unlock page only once if it's present > > > in the PMD range multiple times as it handled on compound level. The > > > same goes for LRU isolation and putpack. > > > > > > Signed-off-by: Kirill A. Shutemov > > > --- > > > mm/khugepaged.c | 41 +++++++++++++++++++++++++++++++---------- > > > 1 file changed, 31 insertions(+), 10 deletions(-) > > > > > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > > > index b47edfe57f7b..c8c2c463095c 100644 > > > --- a/mm/khugepaged.c > > > +++ b/mm/khugepaged.c > > > @@ -515,6 +515,17 @@ void __khugepaged_exit(struct mm_struct *mm) > > > > > > static void release_pte_page(struct page *page) > > > { > > > + /* > > > + * We need to unlock and put compound page on LRU only once. > > > + * The rest of the pages have to be locked and not on LRU here. > > > + */ > > > + VM_BUG_ON_PAGE(!PageCompound(page) && > > > + (!PageLocked(page) && PageLRU(page)), page); > > > + > > > + if (!PageLocked(page)) > > > + return; > > > + > > > + page = compound_head(page); > > > dec_node_page_state(page, NR_ISOLATED_ANON + page_is_file_cache(page)); > > > > We need count in the number of base pages. The same counter is > > modified by vmscan in base page unit. > > Is it though? Where? __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, nr_taken) in vmscan.c, here nr_taken is nr_compound(page), so if it is THP the number would be 512. So in both inc and dec path of collapse PTE mapped THP, we should mod nr_compound(page) too. > > > Also need modify the inc path. > > Done already. > > > > unlock_page(page); > > > putback_lru_page(page); > > > @@ -537,6 +548,7 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, > > > pte_t *_pte; > > > int none_or_zero = 0, result = 0, referenced = 0; > > > bool writable = false; > > > + LIST_HEAD(compound_pagelist); > > > > > > for (_pte = pte; _pte < pte+HPAGE_PMD_NR; > > > _pte++, address += PAGE_SIZE) { > > > @@ -561,13 +573,23 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, > > > goto out; > > > } > > > > > > - /* TODO: teach khugepaged to collapse THP mapped with pte */ > > > + VM_BUG_ON_PAGE(!PageAnon(page), page); > > > + > > > if (PageCompound(page)) { > > > - result = SCAN_PAGE_COMPOUND; > > > - goto out; > > > - } > > > + struct page *p; > > > + page = compound_head(page); > > > > > > - VM_BUG_ON_PAGE(!PageAnon(page), page); > > > + /* > > > + * Check if we have dealt with the compount page > > > > s/compount/compound > > Thanks. > > > > + * already > > > + */ > > > + list_for_each_entry(p, &compound_pagelist, lru) { > > > + if (page == p) > > > + break; > > > + } > > > + if (page == p) > > > + continue; > > > > I don't quite understand why we need the above check. My understanding > > is when we scan the ptes, once the first PTE mapped subpage is found, > > then the THP would be added into compound_pagelist, then the later > > loop would find the same THP on the list then just break the loop. Did > > I miss anything? > > We skip the iteration and look at the next pte. We've already isolated the > page. Nothing to do here. I got your point. Thanks. > > > > + } > > > > > > /* > > > * We can do it before isolate_lru_page because the > > > @@ -640,6 +662,9 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, > > > page_is_young(page) || PageReferenced(page) || > > > mmu_notifier_test_young(vma->vm_mm, address)) > > > referenced++; > > > + > > > + if (PageCompound(page)) > > > + list_add_tail(&page->lru, &compound_pagelist); > > > } > > > if (likely(writable)) { > > > if (likely(referenced)) { > > > @@ -1185,11 +1210,7 @@ static int khugepaged_scan_pmd(struct mm_struct *mm, > > > goto out_unmap; > > > } > > > > > > - /* TODO: teach khugepaged to collapse THP mapped with pte */ > > > - if (PageCompound(page)) { > > > - result = SCAN_PAGE_COMPOUND; > > > - goto out_unmap; > > > - } > > > + page = compound_head(page); > > > > > > /* > > > * Record which node the original page is from and save this > > > -- > > > 2.26.0 > > > > > > > > -- > Kirill A. Shutemov