From patchwork Tue May 22 16:43:59 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: 10419169 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 741D460545 for ; Tue, 22 May 2018 16:44:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 638ED28FC9 for ; Tue, 22 May 2018 16:44:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 586D628F91; Tue, 22 May 2018 16:44:39 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 0C1A628F90 for ; Tue, 22 May 2018 16:44:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751470AbeEVQof (ORCPT ); Tue, 22 May 2018 12:44:35 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:54390 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269AbeEVQob (ORCPT ); Tue, 22 May 2018 12:44:31 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w4MGacbc094192; Tue, 22 May 2018 16:44:02 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=CrYIZyo3A29BMe/jJPnLh83tsKEXUIeGTvUUj00wgA0=; b=ivK5/HGfIJye1KT2HS/xqs7Xr8+NSH/qLJ/EQUKVWdsxj2KuIxwMPW+Ash+PY7KV9kNa oHZcIB3lHo3uG+zzQKQdXz42n6iLHxBvayVnV90XYiw30yJ6GvJOLtKQxAvH9Cbz1ZiA 9QkdJ8iP1uMB9cSOlaOkUBnTtit6ihN15BCjkwHJVOzfjuSXfwbZ0nCbo+I8/TJZua/d aWCH+qOCacAimoLneBFvkdHh36RJFezuauqA7mFqWEG/E+K/HpS4xsJ0N3s0mQASc74B jk4zVqsEOUgxkNQC/z/Nn39KPMkSz+DhMwnLUNxZN+qHdV7NfgmxCiGUlpgzuKvSi05Y og== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2130.oracle.com with ESMTP id 2j4nh78j55-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 May 2018 16:44:02 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w4MGi1ZC004350 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 May 2018 16:44:02 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w4MGi1nP024351; Tue, 22 May 2018 16:44:01 GMT Received: from localhost (/10.159.226.235) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 22 May 2018 09:44:00 -0700 Date: Tue, 22 May 2018 09:43:59 -0700 From: "Darrick J. Wong" To: xfs Cc: Matthew Wilcox , linux-fsdevel@vger.kernel.org, fstests@vger.kernel.org, Jeff Layton , Brian Foster Subject: [PATCH v3] fs: clear writeback errors in inode_init_always Message-ID: <20180522164359.GB12940@magnolia> References: <20180518225037.GA26206@thunk.org> <630faadb74f608aa5a42649b81657e8b62d46bc3.camel@kernel.org> <20180519152700.GB4507@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180519152700.GB4507@magnolia> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8901 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=870 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1805220183 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@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_ENOSPC) 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!) 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 Reviewed-by: Jeff Layton Reviewed-by: Brian Foster --- v3: clear error state when allocating new inode v2: retain AS_EIO/AS_ENOSPC across xfs inode reinit --- fs/inode.c | 1 + fs/xfs/xfs_icache.c | 9 +++++++++ fs/xfs/xfs_inode.c | 5 +++++ 3 files changed, 15 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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..d01f9544ff01 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -298,6 +298,10 @@ 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; + bool as_eio = test_bit(AS_EIO, &inode->i_mapping->flags); + bool as_enospc = test_bit(AS_ENOSPC, + &inode->i_mapping->flags); error = inode_init_always(mp->m_super, inode); @@ -306,6 +310,11 @@ xfs_reinit_inode( inode_set_iversion_queried(inode, version); inode->i_mode = mode; inode->i_rdev = dev; + inode->i_mapping->wb_err = old_err; + if (as_eio) + set_bit(AS_EIO, &inode->i_mapping->flags); + if (as_enospc) + set_bit(AS_ENOSPC, &inode->i_mapping->flags); return error; } diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 02eae5059231..6c47ea3e577b 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -835,6 +835,11 @@ xfs_ialloc( inode->i_mode |= S_ISGID; } + /* Reset all vfs error state. */ + inode->i_mapping->wb_err = 0; + clear_bit(AS_EIO, &inode->i_mapping->flags); + clear_bit(AS_ENOSPC, &inode->i_mapping->flags); + /* * If the group ID of the new file does not match the effective group * ID or one of the supplementary group IDs, the S_ISGID bit is cleared