From patchwork Wed May 30 10:00:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10438307 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 47A9C602CC for ; Wed, 30 May 2018 10:02:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38F24288B7 for ; Wed, 30 May 2018 10:02:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D832288ED; Wed, 30 May 2018 10:02:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A93F1288B7 for ; Wed, 30 May 2018 10:02:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 931E26B029A; Wed, 30 May 2018 06:01:34 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8E2E96B029C; Wed, 30 May 2018 06:01:34 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75C526B029D; Wed, 30 May 2018 06:01:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 35D146B029A for ; Wed, 30 May 2018 06:01:34 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id b25-v6so10618001pfn.10 for ; Wed, 30 May 2018 03:01:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=HAgtzCAD7lmIHCfiQ5wPuA8D2M02FkvPWYiwQnbZj3w=; b=t0WdorCJVaeyBsi7wzTpzu6g3bsORnAk/GTAvF/53+1YK3P53MJC90vsD+aHsUMAhM Pjuq4ejtEJLoVzYeknqdJX2Zjg76b9E3pg1wfqT8XPt5l0CkZPdVZhAdc9eox0VqRaaY k2f+zwEvNoO8YUQFcV0mITlpl8bZFCbgMl7CpULleMi4BPmzKSgw1sUQa2KnH+BdBmsF UBZLclXLvbX7WPb8vlZVxTb1B4xHmH6PbbInI9uAmt+tbFWxepoGMiDqNC5r0hpCi5iC IFzhV9ngb4T0dxM8yPHzAwhpDpnAeTeFXPLesFZA4I641V918D+oG2pAJtHz/PB9yY7b X3nA== X-Gm-Message-State: ALKqPwczxVlRDqMriBCVfTT+TjQ2K+wWRH0pjEDk1u2EOkiDwxd+AJOg am54jK+pC08pExzj944/a1Nb6f+tpjLWQStOGXJYlc1oVA9css3+Ha4xhI40cOIY0Z85oVC2TPh rPEz5ROHY0CvgEO/h79p4Q0iOPzyvLL3Qg3w8R1W7aCO4g5AVpGFNKYbEafz2BSI= X-Received: by 2002:a65:490d:: with SMTP id p13-v6mr1673764pgs.84.1527674493837; Wed, 30 May 2018 03:01:33 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIngsvPSBjzOCE3LXnQgs7lNm9u1fOIQpvgGwP3h9P9HZ9BwGOOOOMG23cxbJN6AuDhoYLe X-Received: by 2002:a65:490d:: with SMTP id p13-v6mr1673712pgs.84.1527674492983; Wed, 30 May 2018 03:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674492; cv=none; d=google.com; s=arc-20160816; b=Mw6ysPo//QBkDjjRdkH2QAc7cJ6U748DcscQ/DyZQbFf7UpTymnzf2xwD7NDrRliHU AHaCJ19YvThdQ+IvtEfxtWSVhdLPdk8dHIYkJ9R+R14vmR4kIsoYB9eqwo2GtIgZ6Db5 QMS5KW7XrNq3PBMyCaI6vf5uPqF6nWOoqE4JIv6k9CaEpkkKMWydaNc0OG5LVwu6zObx 6PWQLdScKqOnzYbMjoeDp7u3leCB9m9Z7DmB0coRwYuNjQ4rblHaj87iGP8XdQ6WH4md fUI3wYxhNCbA9hXREh0mXEbT1MTmScN+ZcraEtVXapFF97WMhqDCJHH4IDLKlJA9cBOx gf1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=HAgtzCAD7lmIHCfiQ5wPuA8D2M02FkvPWYiwQnbZj3w=; b=KuglJnK2JQiPDRPfdf9V4BmGaZt8DPzFA6Vm0QPbtXSmcjLoxwr6Gedo265OFKVcfo NyY5XGzDG288PHASbNS8UtvGvPJk9z8np5K96JQDqJbAOmQvUGMbwf2j9XYBw16Xzoi3 KOYQmRVx6ToIDI1InCEDyZiGeZHBxBH1izm8YTAQ730/WTRSjB+Ai6u5thZqKN1lS8Cs 6fd/ExD0QmNhNDMao9n6VJ/AEL8KA22eG5UXvRoc3RGKkjpbRciLE1/MhQUL6q1E1+L2 CGgtCh8evifcrb0I844CprtqkjkK8oDfqAQcJ9iYDB1eLxw9j/6MFP1gN0FdW4Lh3giD QQ/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=MPZL1KxS; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id z18-v6si34173019pfd.357.2018.05.30.03.01.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 03:01:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=MPZL1KxS; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding: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=HAgtzCAD7lmIHCfiQ5wPuA8D2M02FkvPWYiwQnbZj3w=; b=MPZL1KxSJtDIGN7OUl59U3okK 0fFyJl+ZDdraBmrH/WEauBosbVgBkEImw3xJK98/TuKqiEmYZXOHejtFGpJcf+tCF5FROcb3V0ag3 iF6Q8aHYxeAGB2T4o1O6qgmJ5V/boyYXg+LXDX6Qi4eY2cL0rUGhmlmEXQn93pN04+cClFaXCqh5I m7xHyo65IzAP7+QPOcm7ggTaxeNZTO2hK8Sd+9nMQRYKHU5xdfz+3hNT83JswLVvq2NUzXBS0PeqI 2wTWZhCzu3eQDs0B3sQ3lYFm/IRBIhIlC32XezNDbXBbPw21bFemhXsOWfzWedsTC/k47vHRPbnIo fvexZBwJA==; Received: from 213-225-38-123.nat.highway.a1.net ([213.225.38.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNxv9-000095-SU; Wed, 30 May 2018 10:01:32 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 18/18] xfs: allow writeback on pages without buffer heads Date: Wed, 30 May 2018 12:00:13 +0200 Message-Id: <20180530100013.31358-19-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530100013.31358-1-hch@lst.de> References: <20180530100013.31358-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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: X-Virus-Scanned: ClamAV using ClamSMTP Disable the IOMAP_F_BUFFER_HEAD flag on file systems with a block size equal to the page size, and deal with pages without buffer heads in writeback. Thanks to the previous refactoring this is basically trivial now. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Reviewed-by: Brian Foster --- fs/xfs/xfs_aops.c | 47 +++++++++++++++++++++++++++++++++------------- fs/xfs/xfs_iomap.c | 3 ++- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 84f88cecd2f1..6640377b6eae 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -91,6 +91,19 @@ xfs_find_daxdev_for_inode( return mp->m_ddev_targp->bt_daxdev; } +static void +xfs_finish_page_writeback( + struct inode *inode, + struct bio_vec *bvec, + int error) +{ + if (error) { + SetPageError(bvec->bv_page); + mapping_set_error(inode->i_mapping, -EIO); + } + end_page_writeback(bvec->bv_page); +} + /* * We're now finished for good with this page. Update the page state via the * associated buffer_heads, paying attention to the start and end offsets that @@ -103,7 +116,7 @@ xfs_find_daxdev_for_inode( * and buffers potentially freed after every call to end_buffer_async_write. */ static void -xfs_finish_page_writeback( +xfs_finish_buffer_writeback( struct inode *inode, struct bio_vec *bvec, int error) @@ -178,9 +191,12 @@ xfs_destroy_ioend( next = bio->bi_private; /* walk each page on bio, ending page IO on them */ - bio_for_each_segment_all(bvec, bio, i) - xfs_finish_page_writeback(inode, bvec, error); - + bio_for_each_segment_all(bvec, bio, i) { + if (page_has_buffers(bvec->bv_page)) + xfs_finish_buffer_writeback(inode, bvec, error); + else + xfs_finish_page_writeback(inode, bvec, error); + } bio_put(bio); } @@ -782,13 +798,16 @@ xfs_writepage_map( { LIST_HEAD(submit_list); struct xfs_ioend *ioend, *next; - struct buffer_head *bh; + struct buffer_head *bh = NULL; ssize_t len = i_blocksize(inode); int error = 0; int count = 0; loff_t file_offset; /* file offset of page */ unsigned poffset; /* offset into page */ + if (page_has_buffers(page)) + bh = page_buffers(page); + /* * Walk the blocks on the page, and we we run off then end of the * current map or find the current map invalid, grab a new one. @@ -797,11 +816,9 @@ xfs_writepage_map( * replace the bufferhead with some other state tracking mechanism in * future. */ - file_offset = page_offset(page); - bh = page_buffers(page); - for (poffset = 0; + for (poffset = 0, file_offset = page_offset(page); poffset < PAGE_SIZE; - poffset += len, file_offset += len, bh = bh->b_this_page) { + poffset += len, file_offset += len) { /* past the range we are writing, so nothing more to write. */ if (file_offset >= end_offset) break; @@ -809,9 +826,10 @@ xfs_writepage_map( /* * Block does not contain valid data, skip it. */ - if (!buffer_uptodate(bh)) { + if (bh && !buffer_uptodate(bh)) { if (PageUptodate(page)) ASSERT(buffer_mapped(bh)); + bh = bh->b_this_page; continue; } @@ -836,10 +854,15 @@ xfs_writepage_map( * meaningless for holes (!mapped && uptodate), so check we did * have a buffer covering a hole here and continue. */ + if (bh) + bh = bh->b_this_page; continue; } - xfs_map_at_offset(inode, bh, &wpc->imap, file_offset); + if (bh) { + xfs_map_at_offset(inode, bh, &wpc->imap, file_offset); + bh = bh->b_this_page; + } xfs_add_to_ioend(inode, file_offset, page, wpc, wbc, &submit_list); count++; @@ -939,8 +962,6 @@ xfs_do_writepage( trace_xfs_writepage(inode, page, 0, 0); - ASSERT(page_has_buffers(page)); - /* * Refuse to write the page out if we are called from reclaim context. * diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index f949f0dd7382..93c40da3378a 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -1031,7 +1031,8 @@ xfs_file_iomap_begin( if (XFS_FORCED_SHUTDOWN(mp)) return -EIO; - iomap->flags |= IOMAP_F_BUFFER_HEAD; + if (i_blocksize(inode) < PAGE_SIZE) + iomap->flags |= IOMAP_F_BUFFER_HEAD; if (((flags & (IOMAP_WRITE | IOMAP_DIRECT)) == IOMAP_WRITE) && !IS_DAX(inode) && !xfs_get_extsz_hint(ip)) {