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 038FCC2D0EA for ; Wed, 8 Apr 2020 13:05:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8929F206F7 for ; Wed, 8 Apr 2020 13:05:33 +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="klU2LSQf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8929F206F7 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 D865D8E0010; Wed, 8 Apr 2020 09:05:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D36468E000D; Wed, 8 Apr 2020 09:05:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFED78E0010; Wed, 8 Apr 2020 09:05:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0061.hostedemail.com [216.40.44.61]) by kanga.kvack.org (Postfix) with ESMTP id A84FF8E000D for ; Wed, 8 Apr 2020 09:05:32 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 6843C180AD802 for ; Wed, 8 Apr 2020 13:05:32 +0000 (UTC) X-FDA: 76684709304.16.loaf12_133b43a25ec0f X-HE-Tag: loaf12_133b43a25ec0f X-Filterd-Recvd-Size: 4600 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Wed, 8 Apr 2020 13:05:32 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id q22so3785626ljg.0 for ; Wed, 08 Apr 2020 06:05:31 -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=GBM3DKqxjFqPBu7r80ee330RPi5SgUStiHzhsao8c00=; b=klU2LSQfMNQxZa8JpopxGXOGz/fsc/92q4T9qKbBumLy2uVhDltpjvQ3BKRmFPTLkL ZcCGr4Y/6m29LKkyRIAJD5lGHFwMGdCkn6qG89wDkOZ9GwF26GoX7T/pxsGNZ23GwQ+x 5IWxd2fJOJPwF9NgERabUagw0XQTN5Z9fivRSkHBivGx5IgCkb4f12Rxm1l08pc2IOeK hx84RrIhfuinK7RzCxMpvDCmAGCof9zVI4toAA+lb3Uu4I1u5vDwQQGOdwWtjCbgs4h2 a/p5/Rq93IpXYfFvTeC/rXhz6Jug8zxA9qa9/5BMiSP6W7NrjYU84r2QPx2124JuG/y/ BwWA== 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=GBM3DKqxjFqPBu7r80ee330RPi5SgUStiHzhsao8c00=; b=OSW1c3GXiEEuvNM55W97n5x3gpJcYB7u9ijEDKgh+tSZfHM8H12DErHV40IIFj94mP 0iCCAOgomi/9+qZGhiac0Pz6q/K91+CZOqDB/TxHQWys3wfDy7utfznheQmBD9MUjFJt iTvQHaFkBknpc/+wr0SN6OR9x/Vl2BntTkQUBca8owufJ79LIWDUxOwxc6KecyJ4apE8 2Y7cQHZGf8dHmNhqAYpMmf2dOYWX4XRNhq9t2HCZZntW4+QJEGtYlG87aWbsbwXmSbvT cGlK8V4kC4N9+T/tA0wRcw4j6CAZ7hD/Se3v80uwx+BrsY3Pesmej7kbhBHWGMru5rl5 FWhA== X-Gm-Message-State: AGi0PuY6QEkNIJ0oZq2s2U6WGlwdZRazOfCPwejZBQc176WVUWH6Zb+T vwpxy38S7LkUxCiiLehrXmqEbSK2ZQU= X-Google-Smtp-Source: APiQypKIUJ4/nEHxqc1YLvFqkFWgvb0Gg5OtNloizFa5PpOayv2HzxVYp+7Rd9m5wD40tzS3EjlLkA== X-Received: by 2002:a2e:9c4:: with SMTP id 187mr4986069ljj.89.1586351130188; Wed, 08 Apr 2020 06:05:30 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id j22sm15748998lfg.96.2020.04.08.06.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 06:05:29 -0700 (PDT) Received: by box.localdomain (Postfix, from userid 1000) id BA5ED101C47; Wed, 8 Apr 2020 16:05:32 +0300 (+03) Date: Wed, 8 Apr 2020 16:05:32 +0300 From: "Kirill A. Shutemov" To: Yang Shi Cc: akpm@linux-foundation.org, Andrea Arcangeli , Zi Yan , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: Re: [PATCHv2 4/8] khugepaged: Drain LRU add pagevec after swapin Message-ID: <20200408130532.ktztqf5fabo3x3cd@box> References: <20200403112928.19742-1-kirill.shutemov@linux.intel.com> <20200403112928.19742-5-kirill.shutemov@linux.intel.com> <620a61ed-be87-f60e-f562-379cd3adbe08@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <620a61ed-be87-f60e-f562-379cd3adbe08@linux.alibaba.com> 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, Apr 06, 2020 at 11:29:11AM -0700, Yang Shi wrote: > > > On 4/3/20 4:29 AM, Kirill A. Shutemov wrote: > > __collapse_huge_page_isolate() may fail due to extra pin in the LRU add > > pagevec. It's petty common for swapin case: we swap in pages just to > > fail due to the extra pin. > > > > Drain LRU add pagevec on sucessfull swapin. > > > > Signed-off-by: Kirill A. Shutemov > > --- > > mm/khugepaged.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > > index fdc10ffde1ca..57ff287caf6b 100644 > > --- a/mm/khugepaged.c > > +++ b/mm/khugepaged.c > > @@ -940,6 +940,11 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm, > > } > > vmf.pte--; > > pte_unmap(vmf.pte); > > + > > + /* Drain LRU add pagevec to remove extra pin on the swapped in pages */ > > + if (swapped_in) > > + lru_add_drain(); > > There is already lru_add_drain() called in swap readahead path, please see > swap_vma_readahead() and swap_cluster_readahead(). But not for synchronous case. See SWP_SYNCHRONOUS_IO branch in do_swap_page(). Maybe we should drain it in swap_readpage() or in do_swap_page() after swap_readpage()? I donno. -- Kirill A. Shutemov