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.6 required=3.0 tests=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 5C652C34022 for ; Mon, 17 Feb 2020 18:46:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 098D720836 for ; Mon, 17 Feb 2020 18:46:18 +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="hhh1t6HV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 098D720836 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 5F8266B0003; Mon, 17 Feb 2020 13:46:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 581C76B0006; Mon, 17 Feb 2020 13:46:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 471BB6B0007; Mon, 17 Feb 2020 13:46:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0193.hostedemail.com [216.40.44.193]) by kanga.kvack.org (Postfix) with ESMTP id 2DBF56B0003 for ; Mon, 17 Feb 2020 13:46:18 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B928A180AD802 for ; Mon, 17 Feb 2020 18:46:17 +0000 (UTC) X-FDA: 76500499194.07.look09_19c8a60405e43 X-HE-Tag: look09_19c8a60405e43 X-Filterd-Recvd-Size: 5282 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Mon, 17 Feb 2020 18:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=TLN+MN9liFnLDsYo+PJ3gSWsvtLSIjBwcyOIhgoJ5VY=; b=hhh1t6HVNLsDCWt3MkQiEYSzre hHWiRXNO+r8JdlNSSEGh0o8YrYXOSkS/gp9xDglMuFey74aPYgYuHG2Vw32WCqs2XINOBkEXUc04e dNydvDlRbJXB9yrmAe6jgu25QNAScILW2omvBwbsW7wNsX82P1Rb3XgznMqiit9sLnMo/btfjrCD5 A5pPkGiNWrR7m/KYbChbtfL6nu/34I8dw1/vNm8C4jceWxh/XiSYSIlAOHr3sqBJeyStdcRlWY7zP tRI1xVRaDxQsHjcT3MBSmGrHTevUmS7161Li+DqQn7IbfCuzGT/OQ03Av7NFbi9rxgQk8+/SE8kyH Zp44q6kg==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j3lPM-0005Cb-8w; Mon, 17 Feb 2020 18:46:16 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, ocfs2-devel@oss.oracle.com, linux-xfs@vger.kernel.org Subject: [PATCH v6 14/16] fuse: Convert from readpages to readahead Date: Mon, 17 Feb 2020 10:46:06 -0800 Message-Id: <20200217184613.19668-26-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200217184613.19668-1-willy@infradead.org> References: <20200217184613.19668-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: From: "Matthew Wilcox (Oracle)" Use the new readahead operation in fuse. Switching away from the read_cache_pages() helper gets rid of an implicit call to put_page(), so we can get rid of the get_page() call in fuse_readpages_fill(). Signed-off-by: Matthew Wilcox (Oracle) --- fs/fuse/file.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 9d67b830fb7a..f64f98708b5e 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -923,9 +923,8 @@ struct fuse_fill_data { unsigned int max_pages; }; =20 -static int fuse_readpages_fill(void *_data, struct page *page) +static int fuse_readpages_fill(struct fuse_fill_data *data, struct page = *page) { - struct fuse_fill_data *data =3D _data; struct fuse_io_args *ia =3D data->ia; struct fuse_args_pages *ap =3D &ia->ap; struct inode *inode =3D data->inode; @@ -941,10 +940,8 @@ static int fuse_readpages_fill(void *_data, struct p= age *page) fc->max_pages); fuse_send_readpages(ia, data->file); data->ia =3D ia =3D fuse_io_alloc(NULL, data->max_pages); - if (!ia) { - unlock_page(page); + if (!ia) return -ENOMEM; - } ap =3D &ia->ap; } =20 @@ -954,7 +951,6 @@ static int fuse_readpages_fill(void *_data, struct pa= ge *page) return -EIO; } =20 - get_page(page); ap->pages[ap->num_pages] =3D page; ap->descs[ap->num_pages].length =3D PAGE_SIZE; ap->num_pages++; @@ -962,37 +958,33 @@ static int fuse_readpages_fill(void *_data, struct = page *page) return 0; } =20 -static int fuse_readpages(struct file *file, struct address_space *mappi= ng, - struct list_head *pages, unsigned nr_pages) +static void fuse_readahead(struct readahead_control *rac) { - struct inode *inode =3D mapping->host; + struct inode *inode =3D rac->mapping->host; struct fuse_conn *fc =3D get_fuse_conn(inode); struct fuse_fill_data data; - int err; + struct page *page; =20 - err =3D -EIO; if (is_bad_inode(inode)) - goto out; + return; =20 - data.file =3D file; + data.file =3D rac->file; data.inode =3D inode; - data.nr_pages =3D nr_pages; - data.max_pages =3D min_t(unsigned int, nr_pages, fc->max_pages); -; + data.nr_pages =3D readahead_count(rac); + data.max_pages =3D min_t(unsigned int, data.nr_pages, fc->max_pages); data.ia =3D fuse_io_alloc(NULL, data.max_pages); - err =3D -ENOMEM; if (!data.ia) - goto out; + return; =20 - err =3D read_cache_pages(mapping, pages, fuse_readpages_fill, &data); - if (!err) { - if (data.ia->ap.num_pages) - fuse_send_readpages(data.ia, file); - else - fuse_io_free(data.ia); + readahead_for_each(rac, page) { + if (fuse_readpages_fill(&data, page) !=3D 0) + return; } -out: - return err; + + if (data.ia->ap.num_pages) + fuse_send_readpages(data.ia, rac->file); + else + fuse_io_free(data.ia); } =20 static ssize_t fuse_cache_read_iter(struct kiocb *iocb, struct iov_iter = *to) @@ -3373,10 +3365,10 @@ static const struct file_operations fuse_file_ope= rations =3D { =20 static const struct address_space_operations fuse_file_aops =3D { .readpage =3D fuse_readpage, + .readahead =3D fuse_readahead, .writepage =3D fuse_writepage, .writepages =3D fuse_writepages, .launder_page =3D fuse_launder_page, - .readpages =3D fuse_readpages, .set_page_dirty =3D __set_page_dirty_nobuffers, .bmap =3D fuse_bmap, .direct_IO =3D fuse_direct_IO, --=20 2.25.0