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.8 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 EB8DFC433E2 for ; Thu, 3 Sep 2020 14:09:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8C05020578 for ; Thu, 3 Sep 2020 14:09:14 +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="ioXVhWw7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C05020578 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 9D6D86B0074; Thu, 3 Sep 2020 10:08:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9846A6B0075; Thu, 3 Sep 2020 10:08:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 825196B0078; Thu, 3 Sep 2020 10:08:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0174.hostedemail.com [216.40.44.174]) by kanga.kvack.org (Postfix) with ESMTP id 621A86B0075 for ; Thu, 3 Sep 2020 10:08:59 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 0535C3621 for ; Thu, 3 Sep 2020 14:08:58 +0000 (UTC) X-FDA: 77221931598.19.form78_2c0b8da270aa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id B559E1AD31E for ; Thu, 3 Sep 2020 14:08:58 +0000 (UTC) X-HE-Tag: form78_2c0b8da270aa X-Filterd-Recvd-Size: 4158 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Thu, 3 Sep 2020 14:08:58 +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=2cBKtztXbapuaDPjC85hkD+JbRvyUkQLpluPy1fPuaE=; b=ioXVhWw7Lh/7jBgBK8c4XzfU4h N4msuXj3b9ryTcdexBSV4qFmNkEhq+SkR4XAv3JPJRh4MarNV0X6hXjB1k1alncu3V2CzAvbe7rAD jdGHEQz4iNhZTnpN3DmI5BHQb0pNk+LjHZsN23EbyN13sTlUuhz0pcn4S1Hbhp2IcGzQcV6HGlJRB XfXzRabXH3WYjWKE2xb4NoGIOgK4CvzU/PVIrla7kquX0WFCrxW7Yxvvi4Vr7InQiwg8dlwNzMOkY Len2NIvWhyj1+Jm8X6TgcncIJc4/PVKB9/nXuODEiPFGlZ+F1S4QY7L2dm4q2m7edl78KSKAA3Rq3 mG+0eBig==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDpv3-0003ik-7B; Thu, 03 Sep 2020 14:08:53 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: David Howells , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Eric Biggers , Matthew Wilcox Subject: [PATCH 8/9] mm/filemap: Fold ra_submit into do_sync_mmap_readahead Date: Thu, 3 Sep 2020 15:08:43 +0100 Message-Id: <20200903140844.14194-9-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200903140844.14194-1-willy@infradead.org> References: <20200903140844.14194-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: B559E1AD31E X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: From: David Howells Fold ra_submit() into its last remaining user and pass the readahead_control struct to both do_page_cache_ra() and page_cache_sync_ra(). Signed-off-by: David Howells Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 10 +++++----- mm/internal.h | 10 ---------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 1aaea26556cc..1ad49c33439a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2466,8 +2466,8 @@ static struct file *do_sync_mmap_readahead(struct v= m_fault *vmf) struct file *file =3D vmf->vma->vm_file; struct file_ra_state *ra =3D &file->f_ra; struct address_space *mapping =3D file->f_mapping; + DEFINE_READAHEAD(ractl, file, mapping, vmf->pgoff); struct file *fpin =3D NULL; - pgoff_t offset =3D vmf->pgoff; unsigned int mmap_miss; =20 /* If we don't want any read-ahead, don't bother */ @@ -2478,8 +2478,7 @@ static struct file *do_sync_mmap_readahead(struct v= m_fault *vmf) =20 if (vmf->vma->vm_flags & VM_SEQ_READ) { fpin =3D maybe_unlock_mmap_for_io(vmf, fpin); - page_cache_sync_readahead(mapping, ra, file, offset, - ra->ra_pages); + page_cache_sync_ra(&ractl, ra, ra->ra_pages); return fpin; } =20 @@ -2499,10 +2498,11 @@ static struct file *do_sync_mmap_readahead(struct= vm_fault *vmf) * mmap read-around */ fpin =3D maybe_unlock_mmap_for_io(vmf, fpin); - ra->start =3D max_t(long, 0, offset - ra->ra_pages / 2); + ra->start =3D max_t(long, 0, vmf->pgoff - ra->ra_pages / 2); ra->size =3D ra->ra_pages; ra->async_size =3D ra->ra_pages / 4; - ra_submit(ra, mapping, file); + ractl._index =3D ra->start; + do_page_cache_ra(&ractl, ra->size, ra->async_size); return fpin; } =20 diff --git a/mm/internal.h b/mm/internal.h index 5533e85bd123..0a2e5caea2aa 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -59,16 +59,6 @@ static inline void force_page_cache_readahead(struct a= ddress_space *mapping, force_page_cache_ra(&ractl, nr_to_read); } =20 -/* - * Submit IO for the read-ahead request in file_ra_state. - */ -static inline void ra_submit(struct file_ra_state *ra, - struct address_space *mapping, struct file *file) -{ - DEFINE_READAHEAD(ractl, file, mapping, ra->start); - do_page_cache_ra(&ractl, ra->size, ra->async_size); -} - /** * page_evictable - test whether a page is evictable * @page: the page to test --=20 2.28.0