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=-9.8 required=3.0 tests=BAYES_00,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,URIBL_BLOCKED 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 82DF8C433E7 for ; Wed, 2 Sep 2020 17:43:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 352ED207EA for ; Wed, 2 Sep 2020 17:43:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a740NAoe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 352ED207EA 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 9B12E90000C; Wed, 2 Sep 2020 13:43:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 960516B00A3; Wed, 2 Sep 2020 13:43:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 84ECC90000C; Wed, 2 Sep 2020 13:43:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0231.hostedemail.com [216.40.44.231]) by kanga.kvack.org (Postfix) with ESMTP id 6BC656B00A2 for ; Wed, 2 Sep 2020 13:43:37 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id DAD99181AEF10 for ; Wed, 2 Sep 2020 17:43:36 +0000 (UTC) X-FDA: 77218843632.11.wine35_1d0d103270a2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 5738C180F8B81 for ; Wed, 2 Sep 2020 17:43:36 +0000 (UTC) X-HE-Tag: wine35_1d0d103270a2 X-Filterd-Recvd-Size: 4304 Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Wed, 2 Sep 2020 17:43:35 +0000 (UTC) Received: by mail-ej1-f65.google.com with SMTP id a15so5200933ejf.11 for ; Wed, 02 Sep 2020 10:43:35 -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=vMtrzgDPO6AmfI9ZPBSjKxXAd2ee14HiYfSbmhtlU0o=; b=a740NAoedXkRok+5UfNBY1sTSlo7bklHmwoPOuittzrLsAFwAioFf57AzFa7yphWkP XJzZYoZyU07EX4V2EGo4ZHIvwbG0/TOxEOJZQPuk6Pwru4va9hmOCKChvUxFLG5ViCa4 Avfk07uILC759ju3dAYVr7tND9/cO/OBPsYas1P+tAipN+q4tuy4Rx4ej4E1A2nv/k8B 8/Rp/6uW0NoC7F0Q7r6dgE9kO3EK1HhaJbFn1NL4hNh46QA+usJ+I5RFsVYJfNOGw2uu yq/4s5V/YLDpYZ9B98t8Y0Y9fBxiTKUe6w5RxivGgy5sfwN4DGisCnb52N+imfOUkDpn xgng== 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=vMtrzgDPO6AmfI9ZPBSjKxXAd2ee14HiYfSbmhtlU0o=; b=EjZgEwg+5Z3I3A58Dgl6f/BrSIzeyg+iVza+ajxJnRubeFldxxvjdUgLyHdGBofPSJ c9rUPupv2wI/8lt6tNMeRjjIFhurBPU0WobZUYO3aAe3+eFuFgq6ZO4H5p2nUGeKlW/e Kc8/bzoggRNeuH+BVQfSuMo8Y+FUvt9vHMMsbSChmYLz7EZk/2mqjrezxUCCn5cciWKH bTpXnt5D/9Oh42+MOHjtFkjcon0oFhoXXz+KKC1UHPjd3BOchPWMcSUY2vOTKpo7En3R FXt0tAvgLUGtC59NrcLVCBFm96vdwo5ga+StYIfOD0N1LIrJ7s/bGzLk1sAtGgarLV+I lbDA== X-Gm-Message-State: AOAM532EVMgB79sFv4x8jR/NeLDbZcoC7WqLUW14tuvZNrQaRSkYSDm+ uJCW1DyM5P0Vmdm0AiJATslqdxS4xJ1mlfLYoA4= X-Google-Smtp-Source: ABdhPJxmIK8odO2VkYlxX0ps8YQ8kne3FIuthQ1TDFr5/VmkZPJAhnVx4eJe+tQVmA/23SIxUM0/JjFsC4NGcSfnzgQ= X-Received: by 2002:a17:907:2173:: with SMTP id rl19mr1111153ejb.514.1599068614629; Wed, 02 Sep 2020 10:43:34 -0700 (PDT) MIME-Version: 1.0 References: <159905616280.521200.12444250032673650063.stgit@warthog.procyon.org.uk> In-Reply-To: <159905616280.521200.12444250032673650063.stgit@warthog.procyon.org.uk> From: Yang Shi Date: Wed, 2 Sep 2020 10:43:22 -0700 Message-ID: Subject: Re: [PATCH] Fix khugepaged's request size in collapse_file() To: David Howells Cc: Andrew Morton , Song Liu , "Matthew Wilcox (Oracle)" , Linux MM , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 5738C180F8B81 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 Wed, Sep 2, 2020 at 7:16 AM David Howells wrote: > > collapse_file() in khugepaged passes PAGE_SIZE as the number of pages to be > read ahead to page_cache_sync_readahead(). It seems this was expressed as a > number of bytes rather than a number of pages. > > Fix it to use the number of pages to the end of the window instead. > > Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS") > Signed-off-by: David Howells > Acked-by: Song Liu > Reviewed-by: Matthew Wilcox (Oracle) Acked-by: Yang Shi > --- > > mm/khugepaged.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 6d199c353281..f2d243077b74 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -1706,7 +1706,7 @@ static void collapse_file(struct mm_struct *mm, > xas_unlock_irq(&xas); > page_cache_sync_readahead(mapping, &file->f_ra, > file, index, > - PAGE_SIZE); > + end - index); > /* drain pagevecs to help isolate_lru_page() */ > lru_add_drain(); > page = find_lock_page(mapping, index); > > >