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, 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 E4A0CC2D0E7 for ; Sat, 28 Mar 2020 00:34:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 98C662073B for ; Sat, 28 Mar 2020 00:34:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=shutemov-name.20150623.gappssmtp.com header.i=@shutemov-name.20150623.gappssmtp.com header.b="mU9ZKIun" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98C662073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 29ED66B0010; Fri, 27 Mar 2020 20:34:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 24E9F6B0032; Fri, 27 Mar 2020 20:34:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 117B06B0036; Fri, 27 Mar 2020 20:34:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0041.hostedemail.com [216.40.44.41]) by kanga.kvack.org (Postfix) with ESMTP id EBDF06B0010 for ; Fri, 27 Mar 2020 20:34:22 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id C42F81F10 for ; Sat, 28 Mar 2020 00:34:22 +0000 (UTC) X-FDA: 76642899564.23.sense76_6067ddc021063 X-HE-Tag: sense76_6067ddc021063 X-Filterd-Recvd-Size: 8282 Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Mar 2020 00:34:22 +0000 (UTC) Received: by mail-lf1-f68.google.com with SMTP id j17so9340362lfe.7 for ; Fri, 27 Mar 2020 17:34:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=3yPrNifDefU0IFJdETWJaD75V/HE4NsiLg4PeOLg+pA=; b=mU9ZKIunZTIWCrvB71sJG/cnS7xx/lt4diC09Q+VCL5wmBu4ORkFKbgK0yvsCC2Ipv g4E5FLrgFsMBnS1vCo+0pLUKy2Bbm+tm65gDfSeJfUdh/e2dFDOmQgIr98L50LV+QlNo yYMQ9/CUHz7B/5BTuXBBmThdxhZasKbYOZok+qFNWUSxNHyDV58WCnpcfhvTSepAYMCs AhtzneLAyI8kz7HlHgr7xWRX5Xz0Mn5BoAYpChNyFydhAbBEESbevLK3PjMnQSZJmMZF YnXBB7lgLg3j/Z9+uhhAjGNIoRH5U5DAvoUkD73mSu0NUW97AA96gSPajhuEtTS5Nnxr ++Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=3yPrNifDefU0IFJdETWJaD75V/HE4NsiLg4PeOLg+pA=; b=fqEkVT+s8ZJlRZpcn81ty8Q3ukcx6ueTbAcdlDSzs7r/1Eb1NATSb7A61/TRt1Eu2u weXWoDZyus1V406Moph6/aqBZ65UGfgmYh7Uw5BhC/j32iavB1pp+PddwwEkAM1c3UJT g8LJBs4j2a6RJ54eOapEqWTK9sblW1FDEityu/Z5wmtCfOrY4g+z4Bq5x8I1IKE/x+Ax CQrkbLeN59lIjfF9go19JAI1kdwIFBv2avRzC9SC94LyI7xC0dM68U9eEVT3vCiymJ0s DiwbV3b1w8X5NjHcUQz+yy58nN5jsR/PqC3TyMzetBThX0yUGOpmg+X6HPgFQxERlZPB ONEg== X-Gm-Message-State: AGi0PubxWvYkMI8k8BgQFUxNpPYHs6PBSYrNd/jf7mCiPrYDlzavV1Hg 3biDsjkfZdnGLYv7RNhUuH81JeXLyGg= X-Google-Smtp-Source: APiQypIvqujSGnChOUDlJCVYwMYwtFjGQnPmjCgQijowxE6ZMwmyX2G46YKaTwuq5mHrWBRBYROo/A== X-Received: by 2002:ac2:4433:: with SMTP id w19mr1136860lfl.53.1585355660840; Fri, 27 Mar 2020 17:34:20 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id f9sm1297991ljp.88.2020.03.27.17.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 17:34:20 -0700 (PDT) Received: by box.localdomain (Postfix, from userid 1000) id 96A28101C38; Sat, 28 Mar 2020 03:34:24 +0300 (+03) Date: Sat, 28 Mar 2020 03:34:24 +0300 From: "Kirill A. Shutemov" To: Yang Shi Cc: Andrew Morton , Andrea Arcangeli , Linux MM , Linux Kernel Mailing List , "Kirill A. Shutemov" Subject: Re: [PATCH 5/7] khugepaged: Allow to collapse PTE-mapped compound pages Message-ID: <20200328003424.kusu2xnhnlbmnfzl@box> References: <20200327170601.18563-1-kirill.shutemov@linux.intel.com> <20200327170601.18563-6-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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 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? > 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. > > + } > > > > /* > > * 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