From patchwork Fri May 18 16:48:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10411367 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 AE83C6031B for ; Fri, 18 May 2018 16:50:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DD3028619 for ; Fri, 18 May 2018 16:50:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91EFB288E6; Fri, 18 May 2018 16:50:44 +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=ham 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 E7CFA28619 for ; Fri, 18 May 2018 16:50:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6946F6B0638; Fri, 18 May 2018 12:50:11 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 645806B063A; Fri, 18 May 2018 12:50:11 -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 50ABF6B063B; Fri, 18 May 2018 12:50:11 -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 086776B0638 for ; Fri, 18 May 2018 12:50:11 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id r63-v6so5007405pfl.12 for ; Fri, 18 May 2018 09:50:11 -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=+DiSOJSRMQDFzUjBi5IIcEqppkNyRSQZgXTLy2QP5WY=; b=DXLvMMDfnJbVzjZmPU1UdQDAPoalbyNDF6ujP6lfX6/j5f20iCSnqXvuSjHKPEX/OS vGlV2XzAUfgfOm5oDHiQ5k2Ze7FEb8fxSnDCVV/qREM0OjbL55cCKEhXmmeH4TdVDxG8 Ho080VN5ni2V3WqsPiTmwa1NHGqS4xZ9/HgGw0AK5zAPaXpi38E+CcrdbwvNXzmnm9YL QuXNmjI4ZXSBr6JfO3JNCxnA+vDHfOgyTeqQXYtdYxtX9uuBRSkEPltShJZUk+rZfsW4 b4uFKCpenfn3cYwnsJ3/QeQtHFl/yB9N8BbFaRKgWans0cJkeWTL/uDxTgBk0sFSqoKM d5mA== X-Gm-Message-State: ALKqPwcYPbeMsi7AFISfD06FBHRrDmq21PVR5CRumNH+dtRv0MnSIIfu 60NWh6QESlCftA4FM2AF/d7nxysamYil/ClE6ohunLlMgVLu7E6tBNqQQV7sYet7bTPKLigLWs2 5VvesOe0fFo/zvjjRj5ciuI2lC9oP3pJQybIR6a3UcjqXk10UsvubJ9LleIZMrX8= X-Received: by 2002:a17:902:6e4:: with SMTP id 91-v6mr10213572plh.63.1526662210723; Fri, 18 May 2018 09:50:10 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoHiwSf3+NKB4MDTaG20HXXnS3891lFENtjhErT7RAWEVPhDZDiXtPUZGM53NzcUWDcdDwY X-Received: by 2002:a17:902:6e4:: with SMTP id 91-v6mr10213532plh.63.1526662210039; Fri, 18 May 2018 09:50:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662210; cv=none; d=google.com; s=arc-20160816; b=nFq36PtaWgkl67nHNBYeUOvnYZ54UCYMIBpwC2zDFg5zhGWOfBwcY8juUNwwIg2swF T2WU/sYcpx5KhKnpjmb2Tz8qjJAWu97iVPWcJ9awJIuUyu+tguoW1HmdT6GU0UClfRc6 4+jyOKonwq4yNGKDUC1ukSgVyPIynlD7H7EqBISXExp5UPDymCxjqqR6IXIWhpYKbhx6 UKJpa1myVYAxw2OAjNAcuh7DntvDhTrdiZ+2Zb/4S3si5gcbdY7qGbJJrx8+Oc5chpzB i9KiFuG6wsqn5wdOfvp6dEswrcC9N1kKkJJXPsQz8NSDVhLlOVlflzVUuQBJ9ZBI9P7a +QmQ== 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=+DiSOJSRMQDFzUjBi5IIcEqppkNyRSQZgXTLy2QP5WY=; b=Ve6pW99GVxpn32iwlsVCLFTgw+wgeSoF34mSpmdYc0Evdgup/LuyYxfzrzjH/vhFLN MmwMwTe+agtovEg0S13z8pL5BQIg9oRjgLQu5iFEtZrvoPXLrLpfRrvqxEL25GJLmi5y 7k9hMKxY9uazV81m5hLegb8ZR6R0Kq+upPeoinYlnJ//jz8crJJq5vKtzoIIFdGWEo+E 6HyyuQXL9dsFlYc8hk1S7V7ziYslZJwmgGrEJgr6A24/IMNIK45l47cpxD1A5d7H65Px gJ86NMnxFI4eeJnJwcyRMN7xuePThe5qcRIRmdA0s8D6UfAi1t5KFIUntnsOvwZ9a9y0 2Bkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=hph8jf6V; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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 v17-v6si7870530pfg.222.2018.05.18.09.50.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:50:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+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=hph8jf6V; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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=+DiSOJSRMQDFzUjBi5IIcEqppkNyRSQZgXTLy2QP5WY=; b=hph8jf6VIa/D4Swpg6m/ou71n bZt9O0h4D9WMmqR+8MMzL9pjV4U6/nrkGyevYHZEs1ugBmHZTjuhek/tOMjoUQk9JpcNcZdSmqEWC SQmfdxsG5EQfrqE5dCjYLUz5cnat0VfG7kthVn4zhs4uQgcfHH1frRUwDv86DUIMWGqfOL3l/+syy f8BMSuhhmTSsDGi5nauaAOaucSx3YTm3wCULqD0V4slD/hzrOXLIMrJzBdR29WuWjX83yAcMoN6ox WAPyBk1j4CaJ8xRJb6Nlca3OQbOzlTa2gtUmeCtkEod1bnldQYxo0DCACLcr9jcR6p3T0oAnzimCa uFJoS5o4w==; Received: from 80-109-164-210.cable.dynamic.surfer.at ([80.109.164.210] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJia0-0007kO-EN; Fri, 18 May 2018 16:50:08 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 32/34] xfs: refactor the tail of xfs_writepage_map Date: Fri, 18 May 2018 18:48:28 +0200 Message-Id: <20180518164830.1552-33-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518164830.1552-1-hch@lst.de> References: <20180518164830.1552-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 Rejuggle how we deal with the different error vs non-error and have ioends vs not have ioend cases to keep the fast path streamlined, and the duplicate code at a minimum. Signed-off-by: Christoph Hellwig --- fs/xfs/xfs_aops.c | 65 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index dd92d99df51f..a4e53e0a57c2 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -883,7 +883,14 @@ xfs_writepage_map( * submission of outstanding ioends on the writepage context so they are * treated correctly on error. */ - if (count) { + if (unlikely(error)) { + if (!count) { + xfs_aops_discard_page(page); + ClearPageUptodate(page); + unlock_page(page); + goto done; + } + /* * If the page was not fully cleaned, we need to ensure that the * higher layers come back to it correctly. That means we need @@ -892,43 +899,35 @@ xfs_writepage_map( * so another attempt to write this page in this writeback sweep * will be made. */ - if (error) { - set_page_writeback_keepwrite(page); - } else { - clear_page_dirty_for_io(page); - set_page_writeback(page); - } - unlock_page(page); - - /* - * Preserve the original error if there was one, otherwise catch - * submission errors here and propagate into subsequent ioend - * submissions. - */ - list_for_each_entry_safe(ioend, next, &submit_list, io_list) { - int error2; - - list_del_init(&ioend->io_list); - error2 = xfs_submit_ioend(wbc, ioend, error); - if (error2 && !error) - error = error2; - } - } else if (error) { - xfs_aops_discard_page(page); - ClearPageUptodate(page); - unlock_page(page); + set_page_writeback_keepwrite(page); } else { - /* - * We can end up here with no error and nothing to write if we - * race with a partial page truncate on a sub-page block sized - * filesystem. In that case we need to mark the page clean. - */ clear_page_dirty_for_io(page); set_page_writeback(page); - unlock_page(page); - end_page_writeback(page); } + unlock_page(page); + + /* + * Preserve the original error if there was one, otherwise catch + * submission errors here and propagate into subsequent ioend + * submissions. + */ + list_for_each_entry_safe(ioend, next, &submit_list, io_list) { + int error2; + + list_del_init(&ioend->io_list); + error2 = xfs_submit_ioend(wbc, ioend, error); + if (error2 && !error) + error = error2; + } + + /* + * We can end up here with no error and nothing to write if we race with + * a partial page truncate on a sub-page block sized filesystem. + */ + if (!count) + end_page_writeback(page); +done: mapping_set_error(page->mapping, error); return error; }