Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3214317pxb; Mon, 9 Nov 2020 05:46:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXbTjZRPBA/rEoHFo0vMu9kV+LvIN7ktUoDCunT7+Z+z2lqn2Ur/WA2cB1B5p7ip6Y27rl X-Received: by 2002:a17:907:4186:: with SMTP id mz6mr15685393ejb.175.1604929611616; Mon, 09 Nov 2020 05:46:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604929611; cv=none; d=google.com; s=arc-20160816; b=pyQySNPIX0jhnysA5Di4ScNXpmHHMPsykamOrOjg9JPLsICM9Mr0hc6LeGCrarAVz2 ixe8A+M1Wje0y7ESAhz0l9SDsWjq9JvkqzRrefiXhimdtD4Z/RKaAz0G0qA3Yp6BC9iG NDXQOgQNdI/dub/n7qQV3QaPeiK0iFPzJ2U+HQk6UJWacTb73kscFvLAxINcIKliuEdD O50i2yybcU6eA0R/ymOXimDNUyc0ww7uP4MP3tSLg3DdUhHQBsRtIKQrfMyku4ShSUNR MroAdgIDkUGGeocAfbEeEc2j3JDfzbh6Zw8B4BrZtzW1gdKOGN6ZpWosa3PgcO4NA6lg AcTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gbktCZg5ObejYRl68/j8xcVAEG5aSlU257/rqNzxbhM=; b=Das5+pjQ6Ro2MZWSJGH9ocogSpNERvo2KVf0p0s4QLWUB7nDtuXQ+0kno0RTyBnolt zO8uBoXAc7zwe7zWizo6dKn3MoD1Jpb3lBCjgePZIyKK6bKZCrQH+i7c55cvZPgK54hz IDPeklP5uycowYK96TrP2QANieUu7EQZufg5RUdyGkeWYqloQwt7hPrdIp/rXg2QfI7I xsMzsmdYrywaU/wuhVsN77uRfflXse0DEPp0LISS0ODmiMSeLX+Y3VvMrjnPY4Qcsomb oQQxQnN6rf/NgHb62bOIEWiV1XvY+vNnAYplF9x9yqUitn7P32aY0VuguC7hHW5sFY8V 3oYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f5jqTQRE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m20si6969001eje.363.2020.11.09.05.46.27; Mon, 09 Nov 2020 05:46:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f5jqTQRE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731002AbgKINmt (ORCPT + 99 others); Mon, 9 Nov 2020 08:42:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:54856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730516AbgKINAj (ORCPT ); Mon, 9 Nov 2020 08:00:39 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 94E6C20684; Mon, 9 Nov 2020 13:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604926838; bh=RcEdDrwQajWD/uZnGvD0cyvI3H7zRfbmngLGa/xuX3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f5jqTQRErdeqo+i2i+UQZVyzqob+brKK9j5TNmUiHcLAdeO4XFx4tIef6ifatbgvO u8vh3vySUJr/TqliW/vhieKH6gdlSjZFxtxJvi8FbKiK9uisr3bbeuYpEwJR5CTgDP RmbGBkAGGBHO3LLJeBdWDvT/01GOhc+mmPjIG564= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Darrick J. Wong" , Chandan Babu R , Sasha Levin Subject: [PATCH 4.9 022/117] xfs: fix realtime bitmap/summary file truncation when growing rt volume Date: Mon, 9 Nov 2020 13:54:08 +0100 Message-Id: <20201109125026.705858569@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125025.630721781@linuxfoundation.org> References: <20201109125025.630721781@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Darrick J. Wong [ Upstream commit f4c32e87de7d66074d5612567c5eac7325024428 ] The realtime bitmap and summary files are regular files that are hidden away from the directory tree. Since they're regular files, inode inactivation will try to purge what it thinks are speculative preallocations beyond the incore size of the file. Unfortunately, xfs_growfs_rt forgets to update the incore size when it resizes the inodes, with the result that inactivating the rt inodes at unmount time will cause their contents to be truncated. Fix this by updating the incore size when we change the ondisk size as part of updating the superblock. Note that we don't do this when we're allocating blocks to the rt inodes because we actually want those blocks to get purged if the growfs fails. This fixes corruption complaints from the online rtsummary checker when running xfs/233. Since that test requires rmap, one can also trigger this by growing an rt volume, cycling the mount, and creating rt files. Signed-off-by: Darrick J. Wong Reviewed-by: Chandan Babu R Signed-off-by: Sasha Levin --- fs/xfs/xfs_rtalloc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index d812f84252d5b..3ce400158a0a8 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -1014,10 +1014,13 @@ xfs_growfs_rt( xfs_ilock(mp->m_rbmip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, mp->m_rbmip, XFS_ILOCK_EXCL); /* - * Update the bitmap inode's size. + * Update the bitmap inode's size ondisk and incore. We need + * to update the incore size so that inode inactivation won't + * punch what it thinks are "posteof" blocks. */ mp->m_rbmip->i_d.di_size = nsbp->sb_rbmblocks * nsbp->sb_blocksize; + i_size_write(VFS_I(mp->m_rbmip), mp->m_rbmip->i_d.di_size); xfs_trans_log_inode(tp, mp->m_rbmip, XFS_ILOG_CORE); /* * Get the summary inode into the transaction. @@ -1025,9 +1028,12 @@ xfs_growfs_rt( xfs_ilock(mp->m_rsumip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, mp->m_rsumip, XFS_ILOCK_EXCL); /* - * Update the summary inode's size. + * Update the summary inode's size. We need to update the + * incore size so that inode inactivation won't punch what it + * thinks are "posteof" blocks. */ mp->m_rsumip->i_d.di_size = nmp->m_rsumsize; + i_size_write(VFS_I(mp->m_rsumip), mp->m_rsumip->i_d.di_size); xfs_trans_log_inode(tp, mp->m_rsumip, XFS_ILOG_CORE); /* * Copy summary data from old to new sizes. -- 2.27.0