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=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 0E2CEC433E2 for ; Fri, 4 Sep 2020 23:36:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AD7512084D for ; Fri, 4 Sep 2020 23:36:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="JCSA4QMu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD7512084D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6A5D46B0082; Fri, 4 Sep 2020 19:36:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 657CE6B0083; Fri, 4 Sep 2020 19:36:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 544576B0085; Fri, 4 Sep 2020 19:36:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0204.hostedemail.com [216.40.44.204]) by kanga.kvack.org (Postfix) with ESMTP id 4095F6B0082 for ; Fri, 4 Sep 2020 19:36:18 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 18CD4180AD802 for ; Fri, 4 Sep 2020 23:36:18 +0000 (UTC) X-FDA: 77226990036.28.angle64_4301829270b6 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id E55436C04 for ; Fri, 4 Sep 2020 23:36:17 +0000 (UTC) X-HE-Tag: angle64_4301829270b6 X-Filterd-Recvd-Size: 2904 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Fri, 4 Sep 2020 23:36:17 +0000 (UTC) Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 720242084D; Fri, 4 Sep 2020 23:36:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599262576; bh=U2lx8UBwqh7SqVtsUm7OV0OV+q1ehQlnwi9xpgYCnCE=; h=Date:From:To:Subject:In-Reply-To:From; b=JCSA4QMuz2ptlihdA0m3i13Vpav1JEGG73RpzGD4wxOcVtGqIFe830EYZ1UG8YVia 4TIZDcWYtHClyDfy77yhgwuNGOUA3Ok5rFDB54RaCWnGl7+0gurt90KnWkiuzA7gkF xri84Q93boSPHb7SNXXE0/Qs9c1j/Y/cYf1TzDNs= Date: Fri, 04 Sep 2020 16:36:16 -0700 From: Andrew Morton To: akpm@linux-foundation.org, dhowells@redhat.com, ebiggers@google.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, pankaj.gupta.linux@gmail.com, shy828301@gmail.com, songliubraving@fb.com, torvalds@linux-foundation.org, willy@infradead.org Subject: [patch 18/19] mm/khugepaged.c: fix khugepaged's request size in collapse_file Message-ID: <20200904233616.8nQR2-R8H%akpm@linux-foundation.org> In-Reply-To: <20200904163454.4db0e6ce0c4584d2653678a3@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: E55436C04 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: From: David Howells Subject: mm/khugepaged.c: fix khugepaged's request size in collapse_file collapse_file() in khugepaged passes PAGE_SIZE as the number of pages to be read to page_cache_sync_readahead(). The intent was probably to read a single page. Fix it to use the number of pages to the end of the window instead. Link: https://lkml.kernel.org/r/20200903140844.14194-2-willy@infradead.org Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS") Signed-off-by: David Howells Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Song Liu Reviewed-by: Matthew Wilcox (Oracle) Acked-by: Yang Shi Acked-by: Pankaj Gupta Cc: Eric Biggers Signed-off-by: Andrew Morton --- mm/khugepaged.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/khugepaged.c~fix-khugepageds-request-size-in-collapse_file +++ a/mm/khugepaged.c @@ -1709,7 +1709,7 @@ static void collapse_file(struct mm_stru 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); _