From patchwork Wed May 23 14:43:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421665 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 3B51D60545 for ; Wed, 23 May 2018 14:46:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C2F42897A for ; Wed, 23 May 2018 14:46:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2095B289B5; Wed, 23 May 2018 14:46:56 +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 BF9FA2897A for ; Wed, 23 May 2018 14:46:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8EBB16B029F; Wed, 23 May 2018 10:45:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 86FE76B02A1; Wed, 23 May 2018 10:45:55 -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 6C4456B02A2; Wed, 23 May 2018 10:45:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f71.google.com (mail-pl0-f71.google.com [209.85.160.71]) by kanga.kvack.org (Postfix) with ESMTP id 291756B029F for ; Wed, 23 May 2018 10:45:55 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id q16-v6so14347376pls.15 for ; Wed, 23 May 2018 07:45:55 -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=D5Q5e9rGzVwB6bZEEw3uvuMLacYpauARMe0+3bZI2kA=; b=LBiwO/L5nbgTmuF6VNgF8LPEq9f1hKQ7o6l35My994AUD17/DK3YFM7yRn9heKwaQX yT/Wg9yO340Xqa+qHiMJRU1gTsjZKdWKbZWiNOTCQ3rMhElt9nFsiQQoiWF9EGyC21Yd 0C3iyRXRotEpmVm4syhDwA43mZhw3ZpVvh4DlcwBRpu+sbkd8/DUKCghYIXcYJ8snltX nw4l8wjO9qfTXY6aFXjWZ8iaanC9Pn61R+G3wfyW4N0MRkNGkYP7WY1bMUK76CRvlMrM 9AFk+vGX7USoEWVKySQI5t1LfUbqzGmjRvu+SjVzHRbcBjzYQm4b+ZBm7tnBdY02p0Sm hmVQ== X-Gm-Message-State: ALKqPwdL9EynT0qR5MQEFUWwiPU6VLS3lbsOQ/gjmBIFljTZ3wIzyPGF iwV1I/R5znXupUAC707Ux2KYCiAt9Z8B0cN1ZnGFrGcTaNk3KJCUzn3SUdWhvlpBx6V/+cszm3y nEZjwTJDgvjqz+ZGzPhz68dx52Mj9QNO9v6nfbCZx+wHoAT4X+LGDz5eN3yXo+9U= X-Received: by 2002:a62:7105:: with SMTP id m5-v6mr3114078pfc.167.1527086754807; Wed, 23 May 2018 07:45:54 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqctB8JNno9VkNFp7FtSdurwmnkse/0P3ect8xt/Zb2kBHWCZiDU59xlDg2s1KGVhVlfZWa X-Received: by 2002:a62:7105:: with SMTP id m5-v6mr3114027pfc.167.1527086753922; Wed, 23 May 2018 07:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086753; cv=none; d=google.com; s=arc-20160816; b=FuE/Bjz32S9VFa+khdukBseYX+k/Ph1itafHFlS3B4+yaNYamgkDMb+PLMLp21Febp PIdZXVHFnSxyKOjQ33Fgz2N6AJO3CY8OwJaGRSNFuqF6mWxqzEUrswsGHTj55NPuuQD5 QkA7kP1sonH+L0zWRdE3qqIhzctu/B04hUPJR8+L0Htv/uuEXfhzEUnldtFsfebVrHxS tqZHqwEFkLBq+zsQ2+IQoWepubxfmx6wXHxyJSqcnR9EKvufwCHLinsvEJ/ZJ1O95/s0 V8sRZp1uE8FaMCCjDcdt4/iq5re49CWUHTvOph40xTGPiZliOGkyDntiEazu24I/by3g Y8mw== 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=D5Q5e9rGzVwB6bZEEw3uvuMLacYpauARMe0+3bZI2kA=; b=ZFEPdAneHHFn22S8420XVXmKN3yGQAn40lZAp5PT1ZNOAtPWzqWvFHtcafl5NvV3ex NbqIB+haTQgcEJxJ8inpw6d8BSZbN0VQ6ihnnxfTZrDGcsTj/O8new52UJ8x1ovWIsia R5jy8RkcvyEJuHCIdhbGAt9ZiGB0+7itLY1IhGHGsF5ASCUqOuh5jgO5UE9QOzM0hj/c g3MibHAB1B7z3VCmiOBZM8tUJlaSpNi4DT7oAb4W6WLa8rXGJLdauURk04kktPis9w9a wMpkvVj1EOD0sot2cMaelRjVH3dTWmMc5FZ10tReL2bmBIl3ENLET7TXbq/nyUq4o/q4 qWNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=fcusgm8a; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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 r3-v6si21011953pli.324.2018.05.23.07.45.53 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:45:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+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=fcusgm8a; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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=D5Q5e9rGzVwB6bZEEw3uvuMLacYpauARMe0+3bZI2kA=; b=fcusgm8aEeKH2rALv1ZKhJG2h v5UYu5aE4O5NPHRRgOiMyXJ1JuL3lAD50SvprHHnIXiBbILJ98Jb6GxNGYpun9g5gWpFYWlHAKdjm VqKMf6oHG0ssuxKQWh7LjXtu5KZrURbidTvkzfSqPQ/lSu8LDDilcSZjQSN7AoPZ31Wpd7dsnqxIF 13tH7JsOdFA4iGwTlntyBE7mlVghuRig1sKcyrM10bvU7WvA4G8llz/4x/OBp3WTmHDwmrp9zsydD nb6XruH9E6o0I6JrMV0lR5RqRBNquMHAY2jXnvmThbzNq9ms+AZkT0LMLvd+IKn6/+FVjxayWUqKq mx6Y9Ic6g==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLV1Q-0002JB-GK; Wed, 23 May 2018 14:45:49 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 34/34] xfs: allow writeback on pages without buffer heads Date: Wed, 23 May 2018 16:43:57 +0200 Message-Id: <20180523144357.18985-35-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523144357.18985-1-hch@lst.de> References: <20180523144357.18985-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 --- 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 492f4a4b1deb..efa2cbb27d67 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); } @@ -792,13 +808,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. @@ -807,11 +826,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; @@ -819,9 +836,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; } @@ -846,10 +864,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++; @@ -949,8 +972,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)) {