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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 33F65C55178 for ; Thu, 29 Oct 2020 19:35:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9C89D2176B for ; Thu, 29 Oct 2020 19:34:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="uWdBNNjA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C89D2176B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 12E046B0082; Thu, 29 Oct 2020 15:34:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F2EB76B0087; Thu, 29 Oct 2020 15:34:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFDF86B0082; Thu, 29 Oct 2020 15:34:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id A29996B0085 for ; Thu, 29 Oct 2020 15:34:15 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 4A464181AEF1A for ; Thu, 29 Oct 2020 19:34:15 +0000 (UTC) X-FDA: 77425964070.01.root41_00064c327290 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 2CCB31004B368 for ; Thu, 29 Oct 2020 19:34:15 +0000 (UTC) X-HE-Tag: root41_00064c327290 X-Filterd-Recvd-Size: 3077 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:34:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=i8c7CZBKt8Ob5/OYaiIUyfJTleCuj0emLFJGvRTncuU=; b=uWdBNNjAXs1rCJYYTItaVeSM3U K1J/DzxuCFj1zw6tNJfm7VjwBaTj3OtYg4GL/Mrb3ufFvBjbzQqtwdjMU3PBuieBIGRo84PkFy2Qc f96K75ZsLZsflCQiw8eC+3IpYyiMJa9GZ3DnhjawTbntVRHZ0IuUOcRaJKE670DvTd6/zgkJTT1p5 L0qTFx3v2A7c0BtDAA7urISjaH8w7iyYAOdDFZUOx5/C6wk1NRu0OG1IQhjXzQhYfW2jbQEa2ERNK GTRs8aCcvCdY/PqCekNMqbr6nsoQ3c/tI8WH+Ocsi43H6fHdK0Jy9V9kIdIcvrKb8bRELH8gouo3L FyOqlz9w==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDgY-0007cG-FY; Thu, 29 Oct 2020 19:34:10 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 11/19] mm/filemap: Allow PageReadahead to be set on head pages Date: Thu, 29 Oct 2020 19:33:57 +0000 Message-Id: <20201029193405.29125-12-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201029193405.29125-1-willy@infradead.org> References: <20201029193405.29125-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: Adjust the callers to only call PageReadahead on the head page. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/page-flags.h | 4 ++-- mm/filemap.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 00d8efd72496..8b523d25fccf 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -380,8 +380,8 @@ PAGEFLAG(MappedToDisk, mappedtodisk, PF_NO_TAIL) /* PG_readahead is only used for reads; PG_reclaim is only for writes */ PAGEFLAG(Reclaim, reclaim, PF_NO_TAIL) TESTCLEARFLAG(Reclaim, reclaim, PF_NO_TAIL) -PAGEFLAG(Readahead, reclaim, PF_NO_COMPOUND) - TESTCLEARFLAG(Readahead, reclaim, PF_NO_COMPOUND) +PAGEFLAG(Readahead, reclaim, PF_ONLY_HEAD) + TESTCLEARFLAG(Readahead, reclaim, PF_ONLY_HEAD) =20 #ifdef CONFIG_HIGHMEM /* diff --git a/mm/filemap.c b/mm/filemap.c index dabc26cf0067..91145e33635d 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2892,10 +2892,10 @@ static struct file *do_async_mmap_readahead(struc= t vm_fault *vmf, mmap_miss =3D READ_ONCE(ra->mmap_miss); if (mmap_miss) WRITE_ONCE(ra->mmap_miss, --mmap_miss); - if (PageReadahead(page)) { + if (PageReadahead(thp_head(page))) { fpin =3D maybe_unlock_mmap_for_io(vmf, fpin); page_cache_async_readahead(mapping, ra, file, - page, offset, ra->ra_pages); + thp_head(page), offset, ra->ra_pages); } return fpin; } --=20 2.28.0