From patchwork Sat May 19 15:27:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10412879 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 9D8D5601F9 for ; Sat, 19 May 2018 15:27:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A06F28618 for ; Sat, 19 May 2018 15:27:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7ED262865F; Sat, 19 May 2018 15:27:23 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 314B728618 for ; Sat, 19 May 2018 15:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752424AbeESP1V (ORCPT ); Sat, 19 May 2018 11:27:21 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:52470 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752404AbeESP1U (ORCPT ); Sat, 19 May 2018 11:27:20 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w4JFPteJ082607; Sat, 19 May 2018 15:27:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2017-10-26; bh=akmqoDrUcxLI0Q4MZGrj+I98sn22HQWOZKFOrA/f8+g=; b=ZP8+CRMXYHJaRTuCq+TM6RIpL2zUd/3hcUl5YgavyEDB+5htPUOC5xOdyh0EU+PBfzHW pyt/rVyN8GEtFbS7JT1y0/gO1bZILnXAt0ub88BUbbzkxSqrXKliv5XCBiMAD9Y5o+ML iadQTIaOu223sjVUZOlWhmkwCwfKpCUINljW3iQr9XuhxHJtX/kHtxksLqMPwBL7AC/Y dG8XPeAKSE3N2KNdo/SLha9KliJ5mNBFCZNME07iv7eNiLthGTWl0a64DBW1BKZtIxvI 55vgmoOoixxS2e/iLJOx7noddHG5tLnXqMg2sLIkd5SvdAPYjLrbBTDtunyLyTv4apmZ EQ== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2j2ck98nyf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 19 May 2018 15:27:03 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w4JFR2HQ007902 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 19 May 2018 15:27:02 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w4JFR2et013375; Sat, 19 May 2018 15:27:02 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 19 May 2018 08:27:02 -0700 Date: Sat, 19 May 2018 08:27:00 -0700 From: "Darrick J. Wong" To: Jeff Layton Cc: "Theodore Y. Ts'o" , Matthew Wilcox , linux-fsdevel@vger.kernel.org, fstests@vger.kernel.org, xfs Subject: [PATCH] fs: clear writeback errors in inode_init_always Message-ID: <20180519152700.GB4507@magnolia> References: <20180518225037.GA26206@thunk.org> <630faadb74f608aa5a42649b81657e8b62d46bc3.camel@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <630faadb74f608aa5a42649b81657e8b62d46bc3.camel@kernel.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8898 signatures=668700 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=759 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1805190158 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong In inode_init_always(), we clear the inode mapping flags, which clears any retained error (AS_EIO, AS_ENOSC) bits. Unfortunately, we do not also clear wb_err, which means that old mapping errors can leak through to new inodes. This is crucial for the XFS inode allocation path because we recycle old in-core inodes and we do not want error state from an old file to leak into the new file. This bug was discovered by running generic/036 and generic/047 in a loop and noticing that the EIOs generated by the collision of direct and buffered writes in generic/036 would survive the remount between 036 and 047, and get reported to the fsyncs (on different files on a reformatted fs!) in generic/047. Since we're changing the semantics of inode_init_always, we must also change xfs_reinit_inode to retain the writeback error state when we go to recover an inode that has been torn down in the vfs but not yet disposed of by XFS. Signed-off-by: Darrick J. Wong --- fs/inode.c | 1 + fs/xfs/xfs_icache.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/fs/inode.c b/fs/inode.c index 13ceb98c3bd3..3b55391072f3 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -178,6 +178,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode) mapping->a_ops = &empty_aops; mapping->host = inode; mapping->flags = 0; + mapping->wb_err = 0; atomic_set(&mapping->i_mmap_writable, 0); mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE); mapping->private_data = NULL; diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index 164350d91efc..f4d672cb60a4 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -298,6 +298,7 @@ xfs_reinit_inode( uint64_t version = inode_peek_iversion(inode); umode_t mode = inode->i_mode; dev_t dev = inode->i_rdev; + errseq_t old_err = inode->i_mapping->wb_err; error = inode_init_always(mp->m_super, inode); @@ -306,6 +307,7 @@ xfs_reinit_inode( inode_set_iversion_queried(inode, version); inode->i_mode = mode; inode->i_rdev = dev; + inode->i_mapping->wb_err = old_err; return error; }