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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 9E23BC433E0 for ; Fri, 22 Jan 2021 16:05:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 287EC22EBE for ; Fri, 22 Jan 2021 16:05:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 287EC22EBE 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 AEEEC6B000A; Fri, 22 Jan 2021 11:05:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A9F146B000C; Fri, 22 Jan 2021 11:05:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DD486B000D; Fri, 22 Jan 2021 11:05:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0049.hostedemail.com [216.40.44.49]) by kanga.kvack.org (Postfix) with ESMTP id 891C96B000A for ; Fri, 22 Jan 2021 11:05:08 -0500 (EST) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 3C39318149422 for ; Fri, 22 Jan 2021 16:05:08 +0000 (UTC) X-FDA: 77733885096.01.laugh20_360b22d2756d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 564521004BA99 for ; Fri, 22 Jan 2021 16:04:49 +0000 (UTC) X-HE-Tag: laugh20_360b22d2756d X-Filterd-Recvd-Size: 8315 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Fri, 22 Jan 2021 16:04:48 +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=Xjym9lcL0CxKzUararhEBi3kSrlAKm+bXyK6l1ORLjE=; b=FGYXtlxIJvPCIiOqQR0M1ZHLC8 5AzpbpS9EeuHIzh+NMA6ca8Q6lvkmyxYD76jR9JhhKm5iYY0T1e5RbDKFl0UqvrXsWOMQUgVB7S3Z BRFoqAtBnRs6K75+ZBBJgEGoPX6eGjXpmF0i8/ZvbMKyvn99zAFOIRmVilDrxZbU8EAl2K1wP8gTJ 3gzvo8h/XWw5gjt7+CFvumE5tFhnm3qapaF3CnqoKwx/HBe/XL1oDtqDHx0Po1ye6pnQZdbTbGMrK jvilDFdzdxnVcMaiHS+1poRQ+fD7xjtEcUgX88MOUXO2Qr46Eh3YY0HI37gxNxGipmSlad74Z0AOT zpwbDhQw==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l2yu8-000wCI-H1; Fri, 22 Jan 2021 16:03:26 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: [PATCH v5 03/18] mm/filemap: Convert filemap_get_pages to take a pagevec Date: Fri, 22 Jan 2021 16:01:25 +0000 Message-Id: <20210122160140.223228-4-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122160140.223228-1-willy@infradead.org> References: <20210122160140.223228-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: Using a pagevec lets us keep the pages and the number of pages together which simplifies a lot of the calling conventions. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig --- mm/filemap.c | 82 ++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 44 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index a5c4f7ddfc40c..ca4141dd63a4b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2338,22 +2338,22 @@ static struct page *filemap_create_page(struct ki= ocb *iocb, } =20 static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter, - struct page **pages, unsigned int nr) + struct pagevec *pvec) { struct file *filp =3D iocb->ki_filp; struct address_space *mapping =3D filp->f_mapping; struct file_ra_state *ra =3D &filp->f_ra; pgoff_t index =3D iocb->ki_pos >> PAGE_SHIFT; pgoff_t last_index =3D (iocb->ki_pos + iter->count + PAGE_SIZE-1) >> PA= GE_SHIFT; - int i, j, nr_got, err =3D 0; + unsigned int nr =3D min_t(unsigned long, last_index - index, PAGEVEC_SI= ZE); + int i, j, err =3D 0; =20 - nr =3D min_t(unsigned long, last_index - index, nr); find_page: if (fatal_signal_pending(current)) return -EINTR; =20 - nr_got =3D find_get_pages_contig(mapping, index, nr, pages); - if (nr_got) + pvec->nr =3D find_get_pages_contig(mapping, index, nr, pvec->pages); + if (pvec->nr) goto got_pages; =20 if (iocb->ki_flags & IOCB_NOIO) @@ -2361,17 +2361,17 @@ static int filemap_get_pages(struct kiocb *iocb, = struct iov_iter *iter, =20 page_cache_sync_readahead(mapping, ra, filp, index, last_index - index)= ; =20 - nr_got =3D find_get_pages_contig(mapping, index, nr, pages); - if (nr_got) + pvec->nr =3D find_get_pages_contig(mapping, index, nr, pvec->pages); + if (pvec->nr) goto got_pages; =20 - pages[0] =3D filemap_create_page(iocb, iter); - err =3D PTR_ERR_OR_ZERO(pages[0]); - if (!IS_ERR_OR_NULL(pages[0])) - nr_got =3D 1; + pvec->pages[0] =3D filemap_create_page(iocb, iter); + err =3D PTR_ERR_OR_ZERO(pvec->pages[0]); + if (!IS_ERR_OR_NULL(pvec->pages[0])) + pvec->nr =3D 1; got_pages: - for (i =3D 0; i < nr_got; i++) { - struct page *page =3D pages[i]; + for (i =3D 0; i < pvec->nr; i++) { + struct page *page =3D pvec->pages[i]; pgoff_t pg_index =3D index + i; loff_t pg_pos =3D max(iocb->ki_pos, (loff_t) pg_index << PAGE_SHIFT); @@ -2379,9 +2379,9 @@ static int filemap_get_pages(struct kiocb *iocb, st= ruct iov_iter *iter, =20 if (PageReadahead(page)) { if (iocb->ki_flags & IOCB_NOIO) { - for (j =3D i; j < nr_got; j++) - put_page(pages[j]); - nr_got =3D i; + for (j =3D i; j < pvec->nr; j++) + put_page(pvec->pages[j]); + pvec->nr =3D i; err =3D -EAGAIN; break; } @@ -2392,9 +2392,9 @@ static int filemap_get_pages(struct kiocb *iocb, st= ruct iov_iter *iter, if (!PageUptodate(page)) { if ((iocb->ki_flags & IOCB_NOWAIT) || ((iocb->ki_flags & IOCB_WAITQ) && i)) { - for (j =3D i; j < nr_got; j++) - put_page(pages[j]); - nr_got =3D i; + for (j =3D i; j < pvec->nr; j++) + put_page(pvec->pages[j]); + pvec->nr =3D i; err =3D -EAGAIN; break; } @@ -2402,17 +2402,17 @@ static int filemap_get_pages(struct kiocb *iocb, = struct iov_iter *iter, page =3D filemap_update_page(iocb, filp, iter, page, pg_pos, pg_count); if (IS_ERR_OR_NULL(page)) { - for (j =3D i + 1; j < nr_got; j++) - put_page(pages[j]); - nr_got =3D i; + for (j =3D i + 1; j < pvec->nr; j++) + put_page(pvec->pages[j]); + pvec->nr =3D i; err =3D PTR_ERR_OR_ZERO(page); break; } } } =20 - if (likely(nr_got)) - return nr_got; + if (likely(pvec->nr)) + return 0; if (err) return err; /* @@ -2444,11 +2444,8 @@ ssize_t generic_file_buffered_read(struct kiocb *i= ocb, struct file_ra_state *ra =3D &filp->f_ra; struct address_space *mapping =3D filp->f_mapping; struct inode *inode =3D mapping->host; - struct page *pages[PAGEVEC_SIZE]; - unsigned int nr_pages =3D min_t(unsigned int, PAGEVEC_SIZE, - ((iocb->ki_pos + iter->count + PAGE_SIZE - 1) >> PAGE_SHIFT) - - (iocb->ki_pos >> PAGE_SHIFT)); - int i, pg_nr, error =3D 0; + struct pagevec pvec; + int i, error =3D 0; bool writably_mapped; loff_t isize, end_offset; =20 @@ -2470,12 +2467,9 @@ ssize_t generic_file_buffered_read(struct kiocb *i= ocb, if ((iocb->ki_flags & IOCB_WAITQ) && written) iocb->ki_flags |=3D IOCB_NOWAIT; =20 - i =3D 0; - pg_nr =3D filemap_get_pages(iocb, iter, pages, nr_pages); - if (pg_nr < 0) { - error =3D pg_nr; + error =3D filemap_get_pages(iocb, iter, &pvec); + if (error < 0) break; - } =20 /* * i_size must be checked after we know the pages are Uptodate. @@ -2491,9 +2485,9 @@ ssize_t generic_file_buffered_read(struct kiocb *io= cb, =20 end_offset =3D min_t(loff_t, isize, iocb->ki_pos + iter->count); =20 - while ((iocb->ki_pos >> PAGE_SHIFT) + pg_nr > + while ((iocb->ki_pos >> PAGE_SHIFT) + pvec.nr > (end_offset + PAGE_SIZE - 1) >> PAGE_SHIFT) - put_page(pages[--pg_nr]); + put_page(pvec.pages[--pvec.nr]); =20 /* * Once we start copying data, we don't want to be touching any @@ -2507,11 +2501,11 @@ ssize_t generic_file_buffered_read(struct kiocb *= iocb, */ if (iocb->ki_pos >> PAGE_SHIFT !=3D ra->prev_pos >> PAGE_SHIFT) - mark_page_accessed(pages[0]); - for (i =3D 1; i < pg_nr; i++) - mark_page_accessed(pages[i]); + mark_page_accessed(pvec.pages[0]); + for (i =3D 1; i < pagevec_count(&pvec); i++) + mark_page_accessed(pvec.pages[i]); =20 - for (i =3D 0; i < pg_nr; i++) { + for (i =3D 0; i < pagevec_count(&pvec); i++) { unsigned int offset =3D iocb->ki_pos & ~PAGE_MASK; unsigned int bytes =3D min_t(loff_t, end_offset - iocb->ki_pos, PAGE_SIZE - offset); @@ -2523,9 +2517,9 @@ ssize_t generic_file_buffered_read(struct kiocb *io= cb, * before reading the page on the kernel side. */ if (writably_mapped) - flush_dcache_page(pages[i]); + flush_dcache_page(pvec.pages[i]); =20 - copied =3D copy_page_to_iter(pages[i], offset, bytes, iter); + copied =3D copy_page_to_iter(pvec.pages[i], offset, bytes, iter); =20 written +=3D copied; iocb->ki_pos +=3D copied; @@ -2537,8 +2531,8 @@ ssize_t generic_file_buffered_read(struct kiocb *io= cb, } } put_pages: - for (i =3D 0; i < pg_nr; i++) - put_page(pages[i]); + for (i =3D 0; i < pagevec_count(&pvec); i++) + put_page(pvec.pages[i]); } while (iov_iter_count(iter) && iocb->ki_pos < isize && !error); =20 file_accessed(filp); --=20 2.29.2