Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp10488948ybi; Thu, 25 Jul 2019 00:12:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqwcUMZyo7CGROaM5aj0BU5gZlp9QjE4MetMXC67SkfoGKqr7+udIlrJWQm2qCM0blMXKzUT X-Received: by 2002:a17:902:4283:: with SMTP id h3mr87078635pld.15.1564038747041; Thu, 25 Jul 2019 00:12:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564038747; cv=none; d=google.com; s=arc-20160816; b=ZZxiEQBs3Gs39rMZWYVytFEvrMOnmxhyeuFKK/MKJ+mplCk6jETwlqBs7RuMUNxxs3 EskIbdo5+lr9Rl+Ah8m91sX39h5VTtobrZo7lwhLQk4KidefjhjXRV5x0apbM3bteaED VP1se9BTLXWUyjjlyZeetB8ExBwHWKJk4DvsUl0KXnvWcCFW+dFDSXiQznqOrwm8VHuc Ao2RE6BlD5/i9pMXE+NORizv7eK5rRVOvLHwaY5MO3xn41WjYP6EBNsZDqXnYRCgk/fG JSgV2IrrXZYuO/ae4eOJwhh2R0ofcdv4Two9CRMGveRiQI7L/G57jvGhyWyIbOoXvrg2 lyvg== 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=snLgPDuOUVv6I/V9mW4yl0sz7IC57H+4FoJlSB4spp4=; b=u5MJL2NAXE1P1iLpyGItYTXFlE0tWy/GY4UfVHhXpM+/kr17O6nPrPlyhn5KKnLwfU B59LPp8lzxWG2zj7M4QO8K66J9w8NR1CFoI1W5qwWltgTAM1GopwaDvy2MpCRMN+c3kG jmgZlLCYdzokhq//qMKoHGetTNt9OlSW+Nr8s7F27mhf5Y3erQ+0L++Gk7BxVsogeM5C MnlEhv3DKSOuMIHUUU+X2Tey904rDgQAHYg+6WoQ9J8peFxI/nQT1V7fwX538FRuvbux zYC2QSD65/mWjA0tmsfiTV/IY+Lnco6uZBlwDEFiIfMFwD2OMuLIpOj/e0ZQjbHVE033 hgdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Q/GhdIvO"; 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 m3si10767429pgj.367.2019.07.25.00.12.12; Thu, 25 Jul 2019 00:12:27 -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="Q/GhdIvO"; 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 S2392206AbfGXT7S (ORCPT + 99 others); Wed, 24 Jul 2019 15:59:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:46388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388723AbfGXT7N (ORCPT ); Wed, 24 Jul 2019 15:59:13 -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 7FBC2205C9; Wed, 24 Jul 2019 19:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998352; bh=F94/1BpxU1t5GOQkN3F/93RQja6jm6ECWEQbWvGbUgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q/GhdIvOPC3EPE1gKAPGUrYyBX8vU0FgOG6vmU1BUBc/8INSoQXDIih3J4vBsdieV DrIY8tIWzvwfy5EGMd8E7O7PWLHrGw2pme/yK1q4VHjDfKKamuc5GH8mVYB0E3+rlu CXf0a042N6rvxZdNJr7pr1NhV7v7WQzW2aFG+PNY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Filipe Manana , David Sterba Subject: [PATCH 5.1 334/371] Btrfs: fix fsync not persisting dentry deletions due to inode evictions Date: Wed, 24 Jul 2019 21:21:26 +0200 Message-Id: <20190724191748.885467622@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@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 803f0f64d17769071d7287d9e3e3b79a3e1ae937 upstream. In order to avoid searches on a log tree when unlinking an inode, we check if the inode being unlinked was logged in the current transaction, as well as the inode of its parent directory. When any of the inodes are logged, we proceed to delete directory items and inode reference items from the log, to ensure that if a subsequent fsync of only the inode being unlinked or only of the parent directory when the other is not fsync'ed as well, does not result in the entry still existing after a power failure. That check however is not reliable when one of the inodes involved (the one being unlinked or its parent directory's inode) is evicted, since the logged_trans field is transient, that is, it is not stored on disk, so it is lost when the inode is evicted and loaded into memory again (which is set to zero on load). As a consequence the checks currently being done by btrfs_del_dir_entries_in_log() and btrfs_del_inode_ref_in_log() always return true if the inode was evicted before, regardless of the inode having been logged or not before (and in the current transaction), this results in the dentry being unlinked still existing after a log replay if after the unlink operation only one of the inodes involved is fsync'ed. Example: $ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ mkdir /mnt/dir $ touch /mnt/dir/foo $ xfs_io -c fsync /mnt/dir/foo # Keep an open file descriptor on our directory while we evict inodes. # We just want to evict the file's inode, the directory's inode must not # be evicted. $ ( cd /mnt/dir; while true; do :; done ) & $ pid=$! # Wait a bit to give time to background process to chdir to our test # directory. $ sleep 0.5 # Trigger eviction of the file's inode. $ echo 2 > /proc/sys/vm/drop_caches # Unlink our file and fsync the parent directory. After a power failure # we don't expect to see the file anymore, since we fsync'ed the parent # directory. $ rm -f $SCRATCH_MNT/dir/foo $ xfs_io -c fsync /mnt/dir $ mount /dev/sdb /mnt $ ls /mnt/dir foo $ --> file still there, unlink not persisted despite explicit fsync on dir Fix this by checking if the inode has the full_sync bit set in its runtime flags as well, since that bit is set everytime an inode is loaded from disk, or for other less common cases such as after a shrinking truncate or failure to allocate extent maps for holes, and gets cleared after the first fsync. Also consider the inode as possibly logged only if it was last modified in the current transaction (besides having the full_fsync flag set). Fixes: 3a5f1d458ad161 ("Btrfs: Optimize btree walking while logging inodes") 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 | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -3309,6 +3309,30 @@ int btrfs_free_log_root_tree(struct btrf } /* + * Check if an inode was logged in the current transaction. We can't always rely + * on an inode's logged_trans value, because it's an in-memory only field and + * therefore not persisted. This means that its value is lost if the inode gets + * evicted and loaded again from disk (in which case it has a value of 0, and + * certainly it is smaller then any possible transaction ID), when that happens + * the full_sync flag is set in the inode's runtime flags, so on that case we + * assume eviction happened and ignore the logged_trans value, assuming the + * worst case, that the inode was logged before in the current transaction. + */ +static bool inode_logged(struct btrfs_trans_handle *trans, + struct btrfs_inode *inode) +{ + if (inode->logged_trans == trans->transid) + return true; + + if (inode->last_trans == trans->transid && + test_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &inode->runtime_flags) && + !test_bit(BTRFS_FS_LOG_RECOVERING, &trans->fs_info->flags)) + return true; + + return false; +} + +/* * If both a file and directory are logged, and unlinks or renames are * mixed in, we have a few interesting corners: * @@ -3342,7 +3366,7 @@ int btrfs_del_dir_entries_in_log(struct int bytes_del = 0; u64 dir_ino = btrfs_ino(dir); - if (dir->logged_trans < trans->transid) + if (!inode_logged(trans, dir)) return 0; ret = join_running_log_trans(root); @@ -3447,7 +3471,7 @@ int btrfs_del_inode_ref_in_log(struct bt u64 index; int ret; - if (inode->logged_trans < trans->transid) + if (!inode_logged(trans, inode)) return 0; ret = join_running_log_trans(root);