Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1190215ybl; Fri, 24 Jan 2020 17:37:23 -0800 (PST) X-Google-Smtp-Source: APXvYqx12LLvybtNU949Azsjqh3DbnvxciMVPdM57UM5jLn7PAQb5gKSMjiA7iJV8hOqkoCCbgBQ X-Received: by 2002:aca:f555:: with SMTP id t82mr1234095oih.103.1579916243857; Fri, 24 Jan 2020 17:37:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579916243; cv=none; d=google.com; s=arc-20160816; b=ybdLAlltjRtN9DYrOHBblAcmn9FeR2nuaFytpO2pM2C52KnVKLVt574a9uRiQNMA2z no3KIadQWTLu+Xk2wtBm+xkPU/ujYCsI5LPg7Ptf5kLXOjhGCy2RUv/dgAG4J4wLiLJ7 4duroS2bZBJte41pLCiCies9LljKNhP+/AD+vg203wD9cMmoWRRA6dcl1wP73ItsqN72 XUak4ZmqQWyc4URikqSIf3ty4oaNYVMgwH+0K+dooUkio7/glxYi4G/eiVOz9TEkRCod 7qtoK5E3qMKxRO3JW4Dw7Fe50ixEw6qe2/BlAwpqcbCudR7f0h5ysXLyrWN6oEsvs178 iYDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ldyBROX4ttpX20xjGcZ0P9RkozwGCLMwi7om00TCIb8=; b=oMeLRtHJ7323tK1k8IJDpFpSW7U5a9WAhAhNP/Fe1mit3fpTBqYgcKvyehxJ4N/Qjd psICUIABu3vL96BKGjRPb/zzrY+GSV/tr0uzjl/XAurQ1pprYbh8Jm3hiMvs0FMeLQ4T TorPPZxZYgRf5di2IVZpC4InuUqpsNyFxkU1D0M6KRINnzpHglzDAal/qF1Ra16SbBDX fOKqveAuDmMM5vY/ICFqQAtKB6rtRVa6t7gppgUGmAIP6HatIvDhX8GIS0ppZY0/SXAk dALnjjUGNxWJr6+bu/kfLByrZ3y4a26NNkuP4YWcUwRk+aKzjomW5f7g52jdVWOpSW0S NSnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=dyR6fc6y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q2si3473765otn.220.2020.01.24.17.37.12; Fri, 24 Jan 2020 17:37:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=dyR6fc6y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729917AbgAYBgM (ORCPT + 99 others); Fri, 24 Jan 2020 20:36:12 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:36756 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387677AbgAYBf7 (ORCPT ); Fri, 24 Jan 2020 20:35:59 -0500 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:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ldyBROX4ttpX20xjGcZ0P9RkozwGCLMwi7om00TCIb8=; b=dyR6fc6y9sdVtK/E+BuhZ9EVVF mr0y+PMYQ0N7jUnGxzxKPi8UI68siHl1iJL5omatmrcERsFESzhoeWGX66TkS/UM4Zs29rvPx8VV7 SSFPZivDF0kzqiosJk8HmWPRxj4DJ5qQBtt0BS8Jfng2qcBxG970OV44R1EaSbdA1EIti3/ocHPzf eYkPs8iOf547JKSDVIkvfg2aJJ/2U6nVZzVjFevdQRKAuKNUDlZ+Pr0Mj0QaaIAFzSrxrjljkcFhu FURJN+d83dnQol8EYNSD/v5SpxfiubylgjHMtL0teGBENyW1mAd2sOqbyo/KPsRj+AHV9UDIqOtsb VJuUsloA==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1ivAMd-0006Vi-DH; Sat, 25 Jan 2020 01:35:55 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-erofs@lists.ozlabs.org Subject: [PATCH 07/12] erofs: Convert uncompressed files from readpages to readahead Date: Fri, 24 Jan 2020 17:35:48 -0800 Message-Id: <20200125013553.24899-8-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200125013553.24899-1-willy@infradead.org> References: <20200125013553.24899-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Matthew Wilcox (Oracle)" Use the new readahead operation in erofs. Fix what I believe to be a refcounting bug in the error case. Signed-off-by: Matthew Wilcox (Oracle) Cc: linux-erofs@lists.ozlabs.org --- fs/erofs/data.c | 34 ++++++++++++++-------------------- fs/erofs/zdata.c | 2 +- include/trace/events/erofs.h | 6 +++--- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index fc3a8d8064f8..335c1ab05312 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -280,42 +280,36 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page) return 0; } -static int erofs_raw_access_readpages(struct file *filp, +static unsigned erofs_raw_access_readahead(struct file *file, struct address_space *mapping, - struct list_head *pages, + pgoff_t start, unsigned int nr_pages) { erofs_off_t last_block; struct bio *bio = NULL; - gfp_t gfp = readahead_gfp_mask(mapping); - struct page *page = list_last_entry(pages, struct page, lru); - trace_erofs_readpages(mapping->host, page, nr_pages, true); + trace_erofs_readpages(mapping->host, start, nr_pages, true); for (; nr_pages; --nr_pages) { - page = list_entry(pages->prev, struct page, lru); + struct page *page = readahead_page(mapping, start++); prefetchw(&page->flags); - list_del(&page->lru); - if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) { - bio = erofs_read_raw_page(bio, mapping, page, - &last_block, nr_pages, true); + bio = erofs_read_raw_page(bio, mapping, page, &last_block, + nr_pages, true); - /* all the page errors are ignored when readahead */ - if (IS_ERR(bio)) { - pr_err("%s, readahead error at page %lu of nid %llu\n", - __func__, page->index, - EROFS_I(mapping->host)->nid); + /* all the page errors are ignored when readahead */ + if (IS_ERR(bio)) { + pr_err("%s, readahead error at page %lu of nid %llu\n", + __func__, page->index, + EROFS_I(mapping->host)->nid); - bio = NULL; - } + bio = NULL; + put_page(page); } - /* pages could still be locked */ put_page(page); } - DBG_BUGON(!list_empty(pages)); /* the rare case (end in gaps) */ if (bio) @@ -358,7 +352,7 @@ static sector_t erofs_bmap(struct address_space *mapping, sector_t block) /* for uncompressed (aligned) files and raw access for other files */ const struct address_space_operations erofs_raw_access_aops = { .readpage = erofs_raw_access_readpage, - .readpages = erofs_raw_access_readpages, + .readahead = erofs_raw_access_readahead, .bmap = erofs_bmap, }; diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index ca99425a4536..d3dd8cf1fc01 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1340,7 +1340,7 @@ static int z_erofs_readpages(struct file *filp, struct address_space *mapping, struct page *head = NULL; LIST_HEAD(pagepool); - trace_erofs_readpages(mapping->host, lru_to_page(pages), + trace_erofs_readpages(mapping->host, lru_to_page(pages)->index, nr_pages, false); f.headoffset = (erofs_off_t)lru_to_page(pages)->index << PAGE_SHIFT; diff --git a/include/trace/events/erofs.h b/include/trace/events/erofs.h index 27f5caa6299a..bf9806fd1306 100644 --- a/include/trace/events/erofs.h +++ b/include/trace/events/erofs.h @@ -113,10 +113,10 @@ TRACE_EVENT(erofs_readpage, TRACE_EVENT(erofs_readpages, - TP_PROTO(struct inode *inode, struct page *page, unsigned int nrpage, + TP_PROTO(struct inode *inode, pgoff_t start, unsigned int nrpage, bool raw), - TP_ARGS(inode, page, nrpage, raw), + TP_ARGS(inode, start, nrpage, raw), TP_STRUCT__entry( __field(dev_t, dev ) @@ -129,7 +129,7 @@ TRACE_EVENT(erofs_readpages, TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->nid = EROFS_I(inode)->nid; - __entry->start = page->index; + __entry->start = start; __entry->nrpage = nrpage; __entry->raw = raw; ), -- 2.24.1