Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3785346ybi; Mon, 29 Jul 2019 12:34:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqxO2vHO1f76lVqjXf71mdBqm7svwcfX4rgJs/os5DpRJ7DAz5d+hfePfeZ9hZ5nrSfbqb2A X-Received: by 2002:a63:b64:: with SMTP id a36mr96463741pgl.215.1564428883792; Mon, 29 Jul 2019 12:34:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564428883; cv=none; d=google.com; s=arc-20160816; b=WtBwvvWrxXo72qa6BDsdAlcR4VNWIsuyfrLelVJEk7o12+3OtHoQE6l8va+Vm7tPwM YzMju6KKudCOT17muazptbOVJ1Ii/nqGUfnqhajQHxINuScfiNKM4IAx8wD0ycL9aEBr HURYPrA0N4tCEdptzb+r4gWFZeXVpNaZf2S5XNHuHNGTLGGEuI3UF6mTxbi47nXxjrEf Sc9vBnUb9m6Gpm58o28+VH2WEdLgfY6hTMMNeAoMSg90gGEKbuIulhUKCo+Mc9/zLUlY 4uvaNyd7rHVqYSeORERG3ROvuKEtMG18LOouxc0CYESG0huMq0yxCAaElsN15spVwfF0 jDgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rEfxhEB6kmtEcZQlSyGn5kSGT3i8tPgLUUTHTbuJKL8=; b=OZUYHBr5ZjxlvsCv/77iQesVy2PpnXT9r2gCA4I3uttK/M/hB8150gn+uzi65VbET0 hl+pYrkk9p3xoO0IihiRQvR0CFASb74YUpaiW3j2AtG421RpnQVDqfqXECNLMjTcznVl vkN/3OqCzw2FMAJYJowPitK+iNqMfUxQ4CIuvj84FodicFHGyFhdscVxCN8hHh4ELQhF IvctZxptoXyHNi55aIScTJZfJ/qhjpaYfovRQe28aBtu1Z6DQ/rquApnY6hLPlgjBoFN 8Z2sWk6L0LaNRNLy58+nnJn1M3SOBxhIr2ET817EO+mEfGGsxj0JIsiAFzWT3hJvqYL8 Cqpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VYpx5xU0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r129si29306552pgr.21.2019.07.29.12.34.29; Mon, 29 Jul 2019 12:34:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VYpx5xU0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730177AbfG2Tbe (ORCPT + 99 others); Mon, 29 Jul 2019 15:31:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:44448 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730171AbfG2Tbd (ORCPT ); Mon, 29 Jul 2019 15:31:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 768332070B; Mon, 29 Jul 2019 19:31:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564428692; bh=Gzf3WWtkrrowPcmltvuaNRoEbG4Dir5SZm/LTKsAl8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VYpx5xU0I5mM03xdwodLakCJNxxwQvbNiMiMPjRR05L3skCIvqVd2ARZQjnV+2kEz Vrs3PhCsajMXot3Ye1TP7B+EfZY2S8RJU00VzLr1jdZW1GOH2d07HXMpy7QlNHomjq Q1uN8vXTLXNfy8N7o7bfP8BvOcDNx4XOMJcZBmz4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Filipe Manana , David Sterba Subject: [PATCH 4.14 157/293] Btrfs: fix data loss after inode eviction, renaming it, and fsync it Date: Mon, 29 Jul 2019 21:20:48 +0200 Message-Id: <20190729190836.588994383@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190820.321094988@linuxfoundation.org> References: <20190729190820.321094988@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Filipe Manana commit d1d832a0b51dd9570429bb4b81b2a6c1759e681a upstream. When we log an inode, regardless of logging it completely or only that it exists, we always update it as logged (logged_trans and last_log_commit fields of the inode are updated). This is generally fine and avoids future attempts to log it from having to do repeated work that brings no value. However, if we write data to a file, then evict its inode after all the dealloc was flushed (and ordered extents completed), rename the file and fsync it, we end up not logging the new extents, since the rename may result in logging that the inode exists in case the parent directory was logged before. The following reproducer shows and explains how this can happen: $ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ mkdir /mnt/dir $ touch /mnt/dir/foo $ touch /mnt/dir/bar # Do a direct IO write instead of a buffered write because with a # buffered write we would need to make sure dealloc gets flushed and # complete before we do the inode eviction later, and we can not do that # from user space with call to things such as sync(2) since that results # in a transaction commit as well. $ xfs_io -d -c "pwrite -S 0xd3 0 4K" /mnt/dir/bar # Keep the directory dir in use while we evict inodes. We want our file # bar's inode to be evicted but we don't want our directory's inode to # be evicted (if it were evicted too, we would not be able to reproduce # the issue since the first fsync below, of file foo, would result in a # transaction commit. $ ( cd /mnt/dir; while true; do :; done ) & $ pid=$! # Wait a bit to give time for the background process to chdir. $ sleep 0.1 # Evict all inodes, except the inode for the directory dir because it is # currently in use by our background process. $ echo 2 > /proc/sys/vm/drop_caches # fsync file foo, which ends up persisting information about the parent # directory because it is a new inode. $ xfs_io -c fsync /mnt/dir/foo # Rename bar, this results in logging that this inode exists (inode item, # names, xattrs) because the parent directory is in the log. $ mv /mnt/dir/bar /mnt/dir/baz # Now fsync baz, which ends up doing absolutely nothing because of the # rename operation which logged that the inode exists only. $ xfs_io -c fsync /mnt/dir/baz $ mount /dev/sdb /mnt $ od -t x1 -A d /mnt/dir/baz 0000000 --> Empty file, data we wrote is missing. Fix this by not updating last_sub_trans of an inode when we are logging only that it exists and the inode was not yet logged since it was loaded from disk (full_sync bit set), this is enough to make btrfs_inode_in_log() return false for this scenario and make us log the inode. The logged_trans of the inode is still always setsince that alone is used to track if names need to be deleted as part of unlink operations. Fixes: 257c62e1bce03e ("Btrfs: avoid tree log commit when there are no changes") CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/tree-log.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -5266,9 +5266,19 @@ log_extents: } } + /* + * Don't update last_log_commit if we logged that an inode exists after + * it was loaded to memory (full_sync bit set). + * This is to prevent data loss when we do a write to the inode, then + * the inode gets evicted after all delalloc was flushed, then we log + * it exists (due to a rename for example) and then fsync it. This last + * fsync would do nothing (not logging the extents previously written). + */ spin_lock(&inode->lock); inode->logged_trans = trans->transid; - inode->last_log_commit = inode->last_sub_trans; + if (inode_only != LOG_INODE_EXISTS || + !test_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &inode->runtime_flags)) + inode->last_log_commit = inode->last_sub_trans; spin_unlock(&inode->lock); out_unlock: if (unlikely(err))