2008-09-06 03:13:11 +07:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2008 Oracle. All rights reserved.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public
|
|
|
|
* License v2 as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public
|
|
|
|
* License along with this program; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 021110-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/sched.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 15:04:11 +07:00
|
|
|
#include <linux/slab.h>
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
#include <linux/list_sort.h>
|
2008-09-06 03:13:11 +07:00
|
|
|
#include "ctree.h"
|
|
|
|
#include "transaction.h"
|
|
|
|
#include "disk-io.h"
|
|
|
|
#include "locking.h"
|
|
|
|
#include "print-tree.h"
|
2012-08-09 01:32:27 +07:00
|
|
|
#include "backref.h"
|
2008-09-06 03:13:11 +07:00
|
|
|
#include "compat.h"
|
2008-12-02 21:54:17 +07:00
|
|
|
#include "tree-log.h"
|
2012-08-09 01:32:27 +07:00
|
|
|
#include "hash.h"
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/* magic values for the inode_only field in btrfs_log_inode:
|
|
|
|
*
|
|
|
|
* LOG_INODE_ALL means to log everything
|
|
|
|
* LOG_INODE_EXISTS means to log just enough to recreate the inode
|
|
|
|
* during log replay
|
|
|
|
*/
|
|
|
|
#define LOG_INODE_ALL 0
|
|
|
|
#define LOG_INODE_EXISTS 1
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
/*
|
|
|
|
* directory trouble cases
|
|
|
|
*
|
|
|
|
* 1) on rename or unlink, if the inode being unlinked isn't in the fsync
|
|
|
|
* log, we must force a full commit before doing an fsync of the directory
|
|
|
|
* where the unlink was done.
|
|
|
|
* ---> record transid of last unlink/rename per directory
|
|
|
|
*
|
|
|
|
* mkdir foo/some_dir
|
|
|
|
* normal commit
|
|
|
|
* rename foo/some_dir foo2/some_dir
|
|
|
|
* mkdir foo/some_dir
|
|
|
|
* fsync foo/some_dir/some_file
|
|
|
|
*
|
|
|
|
* The fsync above will unlink the original some_dir without recording
|
|
|
|
* it in its new location (foo2). After a crash, some_dir will be gone
|
|
|
|
* unless the fsync of some_file forces a full commit
|
|
|
|
*
|
|
|
|
* 2) we must log any new names for any file or dir that is in the fsync
|
|
|
|
* log. ---> check inode while renaming/linking.
|
|
|
|
*
|
|
|
|
* 2a) we must log any new names for any file or dir during rename
|
|
|
|
* when the directory they are being removed from was logged.
|
|
|
|
* ---> check inode and old parent dir during rename
|
|
|
|
*
|
|
|
|
* 2a is actually the more important variant. With the extra logging
|
|
|
|
* a crash might unlink the old name without recreating the new one
|
|
|
|
*
|
|
|
|
* 3) after a crash, we must go through any directories with a link count
|
|
|
|
* of zero and redo the rm -rf
|
|
|
|
*
|
|
|
|
* mkdir f1/foo
|
|
|
|
* normal commit
|
|
|
|
* rm -rf f1/foo
|
|
|
|
* fsync(f1)
|
|
|
|
*
|
|
|
|
* The directory f1 was fully removed from the FS, but fsync was never
|
|
|
|
* called on f1, only its parent dir. After a crash the rm -rf must
|
|
|
|
* be replayed. This must be able to recurse down the entire
|
|
|
|
* directory tree. The inode link count fixup code takes care of the
|
|
|
|
* ugly details.
|
|
|
|
*/
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
/*
|
|
|
|
* stages for the tree walking. The first
|
|
|
|
* stage (0) is to only pin down the blocks we find
|
|
|
|
* the second stage (1) is to make sure that all the inodes
|
|
|
|
* we find in the log are created in the subvolume.
|
|
|
|
*
|
|
|
|
* The last stage is to deal with directories and links and extents
|
|
|
|
* and all the other fun semantics
|
|
|
|
*/
|
|
|
|
#define LOG_WALK_PIN_ONLY 0
|
|
|
|
#define LOG_WALK_REPLAY_INODES 1
|
|
|
|
#define LOG_WALK_REPLAY_ALL 2
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
static int btrfs_log_inode(struct btrfs_trans_handle *trans,
|
2008-09-06 03:13:11 +07:00
|
|
|
struct btrfs_root *root, struct inode *inode,
|
|
|
|
int inode_only);
|
2009-01-06 03:43:42 +07:00
|
|
|
static int link_to_fixup_dir(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path, u64 objectid);
|
2009-03-24 21:24:20 +07:00
|
|
|
static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_root *log,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
u64 dirid, int del_all);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* tree logging is a special write ahead log used to make sure that
|
|
|
|
* fsyncs and O_SYNCs can happen without doing full tree commits.
|
|
|
|
*
|
|
|
|
* Full tree commits are expensive because they require commonly
|
|
|
|
* modified blocks to be recowed, creating many dirty pages in the
|
|
|
|
* extent tree an 4x-6x higher write load than ext3.
|
|
|
|
*
|
|
|
|
* Instead of doing a tree commit on every fsync, we use the
|
|
|
|
* key ranges and transaction ids to find items for a given file or directory
|
|
|
|
* that have changed in this transaction. Those items are copied into
|
|
|
|
* a special tree (one per subvolume root), that tree is written to disk
|
|
|
|
* and then the fsync is considered complete.
|
|
|
|
*
|
|
|
|
* After a crash, items are copied out of the log-tree back into the
|
|
|
|
* subvolume tree. Any file data extents found are recorded in the extent
|
|
|
|
* allocation tree, and the log-tree freed.
|
|
|
|
*
|
|
|
|
* The log tree is read three times, once to pin down all the extents it is
|
|
|
|
* using in ram and once, once to create all the inodes logged in the tree
|
|
|
|
* and once to do all the other items.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* start a sub transaction and setup the log tree
|
|
|
|
* this increments the log tree writer count to make the people
|
|
|
|
* syncing the tree wait for us to finish
|
|
|
|
*/
|
|
|
|
static int start_log_trans(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root)
|
|
|
|
{
|
|
|
|
int ret;
|
2010-05-16 21:49:59 +07:00
|
|
|
int err = 0;
|
2009-01-22 00:54:03 +07:00
|
|
|
|
|
|
|
mutex_lock(&root->log_mutex);
|
|
|
|
if (root->log_root) {
|
2009-10-09 02:30:04 +07:00
|
|
|
if (!root->log_start_pid) {
|
|
|
|
root->log_start_pid = current->pid;
|
|
|
|
root->log_multiple_pids = false;
|
|
|
|
} else if (root->log_start_pid != current->pid) {
|
|
|
|
root->log_multiple_pids = true;
|
|
|
|
}
|
|
|
|
|
2012-09-06 17:04:27 +07:00
|
|
|
atomic_inc(&root->log_batch);
|
2009-01-22 00:54:03 +07:00
|
|
|
atomic_inc(&root->log_writers);
|
|
|
|
mutex_unlock(&root->log_mutex);
|
|
|
|
return 0;
|
|
|
|
}
|
2009-10-09 02:30:04 +07:00
|
|
|
root->log_multiple_pids = false;
|
|
|
|
root->log_start_pid = current->pid;
|
2008-09-06 03:13:11 +07:00
|
|
|
mutex_lock(&root->fs_info->tree_log_mutex);
|
|
|
|
if (!root->fs_info->log_root_tree) {
|
|
|
|
ret = btrfs_init_log_root_tree(trans, root->fs_info);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret)
|
|
|
|
err = ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2010-05-16 21:49:59 +07:00
|
|
|
if (err == 0 && !root->log_root) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_add_log_tree(trans, root);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret)
|
|
|
|
err = ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
mutex_unlock(&root->fs_info->tree_log_mutex);
|
2012-09-06 17:04:27 +07:00
|
|
|
atomic_inc(&root->log_batch);
|
2009-01-22 00:54:03 +07:00
|
|
|
atomic_inc(&root->log_writers);
|
|
|
|
mutex_unlock(&root->log_mutex);
|
2010-05-16 21:49:59 +07:00
|
|
|
return err;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* returns 0 if there was a log transaction running and we were able
|
|
|
|
* to join, or returns -ENOENT if there were not transactions
|
|
|
|
* in progress
|
|
|
|
*/
|
|
|
|
static int join_running_log_trans(struct btrfs_root *root)
|
|
|
|
{
|
|
|
|
int ret = -ENOENT;
|
|
|
|
|
|
|
|
smp_mb();
|
|
|
|
if (!root->log_root)
|
|
|
|
return -ENOENT;
|
|
|
|
|
2009-01-22 00:54:03 +07:00
|
|
|
mutex_lock(&root->log_mutex);
|
2008-09-06 03:13:11 +07:00
|
|
|
if (root->log_root) {
|
|
|
|
ret = 0;
|
2009-01-22 00:54:03 +07:00
|
|
|
atomic_inc(&root->log_writers);
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2009-01-22 00:54:03 +07:00
|
|
|
mutex_unlock(&root->log_mutex);
|
2008-09-06 03:13:11 +07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
/*
|
|
|
|
* This either makes the current running log transaction wait
|
|
|
|
* until you call btrfs_end_log_trans() or it makes any future
|
|
|
|
* log transactions wait until you call btrfs_end_log_trans()
|
|
|
|
*/
|
|
|
|
int btrfs_pin_log_trans(struct btrfs_root *root)
|
|
|
|
{
|
|
|
|
int ret = -ENOENT;
|
|
|
|
|
|
|
|
mutex_lock(&root->log_mutex);
|
|
|
|
atomic_inc(&root->log_writers);
|
|
|
|
mutex_unlock(&root->log_mutex);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
/*
|
|
|
|
* indicate we're done making changes to the log tree
|
|
|
|
* and wake up anyone waiting to do a sync
|
|
|
|
*/
|
2012-03-01 20:56:26 +07:00
|
|
|
void btrfs_end_log_trans(struct btrfs_root *root)
|
2008-09-06 03:13:11 +07:00
|
|
|
{
|
2009-01-22 00:54:03 +07:00
|
|
|
if (atomic_dec_and_test(&root->log_writers)) {
|
|
|
|
smp_mb();
|
|
|
|
if (waitqueue_active(&root->log_writer_wait))
|
|
|
|
wake_up(&root->log_writer_wait);
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* the walk control struct is used to pass state down the chain when
|
|
|
|
* processing the log tree. The stage field tells us which part
|
|
|
|
* of the log tree processing we are currently doing. The others
|
|
|
|
* are state fields used for that specific part
|
|
|
|
*/
|
|
|
|
struct walk_control {
|
|
|
|
/* should we free the extent on disk when done? This is used
|
|
|
|
* at transaction commit time while freeing a log tree
|
|
|
|
*/
|
|
|
|
int free;
|
|
|
|
|
|
|
|
/* should we write out the extent buffer? This is used
|
|
|
|
* while flushing the log tree to disk during a sync
|
|
|
|
*/
|
|
|
|
int write;
|
|
|
|
|
|
|
|
/* should we wait for the extent buffer io to finish? Also used
|
|
|
|
* while flushing the log tree to disk for a sync
|
|
|
|
*/
|
|
|
|
int wait;
|
|
|
|
|
|
|
|
/* pin only walk, we record which extents on disk belong to the
|
|
|
|
* log trees
|
|
|
|
*/
|
|
|
|
int pin;
|
|
|
|
|
|
|
|
/* what stage of the replay code we're currently in */
|
|
|
|
int stage;
|
|
|
|
|
|
|
|
/* the root we are currently replaying */
|
|
|
|
struct btrfs_root *replay_dest;
|
|
|
|
|
|
|
|
/* the trans handle for the current replay */
|
|
|
|
struct btrfs_trans_handle *trans;
|
|
|
|
|
|
|
|
/* the function that gets used to process blocks we find in the
|
|
|
|
* tree. Note the extent_buffer might not be up to date when it is
|
|
|
|
* passed in, and it must be checked or read if you need the data
|
|
|
|
* inside it
|
|
|
|
*/
|
|
|
|
int (*process_func)(struct btrfs_root *log, struct extent_buffer *eb,
|
|
|
|
struct walk_control *wc, u64 gen);
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* process_func used to pin down extents, write them or wait on them
|
|
|
|
*/
|
|
|
|
static int process_one_buffer(struct btrfs_root *log,
|
|
|
|
struct extent_buffer *eb,
|
|
|
|
struct walk_control *wc, u64 gen)
|
|
|
|
{
|
2013-04-26 02:55:30 +07:00
|
|
|
int ret = 0;
|
|
|
|
|
2009-04-03 21:14:18 +07:00
|
|
|
if (wc->pin)
|
2013-04-26 02:55:30 +07:00
|
|
|
ret = btrfs_pin_extent_for_log_replay(log->fs_info->extent_root,
|
|
|
|
eb->start, eb->len);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2013-04-26 02:55:30 +07:00
|
|
|
if (!ret && btrfs_buffer_uptodate(eb, gen, 0)) {
|
2008-09-06 03:13:11 +07:00
|
|
|
if (wc->write)
|
|
|
|
btrfs_write_tree_block(eb);
|
|
|
|
if (wc->wait)
|
|
|
|
btrfs_wait_tree_block_writeback(eb);
|
|
|
|
}
|
2013-04-26 02:55:30 +07:00
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Item overwrite used by replay and tree logging. eb, slot and key all refer
|
|
|
|
* to the src data we are copying out.
|
|
|
|
*
|
|
|
|
* root is the tree we are copying into, and path is a scratch
|
|
|
|
* path for use in this function (it should be released on entry and
|
|
|
|
* will be released on exit).
|
|
|
|
*
|
|
|
|
* If the key is already in the destination tree the existing item is
|
|
|
|
* overwritten. If the existing item isn't big enough, it is extended.
|
|
|
|
* If it is too large, it is truncated.
|
|
|
|
*
|
|
|
|
* If the key isn't in the destination yet, a new item is inserted.
|
|
|
|
*/
|
|
|
|
static noinline int overwrite_item(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
struct extent_buffer *eb, int slot,
|
|
|
|
struct btrfs_key *key)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
u32 item_size;
|
|
|
|
u64 saved_i_size = 0;
|
|
|
|
int save_old_i_size = 0;
|
|
|
|
unsigned long src_ptr;
|
|
|
|
unsigned long dst_ptr;
|
|
|
|
int overwrite_root = 0;
|
2013-04-06 03:50:09 +07:00
|
|
|
bool inode_item = key->type == BTRFS_INODE_ITEM_KEY;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID)
|
|
|
|
overwrite_root = 1;
|
|
|
|
|
|
|
|
item_size = btrfs_item_size_nr(eb, slot);
|
|
|
|
src_ptr = btrfs_item_ptr_offset(eb, slot);
|
|
|
|
|
|
|
|
/* look for the key in the destination tree */
|
|
|
|
ret = btrfs_search_slot(NULL, root, key, path, 0, 0);
|
2013-04-06 03:50:09 +07:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
if (ret == 0) {
|
|
|
|
char *src_copy;
|
|
|
|
char *dst_copy;
|
|
|
|
u32 dst_size = btrfs_item_size_nr(path->nodes[0],
|
|
|
|
path->slots[0]);
|
|
|
|
if (dst_size != item_size)
|
|
|
|
goto insert;
|
|
|
|
|
|
|
|
if (item_size == 0) {
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
dst_copy = kmalloc(item_size, GFP_NOFS);
|
|
|
|
src_copy = kmalloc(item_size, GFP_NOFS);
|
2011-01-26 13:22:08 +07:00
|
|
|
if (!dst_copy || !src_copy) {
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2011-01-26 13:22:08 +07:00
|
|
|
kfree(dst_copy);
|
|
|
|
kfree(src_copy);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
read_extent_buffer(eb, src_copy, src_ptr, item_size);
|
|
|
|
|
|
|
|
dst_ptr = btrfs_item_ptr_offset(path->nodes[0], path->slots[0]);
|
|
|
|
read_extent_buffer(path->nodes[0], dst_copy, dst_ptr,
|
|
|
|
item_size);
|
|
|
|
ret = memcmp(dst_copy, src_copy, item_size);
|
|
|
|
|
|
|
|
kfree(dst_copy);
|
|
|
|
kfree(src_copy);
|
|
|
|
/*
|
|
|
|
* they have the same contents, just return, this saves
|
|
|
|
* us from cowing blocks in the destination tree and doing
|
|
|
|
* extra writes that may not have been done by a previous
|
|
|
|
* sync
|
|
|
|
*/
|
|
|
|
if (ret == 0) {
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-04-06 03:50:09 +07:00
|
|
|
/*
|
|
|
|
* We need to load the old nbytes into the inode so when we
|
|
|
|
* replay the extents we've logged we get the right nbytes.
|
|
|
|
*/
|
|
|
|
if (inode_item) {
|
|
|
|
struct btrfs_inode_item *item;
|
|
|
|
u64 nbytes;
|
|
|
|
|
|
|
|
item = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
|
|
|
struct btrfs_inode_item);
|
|
|
|
nbytes = btrfs_inode_nbytes(path->nodes[0], item);
|
|
|
|
item = btrfs_item_ptr(eb, slot,
|
|
|
|
struct btrfs_inode_item);
|
|
|
|
btrfs_set_inode_nbytes(eb, item, nbytes);
|
|
|
|
}
|
|
|
|
} else if (inode_item) {
|
|
|
|
struct btrfs_inode_item *item;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* New inode, set nbytes to 0 so that the nbytes comes out
|
|
|
|
* properly when we replay the extents.
|
|
|
|
*/
|
|
|
|
item = btrfs_item_ptr(eb, slot, struct btrfs_inode_item);
|
|
|
|
btrfs_set_inode_nbytes(eb, item, 0);
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
insert:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
/* try to insert the key into the destination tree */
|
|
|
|
ret = btrfs_insert_empty_item(trans, root, path,
|
|
|
|
key, item_size);
|
|
|
|
|
|
|
|
/* make sure any existing item is the correct size */
|
|
|
|
if (ret == -EEXIST) {
|
|
|
|
u32 found_size;
|
|
|
|
found_size = btrfs_item_size_nr(path->nodes[0],
|
|
|
|
path->slots[0]);
|
2012-03-01 20:56:26 +07:00
|
|
|
if (found_size > item_size)
|
2013-04-16 12:18:22 +07:00
|
|
|
btrfs_truncate_item(root, path, item_size, 1);
|
2012-03-01 20:56:26 +07:00
|
|
|
else if (found_size < item_size)
|
2013-04-16 12:18:49 +07:00
|
|
|
btrfs_extend_item(root, path,
|
2012-03-01 20:56:26 +07:00
|
|
|
item_size - found_size);
|
2008-09-06 03:13:11 +07:00
|
|
|
} else if (ret) {
|
2010-05-16 21:49:59 +07:00
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
dst_ptr = btrfs_item_ptr_offset(path->nodes[0],
|
|
|
|
path->slots[0]);
|
|
|
|
|
|
|
|
/* don't overwrite an existing inode if the generation number
|
|
|
|
* was logged as zero. This is done when the tree logging code
|
|
|
|
* is just logging an inode to make sure it exists after recovery.
|
|
|
|
*
|
|
|
|
* Also, don't overwrite i_size on directories during replay.
|
|
|
|
* log replay inserts and removes directory items based on the
|
|
|
|
* state of the tree found in the subvolume, and i_size is modified
|
|
|
|
* as it goes
|
|
|
|
*/
|
|
|
|
if (key->type == BTRFS_INODE_ITEM_KEY && ret == -EEXIST) {
|
|
|
|
struct btrfs_inode_item *src_item;
|
|
|
|
struct btrfs_inode_item *dst_item;
|
|
|
|
|
|
|
|
src_item = (struct btrfs_inode_item *)src_ptr;
|
|
|
|
dst_item = (struct btrfs_inode_item *)dst_ptr;
|
|
|
|
|
|
|
|
if (btrfs_inode_generation(eb, src_item) == 0)
|
|
|
|
goto no_copy;
|
|
|
|
|
|
|
|
if (overwrite_root &&
|
|
|
|
S_ISDIR(btrfs_inode_mode(eb, src_item)) &&
|
|
|
|
S_ISDIR(btrfs_inode_mode(path->nodes[0], dst_item))) {
|
|
|
|
save_old_i_size = 1;
|
|
|
|
saved_i_size = btrfs_inode_size(path->nodes[0],
|
|
|
|
dst_item);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
copy_extent_buffer(path->nodes[0], eb, dst_ptr,
|
|
|
|
src_ptr, item_size);
|
|
|
|
|
|
|
|
if (save_old_i_size) {
|
|
|
|
struct btrfs_inode_item *dst_item;
|
|
|
|
dst_item = (struct btrfs_inode_item *)dst_ptr;
|
|
|
|
btrfs_set_inode_size(path->nodes[0], dst_item, saved_i_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* make sure the generation is filled in */
|
|
|
|
if (key->type == BTRFS_INODE_ITEM_KEY) {
|
|
|
|
struct btrfs_inode_item *dst_item;
|
|
|
|
dst_item = (struct btrfs_inode_item *)dst_ptr;
|
|
|
|
if (btrfs_inode_generation(path->nodes[0], dst_item) == 0) {
|
|
|
|
btrfs_set_inode_generation(path->nodes[0], dst_item,
|
|
|
|
trans->transid);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
no_copy:
|
|
|
|
btrfs_mark_buffer_dirty(path->nodes[0]);
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* simple helper to read an inode off the disk from a given root
|
|
|
|
* This can only be called for subvolume roots and not for the log
|
|
|
|
*/
|
|
|
|
static noinline struct inode *read_one_inode(struct btrfs_root *root,
|
|
|
|
u64 objectid)
|
|
|
|
{
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
struct btrfs_key key;
|
2008-09-06 03:13:11 +07:00
|
|
|
struct inode *inode;
|
|
|
|
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
key.objectid = objectid;
|
|
|
|
key.type = BTRFS_INODE_ITEM_KEY;
|
|
|
|
key.offset = 0;
|
Btrfs: change how we mount subvolumes
This work is in preperation for being able to set a different root as the
default mounting root.
There is currently a problem with how we mount subvolumes. We cannot currently
mount a subvolume of a subvolume, you can only mount subvolumes/snapshots of the
default subvolume. So say you take a snapshot of the default subvolume and call
it snap1, and then take a snapshot of snap1 and call it snap2, so now you have
/
/snap1
/snap1/snap2
as your available volumes. Currently you can only mount / and /snap1,
you cannot mount /snap1/snap2. To fix this problem instead of passing
subvolid=<name> you must pass in subvolid=<treeid>, where <treeid> is
the tree id that gets spit out via the subvolume listing you get from
the subvolume listing patches (btrfs filesystem list). This allows us
to mount /, /snap1 and /snap1/snap2 as the root volume.
In addition to the above, we also now read the default dir item in the
tree root to get the root key that it points to. For now this just
points at what has always been the default subvolme, but later on I plan
to change it to point at whatever root you want to be the new default
root, so you can just set the default mount and not have to mount with
-o subvolid=<treeid>. I tested this out with the above scenario and it
worked perfectly. Thanks,
mount -o subvol operates inside the selected subvolid. For example:
mount -o subvol=snap1,subvolid=256 /dev/xxx /mnt
/mnt will have the snap1 directory for the subvolume with id
256.
mount -o subvol=snap /dev/xxx /mnt
/mnt will be the snap directory of whatever the default subvolume
is.
Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-12-05 00:38:27 +07:00
|
|
|
inode = btrfs_iget(root->fs_info->sb, &key, root, NULL);
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
if (IS_ERR(inode)) {
|
|
|
|
inode = NULL;
|
|
|
|
} else if (is_bad_inode(inode)) {
|
2008-09-06 03:13:11 +07:00
|
|
|
iput(inode);
|
|
|
|
inode = NULL;
|
|
|
|
}
|
|
|
|
return inode;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* replays a single extent in 'eb' at 'slot' with 'key' into the
|
|
|
|
* subvolume 'root'. path is released on entry and should be released
|
|
|
|
* on exit.
|
|
|
|
*
|
|
|
|
* extents in the log tree have not been allocated out of the extent
|
|
|
|
* tree yet. So, this completes the allocation, taking a reference
|
|
|
|
* as required if the extent already exists or creating a new extent
|
|
|
|
* if it isn't in the extent allocation tree yet.
|
|
|
|
*
|
|
|
|
* The extent is inserted into the file, dropping any existing extents
|
|
|
|
* from the file that overlap the new one.
|
|
|
|
*/
|
|
|
|
static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
struct extent_buffer *eb, int slot,
|
|
|
|
struct btrfs_key *key)
|
|
|
|
{
|
|
|
|
int found_type;
|
|
|
|
u64 extent_end;
|
|
|
|
u64 start = key->offset;
|
2013-04-06 03:50:09 +07:00
|
|
|
u64 nbytes = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
struct btrfs_file_extent_item *item;
|
|
|
|
struct inode *inode = NULL;
|
|
|
|
unsigned long size;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
item = btrfs_item_ptr(eb, slot, struct btrfs_file_extent_item);
|
|
|
|
found_type = btrfs_file_extent_type(eb, item);
|
|
|
|
|
2008-10-31 01:25:28 +07:00
|
|
|
if (found_type == BTRFS_FILE_EXTENT_REG ||
|
2013-04-06 03:50:09 +07:00
|
|
|
found_type == BTRFS_FILE_EXTENT_PREALLOC) {
|
|
|
|
nbytes = btrfs_file_extent_num_bytes(eb, item);
|
|
|
|
extent_end = start + nbytes;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We don't add to the inodes nbytes if we are prealloc or a
|
|
|
|
* hole.
|
|
|
|
*/
|
|
|
|
if (btrfs_file_extent_disk_bytenr(eb, item) == 0)
|
|
|
|
nbytes = 0;
|
|
|
|
} else if (found_type == BTRFS_FILE_EXTENT_INLINE) {
|
Btrfs: Add zlib compression support
This is a large change for adding compression on reading and writing,
both for inline and regular extents. It does some fairly large
surgery to the writeback paths.
Compression is off by default and enabled by mount -o compress. Even
when the -o compress mount option is not used, it is possible to read
compressed extents off the disk.
If compression for a given set of pages fails to make them smaller, the
file is flagged to avoid future compression attempts later.
* While finding delalloc extents, the pages are locked before being sent down
to the delalloc handler. This allows the delalloc handler to do complex things
such as cleaning the pages, marking them writeback and starting IO on their
behalf.
* Inline extents are inserted at delalloc time now. This allows us to compress
the data before inserting the inline extent, and it allows us to insert
an inline extent that spans multiple pages.
* All of the in-memory extent representations (extent_map.c, ordered-data.c etc)
are changed to record both an in-memory size and an on disk size, as well
as a flag for compression.
From a disk format point of view, the extent pointers in the file are changed
to record the on disk size of a given extent and some encoding flags.
Space in the disk format is allocated for compression encoding, as well
as encryption and a generic 'other' field. Neither the encryption or the
'other' field are currently used.
In order to limit the amount of data read for a single random read in the
file, the size of a compressed extent is limited to 128k. This is a
software only limit, the disk format supports u64 sized compressed extents.
In order to limit the ram consumed while processing extents, the uncompressed
size of a compressed extent is limited to 256k. This is a software only limit
and will be subject to tuning later.
Checksumming is still done on compressed extents, and it is done on the
uncompressed version of the data. This way additional encodings can be
layered on without having to figure out which encoding to checksum.
Compression happens at delalloc time, which is basically singled threaded because
it is usually done by a single pdflush thread. This makes it tricky to
spread the compression load across all the cpus on the box. We'll have to
look at parallel pdflush walks of dirty inodes at a later time.
Decompression is hooked into readpages and it does spread across CPUs nicely.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2008-10-30 01:49:59 +07:00
|
|
|
size = btrfs_file_extent_inline_len(eb, item);
|
2013-04-06 03:50:09 +07:00
|
|
|
nbytes = btrfs_file_extent_ram_bytes(eb, item);
|
2013-02-26 15:10:22 +07:00
|
|
|
extent_end = ALIGN(start + size, root->sectorsize);
|
2008-09-06 03:13:11 +07:00
|
|
|
} else {
|
|
|
|
ret = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
inode = read_one_inode(root, key->objectid);
|
|
|
|
if (!inode) {
|
|
|
|
ret = -EIO;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* first check to see if we already have this extent in the
|
|
|
|
* file. This must be done before the btrfs_drop_extents run
|
|
|
|
* so we don't try to drop this extent.
|
|
|
|
*/
|
2011-04-20 09:31:50 +07:00
|
|
|
ret = btrfs_lookup_file_extent(trans, root, path, btrfs_ino(inode),
|
2008-09-06 03:13:11 +07:00
|
|
|
start, 0);
|
|
|
|
|
2008-10-31 01:25:28 +07:00
|
|
|
if (ret == 0 &&
|
|
|
|
(found_type == BTRFS_FILE_EXTENT_REG ||
|
|
|
|
found_type == BTRFS_FILE_EXTENT_PREALLOC)) {
|
2008-09-06 03:13:11 +07:00
|
|
|
struct btrfs_file_extent_item cmp1;
|
|
|
|
struct btrfs_file_extent_item cmp2;
|
|
|
|
struct btrfs_file_extent_item *existing;
|
|
|
|
struct extent_buffer *leaf;
|
|
|
|
|
|
|
|
leaf = path->nodes[0];
|
|
|
|
existing = btrfs_item_ptr(leaf, path->slots[0],
|
|
|
|
struct btrfs_file_extent_item);
|
|
|
|
|
|
|
|
read_extent_buffer(eb, &cmp1, (unsigned long)item,
|
|
|
|
sizeof(cmp1));
|
|
|
|
read_extent_buffer(leaf, &cmp2, (unsigned long)existing,
|
|
|
|
sizeof(cmp2));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we already have a pointer to this exact extent,
|
|
|
|
* we don't have to do anything
|
|
|
|
*/
|
|
|
|
if (memcmp(&cmp1, &cmp2, sizeof(cmp1)) == 0) {
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/* drop any overlapping extents */
|
2012-08-29 23:24:27 +07:00
|
|
|
ret = btrfs_drop_extents(trans, root, inode, start, extent_end, 1);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-01-06 23:42:00 +07:00
|
|
|
if (found_type == BTRFS_FILE_EXTENT_REG ||
|
|
|
|
found_type == BTRFS_FILE_EXTENT_PREALLOC) {
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
u64 offset;
|
2009-01-06 23:42:00 +07:00
|
|
|
unsigned long dest_offset;
|
|
|
|
struct btrfs_key ins;
|
|
|
|
|
|
|
|
ret = btrfs_insert_empty_item(trans, root, path, key,
|
|
|
|
sizeof(*item));
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2009-01-06 23:42:00 +07:00
|
|
|
dest_offset = btrfs_item_ptr_offset(path->nodes[0],
|
|
|
|
path->slots[0]);
|
|
|
|
copy_extent_buffer(path->nodes[0], eb, dest_offset,
|
|
|
|
(unsigned long)item, sizeof(*item));
|
|
|
|
|
|
|
|
ins.objectid = btrfs_file_extent_disk_bytenr(eb, item);
|
|
|
|
ins.offset = btrfs_file_extent_disk_num_bytes(eb, item);
|
|
|
|
ins.type = BTRFS_EXTENT_ITEM_KEY;
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
offset = key->offset - btrfs_file_extent_offset(eb, item);
|
2009-01-06 23:42:00 +07:00
|
|
|
|
|
|
|
if (ins.objectid > 0) {
|
|
|
|
u64 csum_start;
|
|
|
|
u64 csum_end;
|
|
|
|
LIST_HEAD(ordered_sums);
|
|
|
|
/*
|
|
|
|
* is this extent already allocated in the extent
|
|
|
|
* allocation tree? If so, just add a reference
|
|
|
|
*/
|
|
|
|
ret = btrfs_lookup_extent(root, ins.objectid,
|
|
|
|
ins.offset);
|
|
|
|
if (ret == 0) {
|
|
|
|
ret = btrfs_inc_extent_ref(trans, root,
|
|
|
|
ins.objectid, ins.offset,
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
0, root->root_key.objectid,
|
2011-09-12 20:26:38 +07:00
|
|
|
key->objectid, offset, 0);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2009-01-06 23:42:00 +07:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* insert the extent pointer in the extent
|
|
|
|
* allocation tree
|
|
|
|
*/
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
ret = btrfs_alloc_logged_file_extent(trans,
|
|
|
|
root, root->root_key.objectid,
|
|
|
|
key->objectid, offset, &ins);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2009-01-06 23:42:00 +07:00
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2009-01-06 23:42:00 +07:00
|
|
|
|
|
|
|
if (btrfs_file_extent_compression(eb, item)) {
|
|
|
|
csum_start = ins.objectid;
|
|
|
|
csum_end = csum_start + ins.offset;
|
|
|
|
} else {
|
|
|
|
csum_start = ins.objectid +
|
|
|
|
btrfs_file_extent_offset(eb, item);
|
|
|
|
csum_end = csum_start +
|
|
|
|
btrfs_file_extent_num_bytes(eb, item);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = btrfs_lookup_csums_range(root->log_root,
|
|
|
|
csum_start, csum_end - 1,
|
2011-03-08 20:14:00 +07:00
|
|
|
&ordered_sums, 0);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2009-01-06 23:42:00 +07:00
|
|
|
while (!list_empty(&ordered_sums)) {
|
|
|
|
struct btrfs_ordered_sum *sums;
|
|
|
|
sums = list_entry(ordered_sums.next,
|
|
|
|
struct btrfs_ordered_sum,
|
|
|
|
list);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (!ret)
|
|
|
|
ret = btrfs_csum_file_blocks(trans,
|
2009-01-06 23:42:00 +07:00
|
|
|
root->fs_info->csum_root,
|
|
|
|
sums);
|
|
|
|
list_del(&sums->list);
|
|
|
|
kfree(sums);
|
|
|
|
}
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2009-01-06 23:42:00 +07:00
|
|
|
} else {
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2009-01-06 23:42:00 +07:00
|
|
|
}
|
|
|
|
} else if (found_type == BTRFS_FILE_EXTENT_INLINE) {
|
|
|
|
/* inline extents are easy, we just overwrite them */
|
|
|
|
ret = overwrite_item(trans, root, path, eb, slot, key);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2009-01-06 23:42:00 +07:00
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2013-04-06 03:50:09 +07:00
|
|
|
inode_add_bytes(inode, nbytes);
|
2012-06-26 10:25:22 +07:00
|
|
|
ret = btrfs_update_inode(trans, root, inode);
|
2008-09-06 03:13:11 +07:00
|
|
|
out:
|
|
|
|
if (inode)
|
|
|
|
iput(inode);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* when cleaning up conflicts between the directory names in the
|
|
|
|
* subvolume, directory names in the log and directory names in the
|
|
|
|
* inode back references, we may have to unlink inodes from directories.
|
|
|
|
*
|
|
|
|
* This is a helper function to do the unlink of a specific directory
|
|
|
|
* item
|
|
|
|
*/
|
|
|
|
static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
struct inode *dir,
|
|
|
|
struct btrfs_dir_item *di)
|
|
|
|
{
|
|
|
|
struct inode *inode;
|
|
|
|
char *name;
|
|
|
|
int name_len;
|
|
|
|
struct extent_buffer *leaf;
|
|
|
|
struct btrfs_key location;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
leaf = path->nodes[0];
|
|
|
|
|
|
|
|
btrfs_dir_item_key_to_cpu(leaf, di, &location);
|
|
|
|
name_len = btrfs_dir_name_len(leaf, di);
|
|
|
|
name = kmalloc(name_len, GFP_NOFS);
|
2011-01-26 13:22:08 +07:00
|
|
|
if (!name)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
read_extent_buffer(leaf, name, (unsigned long)(di + 1), name_len);
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
inode = read_one_inode(root, location.objectid);
|
2011-04-28 16:10:23 +07:00
|
|
|
if (!inode) {
|
2013-04-26 03:23:32 +07:00
|
|
|
ret = -EIO;
|
|
|
|
goto out;
|
2011-04-28 16:10:23 +07:00
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-01-06 03:43:42 +07:00
|
|
|
ret = link_to_fixup_dir(trans, root, path, location.objectid);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2009-03-24 21:24:20 +07:00
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_unlink_inode(trans, root, dir, inode, name, name_len);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
btrfs_run_delayed_items(trans, root);
|
|
|
|
out:
|
2008-09-06 03:13:11 +07:00
|
|
|
kfree(name);
|
|
|
|
iput(inode);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* helper function to see if a given name and sequence number found
|
|
|
|
* in an inode back reference are already in a directory and correctly
|
|
|
|
* point to this inode
|
|
|
|
*/
|
|
|
|
static noinline int inode_in_dir(struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
u64 dirid, u64 objectid, u64 index,
|
|
|
|
const char *name, int name_len)
|
|
|
|
{
|
|
|
|
struct btrfs_dir_item *di;
|
|
|
|
struct btrfs_key location;
|
|
|
|
int match = 0;
|
|
|
|
|
|
|
|
di = btrfs_lookup_dir_index_item(NULL, root, path, dirid,
|
|
|
|
index, name, name_len, 0);
|
|
|
|
if (di && !IS_ERR(di)) {
|
|
|
|
btrfs_dir_item_key_to_cpu(path->nodes[0], di, &location);
|
|
|
|
if (location.objectid != objectid)
|
|
|
|
goto out;
|
|
|
|
} else
|
|
|
|
goto out;
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
di = btrfs_lookup_dir_item(NULL, root, path, dirid, name, name_len, 0);
|
|
|
|
if (di && !IS_ERR(di)) {
|
|
|
|
btrfs_dir_item_key_to_cpu(path->nodes[0], di, &location);
|
|
|
|
if (location.objectid != objectid)
|
|
|
|
goto out;
|
|
|
|
} else
|
|
|
|
goto out;
|
|
|
|
match = 1;
|
|
|
|
out:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
return match;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* helper function to check a log tree for a named back reference in
|
|
|
|
* an inode. This is used to decide if a back reference that is
|
|
|
|
* found in the subvolume conflicts with what we find in the log.
|
|
|
|
*
|
|
|
|
* inode backreferences may have multiple refs in a single item,
|
|
|
|
* during replay we process one reference at a time, and we don't
|
|
|
|
* want to delete valid links to a file from the subvolume if that
|
|
|
|
* link is also in the log.
|
|
|
|
*/
|
|
|
|
static noinline int backref_in_log(struct btrfs_root *log,
|
|
|
|
struct btrfs_key *key,
|
2012-08-09 01:32:27 +07:00
|
|
|
u64 ref_objectid,
|
2008-09-06 03:13:11 +07:00
|
|
|
char *name, int namelen)
|
|
|
|
{
|
|
|
|
struct btrfs_path *path;
|
|
|
|
struct btrfs_inode_ref *ref;
|
|
|
|
unsigned long ptr;
|
|
|
|
unsigned long ptr_end;
|
|
|
|
unsigned long name_ptr;
|
|
|
|
int found_name_len;
|
|
|
|
int item_size;
|
|
|
|
int ret;
|
|
|
|
int match = 0;
|
|
|
|
|
|
|
|
path = btrfs_alloc_path();
|
2011-01-26 13:22:08 +07:00
|
|
|
if (!path)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_search_slot(NULL, log, key, path, 0, 0);
|
|
|
|
if (ret != 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ptr = btrfs_item_ptr_offset(path->nodes[0], path->slots[0]);
|
2012-08-09 01:32:27 +07:00
|
|
|
|
|
|
|
if (key->type == BTRFS_INODE_EXTREF_KEY) {
|
|
|
|
if (btrfs_find_name_in_ext_backref(path, ref_objectid,
|
|
|
|
name, namelen, NULL))
|
|
|
|
match = 1;
|
|
|
|
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
item_size = btrfs_item_size_nr(path->nodes[0], path->slots[0]);
|
2008-09-06 03:13:11 +07:00
|
|
|
ptr_end = ptr + item_size;
|
|
|
|
while (ptr < ptr_end) {
|
|
|
|
ref = (struct btrfs_inode_ref *)ptr;
|
|
|
|
found_name_len = btrfs_inode_ref_name_len(path->nodes[0], ref);
|
|
|
|
if (found_name_len == namelen) {
|
|
|
|
name_ptr = (unsigned long)(ref + 1);
|
|
|
|
ret = memcmp_extent_buffer(path->nodes[0], name,
|
|
|
|
name_ptr, namelen);
|
|
|
|
if (ret == 0) {
|
|
|
|
match = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ptr = (unsigned long)(ref + 1) + found_name_len;
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
btrfs_free_path(path);
|
|
|
|
return match;
|
|
|
|
}
|
|
|
|
|
2012-08-18 04:04:41 +07:00
|
|
|
static inline int __add_inode_ref(struct btrfs_trans_handle *trans,
|
2008-09-06 03:13:11 +07:00
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
2012-08-18 04:04:41 +07:00
|
|
|
struct btrfs_root *log_root,
|
|
|
|
struct inode *dir, struct inode *inode,
|
|
|
|
struct extent_buffer *eb,
|
2012-08-09 01:32:27 +07:00
|
|
|
u64 inode_objectid, u64 parent_objectid,
|
|
|
|
u64 ref_index, char *name, int namelen,
|
|
|
|
int *search_done)
|
2008-09-06 03:13:11 +07:00
|
|
|
{
|
2011-08-06 15:35:23 +07:00
|
|
|
int ret;
|
2012-08-09 01:32:27 +07:00
|
|
|
char *victim_name;
|
|
|
|
int victim_name_len;
|
|
|
|
struct extent_buffer *leaf;
|
2012-08-18 04:04:41 +07:00
|
|
|
struct btrfs_dir_item *di;
|
2012-08-09 01:32:27 +07:00
|
|
|
struct btrfs_key search_key;
|
|
|
|
struct btrfs_inode_extref *extref;
|
btrfs: make inode ref log recovery faster
When we recover from crash via write-ahead log tree and process
the inode refs, for each btrfs_inode_ref item, we will
1) check if we already have a perfect match in fs/file tree, if
we have, then we're done.
2) search the corresponding back reference in fs/file tree, and
check all the names in this back reference to see if they are
also in the log to avoid conflict corners.
3) recover the logged inode refs to fs/file tree.
In current btrfs, however,
- for 2)'s check, once is enough, since the checked back reference
will remain unchanged after processing all the inode refs belonged
to the key.
- it has no need to do another 1) between 2) and 3).
I've made a small test to show how it improves,
$dd if=/dev/zero of=foobar bs=4K count=1
$sync
$make 100 hard links continuously, like ln foobar link_i
$fsync foobar
$echo b > /proc/sysrq-trigger
after reboot
$time mount DEV PATH
without patch:
real 0m0.285s
user 0m0.001s
sys 0m0.009s
with patch:
real 0m0.123s
user 0m0.000s
sys 0m0.010s
Changelog v1->v2:
- fix double free - pointed by David Sterba
Changelog v2->v3:
- adjust free order
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2011-03-26 19:01:12 +07:00
|
|
|
|
2012-08-09 01:32:27 +07:00
|
|
|
again:
|
|
|
|
/* Search old style refs */
|
|
|
|
search_key.objectid = inode_objectid;
|
|
|
|
search_key.type = BTRFS_INODE_REF_KEY;
|
|
|
|
search_key.offset = parent_objectid;
|
|
|
|
ret = btrfs_search_slot(NULL, root, &search_key, path, 0, 0);
|
2008-09-06 03:13:11 +07:00
|
|
|
if (ret == 0) {
|
|
|
|
struct btrfs_inode_ref *victim_ref;
|
|
|
|
unsigned long ptr;
|
|
|
|
unsigned long ptr_end;
|
2012-08-09 01:32:27 +07:00
|
|
|
|
|
|
|
leaf = path->nodes[0];
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/* are we trying to overwrite a back ref for the root directory
|
|
|
|
* if so, just jump out, we're done
|
|
|
|
*/
|
2012-08-09 01:32:27 +07:00
|
|
|
if (search_key.objectid == search_key.offset)
|
2012-08-18 04:04:41 +07:00
|
|
|
return 1;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/* check all the names in this back reference to see
|
|
|
|
* if they are in the log. if so, we allow them to stay
|
|
|
|
* otherwise they must be unlinked as a conflict
|
|
|
|
*/
|
|
|
|
ptr = btrfs_item_ptr_offset(leaf, path->slots[0]);
|
|
|
|
ptr_end = ptr + btrfs_item_size_nr(leaf, path->slots[0]);
|
2009-01-06 09:25:51 +07:00
|
|
|
while (ptr < ptr_end) {
|
2008-09-06 03:13:11 +07:00
|
|
|
victim_ref = (struct btrfs_inode_ref *)ptr;
|
|
|
|
victim_name_len = btrfs_inode_ref_name_len(leaf,
|
|
|
|
victim_ref);
|
|
|
|
victim_name = kmalloc(victim_name_len, GFP_NOFS);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (!victim_name)
|
|
|
|
return -ENOMEM;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
read_extent_buffer(leaf, victim_name,
|
|
|
|
(unsigned long)(victim_ref + 1),
|
|
|
|
victim_name_len);
|
|
|
|
|
2012-08-09 01:32:27 +07:00
|
|
|
if (!backref_in_log(log_root, &search_key,
|
|
|
|
parent_objectid,
|
|
|
|
victim_name,
|
2008-09-06 03:13:11 +07:00
|
|
|
victim_name_len)) {
|
|
|
|
btrfs_inc_nlink(inode);
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2009-03-24 21:24:20 +07:00
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_unlink_inode(trans, root, dir,
|
|
|
|
inode, victim_name,
|
|
|
|
victim_name_len);
|
2012-08-09 01:32:27 +07:00
|
|
|
kfree(victim_name);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
btrfs_run_delayed_items(trans, root);
|
2012-08-09 01:32:27 +07:00
|
|
|
*search_done = 1;
|
|
|
|
goto again;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
kfree(victim_name);
|
2012-08-09 01:32:27 +07:00
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
ptr = (unsigned long)(victim_ref + 1) + victim_name_len;
|
|
|
|
}
|
|
|
|
|
btrfs: make inode ref log recovery faster
When we recover from crash via write-ahead log tree and process
the inode refs, for each btrfs_inode_ref item, we will
1) check if we already have a perfect match in fs/file tree, if
we have, then we're done.
2) search the corresponding back reference in fs/file tree, and
check all the names in this back reference to see if they are
also in the log to avoid conflict corners.
3) recover the logged inode refs to fs/file tree.
In current btrfs, however,
- for 2)'s check, once is enough, since the checked back reference
will remain unchanged after processing all the inode refs belonged
to the key.
- it has no need to do another 1) between 2) and 3).
I've made a small test to show how it improves,
$dd if=/dev/zero of=foobar bs=4K count=1
$sync
$make 100 hard links continuously, like ln foobar link_i
$fsync foobar
$echo b > /proc/sysrq-trigger
after reboot
$time mount DEV PATH
without patch:
real 0m0.285s
user 0m0.001s
sys 0m0.009s
with patch:
real 0m0.123s
user 0m0.000s
sys 0m0.010s
Changelog v1->v2:
- fix double free - pointed by David Sterba
Changelog v2->v3:
- adjust free order
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2011-03-26 19:01:12 +07:00
|
|
|
/*
|
|
|
|
* NOTE: we have searched root tree and checked the
|
|
|
|
* coresponding ref, it does not need to check again.
|
|
|
|
*/
|
2012-08-18 04:04:41 +07:00
|
|
|
*search_done = 1;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2012-08-09 01:32:27 +07:00
|
|
|
/* Same search but for extended refs */
|
|
|
|
extref = btrfs_lookup_inode_extref(NULL, root, path, name, namelen,
|
|
|
|
inode_objectid, parent_objectid, 0,
|
|
|
|
0);
|
|
|
|
if (!IS_ERR_OR_NULL(extref)) {
|
|
|
|
u32 item_size;
|
|
|
|
u32 cur_offset = 0;
|
|
|
|
unsigned long base;
|
|
|
|
struct inode *victim_parent;
|
|
|
|
|
|
|
|
leaf = path->nodes[0];
|
|
|
|
|
|
|
|
item_size = btrfs_item_size_nr(leaf, path->slots[0]);
|
|
|
|
base = btrfs_item_ptr_offset(leaf, path->slots[0]);
|
|
|
|
|
|
|
|
while (cur_offset < item_size) {
|
|
|
|
extref = (struct btrfs_inode_extref *)base + cur_offset;
|
|
|
|
|
|
|
|
victim_name_len = btrfs_inode_extref_name_len(leaf, extref);
|
|
|
|
|
|
|
|
if (btrfs_inode_extref_parent(leaf, extref) != parent_objectid)
|
|
|
|
goto next;
|
|
|
|
|
|
|
|
victim_name = kmalloc(victim_name_len, GFP_NOFS);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (!victim_name)
|
|
|
|
return -ENOMEM;
|
2012-08-09 01:32:27 +07:00
|
|
|
read_extent_buffer(leaf, victim_name, (unsigned long)&extref->name,
|
|
|
|
victim_name_len);
|
|
|
|
|
|
|
|
search_key.objectid = inode_objectid;
|
|
|
|
search_key.type = BTRFS_INODE_EXTREF_KEY;
|
|
|
|
search_key.offset = btrfs_extref_hash(parent_objectid,
|
|
|
|
victim_name,
|
|
|
|
victim_name_len);
|
|
|
|
ret = 0;
|
|
|
|
if (!backref_in_log(log_root, &search_key,
|
|
|
|
parent_objectid, victim_name,
|
|
|
|
victim_name_len)) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
victim_parent = read_one_inode(root,
|
|
|
|
parent_objectid);
|
|
|
|
if (victim_parent) {
|
|
|
|
btrfs_inc_nlink(inode);
|
|
|
|
btrfs_release_path(path);
|
|
|
|
|
|
|
|
ret = btrfs_unlink_inode(trans, root,
|
|
|
|
victim_parent,
|
|
|
|
inode,
|
|
|
|
victim_name,
|
|
|
|
victim_name_len);
|
|
|
|
btrfs_run_delayed_items(trans, root);
|
|
|
|
}
|
|
|
|
iput(victim_parent);
|
|
|
|
kfree(victim_name);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2012-08-09 01:32:27 +07:00
|
|
|
*search_done = 1;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
kfree(victim_name);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2012-08-09 01:32:27 +07:00
|
|
|
next:
|
|
|
|
cur_offset += victim_name_len + sizeof(*extref);
|
|
|
|
}
|
|
|
|
*search_done = 1;
|
|
|
|
}
|
|
|
|
btrfs_release_path(path);
|
|
|
|
|
2011-08-06 15:35:23 +07:00
|
|
|
/* look for a conflicting sequence number */
|
|
|
|
di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(dir),
|
2012-08-09 01:32:27 +07:00
|
|
|
ref_index, name, namelen, 0);
|
2011-08-06 15:35:23 +07:00
|
|
|
if (di && !IS_ERR(di)) {
|
|
|
|
ret = drop_one_dir_item(trans, root, path, dir, di);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2011-08-06 15:35:23 +07:00
|
|
|
}
|
|
|
|
btrfs_release_path(path);
|
|
|
|
|
|
|
|
/* look for a conflicing name */
|
|
|
|
di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(dir),
|
|
|
|
name, namelen, 0);
|
|
|
|
if (di && !IS_ERR(di)) {
|
|
|
|
ret = drop_one_dir_item(trans, root, path, dir, di);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2011-08-06 15:35:23 +07:00
|
|
|
}
|
|
|
|
btrfs_release_path(path);
|
|
|
|
|
2012-08-18 04:04:41 +07:00
|
|
|
return 0;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2012-08-09 01:32:27 +07:00
|
|
|
static int extref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,
|
|
|
|
u32 *namelen, char **name, u64 *index,
|
|
|
|
u64 *parent_objectid)
|
|
|
|
{
|
|
|
|
struct btrfs_inode_extref *extref;
|
|
|
|
|
|
|
|
extref = (struct btrfs_inode_extref *)ref_ptr;
|
|
|
|
|
|
|
|
*namelen = btrfs_inode_extref_name_len(eb, extref);
|
|
|
|
*name = kmalloc(*namelen, GFP_NOFS);
|
|
|
|
if (*name == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
read_extent_buffer(eb, *name, (unsigned long)&extref->name,
|
|
|
|
*namelen);
|
|
|
|
|
|
|
|
*index = btrfs_inode_extref_index(eb, extref);
|
|
|
|
if (parent_objectid)
|
|
|
|
*parent_objectid = btrfs_inode_extref_parent(eb, extref);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,
|
|
|
|
u32 *namelen, char **name, u64 *index)
|
|
|
|
{
|
|
|
|
struct btrfs_inode_ref *ref;
|
|
|
|
|
|
|
|
ref = (struct btrfs_inode_ref *)ref_ptr;
|
|
|
|
|
|
|
|
*namelen = btrfs_inode_ref_name_len(eb, ref);
|
|
|
|
*name = kmalloc(*namelen, GFP_NOFS);
|
|
|
|
if (*name == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
read_extent_buffer(eb, *name, (unsigned long)(ref + 1), *namelen);
|
|
|
|
|
|
|
|
*index = btrfs_inode_ref_index(eb, ref);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-18 04:04:41 +07:00
|
|
|
/*
|
|
|
|
* replay one inode back reference item found in the log tree.
|
|
|
|
* eb, slot and key refer to the buffer and key found in the log tree.
|
|
|
|
* root is the destination we are replaying into, and path is for temp
|
|
|
|
* use by this function. (it should be released on return).
|
|
|
|
*/
|
|
|
|
static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_root *log,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
struct extent_buffer *eb, int slot,
|
|
|
|
struct btrfs_key *key)
|
|
|
|
{
|
|
|
|
struct inode *dir;
|
|
|
|
struct inode *inode;
|
|
|
|
unsigned long ref_ptr;
|
|
|
|
unsigned long ref_end;
|
|
|
|
char *name;
|
|
|
|
int namelen;
|
|
|
|
int ret;
|
|
|
|
int search_done = 0;
|
2012-08-09 01:32:27 +07:00
|
|
|
int log_ref_ver = 0;
|
|
|
|
u64 parent_objectid;
|
|
|
|
u64 inode_objectid;
|
2012-10-09 22:17:20 +07:00
|
|
|
u64 ref_index = 0;
|
2012-08-09 01:32:27 +07:00
|
|
|
int ref_struct_size;
|
|
|
|
|
|
|
|
ref_ptr = btrfs_item_ptr_offset(eb, slot);
|
|
|
|
ref_end = ref_ptr + btrfs_item_size_nr(eb, slot);
|
|
|
|
|
|
|
|
if (key->type == BTRFS_INODE_EXTREF_KEY) {
|
|
|
|
struct btrfs_inode_extref *r;
|
|
|
|
|
|
|
|
ref_struct_size = sizeof(struct btrfs_inode_extref);
|
|
|
|
log_ref_ver = 1;
|
|
|
|
r = (struct btrfs_inode_extref *)ref_ptr;
|
|
|
|
parent_objectid = btrfs_inode_extref_parent(eb, r);
|
|
|
|
} else {
|
|
|
|
ref_struct_size = sizeof(struct btrfs_inode_ref);
|
|
|
|
parent_objectid = key->offset;
|
|
|
|
}
|
|
|
|
inode_objectid = key->objectid;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2012-08-18 04:04:41 +07:00
|
|
|
/*
|
|
|
|
* it is possible that we didn't log all the parent directories
|
|
|
|
* for a given inode. If we don't find the dir, just don't
|
|
|
|
* copy the back ref in. The link count fixup code will take
|
|
|
|
* care of the rest
|
|
|
|
*/
|
2012-08-09 01:32:27 +07:00
|
|
|
dir = read_one_inode(root, parent_objectid);
|
2012-08-18 04:04:41 +07:00
|
|
|
if (!dir)
|
|
|
|
return -ENOENT;
|
|
|
|
|
2012-08-09 01:32:27 +07:00
|
|
|
inode = read_one_inode(root, inode_objectid);
|
2012-08-18 04:04:41 +07:00
|
|
|
if (!inode) {
|
|
|
|
iput(dir);
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (ref_ptr < ref_end) {
|
2012-08-09 01:32:27 +07:00
|
|
|
if (log_ref_ver) {
|
|
|
|
ret = extref_get_fields(eb, ref_ptr, &namelen, &name,
|
|
|
|
&ref_index, &parent_objectid);
|
|
|
|
/*
|
|
|
|
* parent object can change from one array
|
|
|
|
* item to another.
|
|
|
|
*/
|
|
|
|
if (!dir)
|
|
|
|
dir = read_one_inode(root, parent_objectid);
|
|
|
|
if (!dir)
|
|
|
|
return -ENOENT;
|
|
|
|
} else {
|
|
|
|
ret = ref_get_fields(eb, ref_ptr, &namelen, &name,
|
|
|
|
&ref_index);
|
|
|
|
}
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2012-08-18 04:04:41 +07:00
|
|
|
|
|
|
|
/* if we already have a perfect match, we're done */
|
|
|
|
if (!inode_in_dir(root, path, btrfs_ino(dir), btrfs_ino(inode),
|
2012-08-09 01:32:27 +07:00
|
|
|
ref_index, name, namelen)) {
|
2012-08-18 04:04:41 +07:00
|
|
|
/*
|
|
|
|
* look for a conflicting back reference in the
|
|
|
|
* metadata. if we find one we have to unlink that name
|
|
|
|
* of the file before we add our new link. Later on, we
|
|
|
|
* overwrite any existing back reference, and we don't
|
|
|
|
* want to create dangling pointers in the directory.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (!search_done) {
|
|
|
|
ret = __add_inode_ref(trans, root, path, log,
|
2012-08-09 01:32:27 +07:00
|
|
|
dir, inode, eb,
|
|
|
|
inode_objectid,
|
|
|
|
parent_objectid,
|
|
|
|
ref_index, name, namelen,
|
2012-08-18 04:04:41 +07:00
|
|
|
&search_done);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret == 1) {
|
|
|
|
ret = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (ret)
|
2012-08-18 04:04:41 +07:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* insert our name */
|
|
|
|
ret = btrfs_add_link(trans, dir, inode, name, namelen,
|
2012-08-09 01:32:27 +07:00
|
|
|
0, ref_index);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2012-08-18 04:04:41 +07:00
|
|
|
|
|
|
|
btrfs_update_inode(trans, root, inode);
|
|
|
|
}
|
|
|
|
|
2012-08-09 01:32:27 +07:00
|
|
|
ref_ptr = (unsigned long)(ref_ptr + ref_struct_size) + namelen;
|
2012-08-18 04:04:41 +07:00
|
|
|
kfree(name);
|
2012-08-09 01:32:27 +07:00
|
|
|
if (log_ref_ver) {
|
|
|
|
iput(dir);
|
|
|
|
dir = NULL;
|
|
|
|
}
|
2012-08-18 04:04:41 +07:00
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/* finally write the back reference in the inode */
|
|
|
|
ret = overwrite_item(trans, root, path, eb, slot, key);
|
2012-08-18 04:04:41 +07:00
|
|
|
out:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
iput(dir);
|
|
|
|
iput(inode);
|
2013-04-26 03:23:32 +07:00
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
2009-11-12 16:34:40 +07:00
|
|
|
static int insert_orphan_item(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root, u64 offset)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
ret = btrfs_find_orphan_item(root, offset);
|
|
|
|
if (ret > 0)
|
|
|
|
ret = btrfs_insert_orphan_item(trans, root, offset);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-08-09 01:32:27 +07:00
|
|
|
static int count_inode_extrefs(struct btrfs_root *root,
|
|
|
|
struct inode *inode, struct btrfs_path *path)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
int name_len;
|
|
|
|
unsigned int nlink = 0;
|
|
|
|
u32 item_size;
|
|
|
|
u32 cur_offset = 0;
|
|
|
|
u64 inode_objectid = btrfs_ino(inode);
|
|
|
|
u64 offset = 0;
|
|
|
|
unsigned long ptr;
|
|
|
|
struct btrfs_inode_extref *extref;
|
|
|
|
struct extent_buffer *leaf;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
ret = btrfs_find_one_extref(root, inode_objectid, offset, path,
|
|
|
|
&extref, &offset);
|
|
|
|
if (ret)
|
|
|
|
break;
|
2009-11-12 16:34:40 +07:00
|
|
|
|
2012-08-09 01:32:27 +07:00
|
|
|
leaf = path->nodes[0];
|
|
|
|
item_size = btrfs_item_size_nr(leaf, path->slots[0]);
|
|
|
|
ptr = btrfs_item_ptr_offset(leaf, path->slots[0]);
|
|
|
|
|
|
|
|
while (cur_offset < item_size) {
|
|
|
|
extref = (struct btrfs_inode_extref *) (ptr + cur_offset);
|
|
|
|
name_len = btrfs_inode_extref_name_len(leaf, extref);
|
|
|
|
|
|
|
|
nlink++;
|
|
|
|
|
|
|
|
cur_offset += name_len + sizeof(*extref);
|
|
|
|
}
|
|
|
|
|
|
|
|
offset++;
|
|
|
|
btrfs_release_path(path);
|
|
|
|
}
|
|
|
|
btrfs_release_path(path);
|
|
|
|
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
return nlink;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int count_inode_refs(struct btrfs_root *root,
|
|
|
|
struct inode *inode, struct btrfs_path *path)
|
2008-09-06 03:13:11 +07:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct btrfs_key key;
|
2012-08-09 01:32:27 +07:00
|
|
|
unsigned int nlink = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
unsigned long ptr;
|
|
|
|
unsigned long ptr_end;
|
|
|
|
int name_len;
|
2011-04-20 09:31:50 +07:00
|
|
|
u64 ino = btrfs_ino(inode);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2011-04-20 09:31:50 +07:00
|
|
|
key.objectid = ino;
|
2008-09-06 03:13:11 +07:00
|
|
|
key.type = BTRFS_INODE_REF_KEY;
|
|
|
|
key.offset = (u64)-1;
|
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
|
|
|
|
if (ret < 0)
|
|
|
|
break;
|
|
|
|
if (ret > 0) {
|
|
|
|
if (path->slots[0] == 0)
|
|
|
|
break;
|
|
|
|
path->slots[0]--;
|
|
|
|
}
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &key,
|
|
|
|
path->slots[0]);
|
2011-04-20 09:31:50 +07:00
|
|
|
if (key.objectid != ino ||
|
2008-09-06 03:13:11 +07:00
|
|
|
key.type != BTRFS_INODE_REF_KEY)
|
|
|
|
break;
|
|
|
|
ptr = btrfs_item_ptr_offset(path->nodes[0], path->slots[0]);
|
|
|
|
ptr_end = ptr + btrfs_item_size_nr(path->nodes[0],
|
|
|
|
path->slots[0]);
|
2009-01-06 09:25:51 +07:00
|
|
|
while (ptr < ptr_end) {
|
2008-09-06 03:13:11 +07:00
|
|
|
struct btrfs_inode_ref *ref;
|
|
|
|
|
|
|
|
ref = (struct btrfs_inode_ref *)ptr;
|
|
|
|
name_len = btrfs_inode_ref_name_len(path->nodes[0],
|
|
|
|
ref);
|
|
|
|
ptr = (unsigned long)(ref + 1) + name_len;
|
|
|
|
nlink++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (key.offset == 0)
|
|
|
|
break;
|
|
|
|
key.offset--;
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2012-08-09 01:32:27 +07:00
|
|
|
|
|
|
|
return nlink;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* There are a few corners where the link count of the file can't
|
|
|
|
* be properly maintained during replay. So, instead of adding
|
|
|
|
* lots of complexity to the log code, we just scan the backrefs
|
|
|
|
* for any file that has been through replay.
|
|
|
|
*
|
|
|
|
* The scan will update the link count on the inode to reflect the
|
|
|
|
* number of back refs found. If it goes down to zero, the iput
|
|
|
|
* will free the inode.
|
|
|
|
*/
|
|
|
|
static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct inode *inode)
|
|
|
|
{
|
|
|
|
struct btrfs_path *path;
|
|
|
|
int ret;
|
|
|
|
u64 nlink = 0;
|
|
|
|
u64 ino = btrfs_ino(inode);
|
|
|
|
|
|
|
|
path = btrfs_alloc_path();
|
|
|
|
if (!path)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
ret = count_inode_refs(root, inode, path);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
nlink = ret;
|
|
|
|
|
|
|
|
ret = count_inode_extrefs(root, inode, path);
|
|
|
|
if (ret == -ENOENT)
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
nlink += ret;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
if (nlink != inode->i_nlink) {
|
2011-10-28 19:13:29 +07:00
|
|
|
set_nlink(inode, nlink);
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_update_inode(trans, root, inode);
|
|
|
|
}
|
2008-09-12 02:51:21 +07:00
|
|
|
BTRFS_I(inode)->index_cnt = (u64)-1;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-11-12 16:34:40 +07:00
|
|
|
if (inode->i_nlink == 0) {
|
|
|
|
if (S_ISDIR(inode->i_mode)) {
|
|
|
|
ret = replay_dir_deletes(trans, root, NULL, path,
|
2011-04-20 09:31:50 +07:00
|
|
|
ino, 1);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2009-11-12 16:34:40 +07:00
|
|
|
}
|
2011-04-20 09:31:50 +07:00
|
|
|
ret = insert_orphan_item(trans, root, ino);
|
2009-03-24 21:24:20 +07:00
|
|
|
}
|
|
|
|
|
2012-08-09 01:32:27 +07:00
|
|
|
out:
|
|
|
|
btrfs_free_path(path);
|
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static noinline int fixup_inode_link_counts(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct btrfs_key key;
|
|
|
|
struct inode *inode;
|
|
|
|
|
|
|
|
key.objectid = BTRFS_TREE_LOG_FIXUP_OBJECTID;
|
|
|
|
key.type = BTRFS_ORPHAN_ITEM_KEY;
|
|
|
|
key.offset = (u64)-1;
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
|
|
|
|
if (ret < 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (ret == 1) {
|
|
|
|
if (path->slots[0] == 0)
|
|
|
|
break;
|
|
|
|
path->slots[0]--;
|
|
|
|
}
|
|
|
|
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
|
|
|
|
if (key.objectid != BTRFS_TREE_LOG_FIXUP_OBJECTID ||
|
|
|
|
key.type != BTRFS_ORPHAN_ITEM_KEY)
|
|
|
|
break;
|
|
|
|
|
|
|
|
ret = btrfs_del_item(trans, root, path);
|
2011-05-19 11:37:44 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
inode = read_one_inode(root, key.offset);
|
2011-04-28 16:10:23 +07:00
|
|
|
if (!inode)
|
|
|
|
return -EIO;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
ret = fixup_inode_link_count(trans, root, inode);
|
|
|
|
iput(inode);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
/*
|
|
|
|
* fixup on a directory may create new entries,
|
|
|
|
* make sure we always look for the highset possible
|
|
|
|
* offset
|
|
|
|
*/
|
|
|
|
key.offset = (u64)-1;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2011-05-19 11:37:44 +07:00
|
|
|
ret = 0;
|
|
|
|
out:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2011-05-19 11:37:44 +07:00
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* record a given inode in the fixup dir so we can check its link
|
|
|
|
* count when replay is done. The link count is incremented here
|
|
|
|
* so the inode won't go away until we check it
|
|
|
|
*/
|
|
|
|
static noinline int link_to_fixup_dir(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
u64 objectid)
|
|
|
|
{
|
|
|
|
struct btrfs_key key;
|
|
|
|
int ret = 0;
|
|
|
|
struct inode *inode;
|
|
|
|
|
|
|
|
inode = read_one_inode(root, objectid);
|
2011-04-28 16:10:23 +07:00
|
|
|
if (!inode)
|
|
|
|
return -EIO;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
key.objectid = BTRFS_TREE_LOG_FIXUP_OBJECTID;
|
|
|
|
btrfs_set_key_type(&key, BTRFS_ORPHAN_ITEM_KEY);
|
|
|
|
key.offset = objectid;
|
|
|
|
|
|
|
|
ret = btrfs_insert_empty_item(trans, root, path, &key, 0);
|
|
|
|
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
if (ret == 0) {
|
2013-03-02 01:35:47 +07:00
|
|
|
if (!inode->i_nlink)
|
|
|
|
set_nlink(inode, 1);
|
|
|
|
else
|
|
|
|
btrfs_inc_nlink(inode);
|
2012-06-26 10:25:22 +07:00
|
|
|
ret = btrfs_update_inode(trans, root, inode);
|
2008-09-06 03:13:11 +07:00
|
|
|
} else if (ret == -EEXIST) {
|
|
|
|
ret = 0;
|
|
|
|
} else {
|
2013-04-26 03:23:32 +07:00
|
|
|
BUG(); /* Logic Error */
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
iput(inode);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* when replaying the log for a directory, we only insert names
|
|
|
|
* for inodes that actually exist. This means an fsync on a directory
|
|
|
|
* does not implicitly fsync all the new files in it
|
|
|
|
*/
|
|
|
|
static noinline int insert_one_name(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
u64 dirid, u64 index,
|
|
|
|
char *name, int name_len, u8 type,
|
|
|
|
struct btrfs_key *location)
|
|
|
|
{
|
|
|
|
struct inode *inode;
|
|
|
|
struct inode *dir;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
inode = read_one_inode(root, location->objectid);
|
|
|
|
if (!inode)
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
dir = read_one_inode(root, dirid);
|
|
|
|
if (!dir) {
|
|
|
|
iput(inode);
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
ret = btrfs_add_link(trans, dir, inode, name, name_len, 1, index);
|
|
|
|
|
|
|
|
/* FIXME, put inode into FIXUP list */
|
|
|
|
|
|
|
|
iput(inode);
|
|
|
|
iput(dir);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* take a single entry in a log directory item and replay it into
|
|
|
|
* the subvolume.
|
|
|
|
*
|
|
|
|
* if a conflicting item exists in the subdirectory already,
|
|
|
|
* the inode it points to is unlinked and put into the link count
|
|
|
|
* fix up tree.
|
|
|
|
*
|
|
|
|
* If a name from the log points to a file or directory that does
|
|
|
|
* not exist in the FS, it is skipped. fsyncs on directories
|
|
|
|
* do not force down inodes inside that directory, just changes to the
|
|
|
|
* names or unlinks in a directory.
|
|
|
|
*/
|
|
|
|
static noinline int replay_one_name(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
struct extent_buffer *eb,
|
|
|
|
struct btrfs_dir_item *di,
|
|
|
|
struct btrfs_key *key)
|
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
int name_len;
|
|
|
|
struct btrfs_dir_item *dst_di;
|
|
|
|
struct btrfs_key found_key;
|
|
|
|
struct btrfs_key log_key;
|
|
|
|
struct inode *dir;
|
|
|
|
u8 log_type;
|
2008-09-08 22:18:08 +07:00
|
|
|
int exists;
|
2013-04-26 03:23:32 +07:00
|
|
|
int ret = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
dir = read_one_inode(root, key->objectid);
|
2011-04-28 16:10:23 +07:00
|
|
|
if (!dir)
|
|
|
|
return -EIO;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
name_len = btrfs_dir_name_len(eb, di);
|
|
|
|
name = kmalloc(name_len, GFP_NOFS);
|
2011-01-26 13:22:08 +07:00
|
|
|
if (!name)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
log_type = btrfs_dir_type(eb, di);
|
|
|
|
read_extent_buffer(eb, name, (unsigned long)(di + 1),
|
|
|
|
name_len);
|
|
|
|
|
|
|
|
btrfs_dir_item_key_to_cpu(eb, di, &log_key);
|
2008-09-08 22:18:08 +07:00
|
|
|
exists = btrfs_lookup_inode(trans, root, path, &log_key, 0);
|
|
|
|
if (exists == 0)
|
|
|
|
exists = 1;
|
|
|
|
else
|
|
|
|
exists = 0;
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-08 22:18:08 +07:00
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
if (key->type == BTRFS_DIR_ITEM_KEY) {
|
|
|
|
dst_di = btrfs_lookup_dir_item(trans, root, path, key->objectid,
|
|
|
|
name, name_len, 1);
|
2009-01-06 09:25:51 +07:00
|
|
|
} else if (key->type == BTRFS_DIR_INDEX_KEY) {
|
2008-09-06 03:13:11 +07:00
|
|
|
dst_di = btrfs_lookup_dir_index_item(trans, root, path,
|
|
|
|
key->objectid,
|
|
|
|
key->offset, name,
|
|
|
|
name_len, 1);
|
|
|
|
} else {
|
2013-04-26 03:23:32 +07:00
|
|
|
/* Corruption */
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2011-04-19 23:00:01 +07:00
|
|
|
if (IS_ERR_OR_NULL(dst_di)) {
|
2008-09-06 03:13:11 +07:00
|
|
|
/* we need a sequence number to insert, so we only
|
|
|
|
* do inserts for the BTRFS_DIR_INDEX_KEY types
|
|
|
|
*/
|
|
|
|
if (key->type != BTRFS_DIR_INDEX_KEY)
|
|
|
|
goto out;
|
|
|
|
goto insert;
|
|
|
|
}
|
|
|
|
|
|
|
|
btrfs_dir_item_key_to_cpu(path->nodes[0], dst_di, &found_key);
|
|
|
|
/* the existing item matches the logged item */
|
|
|
|
if (found_key.objectid == log_key.objectid &&
|
|
|
|
found_key.type == log_key.type &&
|
|
|
|
found_key.offset == log_key.offset &&
|
|
|
|
btrfs_dir_type(path->nodes[0], dst_di) == log_type) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* don't drop the conflicting directory entry if the inode
|
|
|
|
* for the new entry doesn't exist
|
|
|
|
*/
|
2008-09-08 22:18:08 +07:00
|
|
|
if (!exists)
|
2008-09-06 03:13:11 +07:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = drop_one_dir_item(trans, root, path, dir, dst_di);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
if (key->type == BTRFS_DIR_INDEX_KEY)
|
|
|
|
goto insert;
|
|
|
|
out:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
kfree(name);
|
|
|
|
iput(dir);
|
2013-04-26 03:23:32 +07:00
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
insert:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = insert_one_name(trans, root, path, key->objectid, key->offset,
|
|
|
|
name, name_len, log_type, &log_key);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret && ret != -ENOENT)
|
|
|
|
goto out;
|
|
|
|
ret = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* find all the names in a directory item and reconcile them into
|
|
|
|
* the subvolume. Only BTRFS_DIR_ITEM_KEY types will have more than
|
|
|
|
* one name in a directory item, but the same code gets used for
|
|
|
|
* both directory index types
|
|
|
|
*/
|
|
|
|
static noinline int replay_one_dir_item(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
struct extent_buffer *eb, int slot,
|
|
|
|
struct btrfs_key *key)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
u32 item_size = btrfs_item_size_nr(eb, slot);
|
|
|
|
struct btrfs_dir_item *di;
|
|
|
|
int name_len;
|
|
|
|
unsigned long ptr;
|
|
|
|
unsigned long ptr_end;
|
|
|
|
|
|
|
|
ptr = btrfs_item_ptr_offset(eb, slot);
|
|
|
|
ptr_end = ptr + item_size;
|
2009-01-06 09:25:51 +07:00
|
|
|
while (ptr < ptr_end) {
|
2008-09-06 03:13:11 +07:00
|
|
|
di = (struct btrfs_dir_item *)ptr;
|
2011-03-17 03:47:17 +07:00
|
|
|
if (verify_dir_item(root, eb, di))
|
|
|
|
return -EIO;
|
2008-09-06 03:13:11 +07:00
|
|
|
name_len = btrfs_dir_name_len(eb, di);
|
|
|
|
ret = replay_one_name(trans, root, path, eb, di, key);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
ptr = (unsigned long)(di + 1);
|
|
|
|
ptr += name_len;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* directory replay has two parts. There are the standard directory
|
|
|
|
* items in the log copied from the subvolume, and range items
|
|
|
|
* created in the log while the subvolume was logged.
|
|
|
|
*
|
|
|
|
* The range items tell us which parts of the key space the log
|
|
|
|
* is authoritative for. During replay, if a key in the subvolume
|
|
|
|
* directory is in a logged range item, but not actually in the log
|
|
|
|
* that means it was deleted from the directory before the fsync
|
|
|
|
* and should be removed.
|
|
|
|
*/
|
|
|
|
static noinline int find_dir_range(struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
u64 dirid, int key_type,
|
|
|
|
u64 *start_ret, u64 *end_ret)
|
|
|
|
{
|
|
|
|
struct btrfs_key key;
|
|
|
|
u64 found_end;
|
|
|
|
struct btrfs_dir_log_item *item;
|
|
|
|
int ret;
|
|
|
|
int nritems;
|
|
|
|
|
|
|
|
if (*start_ret == (u64)-1)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
key.objectid = dirid;
|
|
|
|
key.type = key_type;
|
|
|
|
key.offset = *start_ret;
|
|
|
|
|
|
|
|
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
if (ret > 0) {
|
|
|
|
if (path->slots[0] == 0)
|
|
|
|
goto out;
|
|
|
|
path->slots[0]--;
|
|
|
|
}
|
|
|
|
if (ret != 0)
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
|
|
|
|
|
|
|
|
if (key.type != key_type || key.objectid != dirid) {
|
|
|
|
ret = 1;
|
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
item = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
|
|
|
struct btrfs_dir_log_item);
|
|
|
|
found_end = btrfs_dir_log_end(path->nodes[0], item);
|
|
|
|
|
|
|
|
if (*start_ret >= key.offset && *start_ret <= found_end) {
|
|
|
|
ret = 0;
|
|
|
|
*start_ret = key.offset;
|
|
|
|
*end_ret = found_end;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ret = 1;
|
|
|
|
next:
|
|
|
|
/* check the next slot in the tree to see if it is a valid item */
|
|
|
|
nritems = btrfs_header_nritems(path->nodes[0]);
|
|
|
|
if (path->slots[0] >= nritems) {
|
|
|
|
ret = btrfs_next_leaf(root, path);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
} else {
|
|
|
|
path->slots[0]++;
|
|
|
|
}
|
|
|
|
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
|
|
|
|
|
|
|
|
if (key.type != key_type || key.objectid != dirid) {
|
|
|
|
ret = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
item = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
|
|
|
struct btrfs_dir_log_item);
|
|
|
|
found_end = btrfs_dir_log_end(path->nodes[0], item);
|
|
|
|
*start_ret = key.offset;
|
|
|
|
*end_ret = found_end;
|
|
|
|
ret = 0;
|
|
|
|
out:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* this looks for a given directory item in the log. If the directory
|
|
|
|
* item is not in the log, the item is removed and the inode it points
|
|
|
|
* to is unlinked
|
|
|
|
*/
|
|
|
|
static noinline int check_item_in_log(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_root *log,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
struct btrfs_path *log_path,
|
|
|
|
struct inode *dir,
|
|
|
|
struct btrfs_key *dir_key)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct extent_buffer *eb;
|
|
|
|
int slot;
|
|
|
|
u32 item_size;
|
|
|
|
struct btrfs_dir_item *di;
|
|
|
|
struct btrfs_dir_item *log_di;
|
|
|
|
int name_len;
|
|
|
|
unsigned long ptr;
|
|
|
|
unsigned long ptr_end;
|
|
|
|
char *name;
|
|
|
|
struct inode *inode;
|
|
|
|
struct btrfs_key location;
|
|
|
|
|
|
|
|
again:
|
|
|
|
eb = path->nodes[0];
|
|
|
|
slot = path->slots[0];
|
|
|
|
item_size = btrfs_item_size_nr(eb, slot);
|
|
|
|
ptr = btrfs_item_ptr_offset(eb, slot);
|
|
|
|
ptr_end = ptr + item_size;
|
2009-01-06 09:25:51 +07:00
|
|
|
while (ptr < ptr_end) {
|
2008-09-06 03:13:11 +07:00
|
|
|
di = (struct btrfs_dir_item *)ptr;
|
2011-03-17 03:47:17 +07:00
|
|
|
if (verify_dir_item(root, eb, di)) {
|
|
|
|
ret = -EIO;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
name_len = btrfs_dir_name_len(eb, di);
|
|
|
|
name = kmalloc(name_len, GFP_NOFS);
|
|
|
|
if (!name) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
read_extent_buffer(eb, name, (unsigned long)(di + 1),
|
|
|
|
name_len);
|
|
|
|
log_di = NULL;
|
2009-03-24 21:24:20 +07:00
|
|
|
if (log && dir_key->type == BTRFS_DIR_ITEM_KEY) {
|
2008-09-06 03:13:11 +07:00
|
|
|
log_di = btrfs_lookup_dir_item(trans, log, log_path,
|
|
|
|
dir_key->objectid,
|
|
|
|
name, name_len, 0);
|
2009-03-24 21:24:20 +07:00
|
|
|
} else if (log && dir_key->type == BTRFS_DIR_INDEX_KEY) {
|
2008-09-06 03:13:11 +07:00
|
|
|
log_di = btrfs_lookup_dir_index_item(trans, log,
|
|
|
|
log_path,
|
|
|
|
dir_key->objectid,
|
|
|
|
dir_key->offset,
|
|
|
|
name, name_len, 0);
|
|
|
|
}
|
2011-04-19 23:00:01 +07:00
|
|
|
if (IS_ERR_OR_NULL(log_di)) {
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_dir_item_key_to_cpu(eb, di, &location);
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
|
|
|
btrfs_release_path(log_path);
|
2008-09-06 03:13:11 +07:00
|
|
|
inode = read_one_inode(root, location.objectid);
|
2011-04-28 16:10:23 +07:00
|
|
|
if (!inode) {
|
|
|
|
kfree(name);
|
|
|
|
return -EIO;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
ret = link_to_fixup_dir(trans, root,
|
|
|
|
path, location.objectid);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret) {
|
|
|
|
kfree(name);
|
|
|
|
iput(inode);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_inc_nlink(inode);
|
|
|
|
ret = btrfs_unlink_inode(trans, root, dir, inode,
|
|
|
|
name, name_len);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (!ret)
|
|
|
|
btrfs_run_delayed_items(trans, root);
|
2008-09-06 03:13:11 +07:00
|
|
|
kfree(name);
|
|
|
|
iput(inode);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/* there might still be more names under this key
|
|
|
|
* check and repeat if required
|
|
|
|
*/
|
|
|
|
ret = btrfs_search_slot(NULL, root, dir_key, path,
|
|
|
|
0, 0);
|
|
|
|
if (ret == 0)
|
|
|
|
goto again;
|
|
|
|
ret = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(log_path);
|
2008-09-06 03:13:11 +07:00
|
|
|
kfree(name);
|
|
|
|
|
|
|
|
ptr = (unsigned long)(di + 1);
|
|
|
|
ptr += name_len;
|
|
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
out:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
|
|
|
btrfs_release_path(log_path);
|
2008-09-06 03:13:11 +07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* deletion replay happens before we copy any new directory items
|
|
|
|
* out of the log or out of backreferences from inodes. It
|
|
|
|
* scans the log to find ranges of keys that log is authoritative for,
|
|
|
|
* and then scans the directory to find items in those ranges that are
|
|
|
|
* not present in the log.
|
|
|
|
*
|
|
|
|
* Anything we don't find in the log is unlinked and removed from the
|
|
|
|
* directory.
|
|
|
|
*/
|
|
|
|
static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_root *log,
|
|
|
|
struct btrfs_path *path,
|
2009-03-24 21:24:20 +07:00
|
|
|
u64 dirid, int del_all)
|
2008-09-06 03:13:11 +07:00
|
|
|
{
|
|
|
|
u64 range_start;
|
|
|
|
u64 range_end;
|
|
|
|
int key_type = BTRFS_DIR_LOG_ITEM_KEY;
|
|
|
|
int ret = 0;
|
|
|
|
struct btrfs_key dir_key;
|
|
|
|
struct btrfs_key found_key;
|
|
|
|
struct btrfs_path *log_path;
|
|
|
|
struct inode *dir;
|
|
|
|
|
|
|
|
dir_key.objectid = dirid;
|
|
|
|
dir_key.type = BTRFS_DIR_ITEM_KEY;
|
|
|
|
log_path = btrfs_alloc_path();
|
|
|
|
if (!log_path)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
dir = read_one_inode(root, dirid);
|
|
|
|
/* it isn't an error if the inode isn't there, that can happen
|
|
|
|
* because we replay the deletes before we copy in the inode item
|
|
|
|
* from the log
|
|
|
|
*/
|
|
|
|
if (!dir) {
|
|
|
|
btrfs_free_path(log_path);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
again:
|
|
|
|
range_start = 0;
|
|
|
|
range_end = 0;
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2009-03-24 21:24:20 +07:00
|
|
|
if (del_all)
|
|
|
|
range_end = (u64)-1;
|
|
|
|
else {
|
|
|
|
ret = find_dir_range(log, path, dirid, key_type,
|
|
|
|
&range_start, &range_end);
|
|
|
|
if (ret != 0)
|
|
|
|
break;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
dir_key.offset = range_start;
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-06 03:13:11 +07:00
|
|
|
int nritems;
|
|
|
|
ret = btrfs_search_slot(NULL, root, &dir_key, path,
|
|
|
|
0, 0);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
nritems = btrfs_header_nritems(path->nodes[0]);
|
|
|
|
if (path->slots[0] >= nritems) {
|
|
|
|
ret = btrfs_next_leaf(root, path);
|
|
|
|
if (ret)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &found_key,
|
|
|
|
path->slots[0]);
|
|
|
|
if (found_key.objectid != dirid ||
|
|
|
|
found_key.type != dir_key.type)
|
|
|
|
goto next_type;
|
|
|
|
|
|
|
|
if (found_key.offset > range_end)
|
|
|
|
break;
|
|
|
|
|
|
|
|
ret = check_item_in_log(trans, root, log, path,
|
2009-03-24 21:24:20 +07:00
|
|
|
log_path, dir,
|
|
|
|
&found_key);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-09-06 03:13:11 +07:00
|
|
|
if (found_key.offset == (u64)-1)
|
|
|
|
break;
|
|
|
|
dir_key.offset = found_key.offset + 1;
|
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
if (range_end == (u64)-1)
|
|
|
|
break;
|
|
|
|
range_start = range_end + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
next_type:
|
|
|
|
ret = 0;
|
|
|
|
if (key_type == BTRFS_DIR_LOG_ITEM_KEY) {
|
|
|
|
key_type = BTRFS_DIR_LOG_INDEX_KEY;
|
|
|
|
dir_key.type = BTRFS_DIR_INDEX_KEY;
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
out:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_free_path(log_path);
|
|
|
|
iput(dir);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* the process_func used to replay items from the log tree. This
|
|
|
|
* gets called in two different stages. The first stage just looks
|
|
|
|
* for inodes and makes sure they are all copied into the subvolume.
|
|
|
|
*
|
|
|
|
* The second stage copies all the other item types from the log into
|
|
|
|
* the subvolume. The two stage approach is slower, but gets rid of
|
|
|
|
* lots of complexity around inodes referencing other inodes that exist
|
|
|
|
* only in the log (references come from either directory items or inode
|
|
|
|
* back refs).
|
|
|
|
*/
|
|
|
|
static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
|
|
|
|
struct walk_control *wc, u64 gen)
|
|
|
|
{
|
|
|
|
int nritems;
|
|
|
|
struct btrfs_path *path;
|
|
|
|
struct btrfs_root *root = wc->replay_dest;
|
|
|
|
struct btrfs_key key;
|
|
|
|
int level;
|
|
|
|
int i;
|
|
|
|
int ret;
|
|
|
|
|
2012-05-29 16:10:13 +07:00
|
|
|
ret = btrfs_read_buffer(eb, gen);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
level = btrfs_header_level(eb);
|
|
|
|
|
|
|
|
if (level != 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
path = btrfs_alloc_path();
|
2011-07-13 00:46:06 +07:00
|
|
|
if (!path)
|
|
|
|
return -ENOMEM;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
nritems = btrfs_header_nritems(eb);
|
|
|
|
for (i = 0; i < nritems; i++) {
|
|
|
|
btrfs_item_key_to_cpu(eb, &key, i);
|
|
|
|
|
|
|
|
/* inode keys are done during the first stage */
|
|
|
|
if (key.type == BTRFS_INODE_ITEM_KEY &&
|
|
|
|
wc->stage == LOG_WALK_REPLAY_INODES) {
|
|
|
|
struct btrfs_inode_item *inode_item;
|
|
|
|
u32 mode;
|
|
|
|
|
|
|
|
inode_item = btrfs_item_ptr(eb, i,
|
|
|
|
struct btrfs_inode_item);
|
|
|
|
mode = btrfs_inode_mode(eb, inode_item);
|
|
|
|
if (S_ISDIR(mode)) {
|
|
|
|
ret = replay_dir_deletes(wc->trans,
|
2009-03-24 21:24:20 +07:00
|
|
|
root, log, path, key.objectid, 0);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
break;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
ret = overwrite_item(wc->trans, root, path,
|
|
|
|
eb, i, &key);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
break;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-11-12 16:34:40 +07:00
|
|
|
/* for regular files, make sure corresponding
|
|
|
|
* orhpan item exist. extents past the new EOF
|
|
|
|
* will be truncated later by orphan cleanup.
|
2008-09-06 03:13:11 +07:00
|
|
|
*/
|
|
|
|
if (S_ISREG(mode)) {
|
2009-11-12 16:34:40 +07:00
|
|
|
ret = insert_orphan_item(wc->trans, root,
|
|
|
|
key.objectid);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
break;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2009-11-12 16:34:40 +07:00
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = link_to_fixup_dir(wc->trans, root,
|
|
|
|
path, key.objectid);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
break;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
if (wc->stage < LOG_WALK_REPLAY_ALL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* these keys are simply copied */
|
|
|
|
if (key.type == BTRFS_XATTR_ITEM_KEY) {
|
|
|
|
ret = overwrite_item(wc->trans, root, path,
|
|
|
|
eb, i, &key);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
break;
|
2013-05-26 20:50:29 +07:00
|
|
|
} else if (key.type == BTRFS_INODE_REF_KEY ||
|
|
|
|
key.type == BTRFS_INODE_EXTREF_KEY) {
|
2012-08-09 01:32:27 +07:00
|
|
|
ret = add_inode_ref(wc->trans, root, log, path,
|
|
|
|
eb, i, &key);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret && ret != -ENOENT)
|
|
|
|
break;
|
|
|
|
ret = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
} else if (key.type == BTRFS_EXTENT_DATA_KEY) {
|
|
|
|
ret = replay_one_extent(wc->trans, root, path,
|
|
|
|
eb, i, &key);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
break;
|
2008-09-06 03:13:11 +07:00
|
|
|
} else if (key.type == BTRFS_DIR_ITEM_KEY ||
|
|
|
|
key.type == BTRFS_DIR_INDEX_KEY) {
|
|
|
|
ret = replay_one_dir_item(wc->trans, root, path,
|
|
|
|
eb, i, &key);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
break;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
btrfs_free_path(path);
|
2013-04-26 02:55:30 +07:00
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
|
2008-09-06 03:13:11 +07:00
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path, int *level,
|
|
|
|
struct walk_control *wc)
|
|
|
|
{
|
|
|
|
u64 root_owner;
|
|
|
|
u64 bytenr;
|
|
|
|
u64 ptr_gen;
|
|
|
|
struct extent_buffer *next;
|
|
|
|
struct extent_buffer *cur;
|
|
|
|
struct extent_buffer *parent;
|
|
|
|
u32 blocksize;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
WARN_ON(*level < 0);
|
|
|
|
WARN_ON(*level >= BTRFS_MAX_LEVEL);
|
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
while (*level > 0) {
|
2008-09-06 03:13:11 +07:00
|
|
|
WARN_ON(*level < 0);
|
|
|
|
WARN_ON(*level >= BTRFS_MAX_LEVEL);
|
|
|
|
cur = path->nodes[*level];
|
|
|
|
|
|
|
|
if (btrfs_header_level(cur) != *level)
|
|
|
|
WARN_ON(1);
|
|
|
|
|
|
|
|
if (path->slots[*level] >=
|
|
|
|
btrfs_header_nritems(cur))
|
|
|
|
break;
|
|
|
|
|
|
|
|
bytenr = btrfs_node_blockptr(cur, path->slots[*level]);
|
|
|
|
ptr_gen = btrfs_node_ptr_generation(cur, path->slots[*level]);
|
|
|
|
blocksize = btrfs_level_size(root, *level - 1);
|
|
|
|
|
|
|
|
parent = path->nodes[*level];
|
|
|
|
root_owner = btrfs_header_owner(parent);
|
|
|
|
|
|
|
|
next = btrfs_find_create_tree_block(root, bytenr, blocksize);
|
2011-01-26 13:22:08 +07:00
|
|
|
if (!next)
|
|
|
|
return -ENOMEM;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
if (*level == 1) {
|
2011-07-13 00:46:06 +07:00
|
|
|
ret = wc->process_func(root, next, wc, ptr_gen);
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret) {
|
|
|
|
free_extent_buffer(next);
|
2011-07-13 00:46:06 +07:00
|
|
|
return ret;
|
2013-04-26 02:55:30 +07:00
|
|
|
}
|
2010-05-16 21:49:59 +07:00
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
path->slots[*level]++;
|
|
|
|
if (wc->free) {
|
2012-05-29 16:10:13 +07:00
|
|
|
ret = btrfs_read_buffer(next, ptr_gen);
|
|
|
|
if (ret) {
|
|
|
|
free_extent_buffer(next);
|
|
|
|
return ret;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
btrfs_tree_lock(next);
|
Btrfs: Change btree locking to use explicit blocking points
Most of the btrfs metadata operations can be protected by a spinlock,
but some operations still need to schedule.
So far, btrfs has been using a mutex along with a trylock loop,
most of the time it is able to avoid going for the full mutex, so
the trylock loop is a big performance gain.
This commit is step one for getting rid of the blocking locks entirely.
btrfs_tree_lock takes a spinlock, and the code explicitly switches
to a blocking lock when it starts an operation that can schedule.
We'll be able get rid of the blocking locks in smaller pieces over time.
Tracing allows us to find the most common cause of blocking, so we
can start with the hot spots first.
The basic idea is:
btrfs_tree_lock() returns with the spin lock held
btrfs_set_lock_blocking() sets the EXTENT_BUFFER_BLOCKING bit in
the extent buffer flags, and then drops the spin lock. The buffer is
still considered locked by all of the btrfs code.
If btrfs_tree_lock gets the spinlock but finds the blocking bit set, it drops
the spin lock and waits on a wait queue for the blocking bit to go away.
Much of the code that needs to set the blocking bit finishes without actually
blocking a good percentage of the time. So, an adaptive spin is still
used against the blocking bit to avoid very high context switch rates.
btrfs_clear_lock_blocking() clears the blocking bit and returns
with the spinlock held again.
btrfs_tree_unlock() can be called on either blocking or spinning locks,
it does the right thing based on the blocking bit.
ctree.c has a helper function to set/clear all the locked buffers in a
path as blocking.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-02-04 21:25:08 +07:00
|
|
|
btrfs_set_lock_blocking(next);
|
2011-07-17 02:23:14 +07:00
|
|
|
clean_tree_block(trans, root, next);
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_wait_tree_block_writeback(next);
|
|
|
|
btrfs_tree_unlock(next);
|
|
|
|
|
|
|
|
WARN_ON(root_owner !=
|
|
|
|
BTRFS_TREE_LOG_OBJECTID);
|
2011-11-01 07:52:39 +07:00
|
|
|
ret = btrfs_free_and_pin_reserved_extent(root,
|
2008-09-12 02:54:42 +07:00
|
|
|
bytenr, blocksize);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret) {
|
|
|
|
free_extent_buffer(next);
|
|
|
|
return ret;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
free_extent_buffer(next);
|
|
|
|
continue;
|
|
|
|
}
|
2012-05-29 16:10:13 +07:00
|
|
|
ret = btrfs_read_buffer(next, ptr_gen);
|
|
|
|
if (ret) {
|
|
|
|
free_extent_buffer(next);
|
|
|
|
return ret;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
WARN_ON(*level <= 0);
|
|
|
|
if (path->nodes[*level-1])
|
|
|
|
free_extent_buffer(path->nodes[*level-1]);
|
|
|
|
path->nodes[*level-1] = next;
|
|
|
|
*level = btrfs_header_level(next);
|
|
|
|
path->slots[*level] = 0;
|
|
|
|
cond_resched();
|
|
|
|
}
|
|
|
|
WARN_ON(*level < 0);
|
|
|
|
WARN_ON(*level >= BTRFS_MAX_LEVEL);
|
|
|
|
|
2010-05-16 21:49:59 +07:00
|
|
|
path->slots[*level] = btrfs_header_nritems(path->nodes[*level]);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
cond_resched();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,
|
2008-09-06 03:13:11 +07:00
|
|
|
struct btrfs_root *root,
|
|
|
|
struct btrfs_path *path, int *level,
|
|
|
|
struct walk_control *wc)
|
|
|
|
{
|
|
|
|
u64 root_owner;
|
|
|
|
int i;
|
|
|
|
int slot;
|
|
|
|
int ret;
|
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
for (i = *level; i < BTRFS_MAX_LEVEL - 1 && path->nodes[i]; i++) {
|
2008-09-06 03:13:11 +07:00
|
|
|
slot = path->slots[i];
|
2010-05-16 21:49:59 +07:00
|
|
|
if (slot + 1 < btrfs_header_nritems(path->nodes[i])) {
|
2008-09-06 03:13:11 +07:00
|
|
|
path->slots[i]++;
|
|
|
|
*level = i;
|
|
|
|
WARN_ON(*level == 0);
|
|
|
|
return 0;
|
|
|
|
} else {
|
2008-09-24 00:14:14 +07:00
|
|
|
struct extent_buffer *parent;
|
|
|
|
if (path->nodes[*level] == root->node)
|
|
|
|
parent = path->nodes[*level];
|
|
|
|
else
|
|
|
|
parent = path->nodes[*level + 1];
|
|
|
|
|
|
|
|
root_owner = btrfs_header_owner(parent);
|
2011-07-13 00:46:06 +07:00
|
|
|
ret = wc->process_func(root, path->nodes[*level], wc,
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_header_generation(path->nodes[*level]));
|
2011-07-13 00:46:06 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
if (wc->free) {
|
|
|
|
struct extent_buffer *next;
|
|
|
|
|
|
|
|
next = path->nodes[*level];
|
|
|
|
|
|
|
|
btrfs_tree_lock(next);
|
Btrfs: Change btree locking to use explicit blocking points
Most of the btrfs metadata operations can be protected by a spinlock,
but some operations still need to schedule.
So far, btrfs has been using a mutex along with a trylock loop,
most of the time it is able to avoid going for the full mutex, so
the trylock loop is a big performance gain.
This commit is step one for getting rid of the blocking locks entirely.
btrfs_tree_lock takes a spinlock, and the code explicitly switches
to a blocking lock when it starts an operation that can schedule.
We'll be able get rid of the blocking locks in smaller pieces over time.
Tracing allows us to find the most common cause of blocking, so we
can start with the hot spots first.
The basic idea is:
btrfs_tree_lock() returns with the spin lock held
btrfs_set_lock_blocking() sets the EXTENT_BUFFER_BLOCKING bit in
the extent buffer flags, and then drops the spin lock. The buffer is
still considered locked by all of the btrfs code.
If btrfs_tree_lock gets the spinlock but finds the blocking bit set, it drops
the spin lock and waits on a wait queue for the blocking bit to go away.
Much of the code that needs to set the blocking bit finishes without actually
blocking a good percentage of the time. So, an adaptive spin is still
used against the blocking bit to avoid very high context switch rates.
btrfs_clear_lock_blocking() clears the blocking bit and returns
with the spinlock held again.
btrfs_tree_unlock() can be called on either blocking or spinning locks,
it does the right thing based on the blocking bit.
ctree.c has a helper function to set/clear all the locked buffers in a
path as blocking.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-02-04 21:25:08 +07:00
|
|
|
btrfs_set_lock_blocking(next);
|
2011-07-17 02:23:14 +07:00
|
|
|
clean_tree_block(trans, root, next);
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_wait_tree_block_writeback(next);
|
|
|
|
btrfs_tree_unlock(next);
|
|
|
|
|
|
|
|
WARN_ON(root_owner != BTRFS_TREE_LOG_OBJECTID);
|
2011-11-01 07:52:39 +07:00
|
|
|
ret = btrfs_free_and_pin_reserved_extent(root,
|
2008-09-06 03:13:11 +07:00
|
|
|
path->nodes[*level]->start,
|
2008-09-12 02:54:42 +07:00
|
|
|
path->nodes[*level]->len);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
free_extent_buffer(path->nodes[*level]);
|
|
|
|
path->nodes[*level] = NULL;
|
|
|
|
*level = i + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* drop the reference count on the tree rooted at 'snap'. This traverses
|
|
|
|
* the tree freeing any blocks that have a ref count of zero after being
|
|
|
|
* decremented.
|
|
|
|
*/
|
|
|
|
static int walk_log_tree(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *log, struct walk_control *wc)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
int wret;
|
|
|
|
int level;
|
|
|
|
struct btrfs_path *path;
|
|
|
|
int orig_level;
|
|
|
|
|
|
|
|
path = btrfs_alloc_path();
|
2011-03-23 15:14:16 +07:00
|
|
|
if (!path)
|
|
|
|
return -ENOMEM;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
level = btrfs_header_level(log->node);
|
|
|
|
orig_level = level;
|
|
|
|
path->nodes[level] = log->node;
|
|
|
|
extent_buffer_get(log->node);
|
|
|
|
path->slots[level] = 0;
|
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-06 03:13:11 +07:00
|
|
|
wret = walk_down_log_tree(trans, log, path, &level, wc);
|
|
|
|
if (wret > 0)
|
|
|
|
break;
|
2012-03-12 22:03:00 +07:00
|
|
|
if (wret < 0) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = wret;
|
2012-03-12 22:03:00 +07:00
|
|
|
goto out;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
wret = walk_up_log_tree(trans, log, path, &level, wc);
|
|
|
|
if (wret > 0)
|
|
|
|
break;
|
2012-03-12 22:03:00 +07:00
|
|
|
if (wret < 0) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = wret;
|
2012-03-12 22:03:00 +07:00
|
|
|
goto out;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* was the root node processed? if not, catch it here */
|
|
|
|
if (path->nodes[orig_level]) {
|
2012-03-12 22:03:00 +07:00
|
|
|
ret = wc->process_func(log, path->nodes[orig_level], wc,
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_header_generation(path->nodes[orig_level]));
|
2012-03-12 22:03:00 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-09-06 03:13:11 +07:00
|
|
|
if (wc->free) {
|
|
|
|
struct extent_buffer *next;
|
|
|
|
|
|
|
|
next = path->nodes[orig_level];
|
|
|
|
|
|
|
|
btrfs_tree_lock(next);
|
Btrfs: Change btree locking to use explicit blocking points
Most of the btrfs metadata operations can be protected by a spinlock,
but some operations still need to schedule.
So far, btrfs has been using a mutex along with a trylock loop,
most of the time it is able to avoid going for the full mutex, so
the trylock loop is a big performance gain.
This commit is step one for getting rid of the blocking locks entirely.
btrfs_tree_lock takes a spinlock, and the code explicitly switches
to a blocking lock when it starts an operation that can schedule.
We'll be able get rid of the blocking locks in smaller pieces over time.
Tracing allows us to find the most common cause of blocking, so we
can start with the hot spots first.
The basic idea is:
btrfs_tree_lock() returns with the spin lock held
btrfs_set_lock_blocking() sets the EXTENT_BUFFER_BLOCKING bit in
the extent buffer flags, and then drops the spin lock. The buffer is
still considered locked by all of the btrfs code.
If btrfs_tree_lock gets the spinlock but finds the blocking bit set, it drops
the spin lock and waits on a wait queue for the blocking bit to go away.
Much of the code that needs to set the blocking bit finishes without actually
blocking a good percentage of the time. So, an adaptive spin is still
used against the blocking bit to avoid very high context switch rates.
btrfs_clear_lock_blocking() clears the blocking bit and returns
with the spinlock held again.
btrfs_tree_unlock() can be called on either blocking or spinning locks,
it does the right thing based on the blocking bit.
ctree.c has a helper function to set/clear all the locked buffers in a
path as blocking.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-02-04 21:25:08 +07:00
|
|
|
btrfs_set_lock_blocking(next);
|
2011-07-17 02:23:14 +07:00
|
|
|
clean_tree_block(trans, log, next);
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_wait_tree_block_writeback(next);
|
|
|
|
btrfs_tree_unlock(next);
|
|
|
|
|
|
|
|
WARN_ON(log->root_key.objectid !=
|
|
|
|
BTRFS_TREE_LOG_OBJECTID);
|
2011-11-01 07:52:39 +07:00
|
|
|
ret = btrfs_free_and_pin_reserved_extent(log, next->start,
|
2008-09-12 02:54:42 +07:00
|
|
|
next->len);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-12 22:03:00 +07:00
|
|
|
out:
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_free_path(path);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-01-22 00:54:03 +07:00
|
|
|
/*
|
|
|
|
* helper function to update the item for a given subvolumes log root
|
|
|
|
* in the tree of log roots
|
|
|
|
*/
|
|
|
|
static int update_log_root(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *log)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (log->log_transid == 1) {
|
|
|
|
/* insert root item on the first sync */
|
|
|
|
ret = btrfs_insert_root(trans, log->fs_info->log_root_tree,
|
|
|
|
&log->root_key, &log->root_item);
|
|
|
|
} else {
|
|
|
|
ret = btrfs_update_root(trans, log->fs_info->log_root_tree,
|
|
|
|
&log->root_key, &log->root_item);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
static int wait_log_commit(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root, unsigned long transid)
|
2008-09-06 03:13:11 +07:00
|
|
|
{
|
|
|
|
DEFINE_WAIT(wait);
|
2009-01-22 00:54:03 +07:00
|
|
|
int index = transid % 2;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-01-22 00:54:03 +07:00
|
|
|
/*
|
|
|
|
* we only allow two pending log transactions at a time,
|
|
|
|
* so we know that if ours is more than 2 older than the
|
|
|
|
* current transaction, we're done
|
|
|
|
*/
|
2008-09-06 03:13:11 +07:00
|
|
|
do {
|
2009-01-22 00:54:03 +07:00
|
|
|
prepare_to_wait(&root->log_commit_wait[index],
|
|
|
|
&wait, TASK_UNINTERRUPTIBLE);
|
|
|
|
mutex_unlock(&root->log_mutex);
|
2009-03-24 21:24:20 +07:00
|
|
|
|
|
|
|
if (root->fs_info->last_trans_log_full_commit !=
|
|
|
|
trans->transid && root->log_transid < transid + 2 &&
|
2009-01-22 00:54:03 +07:00
|
|
|
atomic_read(&root->log_commit[index]))
|
|
|
|
schedule();
|
2009-03-24 21:24:20 +07:00
|
|
|
|
2009-01-22 00:54:03 +07:00
|
|
|
finish_wait(&root->log_commit_wait[index], &wait);
|
|
|
|
mutex_lock(&root->log_mutex);
|
2012-01-27 03:01:11 +07:00
|
|
|
} while (root->fs_info->last_trans_log_full_commit !=
|
|
|
|
trans->transid && root->log_transid < transid + 2 &&
|
2009-01-22 00:54:03 +07:00
|
|
|
atomic_read(&root->log_commit[index]));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-03-01 20:56:26 +07:00
|
|
|
static void wait_for_writer(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root)
|
2009-01-22 00:54:03 +07:00
|
|
|
{
|
|
|
|
DEFINE_WAIT(wait);
|
2012-01-27 03:01:11 +07:00
|
|
|
while (root->fs_info->last_trans_log_full_commit !=
|
|
|
|
trans->transid && atomic_read(&root->log_writers)) {
|
2009-01-22 00:54:03 +07:00
|
|
|
prepare_to_wait(&root->log_writer_wait,
|
|
|
|
&wait, TASK_UNINTERRUPTIBLE);
|
|
|
|
mutex_unlock(&root->log_mutex);
|
2009-03-24 21:24:20 +07:00
|
|
|
if (root->fs_info->last_trans_log_full_commit !=
|
|
|
|
trans->transid && atomic_read(&root->log_writers))
|
2008-09-06 03:13:11 +07:00
|
|
|
schedule();
|
2009-01-22 00:54:03 +07:00
|
|
|
mutex_lock(&root->log_mutex);
|
|
|
|
finish_wait(&root->log_writer_wait, &wait);
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* btrfs_sync_log does sends a given tree log down to the disk and
|
|
|
|
* updates the super blocks to record it. When this call is done,
|
2009-03-24 21:24:20 +07:00
|
|
|
* you know that any inodes previously logged are safely on disk only
|
|
|
|
* if it returns 0.
|
|
|
|
*
|
|
|
|
* Any other return value means you need to call btrfs_commit_transaction.
|
|
|
|
* Some of the edge cases for fsyncing directories that have had unlinks
|
|
|
|
* or renames done in the past mean that sometimes the only safe
|
|
|
|
* fsync is to commit the whole FS. When btrfs_sync_log returns -EAGAIN,
|
|
|
|
* that has happened.
|
2008-09-06 03:13:11 +07:00
|
|
|
*/
|
|
|
|
int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root)
|
|
|
|
{
|
2009-01-22 00:54:03 +07:00
|
|
|
int index1;
|
|
|
|
int index2;
|
2009-11-12 16:33:26 +07:00
|
|
|
int mark;
|
2008-09-06 03:13:11 +07:00
|
|
|
int ret;
|
|
|
|
struct btrfs_root *log = root->log_root;
|
2009-01-22 00:54:03 +07:00
|
|
|
struct btrfs_root *log_root_tree = root->fs_info->log_root_tree;
|
2009-11-12 16:33:26 +07:00
|
|
|
unsigned long log_transid = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-01-22 00:54:03 +07:00
|
|
|
mutex_lock(&root->log_mutex);
|
2012-10-13 02:27:49 +07:00
|
|
|
log_transid = root->log_transid;
|
2009-01-22 00:54:03 +07:00
|
|
|
index1 = root->log_transid % 2;
|
|
|
|
if (atomic_read(&root->log_commit[index1])) {
|
2009-03-24 21:24:20 +07:00
|
|
|
wait_log_commit(trans, root, root->log_transid);
|
2009-01-22 00:54:03 +07:00
|
|
|
mutex_unlock(&root->log_mutex);
|
|
|
|
return 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2009-01-22 00:54:03 +07:00
|
|
|
atomic_set(&root->log_commit[index1], 1);
|
|
|
|
|
|
|
|
/* wait for previous tree log sync to complete */
|
|
|
|
if (atomic_read(&root->log_commit[(index1 + 1) % 2]))
|
2009-03-24 21:24:20 +07:00
|
|
|
wait_log_commit(trans, root, root->log_transid - 1);
|
2009-10-14 20:24:59 +07:00
|
|
|
while (1) {
|
2012-09-06 17:04:27 +07:00
|
|
|
int batch = atomic_read(&root->log_batch);
|
2011-10-21 02:45:37 +07:00
|
|
|
/* when we're on an ssd, just kick the log commit out */
|
|
|
|
if (!btrfs_test_opt(root, SSD) && root->log_multiple_pids) {
|
2009-10-14 20:24:59 +07:00
|
|
|
mutex_unlock(&root->log_mutex);
|
|
|
|
schedule_timeout_uninterruptible(1);
|
|
|
|
mutex_lock(&root->log_mutex);
|
|
|
|
}
|
2009-03-24 21:24:20 +07:00
|
|
|
wait_for_writer(trans, root);
|
2012-09-06 17:04:27 +07:00
|
|
|
if (batch == atomic_read(&root->log_batch))
|
2008-09-06 03:13:11 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
/* bail out if we need to do a full commit */
|
|
|
|
if (root->fs_info->last_trans_log_full_commit == trans->transid) {
|
|
|
|
ret = -EAGAIN;
|
2012-10-13 02:27:49 +07:00
|
|
|
btrfs_free_logged_extents(log, log_transid);
|
2009-03-24 21:24:20 +07:00
|
|
|
mutex_unlock(&root->log_mutex);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-11-12 16:33:26 +07:00
|
|
|
if (log_transid % 2 == 0)
|
|
|
|
mark = EXTENT_DIRTY;
|
|
|
|
else
|
|
|
|
mark = EXTENT_NEW;
|
|
|
|
|
2009-10-14 00:29:19 +07:00
|
|
|
/* we start IO on all the marked extents here, but we don't actually
|
|
|
|
* wait for them until later.
|
|
|
|
*/
|
2009-11-12 16:33:26 +07:00
|
|
|
ret = btrfs_write_marked_extents(log, &log->dirty_log_pages, mark);
|
2012-03-12 22:03:00 +07:00
|
|
|
if (ret) {
|
|
|
|
btrfs_abort_transaction(trans, root, ret);
|
2012-10-13 02:27:49 +07:00
|
|
|
btrfs_free_logged_extents(log, log_transid);
|
2012-03-12 22:03:00 +07:00
|
|
|
mutex_unlock(&root->log_mutex);
|
|
|
|
goto out;
|
|
|
|
}
|
2009-01-22 00:54:03 +07:00
|
|
|
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
btrfs_set_root_node(&log->root_item, log->node);
|
2009-01-22 00:54:03 +07:00
|
|
|
|
|
|
|
root->log_transid++;
|
|
|
|
log->log_transid = root->log_transid;
|
2009-10-09 02:30:04 +07:00
|
|
|
root->log_start_pid = 0;
|
2009-01-22 00:54:03 +07:00
|
|
|
smp_mb();
|
|
|
|
/*
|
2009-11-12 16:33:26 +07:00
|
|
|
* IO has been started, blocks of the log tree have WRITTEN flag set
|
|
|
|
* in their headers. new modifications of the log will be written to
|
|
|
|
* new positions. so it's safe to allow log writers to go in.
|
2009-01-22 00:54:03 +07:00
|
|
|
*/
|
|
|
|
mutex_unlock(&root->log_mutex);
|
|
|
|
|
|
|
|
mutex_lock(&log_root_tree->log_mutex);
|
2012-09-06 17:04:27 +07:00
|
|
|
atomic_inc(&log_root_tree->log_batch);
|
2009-01-22 00:54:03 +07:00
|
|
|
atomic_inc(&log_root_tree->log_writers);
|
|
|
|
mutex_unlock(&log_root_tree->log_mutex);
|
|
|
|
|
|
|
|
ret = update_log_root(trans, log);
|
|
|
|
|
|
|
|
mutex_lock(&log_root_tree->log_mutex);
|
|
|
|
if (atomic_dec_and_test(&log_root_tree->log_writers)) {
|
|
|
|
smp_mb();
|
|
|
|
if (waitqueue_active(&log_root_tree->log_writer_wait))
|
|
|
|
wake_up(&log_root_tree->log_writer_wait);
|
|
|
|
}
|
|
|
|
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret) {
|
2012-03-12 22:03:00 +07:00
|
|
|
if (ret != -ENOSPC) {
|
|
|
|
btrfs_abort_transaction(trans, root, ret);
|
|
|
|
mutex_unlock(&log_root_tree->log_mutex);
|
|
|
|
goto out;
|
|
|
|
}
|
2010-05-16 21:49:59 +07:00
|
|
|
root->fs_info->last_trans_log_full_commit = trans->transid;
|
|
|
|
btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark);
|
2012-10-13 02:27:49 +07:00
|
|
|
btrfs_free_logged_extents(log, log_transid);
|
2010-05-16 21:49:59 +07:00
|
|
|
mutex_unlock(&log_root_tree->log_mutex);
|
|
|
|
ret = -EAGAIN;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-01-22 00:54:03 +07:00
|
|
|
index2 = log_root_tree->log_transid % 2;
|
|
|
|
if (atomic_read(&log_root_tree->log_commit[index2])) {
|
2009-11-12 16:33:26 +07:00
|
|
|
btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark);
|
2009-03-24 21:24:20 +07:00
|
|
|
wait_log_commit(trans, log_root_tree,
|
|
|
|
log_root_tree->log_transid);
|
2012-10-13 02:27:49 +07:00
|
|
|
btrfs_free_logged_extents(log, log_transid);
|
2009-01-22 00:54:03 +07:00
|
|
|
mutex_unlock(&log_root_tree->log_mutex);
|
2011-02-01 04:48:24 +07:00
|
|
|
ret = 0;
|
2009-01-22 00:54:03 +07:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
atomic_set(&log_root_tree->log_commit[index2], 1);
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
if (atomic_read(&log_root_tree->log_commit[(index2 + 1) % 2])) {
|
|
|
|
wait_log_commit(trans, log_root_tree,
|
|
|
|
log_root_tree->log_transid - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
wait_for_writer(trans, log_root_tree);
|
2009-01-22 00:54:03 +07:00
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
/*
|
|
|
|
* now that we've moved on to the tree of log tree roots,
|
|
|
|
* check the full commit flag again
|
|
|
|
*/
|
|
|
|
if (root->fs_info->last_trans_log_full_commit == trans->transid) {
|
2009-11-12 16:33:26 +07:00
|
|
|
btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark);
|
2012-10-13 02:27:49 +07:00
|
|
|
btrfs_free_logged_extents(log, log_transid);
|
2009-03-24 21:24:20 +07:00
|
|
|
mutex_unlock(&log_root_tree->log_mutex);
|
|
|
|
ret = -EAGAIN;
|
|
|
|
goto out_wake_log_root;
|
|
|
|
}
|
2009-01-22 00:54:03 +07:00
|
|
|
|
|
|
|
ret = btrfs_write_and_wait_marked_extents(log_root_tree,
|
2009-11-12 16:33:26 +07:00
|
|
|
&log_root_tree->dirty_log_pages,
|
|
|
|
EXTENT_DIRTY | EXTENT_NEW);
|
2012-03-12 22:03:00 +07:00
|
|
|
if (ret) {
|
|
|
|
btrfs_abort_transaction(trans, root, ret);
|
2012-10-13 02:27:49 +07:00
|
|
|
btrfs_free_logged_extents(log, log_transid);
|
2012-03-12 22:03:00 +07:00
|
|
|
mutex_unlock(&log_root_tree->log_mutex);
|
|
|
|
goto out_wake_log_root;
|
|
|
|
}
|
2009-11-12 16:33:26 +07:00
|
|
|
btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark);
|
2012-10-13 02:27:49 +07:00
|
|
|
btrfs_wait_logged_extents(log, log_transid);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2011-04-13 20:41:04 +07:00
|
|
|
btrfs_set_super_log_root(root->fs_info->super_for_commit,
|
2009-01-22 00:54:03 +07:00
|
|
|
log_root_tree->node->start);
|
2011-04-13 20:41:04 +07:00
|
|
|
btrfs_set_super_log_root_level(root->fs_info->super_for_commit,
|
2009-01-22 00:54:03 +07:00
|
|
|
btrfs_header_level(log_root_tree->node));
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-01-22 00:54:03 +07:00
|
|
|
log_root_tree->log_transid++;
|
2008-09-06 03:13:11 +07:00
|
|
|
smp_mb();
|
2009-01-22 00:54:03 +07:00
|
|
|
|
|
|
|
mutex_unlock(&log_root_tree->log_mutex);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* nobody else is going to jump in and write the the ctree
|
|
|
|
* super here because the log_commit atomic below is protecting
|
|
|
|
* us. We must be called with a transaction handle pinning
|
|
|
|
* the running transaction open, so a full commit can't hop
|
|
|
|
* in and cause problems either.
|
|
|
|
*/
|
2011-03-08 20:14:00 +07:00
|
|
|
btrfs_scrub_pause_super(root);
|
2012-08-01 23:56:49 +07:00
|
|
|
ret = write_ctree_super(trans, root->fs_info->tree_root, 1);
|
2011-03-08 20:14:00 +07:00
|
|
|
btrfs_scrub_continue_super(root);
|
2012-08-01 23:56:49 +07:00
|
|
|
if (ret) {
|
|
|
|
btrfs_abort_transaction(trans, root, ret);
|
|
|
|
goto out_wake_log_root;
|
|
|
|
}
|
2009-01-22 00:54:03 +07:00
|
|
|
|
2009-10-14 00:21:08 +07:00
|
|
|
mutex_lock(&root->log_mutex);
|
|
|
|
if (root->last_log_commit < log_transid)
|
|
|
|
root->last_log_commit = log_transid;
|
|
|
|
mutex_unlock(&root->log_mutex);
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
out_wake_log_root:
|
2009-01-22 00:54:03 +07:00
|
|
|
atomic_set(&log_root_tree->log_commit[index2], 0);
|
|
|
|
smp_mb();
|
|
|
|
if (waitqueue_active(&log_root_tree->log_commit_wait[index2]))
|
|
|
|
wake_up(&log_root_tree->log_commit_wait[index2]);
|
2008-09-06 03:13:11 +07:00
|
|
|
out:
|
2009-01-22 00:54:03 +07:00
|
|
|
atomic_set(&root->log_commit[index1], 0);
|
|
|
|
smp_mb();
|
|
|
|
if (waitqueue_active(&root->log_commit_wait[index1]))
|
|
|
|
wake_up(&root->log_commit_wait[index1]);
|
2011-02-01 04:48:24 +07:00
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
2010-05-16 21:49:59 +07:00
|
|
|
static void free_log_tree(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *log)
|
2008-09-06 03:13:11 +07:00
|
|
|
{
|
|
|
|
int ret;
|
2008-09-12 03:17:57 +07:00
|
|
|
u64 start;
|
|
|
|
u64 end;
|
2008-09-06 03:13:11 +07:00
|
|
|
struct walk_control wc = {
|
|
|
|
.free = 1,
|
|
|
|
.process_func = process_one_buffer
|
|
|
|
};
|
|
|
|
|
2013-02-27 20:28:24 +07:00
|
|
|
if (trans) {
|
|
|
|
ret = walk_log_tree(trans, log, &wc);
|
2013-04-26 03:23:32 +07:00
|
|
|
|
|
|
|
/* I don't think this can happen but just in case */
|
|
|
|
if (ret)
|
|
|
|
btrfs_abort_transaction(trans, log, ret);
|
2013-02-27 20:28:24 +07:00
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-12 03:17:57 +07:00
|
|
|
ret = find_first_extent_bit(&log->dirty_log_pages,
|
2012-09-28 04:07:30 +07:00
|
|
|
0, &start, &end, EXTENT_DIRTY | EXTENT_NEW,
|
|
|
|
NULL);
|
2008-09-12 03:17:57 +07:00
|
|
|
if (ret)
|
|
|
|
break;
|
|
|
|
|
2009-11-12 16:33:26 +07:00
|
|
|
clear_extent_bits(&log->dirty_log_pages, start, end,
|
|
|
|
EXTENT_DIRTY | EXTENT_NEW, GFP_NOFS);
|
2008-09-12 03:17:57 +07:00
|
|
|
}
|
|
|
|
|
2012-10-13 02:27:49 +07:00
|
|
|
/*
|
|
|
|
* We may have short-circuited the log tree with the full commit logic
|
|
|
|
* and left ordered extents on our list, so clear these out to keep us
|
|
|
|
* from leaking inodes and memory.
|
|
|
|
*/
|
|
|
|
btrfs_free_logged_extents(log, 0);
|
|
|
|
btrfs_free_logged_extents(log, 1);
|
|
|
|
|
2009-01-22 00:54:03 +07:00
|
|
|
free_extent_buffer(log->node);
|
|
|
|
kfree(log);
|
2010-05-16 21:49:59 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* free all the extents used by the tree log. This should be called
|
|
|
|
* at commit time of the full transaction
|
|
|
|
*/
|
|
|
|
int btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root)
|
|
|
|
{
|
|
|
|
if (root->log_root) {
|
|
|
|
free_log_tree(trans, root->log_root);
|
|
|
|
root->log_root = NULL;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int btrfs_free_log_root_tree(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_fs_info *fs_info)
|
|
|
|
{
|
|
|
|
if (fs_info->log_root_tree) {
|
|
|
|
free_log_tree(trans, fs_info->log_root_tree);
|
|
|
|
fs_info->log_root_tree = NULL;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If both a file and directory are logged, and unlinks or renames are
|
|
|
|
* mixed in, we have a few interesting corners:
|
|
|
|
*
|
|
|
|
* create file X in dir Y
|
|
|
|
* link file X to X.link in dir Y
|
|
|
|
* fsync file X
|
|
|
|
* unlink file X but leave X.link
|
|
|
|
* fsync dir Y
|
|
|
|
*
|
|
|
|
* After a crash we would expect only X.link to exist. But file X
|
|
|
|
* didn't get fsync'd again so the log has back refs for X and X.link.
|
|
|
|
*
|
|
|
|
* We solve this by removing directory entries and inode backrefs from the
|
|
|
|
* log when a file that was logged in the current transaction is
|
|
|
|
* unlinked. Any later fsync will include the updated log entries, and
|
|
|
|
* we'll be able to reconstruct the proper directory items from backrefs.
|
|
|
|
*
|
|
|
|
* This optimizations allows us to avoid relogging the entire inode
|
|
|
|
* or the entire directory.
|
|
|
|
*/
|
|
|
|
int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
const char *name, int name_len,
|
|
|
|
struct inode *dir, u64 index)
|
|
|
|
{
|
|
|
|
struct btrfs_root *log;
|
|
|
|
struct btrfs_dir_item *di;
|
|
|
|
struct btrfs_path *path;
|
|
|
|
int ret;
|
2010-05-16 21:49:59 +07:00
|
|
|
int err = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
int bytes_del = 0;
|
2011-04-20 09:31:50 +07:00
|
|
|
u64 dir_ino = btrfs_ino(dir);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2008-09-12 02:53:37 +07:00
|
|
|
if (BTRFS_I(dir)->logged_trans < trans->transid)
|
|
|
|
return 0;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = join_running_log_trans(root);
|
|
|
|
if (ret)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
mutex_lock(&BTRFS_I(dir)->log_mutex);
|
|
|
|
|
|
|
|
log = root->log_root;
|
|
|
|
path = btrfs_alloc_path();
|
2011-04-26 06:43:51 +07:00
|
|
|
if (!path) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2011-01-26 13:22:08 +07:00
|
|
|
|
2011-04-20 09:31:50 +07:00
|
|
|
di = btrfs_lookup_dir_item(trans, log, path, dir_ino,
|
2008-09-06 03:13:11 +07:00
|
|
|
name, name_len, -1);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (IS_ERR(di)) {
|
|
|
|
err = PTR_ERR(di);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (di) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_delete_one_dir_name(trans, log, path, di);
|
|
|
|
bytes_del += name_len;
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto fail;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2011-04-20 09:31:50 +07:00
|
|
|
di = btrfs_lookup_dir_index_item(trans, log, path, dir_ino,
|
2008-09-06 03:13:11 +07:00
|
|
|
index, name, name_len, -1);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (IS_ERR(di)) {
|
|
|
|
err = PTR_ERR(di);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (di) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_delete_one_dir_name(trans, log, path, di);
|
|
|
|
bytes_del += name_len;
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto fail;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* update the directory size in the log to reflect the names
|
|
|
|
* we have removed
|
|
|
|
*/
|
|
|
|
if (bytes_del) {
|
|
|
|
struct btrfs_key key;
|
|
|
|
|
2011-04-20 09:31:50 +07:00
|
|
|
key.objectid = dir_ino;
|
2008-09-06 03:13:11 +07:00
|
|
|
key.offset = 0;
|
|
|
|
key.type = BTRFS_INODE_ITEM_KEY;
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
ret = btrfs_search_slot(trans, log, &key, path, 0, 1);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret < 0) {
|
|
|
|
err = ret;
|
|
|
|
goto fail;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
if (ret == 0) {
|
|
|
|
struct btrfs_inode_item *item;
|
|
|
|
u64 i_size;
|
|
|
|
|
|
|
|
item = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
|
|
|
struct btrfs_inode_item);
|
|
|
|
i_size = btrfs_inode_size(path->nodes[0], item);
|
|
|
|
if (i_size > bytes_del)
|
|
|
|
i_size -= bytes_del;
|
|
|
|
else
|
|
|
|
i_size = 0;
|
|
|
|
btrfs_set_inode_size(path->nodes[0], item, i_size);
|
|
|
|
btrfs_mark_buffer_dirty(path->nodes[0]);
|
|
|
|
} else
|
|
|
|
ret = 0;
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2010-05-16 21:49:59 +07:00
|
|
|
fail:
|
2008-09-06 03:13:11 +07:00
|
|
|
btrfs_free_path(path);
|
2011-04-26 06:43:51 +07:00
|
|
|
out_unlock:
|
2008-09-06 03:13:11 +07:00
|
|
|
mutex_unlock(&BTRFS_I(dir)->log_mutex);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret == -ENOSPC) {
|
|
|
|
root->fs_info->last_trans_log_full_commit = trans->transid;
|
|
|
|
ret = 0;
|
2012-03-12 22:03:00 +07:00
|
|
|
} else if (ret < 0)
|
|
|
|
btrfs_abort_transaction(trans, root, ret);
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
btrfs_end_log_trans(root);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2010-10-30 02:14:31 +07:00
|
|
|
return err;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* see comments for btrfs_del_dir_entries_in_log */
|
|
|
|
int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
const char *name, int name_len,
|
|
|
|
struct inode *inode, u64 dirid)
|
|
|
|
{
|
|
|
|
struct btrfs_root *log;
|
|
|
|
u64 index;
|
|
|
|
int ret;
|
|
|
|
|
2008-09-12 02:53:37 +07:00
|
|
|
if (BTRFS_I(inode)->logged_trans < trans->transid)
|
|
|
|
return 0;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = join_running_log_trans(root);
|
|
|
|
if (ret)
|
|
|
|
return 0;
|
|
|
|
log = root->log_root;
|
|
|
|
mutex_lock(&BTRFS_I(inode)->log_mutex);
|
|
|
|
|
2011-04-20 09:31:50 +07:00
|
|
|
ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(inode),
|
2008-09-06 03:13:11 +07:00
|
|
|
dirid, &index);
|
|
|
|
mutex_unlock(&BTRFS_I(inode)->log_mutex);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret == -ENOSPC) {
|
|
|
|
root->fs_info->last_trans_log_full_commit = trans->transid;
|
|
|
|
ret = 0;
|
2012-03-12 22:03:00 +07:00
|
|
|
} else if (ret < 0 && ret != -ENOENT)
|
|
|
|
btrfs_abort_transaction(trans, root, ret);
|
2009-03-24 21:24:20 +07:00
|
|
|
btrfs_end_log_trans(root);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* creates a range item in the log for 'dirid'. first_offset and
|
|
|
|
* last_offset tell us which parts of the key space the log should
|
|
|
|
* be considered authoritative for.
|
|
|
|
*/
|
|
|
|
static noinline int insert_dir_log_key(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *log,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
int key_type, u64 dirid,
|
|
|
|
u64 first_offset, u64 last_offset)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct btrfs_key key;
|
|
|
|
struct btrfs_dir_log_item *item;
|
|
|
|
|
|
|
|
key.objectid = dirid;
|
|
|
|
key.offset = first_offset;
|
|
|
|
if (key_type == BTRFS_DIR_ITEM_KEY)
|
|
|
|
key.type = BTRFS_DIR_LOG_ITEM_KEY;
|
|
|
|
else
|
|
|
|
key.type = BTRFS_DIR_LOG_INDEX_KEY;
|
|
|
|
ret = btrfs_insert_empty_item(trans, log, path, &key, sizeof(*item));
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
item = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
|
|
|
struct btrfs_dir_log_item);
|
|
|
|
btrfs_set_dir_log_end(path->nodes[0], item, last_offset);
|
|
|
|
btrfs_mark_buffer_dirty(path->nodes[0]);
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* log all the items included in the current transaction for a given
|
|
|
|
* directory. This also creates the range items in the log tree required
|
|
|
|
* to replay anything deleted before the fsync
|
|
|
|
*/
|
|
|
|
static noinline int log_dir_items(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root, struct inode *inode,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
struct btrfs_path *dst_path, int key_type,
|
|
|
|
u64 min_offset, u64 *last_offset_ret)
|
|
|
|
{
|
|
|
|
struct btrfs_key min_key;
|
|
|
|
struct btrfs_key max_key;
|
|
|
|
struct btrfs_root *log = root->log_root;
|
|
|
|
struct extent_buffer *src;
|
2010-05-16 21:49:59 +07:00
|
|
|
int err = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
int ret;
|
|
|
|
int i;
|
|
|
|
int nritems;
|
|
|
|
u64 first_offset = min_offset;
|
|
|
|
u64 last_offset = (u64)-1;
|
2011-04-20 09:31:50 +07:00
|
|
|
u64 ino = btrfs_ino(inode);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
log = root->log_root;
|
2011-04-20 09:31:50 +07:00
|
|
|
max_key.objectid = ino;
|
2008-09-06 03:13:11 +07:00
|
|
|
max_key.offset = (u64)-1;
|
|
|
|
max_key.type = key_type;
|
|
|
|
|
2011-04-20 09:31:50 +07:00
|
|
|
min_key.objectid = ino;
|
2008-09-06 03:13:11 +07:00
|
|
|
min_key.type = key_type;
|
|
|
|
min_key.offset = min_offset;
|
|
|
|
|
|
|
|
path->keep_locks = 1;
|
|
|
|
|
|
|
|
ret = btrfs_search_forward(root, &min_key, &max_key,
|
2013-02-01 01:21:12 +07:00
|
|
|
path, trans->transid);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* we didn't find anything from this transaction, see if there
|
|
|
|
* is anything at all
|
|
|
|
*/
|
2011-04-20 09:31:50 +07:00
|
|
|
if (ret != 0 || min_key.objectid != ino || min_key.type != key_type) {
|
|
|
|
min_key.objectid = ino;
|
2008-09-06 03:13:11 +07:00
|
|
|
min_key.type = key_type;
|
|
|
|
min_key.offset = (u64)-1;
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_search_slot(NULL, root, &min_key, path, 0, 0);
|
|
|
|
if (ret < 0) {
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
return ret;
|
|
|
|
}
|
2011-04-20 09:31:50 +07:00
|
|
|
ret = btrfs_previous_item(root, path, ino, key_type);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/* if ret == 0 there are items for this type,
|
|
|
|
* create a range to tell us the last key of this type.
|
|
|
|
* otherwise, there are no items in this directory after
|
|
|
|
* *min_offset, and we create a range to indicate that.
|
|
|
|
*/
|
|
|
|
if (ret == 0) {
|
|
|
|
struct btrfs_key tmp;
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &tmp,
|
|
|
|
path->slots[0]);
|
2009-01-06 09:25:51 +07:00
|
|
|
if (key_type == tmp.type)
|
2008-09-06 03:13:11 +07:00
|
|
|
first_offset = max(min_offset, tmp.offset) + 1;
|
|
|
|
}
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* go backward to find any previous key */
|
2011-04-20 09:31:50 +07:00
|
|
|
ret = btrfs_previous_item(root, path, ino, key_type);
|
2008-09-06 03:13:11 +07:00
|
|
|
if (ret == 0) {
|
|
|
|
struct btrfs_key tmp;
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &tmp, path->slots[0]);
|
|
|
|
if (key_type == tmp.type) {
|
|
|
|
first_offset = tmp.offset;
|
|
|
|
ret = overwrite_item(trans, log, dst_path,
|
|
|
|
path->nodes[0], path->slots[0],
|
|
|
|
&tmp);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto done;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/* find the first key from this transaction again */
|
|
|
|
ret = btrfs_search_slot(NULL, root, &min_key, path, 0, 0);
|
|
|
|
if (ret != 0) {
|
|
|
|
WARN_ON(1);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we have a block from this transaction, log every item in it
|
|
|
|
* from our directory
|
|
|
|
*/
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-06 03:13:11 +07:00
|
|
|
struct btrfs_key tmp;
|
|
|
|
src = path->nodes[0];
|
|
|
|
nritems = btrfs_header_nritems(src);
|
|
|
|
for (i = path->slots[0]; i < nritems; i++) {
|
|
|
|
btrfs_item_key_to_cpu(src, &min_key, i);
|
|
|
|
|
2011-04-20 09:31:50 +07:00
|
|
|
if (min_key.objectid != ino || min_key.type != key_type)
|
2008-09-06 03:13:11 +07:00
|
|
|
goto done;
|
|
|
|
ret = overwrite_item(trans, log, dst_path, src, i,
|
|
|
|
&min_key);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto done;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
path->slots[0] = nritems;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* look ahead to the next item and see if it is also
|
|
|
|
* from this directory and from this transaction
|
|
|
|
*/
|
|
|
|
ret = btrfs_next_leaf(root, path);
|
|
|
|
if (ret == 1) {
|
|
|
|
last_offset = (u64)-1;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &tmp, path->slots[0]);
|
2011-04-20 09:31:50 +07:00
|
|
|
if (tmp.objectid != ino || tmp.type != key_type) {
|
2008-09-06 03:13:11 +07:00
|
|
|
last_offset = (u64)-1;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
if (btrfs_header_generation(path->nodes[0]) != trans->transid) {
|
|
|
|
ret = overwrite_item(trans, log, dst_path,
|
|
|
|
path->nodes[0], path->slots[0],
|
|
|
|
&tmp);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret)
|
|
|
|
err = ret;
|
|
|
|
else
|
|
|
|
last_offset = tmp.offset;
|
2008-09-06 03:13:11 +07:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
done:
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
|
|
|
btrfs_release_path(dst_path);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2010-05-16 21:49:59 +07:00
|
|
|
if (err == 0) {
|
|
|
|
*last_offset_ret = last_offset;
|
|
|
|
/*
|
|
|
|
* insert the log range keys to indicate where the log
|
|
|
|
* is valid
|
|
|
|
*/
|
|
|
|
ret = insert_dir_log_key(trans, log, path, key_type,
|
2011-04-20 09:31:50 +07:00
|
|
|
ino, first_offset, last_offset);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret)
|
|
|
|
err = ret;
|
|
|
|
}
|
|
|
|
return err;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* logging directories is very similar to logging inodes, We find all the items
|
|
|
|
* from the current transaction and write them to the log.
|
|
|
|
*
|
|
|
|
* The recovery code scans the directory in the subvolume, and if it finds a
|
|
|
|
* key in the range logged that is not present in the log tree, then it means
|
|
|
|
* that dir entry was unlinked during the transaction.
|
|
|
|
*
|
|
|
|
* In order for that scan to work, we must include one key smaller than
|
|
|
|
* the smallest logged by this transaction and one key larger than the largest
|
|
|
|
* key logged by this transaction.
|
|
|
|
*/
|
|
|
|
static noinline int log_directory_changes(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root, struct inode *inode,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
struct btrfs_path *dst_path)
|
|
|
|
{
|
|
|
|
u64 min_key;
|
|
|
|
u64 max_key;
|
|
|
|
int ret;
|
|
|
|
int key_type = BTRFS_DIR_ITEM_KEY;
|
|
|
|
|
|
|
|
again:
|
|
|
|
min_key = 0;
|
|
|
|
max_key = 0;
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = log_dir_items(trans, root, inode, path,
|
|
|
|
dst_path, key_type, min_key,
|
|
|
|
&max_key);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
if (max_key == (u64)-1)
|
|
|
|
break;
|
|
|
|
min_key = max_key + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (key_type == BTRFS_DIR_ITEM_KEY) {
|
|
|
|
key_type = BTRFS_DIR_INDEX_KEY;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* a helper function to drop items from the log before we relog an
|
|
|
|
* inode. max_key_type indicates the highest item type to remove.
|
|
|
|
* This cannot be run for file data extents because it does not
|
|
|
|
* free the extents they point to.
|
|
|
|
*/
|
|
|
|
static int drop_objectid_items(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *log,
|
|
|
|
struct btrfs_path *path,
|
|
|
|
u64 objectid, int max_key_type)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct btrfs_key key;
|
|
|
|
struct btrfs_key found_key;
|
2012-09-28 22:56:28 +07:00
|
|
|
int start_slot;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
key.objectid = objectid;
|
|
|
|
key.type = max_key_type;
|
|
|
|
key.offset = (u64)-1;
|
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_search_slot(trans, log, &key, path, -1, 1);
|
2013-04-26 03:23:32 +07:00
|
|
|
BUG_ON(ret == 0); /* Logic error */
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret < 0)
|
2008-09-06 03:13:11 +07:00
|
|
|
break;
|
|
|
|
|
|
|
|
if (path->slots[0] == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
path->slots[0]--;
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &found_key,
|
|
|
|
path->slots[0]);
|
|
|
|
|
|
|
|
if (found_key.objectid != objectid)
|
|
|
|
break;
|
|
|
|
|
2012-09-28 22:56:28 +07:00
|
|
|
found_key.offset = 0;
|
|
|
|
found_key.type = 0;
|
|
|
|
ret = btrfs_bin_search(path->nodes[0], &found_key, 0,
|
|
|
|
&start_slot);
|
|
|
|
|
|
|
|
ret = btrfs_del_items(trans, log, path, start_slot,
|
|
|
|
path->slots[0] - start_slot + 1);
|
|
|
|
/*
|
|
|
|
* If start slot isn't 0 then we don't need to re-search, we've
|
|
|
|
* found the last guy with the objectid in this tree.
|
|
|
|
*/
|
|
|
|
if (ret || start_slot != 0)
|
2011-05-19 11:37:44 +07:00
|
|
|
break;
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2012-05-30 03:59:49 +07:00
|
|
|
if (ret > 0)
|
|
|
|
ret = 0;
|
2010-05-16 21:49:59 +07:00
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
2012-09-26 01:56:25 +07:00
|
|
|
static void fill_inode_item(struct btrfs_trans_handle *trans,
|
|
|
|
struct extent_buffer *leaf,
|
|
|
|
struct btrfs_inode_item *item,
|
|
|
|
struct inode *inode, int log_inode_only)
|
|
|
|
{
|
2012-10-24 03:03:44 +07:00
|
|
|
struct btrfs_map_token token;
|
|
|
|
|
|
|
|
btrfs_init_map_token(&token);
|
2012-09-26 01:56:25 +07:00
|
|
|
|
|
|
|
if (log_inode_only) {
|
|
|
|
/* set the generation to zero so the recover code
|
|
|
|
* can tell the difference between an logging
|
|
|
|
* just to say 'this inode exists' and a logging
|
|
|
|
* to say 'update this inode with these values'
|
|
|
|
*/
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_set_token_inode_generation(leaf, item, 0, &token);
|
|
|
|
btrfs_set_token_inode_size(leaf, item, 0, &token);
|
2012-09-26 01:56:25 +07:00
|
|
|
} else {
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_set_token_inode_generation(leaf, item,
|
|
|
|
BTRFS_I(inode)->generation,
|
|
|
|
&token);
|
|
|
|
btrfs_set_token_inode_size(leaf, item, inode->i_size, &token);
|
|
|
|
}
|
|
|
|
|
|
|
|
btrfs_set_token_inode_uid(leaf, item, i_uid_read(inode), &token);
|
|
|
|
btrfs_set_token_inode_gid(leaf, item, i_gid_read(inode), &token);
|
|
|
|
btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
|
|
|
|
btrfs_set_token_inode_nlink(leaf, item, inode->i_nlink, &token);
|
|
|
|
|
|
|
|
btrfs_set_token_timespec_sec(leaf, btrfs_inode_atime(item),
|
|
|
|
inode->i_atime.tv_sec, &token);
|
|
|
|
btrfs_set_token_timespec_nsec(leaf, btrfs_inode_atime(item),
|
|
|
|
inode->i_atime.tv_nsec, &token);
|
|
|
|
|
|
|
|
btrfs_set_token_timespec_sec(leaf, btrfs_inode_mtime(item),
|
|
|
|
inode->i_mtime.tv_sec, &token);
|
|
|
|
btrfs_set_token_timespec_nsec(leaf, btrfs_inode_mtime(item),
|
|
|
|
inode->i_mtime.tv_nsec, &token);
|
|
|
|
|
|
|
|
btrfs_set_token_timespec_sec(leaf, btrfs_inode_ctime(item),
|
|
|
|
inode->i_ctime.tv_sec, &token);
|
|
|
|
btrfs_set_token_timespec_nsec(leaf, btrfs_inode_ctime(item),
|
|
|
|
inode->i_ctime.tv_nsec, &token);
|
|
|
|
|
|
|
|
btrfs_set_token_inode_nbytes(leaf, item, inode_get_bytes(inode),
|
|
|
|
&token);
|
|
|
|
|
|
|
|
btrfs_set_token_inode_sequence(leaf, item, inode->i_version, &token);
|
|
|
|
btrfs_set_token_inode_transid(leaf, item, trans->transid, &token);
|
|
|
|
btrfs_set_token_inode_rdev(leaf, item, inode->i_rdev, &token);
|
|
|
|
btrfs_set_token_inode_flags(leaf, item, BTRFS_I(inode)->flags, &token);
|
|
|
|
btrfs_set_token_inode_block_group(leaf, item, 0, &token);
|
2012-09-26 01:56:25 +07:00
|
|
|
}
|
|
|
|
|
2012-10-12 03:17:34 +07:00
|
|
|
static int log_inode_item(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *log, struct btrfs_path *path,
|
|
|
|
struct inode *inode)
|
|
|
|
{
|
|
|
|
struct btrfs_inode_item *inode_item;
|
|
|
|
struct btrfs_key key;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
memcpy(&key, &BTRFS_I(inode)->location, sizeof(key));
|
|
|
|
ret = btrfs_insert_empty_item(trans, log, path, &key,
|
|
|
|
sizeof(*inode_item));
|
|
|
|
if (ret && ret != -EEXIST)
|
|
|
|
return ret;
|
|
|
|
inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
|
|
|
struct btrfs_inode_item);
|
|
|
|
fill_inode_item(trans, path->nodes[0], inode_item, inode, 0);
|
|
|
|
btrfs_release_path(path);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-12 03:17:57 +07:00
|
|
|
static noinline int copy_items(struct btrfs_trans_handle *trans,
|
2012-08-29 14:07:56 +07:00
|
|
|
struct inode *inode,
|
2008-09-12 03:17:57 +07:00
|
|
|
struct btrfs_path *dst_path,
|
|
|
|
struct extent_buffer *src,
|
|
|
|
int start_slot, int nr, int inode_only)
|
|
|
|
{
|
|
|
|
unsigned long src_offset;
|
|
|
|
unsigned long dst_offset;
|
2012-08-29 14:07:56 +07:00
|
|
|
struct btrfs_root *log = BTRFS_I(inode)->root->log_root;
|
2008-09-12 03:17:57 +07:00
|
|
|
struct btrfs_file_extent_item *extent;
|
|
|
|
struct btrfs_inode_item *inode_item;
|
|
|
|
int ret;
|
|
|
|
struct btrfs_key *ins_keys;
|
|
|
|
u32 *ins_sizes;
|
|
|
|
char *ins_data;
|
|
|
|
int i;
|
Btrfs: move data checksumming into a dedicated tree
Btrfs stores checksums for each data block. Until now, they have
been stored in the subvolume trees, indexed by the inode that is
referencing the data block. This means that when we read the inode,
we've probably read in at least some checksums as well.
But, this has a few problems:
* The checksums are indexed by logical offset in the file. When
compression is on, this means we have to do the expensive checksumming
on the uncompressed data. It would be faster if we could checksum
the compressed data instead.
* If we implement encryption, we'll be checksumming the plain text and
storing that on disk. This is significantly less secure.
* For either compression or encryption, we have to get the plain text
back before we can verify the checksum as correct. This makes the raid
layer balancing and extent moving much more expensive.
* It makes the front end caching code more complex, as we have touch
the subvolume and inodes as we cache extents.
* There is potentitally one copy of the checksum in each subvolume
referencing an extent.
The solution used here is to store the extent checksums in a dedicated
tree. This allows us to index the checksums by phyiscal extent
start and length. It means:
* The checksum is against the data stored on disk, after any compression
or encryption is done.
* The checksum is stored in a central location, and can be verified without
following back references, or reading inodes.
This makes compression significantly faster by reducing the amount of
data that needs to be checksummed. It will also allow much faster
raid management code in general.
The checksums are indexed by a key with a fixed objectid (a magic value
in ctree.h) and offset set to the starting byte of the extent. This
allows us to copy the checksum items into the fsync log tree directly (or
any other tree), without having to invent a second format for them.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2008-12-09 04:58:54 +07:00
|
|
|
struct list_head ordered_sums;
|
2012-08-29 14:07:56 +07:00
|
|
|
int skip_csum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;
|
Btrfs: move data checksumming into a dedicated tree
Btrfs stores checksums for each data block. Until now, they have
been stored in the subvolume trees, indexed by the inode that is
referencing the data block. This means that when we read the inode,
we've probably read in at least some checksums as well.
But, this has a few problems:
* The checksums are indexed by logical offset in the file. When
compression is on, this means we have to do the expensive checksumming
on the uncompressed data. It would be faster if we could checksum
the compressed data instead.
* If we implement encryption, we'll be checksumming the plain text and
storing that on disk. This is significantly less secure.
* For either compression or encryption, we have to get the plain text
back before we can verify the checksum as correct. This makes the raid
layer balancing and extent moving much more expensive.
* It makes the front end caching code more complex, as we have touch
the subvolume and inodes as we cache extents.
* There is potentitally one copy of the checksum in each subvolume
referencing an extent.
The solution used here is to store the extent checksums in a dedicated
tree. This allows us to index the checksums by phyiscal extent
start and length. It means:
* The checksum is against the data stored on disk, after any compression
or encryption is done.
* The checksum is stored in a central location, and can be verified without
following back references, or reading inodes.
This makes compression significantly faster by reducing the amount of
data that needs to be checksummed. It will also allow much faster
raid management code in general.
The checksums are indexed by a key with a fixed objectid (a magic value
in ctree.h) and offset set to the starting byte of the extent. This
allows us to copy the checksum items into the fsync log tree directly (or
any other tree), without having to invent a second format for them.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2008-12-09 04:58:54 +07:00
|
|
|
|
|
|
|
INIT_LIST_HEAD(&ordered_sums);
|
2008-09-12 03:17:57 +07:00
|
|
|
|
|
|
|
ins_data = kmalloc(nr * sizeof(struct btrfs_key) +
|
|
|
|
nr * sizeof(u32), GFP_NOFS);
|
2011-01-26 13:22:08 +07:00
|
|
|
if (!ins_data)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-09-12 03:17:57 +07:00
|
|
|
ins_sizes = (u32 *)ins_data;
|
|
|
|
ins_keys = (struct btrfs_key *)(ins_data + nr * sizeof(u32));
|
|
|
|
|
|
|
|
for (i = 0; i < nr; i++) {
|
|
|
|
ins_sizes[i] = btrfs_item_size_nr(src, i + start_slot);
|
|
|
|
btrfs_item_key_to_cpu(src, ins_keys + i, i + start_slot);
|
|
|
|
}
|
|
|
|
ret = btrfs_insert_empty_items(trans, log, dst_path,
|
|
|
|
ins_keys, ins_sizes, nr);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret) {
|
|
|
|
kfree(ins_data);
|
|
|
|
return ret;
|
|
|
|
}
|
2008-09-12 03:17:57 +07:00
|
|
|
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
for (i = 0; i < nr; i++, dst_path->slots[0]++) {
|
2008-09-12 03:17:57 +07:00
|
|
|
dst_offset = btrfs_item_ptr_offset(dst_path->nodes[0],
|
|
|
|
dst_path->slots[0]);
|
|
|
|
|
|
|
|
src_offset = btrfs_item_ptr_offset(src, start_slot + i);
|
|
|
|
|
2012-09-26 01:56:25 +07:00
|
|
|
if (ins_keys[i].type == BTRFS_INODE_ITEM_KEY) {
|
2008-09-12 03:17:57 +07:00
|
|
|
inode_item = btrfs_item_ptr(dst_path->nodes[0],
|
|
|
|
dst_path->slots[0],
|
|
|
|
struct btrfs_inode_item);
|
2012-09-26 01:56:25 +07:00
|
|
|
fill_inode_item(trans, dst_path->nodes[0], inode_item,
|
|
|
|
inode, inode_only == LOG_INODE_EXISTS);
|
|
|
|
} else {
|
|
|
|
copy_extent_buffer(dst_path->nodes[0], src, dst_offset,
|
|
|
|
src_offset, ins_sizes[i]);
|
2008-09-12 03:17:57 +07:00
|
|
|
}
|
2012-09-26 01:56:25 +07:00
|
|
|
|
2008-09-12 03:17:57 +07:00
|
|
|
/* take a reference on file data extents so that truncates
|
|
|
|
* or deletes of this inode don't have to relog the inode
|
|
|
|
* again
|
|
|
|
*/
|
2012-08-29 14:07:56 +07:00
|
|
|
if (btrfs_key_type(ins_keys + i) == BTRFS_EXTENT_DATA_KEY &&
|
|
|
|
!skip_csum) {
|
2008-09-12 03:17:57 +07:00
|
|
|
int found_type;
|
|
|
|
extent = btrfs_item_ptr(src, start_slot + i,
|
|
|
|
struct btrfs_file_extent_item);
|
|
|
|
|
Btrfs: do not flush csum items of unchanged file data during treelog
The current code relogs the entire inode every time during fsync log,
and it is much better suited to small files rather than large ones.
During my performance test, the fsync performace of large files sucks,
and we can ascribe this to the tremendous amount of csum infos of the
large ones, cause we have to flush all of these csum infos into log trees
even when there are only _one_ change in the whole file data. Apparently,
to optimize fsync, we need to create a filter to skip the unnecessary csum
ones, that is, the corresponding file data remains unchanged before this fsync.
Here I have some test results to show, I use sysbench to do "random write + fsync".
===
sysbench --test=fileio --num-threads=1 --file-num=2 --file-block-size=4K --file-total-size=8G --file-test-mode=rndwr --file-io-mode=sync --file-extra-flags= [prepare, run]
===
Sysbench args:
- Number of threads: 1
- Extra file open flags: 0
- 2 files, 4Gb each
- Block size 4Kb
- Number of random requests for random IO: 10000
- Read/Write ratio for combined random IO test: 1.50
- Periodic FSYNC enabled, calling fsync() each 100 requests.
- Calling fsync() at the end of test, Enabled.
- Using synchronous I/O mode
- Doing random write test
Sysbench results:
===
Operations performed: 0 Read, 10000 Write, 200 Other = 10200 Total
Read 0b Written 39.062Mb Total transferred 39.062Mb
===
a) without patch: (*SPEED* : 451.01Kb/sec)
112.75 Requests/sec executed
b) with patch: (*SPEED* : 4.7533Mb/sec)
1216.84 Requests/sec executed
PS: I've made a _sub transid_ stuff patch, but it does not perform as effectively as this patch,
and I'm wanderring where the problem is and trying to improve it more.
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2011-05-06 09:36:09 +07:00
|
|
|
if (btrfs_file_extent_generation(src, extent) < trans->transid)
|
|
|
|
continue;
|
|
|
|
|
2008-09-12 03:17:57 +07:00
|
|
|
found_type = btrfs_file_extent_type(src, extent);
|
2012-09-26 22:07:06 +07:00
|
|
|
if (found_type == BTRFS_FILE_EXTENT_REG) {
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
u64 ds, dl, cs, cl;
|
|
|
|
ds = btrfs_file_extent_disk_bytenr(src,
|
|
|
|
extent);
|
|
|
|
/* ds == 0 is a hole */
|
|
|
|
if (ds == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
dl = btrfs_file_extent_disk_num_bytes(src,
|
|
|
|
extent);
|
|
|
|
cs = btrfs_file_extent_offset(src, extent);
|
|
|
|
cl = btrfs_file_extent_num_bytes(src,
|
2009-08-19 01:18:35 +07:00
|
|
|
extent);
|
2008-12-09 07:15:39 +07:00
|
|
|
if (btrfs_file_extent_compression(src,
|
|
|
|
extent)) {
|
|
|
|
cs = 0;
|
|
|
|
cl = dl;
|
|
|
|
}
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
|
|
|
|
ret = btrfs_lookup_csums_range(
|
|
|
|
log->fs_info->csum_root,
|
|
|
|
ds + cs, ds + cs + cl - 1,
|
2011-03-08 20:14:00 +07:00
|
|
|
&ordered_sums, 0);
|
2013-04-26 03:23:32 +07:00
|
|
|
if (ret) {
|
|
|
|
btrfs_release_path(dst_path);
|
|
|
|
kfree(ins_data);
|
|
|
|
return ret;
|
|
|
|
}
|
2008-09-12 03:17:57 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
btrfs_mark_buffer_dirty(dst_path->nodes[0]);
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(dst_path);
|
2008-09-12 03:17:57 +07:00
|
|
|
kfree(ins_data);
|
Btrfs: move data checksumming into a dedicated tree
Btrfs stores checksums for each data block. Until now, they have
been stored in the subvolume trees, indexed by the inode that is
referencing the data block. This means that when we read the inode,
we've probably read in at least some checksums as well.
But, this has a few problems:
* The checksums are indexed by logical offset in the file. When
compression is on, this means we have to do the expensive checksumming
on the uncompressed data. It would be faster if we could checksum
the compressed data instead.
* If we implement encryption, we'll be checksumming the plain text and
storing that on disk. This is significantly less secure.
* For either compression or encryption, we have to get the plain text
back before we can verify the checksum as correct. This makes the raid
layer balancing and extent moving much more expensive.
* It makes the front end caching code more complex, as we have touch
the subvolume and inodes as we cache extents.
* There is potentitally one copy of the checksum in each subvolume
referencing an extent.
The solution used here is to store the extent checksums in a dedicated
tree. This allows us to index the checksums by phyiscal extent
start and length. It means:
* The checksum is against the data stored on disk, after any compression
or encryption is done.
* The checksum is stored in a central location, and can be verified without
following back references, or reading inodes.
This makes compression significantly faster by reducing the amount of
data that needs to be checksummed. It will also allow much faster
raid management code in general.
The checksums are indexed by a key with a fixed objectid (a magic value
in ctree.h) and offset set to the starting byte of the extent. This
allows us to copy the checksum items into the fsync log tree directly (or
any other tree), without having to invent a second format for them.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2008-12-09 04:58:54 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* we have to do this after the loop above to avoid changing the
|
|
|
|
* log tree while trying to change the log tree.
|
|
|
|
*/
|
2010-05-16 21:49:59 +07:00
|
|
|
ret = 0;
|
2009-01-06 09:25:51 +07:00
|
|
|
while (!list_empty(&ordered_sums)) {
|
Btrfs: move data checksumming into a dedicated tree
Btrfs stores checksums for each data block. Until now, they have
been stored in the subvolume trees, indexed by the inode that is
referencing the data block. This means that when we read the inode,
we've probably read in at least some checksums as well.
But, this has a few problems:
* The checksums are indexed by logical offset in the file. When
compression is on, this means we have to do the expensive checksumming
on the uncompressed data. It would be faster if we could checksum
the compressed data instead.
* If we implement encryption, we'll be checksumming the plain text and
storing that on disk. This is significantly less secure.
* For either compression or encryption, we have to get the plain text
back before we can verify the checksum as correct. This makes the raid
layer balancing and extent moving much more expensive.
* It makes the front end caching code more complex, as we have touch
the subvolume and inodes as we cache extents.
* There is potentitally one copy of the checksum in each subvolume
referencing an extent.
The solution used here is to store the extent checksums in a dedicated
tree. This allows us to index the checksums by phyiscal extent
start and length. It means:
* The checksum is against the data stored on disk, after any compression
or encryption is done.
* The checksum is stored in a central location, and can be verified without
following back references, or reading inodes.
This makes compression significantly faster by reducing the amount of
data that needs to be checksummed. It will also allow much faster
raid management code in general.
The checksums are indexed by a key with a fixed objectid (a magic value
in ctree.h) and offset set to the starting byte of the extent. This
allows us to copy the checksum items into the fsync log tree directly (or
any other tree), without having to invent a second format for them.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2008-12-09 04:58:54 +07:00
|
|
|
struct btrfs_ordered_sum *sums = list_entry(ordered_sums.next,
|
|
|
|
struct btrfs_ordered_sum,
|
|
|
|
list);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (!ret)
|
|
|
|
ret = btrfs_csum_file_blocks(trans, log, sums);
|
Btrfs: move data checksumming into a dedicated tree
Btrfs stores checksums for each data block. Until now, they have
been stored in the subvolume trees, indexed by the inode that is
referencing the data block. This means that when we read the inode,
we've probably read in at least some checksums as well.
But, this has a few problems:
* The checksums are indexed by logical offset in the file. When
compression is on, this means we have to do the expensive checksumming
on the uncompressed data. It would be faster if we could checksum
the compressed data instead.
* If we implement encryption, we'll be checksumming the plain text and
storing that on disk. This is significantly less secure.
* For either compression or encryption, we have to get the plain text
back before we can verify the checksum as correct. This makes the raid
layer balancing and extent moving much more expensive.
* It makes the front end caching code more complex, as we have touch
the subvolume and inodes as we cache extents.
* There is potentitally one copy of the checksum in each subvolume
referencing an extent.
The solution used here is to store the extent checksums in a dedicated
tree. This allows us to index the checksums by phyiscal extent
start and length. It means:
* The checksum is against the data stored on disk, after any compression
or encryption is done.
* The checksum is stored in a central location, and can be verified without
following back references, or reading inodes.
This makes compression significantly faster by reducing the amount of
data that needs to be checksummed. It will also allow much faster
raid management code in general.
The checksums are indexed by a key with a fixed objectid (a magic value
in ctree.h) and offset set to the starting byte of the extent. This
allows us to copy the checksum items into the fsync log tree directly (or
any other tree), without having to invent a second format for them.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2008-12-09 04:58:54 +07:00
|
|
|
list_del(&sums->list);
|
|
|
|
kfree(sums);
|
|
|
|
}
|
2010-05-16 21:49:59 +07:00
|
|
|
return ret;
|
2008-09-12 03:17:57 +07:00
|
|
|
}
|
|
|
|
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
static int extent_cmp(void *priv, struct list_head *a, struct list_head *b)
|
|
|
|
{
|
|
|
|
struct extent_map *em1, *em2;
|
|
|
|
|
|
|
|
em1 = list_entry(a, struct extent_map, list);
|
|
|
|
em2 = list_entry(b, struct extent_map, list);
|
|
|
|
|
|
|
|
if (em1->start < em2->start)
|
|
|
|
return -1;
|
|
|
|
else if (em1->start > em2->start)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int log_one_extent(struct btrfs_trans_handle *trans,
|
|
|
|
struct inode *inode, struct btrfs_root *root,
|
2012-10-12 03:54:30 +07:00
|
|
|
struct extent_map *em, struct btrfs_path *path)
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
{
|
|
|
|
struct btrfs_root *log = root->log_root;
|
2012-10-12 03:54:30 +07:00
|
|
|
struct btrfs_file_extent_item *fi;
|
|
|
|
struct extent_buffer *leaf;
|
2012-10-13 02:27:49 +07:00
|
|
|
struct btrfs_ordered_extent *ordered;
|
2012-10-12 03:54:30 +07:00
|
|
|
struct list_head ordered_sums;
|
2012-10-24 03:03:44 +07:00
|
|
|
struct btrfs_map_token token;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
struct btrfs_key key;
|
2012-10-13 02:27:49 +07:00
|
|
|
u64 mod_start = em->mod_start;
|
|
|
|
u64 mod_len = em->mod_len;
|
|
|
|
u64 csum_offset;
|
|
|
|
u64 csum_len;
|
2012-10-12 03:54:30 +07:00
|
|
|
u64 extent_offset = em->start - em->orig_start;
|
|
|
|
u64 block_len;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
int ret;
|
2012-10-13 02:27:49 +07:00
|
|
|
int index = log->log_transid % 2;
|
2012-10-12 03:54:30 +07:00
|
|
|
bool skip_csum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
|
2013-04-06 03:51:15 +07:00
|
|
|
ret = __btrfs_drop_extents(trans, log, inode, path, em->start,
|
|
|
|
em->start + em->len, NULL, 0);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2012-10-12 03:54:30 +07:00
|
|
|
INIT_LIST_HEAD(&ordered_sums);
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_init_map_token(&token);
|
2012-10-12 03:54:30 +07:00
|
|
|
key.objectid = btrfs_ino(inode);
|
|
|
|
key.type = BTRFS_EXTENT_DATA_KEY;
|
|
|
|
key.offset = em->start;
|
|
|
|
|
|
|
|
ret = btrfs_insert_empty_item(trans, log, path, &key, sizeof(*fi));
|
2013-04-06 03:51:15 +07:00
|
|
|
if (ret)
|
2012-10-12 03:54:30 +07:00
|
|
|
return ret;
|
|
|
|
leaf = path->nodes[0];
|
|
|
|
fi = btrfs_item_ptr(leaf, path->slots[0],
|
|
|
|
struct btrfs_file_extent_item);
|
2013-03-01 23:47:21 +07:00
|
|
|
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_set_token_file_extent_generation(leaf, fi, em->generation,
|
|
|
|
&token);
|
2012-10-12 03:54:30 +07:00
|
|
|
if (test_bit(EXTENT_FLAG_PREALLOC, &em->flags)) {
|
|
|
|
skip_csum = true;
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_set_token_file_extent_type(leaf, fi,
|
|
|
|
BTRFS_FILE_EXTENT_PREALLOC,
|
|
|
|
&token);
|
2012-10-12 03:54:30 +07:00
|
|
|
} else {
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_set_token_file_extent_type(leaf, fi,
|
|
|
|
BTRFS_FILE_EXTENT_REG,
|
|
|
|
&token);
|
2012-10-12 03:54:30 +07:00
|
|
|
if (em->block_start == 0)
|
|
|
|
skip_csum = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
block_len = max(em->block_len, em->orig_block_len);
|
|
|
|
if (em->compress_type != BTRFS_COMPRESS_NONE) {
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_set_token_file_extent_disk_bytenr(leaf, fi,
|
|
|
|
em->block_start,
|
|
|
|
&token);
|
|
|
|
btrfs_set_token_file_extent_disk_num_bytes(leaf, fi, block_len,
|
|
|
|
&token);
|
2012-10-12 03:54:30 +07:00
|
|
|
} else if (em->block_start < EXTENT_MAP_LAST_BYTE) {
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_set_token_file_extent_disk_bytenr(leaf, fi,
|
|
|
|
em->block_start -
|
|
|
|
extent_offset, &token);
|
|
|
|
btrfs_set_token_file_extent_disk_num_bytes(leaf, fi, block_len,
|
|
|
|
&token);
|
2012-10-12 03:54:30 +07:00
|
|
|
} else {
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_set_token_file_extent_disk_bytenr(leaf, fi, 0, &token);
|
|
|
|
btrfs_set_token_file_extent_disk_num_bytes(leaf, fi, 0,
|
|
|
|
&token);
|
|
|
|
}
|
|
|
|
|
|
|
|
btrfs_set_token_file_extent_offset(leaf, fi,
|
|
|
|
em->start - em->orig_start,
|
|
|
|
&token);
|
|
|
|
btrfs_set_token_file_extent_num_bytes(leaf, fi, em->len, &token);
|
2013-04-05 01:31:27 +07:00
|
|
|
btrfs_set_token_file_extent_ram_bytes(leaf, fi, em->ram_bytes, &token);
|
2012-10-24 03:03:44 +07:00
|
|
|
btrfs_set_token_file_extent_compression(leaf, fi, em->compress_type,
|
|
|
|
&token);
|
|
|
|
btrfs_set_token_file_extent_encryption(leaf, fi, 0, &token);
|
|
|
|
btrfs_set_token_file_extent_other_encoding(leaf, fi, 0, &token);
|
2012-10-12 03:54:30 +07:00
|
|
|
btrfs_mark_buffer_dirty(leaf);
|
2012-09-20 02:42:38 +07:00
|
|
|
|
2012-10-12 03:54:30 +07:00
|
|
|
btrfs_release_path(path);
|
|
|
|
if (ret) {
|
|
|
|
return ret;
|
|
|
|
}
|
2012-09-20 02:42:38 +07:00
|
|
|
|
2012-10-12 03:54:30 +07:00
|
|
|
if (skip_csum)
|
|
|
|
return 0;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
|
2013-01-06 10:38:22 +07:00
|
|
|
if (em->compress_type) {
|
|
|
|
csum_offset = 0;
|
|
|
|
csum_len = block_len;
|
|
|
|
}
|
|
|
|
|
2012-10-13 02:27:49 +07:00
|
|
|
/*
|
|
|
|
* First check and see if our csums are on our outstanding ordered
|
|
|
|
* extents.
|
|
|
|
*/
|
|
|
|
again:
|
|
|
|
spin_lock_irq(&log->log_extents_lock[index]);
|
|
|
|
list_for_each_entry(ordered, &log->logged_list[index], log_list) {
|
|
|
|
struct btrfs_ordered_sum *sum;
|
|
|
|
|
|
|
|
if (!mod_len)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (ordered->inode != inode)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (ordered->file_offset + ordered->len <= mod_start ||
|
|
|
|
mod_start + mod_len <= ordered->file_offset)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We are going to copy all the csums on this ordered extent, so
|
|
|
|
* go ahead and adjust mod_start and mod_len in case this
|
|
|
|
* ordered extent has already been logged.
|
|
|
|
*/
|
|
|
|
if (ordered->file_offset > mod_start) {
|
|
|
|
if (ordered->file_offset + ordered->len >=
|
|
|
|
mod_start + mod_len)
|
|
|
|
mod_len = ordered->file_offset - mod_start;
|
|
|
|
/*
|
|
|
|
* If we have this case
|
|
|
|
*
|
|
|
|
* |--------- logged extent ---------|
|
|
|
|
* |----- ordered extent ----|
|
|
|
|
*
|
|
|
|
* Just don't mess with mod_start and mod_len, we'll
|
|
|
|
* just end up logging more csums than we need and it
|
|
|
|
* will be ok.
|
|
|
|
*/
|
|
|
|
} else {
|
|
|
|
if (ordered->file_offset + ordered->len <
|
|
|
|
mod_start + mod_len) {
|
|
|
|
mod_len = (mod_start + mod_len) -
|
|
|
|
(ordered->file_offset + ordered->len);
|
|
|
|
mod_start = ordered->file_offset +
|
|
|
|
ordered->len;
|
|
|
|
} else {
|
|
|
|
mod_len = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* To keep us from looping for the above case of an ordered
|
|
|
|
* extent that falls inside of the logged extent.
|
|
|
|
*/
|
|
|
|
if (test_and_set_bit(BTRFS_ORDERED_LOGGED_CSUM,
|
|
|
|
&ordered->flags))
|
|
|
|
continue;
|
|
|
|
atomic_inc(&ordered->refs);
|
|
|
|
spin_unlock_irq(&log->log_extents_lock[index]);
|
|
|
|
/*
|
|
|
|
* we've dropped the lock, we must either break or
|
|
|
|
* start over after this.
|
|
|
|
*/
|
|
|
|
|
|
|
|
wait_event(ordered->wait, ordered->csum_bytes_left == 0);
|
|
|
|
|
|
|
|
list_for_each_entry(sum, &ordered->list, list) {
|
|
|
|
ret = btrfs_csum_file_blocks(trans, log, sum);
|
|
|
|
if (ret) {
|
|
|
|
btrfs_put_ordered_extent(ordered);
|
|
|
|
goto unlocked;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
btrfs_put_ordered_extent(ordered);
|
|
|
|
goto again;
|
|
|
|
|
|
|
|
}
|
|
|
|
spin_unlock_irq(&log->log_extents_lock[index]);
|
|
|
|
unlocked:
|
|
|
|
|
|
|
|
if (!mod_len || ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
csum_offset = mod_start - em->start;
|
|
|
|
csum_len = mod_len;
|
|
|
|
|
2012-10-12 03:54:30 +07:00
|
|
|
/* block start is already adjusted for the file extent offset. */
|
|
|
|
ret = btrfs_lookup_csums_range(log->fs_info->csum_root,
|
|
|
|
em->block_start + csum_offset,
|
|
|
|
em->block_start + csum_offset +
|
|
|
|
csum_len - 1, &ordered_sums, 0);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
|
2012-10-12 03:54:30 +07:00
|
|
|
while (!list_empty(&ordered_sums)) {
|
|
|
|
struct btrfs_ordered_sum *sums = list_entry(ordered_sums.next,
|
|
|
|
struct btrfs_ordered_sum,
|
|
|
|
list);
|
|
|
|
if (!ret)
|
|
|
|
ret = btrfs_csum_file_blocks(trans, log, sums);
|
|
|
|
list_del(&sums->list);
|
|
|
|
kfree(sums);
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
}
|
|
|
|
|
2012-10-12 03:54:30 +07:00
|
|
|
return ret;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root,
|
|
|
|
struct inode *inode,
|
2012-10-12 03:54:30 +07:00
|
|
|
struct btrfs_path *path)
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
{
|
|
|
|
struct extent_map *em, *n;
|
|
|
|
struct list_head extents;
|
|
|
|
struct extent_map_tree *tree = &BTRFS_I(inode)->extent_tree;
|
|
|
|
u64 test_gen;
|
|
|
|
int ret = 0;
|
2012-10-13 02:27:49 +07:00
|
|
|
int num = 0;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
|
|
|
|
INIT_LIST_HEAD(&extents);
|
|
|
|
|
|
|
|
write_lock(&tree->lock);
|
|
|
|
test_gen = root->fs_info->last_trans_committed;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(em, n, &tree->modified_extents, list) {
|
|
|
|
list_del_init(&em->list);
|
2012-10-13 02:27:49 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Just an arbitrary number, this can be really CPU intensive
|
|
|
|
* once we start getting a lot of extents, and really once we
|
|
|
|
* have a bunch of extents we just want to commit since it will
|
|
|
|
* be faster.
|
|
|
|
*/
|
|
|
|
if (++num > 32768) {
|
|
|
|
list_del_init(&tree->modified_extents);
|
|
|
|
ret = -EFBIG;
|
|
|
|
goto process;
|
|
|
|
}
|
|
|
|
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
if (em->generation <= test_gen)
|
|
|
|
continue;
|
2012-09-14 23:59:20 +07:00
|
|
|
/* Need a ref to keep it from getting evicted from cache */
|
|
|
|
atomic_inc(&em->refs);
|
|
|
|
set_bit(EXTENT_FLAG_LOGGING, &em->flags);
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
list_add_tail(&em->list, &extents);
|
2012-10-13 02:27:49 +07:00
|
|
|
num++;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
list_sort(NULL, &extents, extent_cmp);
|
|
|
|
|
2012-10-13 02:27:49 +07:00
|
|
|
process:
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
while (!list_empty(&extents)) {
|
|
|
|
em = list_entry(extents.next, struct extent_map, list);
|
|
|
|
|
|
|
|
list_del_init(&em->list);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we had an error we just need to delete everybody from our
|
|
|
|
* private list.
|
|
|
|
*/
|
2012-09-14 23:59:20 +07:00
|
|
|
if (ret) {
|
2013-01-25 00:02:07 +07:00
|
|
|
clear_em_logging(tree, em);
|
2012-09-14 23:59:20 +07:00
|
|
|
free_extent_map(em);
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
continue;
|
2012-09-14 23:59:20 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
write_unlock(&tree->lock);
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
|
2012-10-12 03:54:30 +07:00
|
|
|
ret = log_one_extent(trans, inode, root, em, path);
|
2012-09-14 23:59:20 +07:00
|
|
|
write_lock(&tree->lock);
|
2013-01-25 00:02:07 +07:00
|
|
|
clear_em_logging(tree, em);
|
|
|
|
free_extent_map(em);
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
}
|
2012-09-14 23:59:20 +07:00
|
|
|
WARN_ON(!list_empty(&extents));
|
|
|
|
write_unlock(&tree->lock);
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
|
|
|
|
btrfs_release_path(path);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
/* log a single inode in the tree log.
|
|
|
|
* At least one parent directory for this inode must exist in the tree
|
|
|
|
* or be logged already.
|
|
|
|
*
|
|
|
|
* Any items from this inode changed by the current transaction are copied
|
|
|
|
* to the log tree. An extra reference is taken on any extents in this
|
|
|
|
* file, allowing us to avoid a whole pile of corner cases around logging
|
|
|
|
* blocks that have been removed from the tree.
|
|
|
|
*
|
|
|
|
* See LOG_INODE_ALL and related defines for a description of what inode_only
|
|
|
|
* does.
|
|
|
|
*
|
|
|
|
* This handles both files and directories.
|
|
|
|
*/
|
2009-03-24 21:24:20 +07:00
|
|
|
static int btrfs_log_inode(struct btrfs_trans_handle *trans,
|
2008-09-06 03:13:11 +07:00
|
|
|
struct btrfs_root *root, struct inode *inode,
|
|
|
|
int inode_only)
|
|
|
|
{
|
|
|
|
struct btrfs_path *path;
|
|
|
|
struct btrfs_path *dst_path;
|
|
|
|
struct btrfs_key min_key;
|
|
|
|
struct btrfs_key max_key;
|
|
|
|
struct btrfs_root *log = root->log_root;
|
2008-09-12 03:17:57 +07:00
|
|
|
struct extent_buffer *src = NULL;
|
2010-05-16 21:49:59 +07:00
|
|
|
int err = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
int ret;
|
2008-09-12 02:53:37 +07:00
|
|
|
int nritems;
|
2008-09-12 03:17:57 +07:00
|
|
|
int ins_start_slot = 0;
|
|
|
|
int ins_nr;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
bool fast_search = false;
|
2011-04-20 09:31:50 +07:00
|
|
|
u64 ino = btrfs_ino(inode);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
path = btrfs_alloc_path();
|
2011-02-01 16:17:35 +07:00
|
|
|
if (!path)
|
|
|
|
return -ENOMEM;
|
2008-09-06 03:13:11 +07:00
|
|
|
dst_path = btrfs_alloc_path();
|
2011-02-01 16:17:35 +07:00
|
|
|
if (!dst_path) {
|
|
|
|
btrfs_free_path(path);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2011-04-20 09:31:50 +07:00
|
|
|
min_key.objectid = ino;
|
2008-09-06 03:13:11 +07:00
|
|
|
min_key.type = BTRFS_INODE_ITEM_KEY;
|
|
|
|
min_key.offset = 0;
|
|
|
|
|
2011-04-20 09:31:50 +07:00
|
|
|
max_key.objectid = ino;
|
2009-03-24 21:24:20 +07:00
|
|
|
|
|
|
|
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
/* today the code can only do partial logging of directories */
|
2012-11-01 14:35:23 +07:00
|
|
|
if (S_ISDIR(inode->i_mode) ||
|
|
|
|
(!test_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
|
|
|
|
&BTRFS_I(inode)->runtime_flags) &&
|
|
|
|
inode_only == LOG_INODE_EXISTS))
|
2008-09-06 03:13:11 +07:00
|
|
|
max_key.type = BTRFS_XATTR_ITEM_KEY;
|
|
|
|
else
|
|
|
|
max_key.type = (u8)-1;
|
|
|
|
max_key.offset = (u64)-1;
|
|
|
|
|
2012-09-26 01:56:25 +07:00
|
|
|
/* Only run delayed items if we are a dir or a new file */
|
|
|
|
if (S_ISDIR(inode->i_mode) ||
|
|
|
|
BTRFS_I(inode)->generation > root->fs_info->last_trans_committed) {
|
|
|
|
ret = btrfs_commit_inode_delayed_items(trans, inode);
|
|
|
|
if (ret) {
|
|
|
|
btrfs_free_path(path);
|
|
|
|
btrfs_free_path(dst_path);
|
|
|
|
return ret;
|
|
|
|
}
|
btrfs: implement delayed inode items operation
Changelog V5 -> V6:
- Fix oom when the memory load is high, by storing the delayed nodes into the
root's radix tree, and letting btrfs inodes go.
Changelog V4 -> V5:
- Fix the race on adding the delayed node to the inode, which is spotted by
Chris Mason.
- Merge Chris Mason's incremental patch into this patch.
- Fix deadlock between readdir() and memory fault, which is reported by
Itaru Kitayama.
Changelog V3 -> V4:
- Fix nested lock, which is reported by Itaru Kitayama, by updating space cache
inode in time.
Changelog V2 -> V3:
- Fix the race between the delayed worker and the task which does delayed items
balance, which is reported by Tsutomu Itoh.
- Modify the patch address David Sterba's comment.
- Fix the bug of the cpu recursion spinlock, reported by Chris Mason
Changelog V1 -> V2:
- break up the global rb-tree, use a list to manage the delayed nodes,
which is created for every directory and file, and used to manage the
delayed directory name index items and the delayed inode item.
- introduce a worker to deal with the delayed nodes.
Compare with Ext3/4, the performance of file creation and deletion on btrfs
is very poor. the reason is that btrfs must do a lot of b+ tree insertions,
such as inode item, directory name item, directory name index and so on.
If we can do some delayed b+ tree insertion or deletion, we can improve the
performance, so we made this patch which implemented delayed directory name
index insertion/deletion and delayed inode update.
Implementation:
- introduce a delayed root object into the filesystem, that use two lists to
manage the delayed nodes which are created for every file/directory.
One is used to manage all the delayed nodes that have delayed items. And the
other is used to manage the delayed nodes which is waiting to be dealt with
by the work thread.
- Every delayed node has two rb-tree, one is used to manage the directory name
index which is going to be inserted into b+ tree, and the other is used to
manage the directory name index which is going to be deleted from b+ tree.
- introduce a worker to deal with the delayed operation. This worker is used
to deal with the works of the delayed directory name index items insertion
and deletion and the delayed inode update.
When the delayed items is beyond the lower limit, we create works for some
delayed nodes and insert them into the work queue of the worker, and then
go back.
When the delayed items is beyond the upper bound, we create works for all
the delayed nodes that haven't been dealt with, and insert them into the work
queue of the worker, and then wait for that the untreated items is below some
threshold value.
- When we want to insert a directory name index into b+ tree, we just add the
information into the delayed inserting rb-tree.
And then we check the number of the delayed items and do delayed items
balance. (The balance policy is above.)
- When we want to delete a directory name index from the b+ tree, we search it
in the inserting rb-tree at first. If we look it up, just drop it. If not,
add the key of it into the delayed deleting rb-tree.
Similar to the delayed inserting rb-tree, we also check the number of the
delayed items and do delayed items balance.
(The same to inserting manipulation)
- When we want to update the metadata of some inode, we cached the data of the
inode into the delayed node. the worker will flush it into the b+ tree after
dealing with the delayed insertion and deletion.
- We will move the delayed node to the tail of the list after we access the
delayed node, By this way, we can cache more delayed items and merge more
inode updates.
- If we want to commit transaction, we will deal with all the delayed node.
- the delayed node will be freed when we free the btrfs inode.
- Before we log the inode items, we commit all the directory name index items
and the delayed inode update.
I did a quick test by the benchmark tool[1] and found we can improve the
performance of file creation by ~15%, and file deletion by ~20%.
Before applying this patch:
Create files:
Total files: 50000
Total time: 1.096108
Average time: 0.000022
Delete files:
Total files: 50000
Total time: 1.510403
Average time: 0.000030
After applying this patch:
Create files:
Total files: 50000
Total time: 0.932899
Average time: 0.000019
Delete files:
Total files: 50000
Total time: 1.215732
Average time: 0.000024
[1] http://marc.info/?l=linux-btrfs&m=128212635122920&q=p3
Many thanks for Kitayama-san's help!
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Reviewed-by: David Sterba <dave@jikos.cz>
Tested-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Tested-by: Itaru Kitayama <kitayama@cl.bb4u.ne.jp>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2011-04-22 17:12:22 +07:00
|
|
|
}
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
mutex_lock(&BTRFS_I(inode)->log_mutex);
|
|
|
|
|
2012-10-13 02:27:49 +07:00
|
|
|
btrfs_get_logged_extents(log, inode);
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
/*
|
|
|
|
* a brute force approach to making sure we get the most uptodate
|
|
|
|
* copies of everything.
|
|
|
|
*/
|
|
|
|
if (S_ISDIR(inode->i_mode)) {
|
|
|
|
int max_key_type = BTRFS_DIR_LOG_INDEX_KEY;
|
|
|
|
|
|
|
|
if (inode_only == LOG_INODE_EXISTS)
|
|
|
|
max_key_type = BTRFS_XATTR_ITEM_KEY;
|
2011-04-20 09:31:50 +07:00
|
|
|
ret = drop_objectid_items(trans, log, path, ino, max_key_type);
|
2008-09-06 03:13:11 +07:00
|
|
|
} else {
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
if (test_and_clear_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
|
|
|
|
&BTRFS_I(inode)->runtime_flags)) {
|
2012-10-12 02:53:56 +07:00
|
|
|
clear_bit(BTRFS_INODE_COPY_EVERYTHING,
|
|
|
|
&BTRFS_I(inode)->runtime_flags);
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
ret = btrfs_truncate_inode_items(trans, log,
|
|
|
|
inode, 0, 0);
|
2012-10-12 03:17:34 +07:00
|
|
|
} else if (test_and_clear_bit(BTRFS_INODE_COPY_EVERYTHING,
|
|
|
|
&BTRFS_I(inode)->runtime_flags)) {
|
2012-11-01 13:38:47 +07:00
|
|
|
if (inode_only == LOG_INODE_ALL)
|
|
|
|
fast_search = true;
|
2012-10-12 03:17:34 +07:00
|
|
|
max_key.type = BTRFS_XATTR_ITEM_KEY;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
ret = drop_objectid_items(trans, log, path, ino,
|
2012-10-12 02:53:56 +07:00
|
|
|
max_key.type);
|
2012-10-12 03:17:34 +07:00
|
|
|
} else {
|
|
|
|
if (inode_only == LOG_INODE_ALL)
|
|
|
|
fast_search = true;
|
|
|
|
ret = log_inode_item(trans, log, dst_path, inode);
|
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
goto log_extents;
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
}
|
2012-10-12 03:17:34 +07:00
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
path->keep_locks = 1;
|
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-12 03:17:57 +07:00
|
|
|
ins_nr = 0;
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_search_forward(root, &min_key, &max_key,
|
2013-02-01 01:21:12 +07:00
|
|
|
path, trans->transid);
|
2008-09-06 03:13:11 +07:00
|
|
|
if (ret != 0)
|
|
|
|
break;
|
2008-09-12 02:53:37 +07:00
|
|
|
again:
|
2008-09-12 03:17:57 +07:00
|
|
|
/* note, ins_nr might be > 0 here, cleanup outside the loop */
|
2011-04-20 09:31:50 +07:00
|
|
|
if (min_key.objectid != ino)
|
2008-09-06 03:13:11 +07:00
|
|
|
break;
|
|
|
|
if (min_key.type > max_key.type)
|
|
|
|
break;
|
2008-09-12 03:17:57 +07:00
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
src = path->nodes[0];
|
2008-09-12 03:17:57 +07:00
|
|
|
if (ins_nr && ins_start_slot + ins_nr == path->slots[0]) {
|
|
|
|
ins_nr++;
|
|
|
|
goto next_slot;
|
|
|
|
} else if (!ins_nr) {
|
|
|
|
ins_start_slot = path->slots[0];
|
|
|
|
ins_nr = 1;
|
|
|
|
goto next_slot;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
2012-08-29 14:07:56 +07:00
|
|
|
ret = copy_items(trans, inode, dst_path, src, ins_start_slot,
|
2008-09-12 03:17:57 +07:00
|
|
|
ins_nr, inode_only);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2008-09-12 03:17:57 +07:00
|
|
|
ins_nr = 1;
|
|
|
|
ins_start_slot = path->slots[0];
|
|
|
|
next_slot:
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2008-09-12 02:53:37 +07:00
|
|
|
nritems = btrfs_header_nritems(path->nodes[0]);
|
|
|
|
path->slots[0]++;
|
|
|
|
if (path->slots[0] < nritems) {
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &min_key,
|
|
|
|
path->slots[0]);
|
|
|
|
goto again;
|
|
|
|
}
|
2008-09-12 03:17:57 +07:00
|
|
|
if (ins_nr) {
|
2012-08-29 14:07:56 +07:00
|
|
|
ret = copy_items(trans, inode, dst_path, src,
|
2008-09-12 03:17:57 +07:00
|
|
|
ins_start_slot,
|
|
|
|
ins_nr, inode_only);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2008-09-12 03:17:57 +07:00
|
|
|
ins_nr = 0;
|
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-12 02:53:37 +07:00
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
if (min_key.offset < (u64)-1)
|
|
|
|
min_key.offset++;
|
|
|
|
else if (min_key.type < (u8)-1)
|
|
|
|
min_key.type++;
|
|
|
|
else if (min_key.objectid < (u64)-1)
|
|
|
|
min_key.objectid++;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
2008-09-12 03:17:57 +07:00
|
|
|
if (ins_nr) {
|
2012-08-29 14:07:56 +07:00
|
|
|
ret = copy_items(trans, inode, dst_path, src, ins_start_slot,
|
2008-09-12 03:17:57 +07:00
|
|
|
ins_nr, inode_only);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2008-09-12 03:17:57 +07:00
|
|
|
ins_nr = 0;
|
|
|
|
}
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
|
2012-10-12 03:17:34 +07:00
|
|
|
log_extents:
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
if (fast_search) {
|
|
|
|
btrfs_release_path(dst_path);
|
2012-10-12 03:54:30 +07:00
|
|
|
ret = btrfs_log_changed_extents(trans, root, inode, dst_path);
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2012-08-27 23:52:19 +07:00
|
|
|
} else {
|
|
|
|
struct extent_map_tree *tree = &BTRFS_I(inode)->extent_tree;
|
|
|
|
struct extent_map *em, *n;
|
|
|
|
|
2012-11-01 14:34:54 +07:00
|
|
|
write_lock(&tree->lock);
|
2012-08-27 23:52:19 +07:00
|
|
|
list_for_each_entry_safe(em, n, &tree->modified_extents, list)
|
|
|
|
list_del_init(&em->list);
|
2012-11-01 14:34:54 +07:00
|
|
|
write_unlock(&tree->lock);
|
Btrfs: turbo charge fsync
At least for the vm workload. Currently on fsync we will
1) Truncate all items in the log tree for the given inode if they exist
and
2) Copy all items for a given inode into the log
The problem with this is that for things like VMs you can have lots of
extents from the fragmented writing behavior, and worst yet you may have
only modified a few extents, not the entire thing. This patch fixes this
problem by tracking which transid modified our extent, and then when we do
the tree logging we find all of the extents we've modified in our current
transaction, sort them and commit them. We also only truncate up to the
xattrs of the inode and copy that stuff in normally, and then just drop any
extents in the range we have that exist in the log already. Here are some
numbers of a 50 meg fio job that does random writes and fsync()s after every
write
Original Patched
SATA drive 82KB/s 140KB/s
Fusion drive 431KB/s 2532KB/s
So around 2-6 times faster depending on your hardware. There are a few
corner cases, for example if you truncate at all we have to do it the old
way since there is no way to be sure what is in the log is ok. This
probably could be done smarter, but if you write-fsync-truncate-write-fsync
you deserve what you get. All this work is in RAM of course so if your
inode gets evicted from cache and you read it in and fsync it we'll do it
the slow way if we are still in the same transaction that we last modified
the inode in.
The biggest cool part of this is that it requires no changes to the recovery
code, so if you fsync with this patch and crash and load an old kernel, it
will run the recovery and be a-ok. I have tested this pretty thoroughly
with an fsync tester and everything comes back fine, as well as xfstests.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
2012-08-18 00:14:17 +07:00
|
|
|
}
|
|
|
|
|
2008-09-12 04:42:42 +07:00
|
|
|
if (inode_only == LOG_INODE_ALL && S_ISDIR(inode->i_mode)) {
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
|
|
|
btrfs_release_path(dst_path);
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = log_directory_changes(trans, root, inode, path, dst_path);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret) {
|
|
|
|
err = ret;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2008-09-12 02:53:37 +07:00
|
|
|
BTRFS_I(inode)->logged_trans = trans->transid;
|
2012-08-29 14:07:55 +07:00
|
|
|
BTRFS_I(inode)->last_log_commit = BTRFS_I(inode)->last_sub_trans;
|
2010-05-16 21:49:59 +07:00
|
|
|
out_unlock:
|
2012-10-13 02:27:49 +07:00
|
|
|
if (err)
|
|
|
|
btrfs_free_logged_extents(log, log->log_transid);
|
2008-09-06 03:13:11 +07:00
|
|
|
mutex_unlock(&BTRFS_I(inode)->log_mutex);
|
|
|
|
|
|
|
|
btrfs_free_path(path);
|
|
|
|
btrfs_free_path(dst_path);
|
2010-05-16 21:49:59 +07:00
|
|
|
return err;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
/*
|
|
|
|
* follow the dentry parent pointers up the chain and see if any
|
|
|
|
* of the directories in it require a full commit before they can
|
|
|
|
* be logged. Returns zero if nothing special needs to be done or 1 if
|
|
|
|
* a full commit is required.
|
|
|
|
*/
|
|
|
|
static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
|
|
|
|
struct inode *inode,
|
|
|
|
struct dentry *parent,
|
|
|
|
struct super_block *sb,
|
|
|
|
u64 last_committed)
|
2008-09-06 03:13:11 +07:00
|
|
|
{
|
2009-03-24 21:24:20 +07:00
|
|
|
int ret = 0;
|
|
|
|
struct btrfs_root *root;
|
2010-11-20 16:48:00 +07:00
|
|
|
struct dentry *old_parent = NULL;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-03-24 21:24:31 +07:00
|
|
|
/*
|
|
|
|
* for regular files, if its inode is already on disk, we don't
|
|
|
|
* have to worry about the parents at all. This is because
|
|
|
|
* we can use the last_unlink_trans field to record renames
|
|
|
|
* and other fun in this file.
|
|
|
|
*/
|
|
|
|
if (S_ISREG(inode->i_mode) &&
|
|
|
|
BTRFS_I(inode)->generation <= last_committed &&
|
|
|
|
BTRFS_I(inode)->last_unlink_trans <= last_committed)
|
|
|
|
goto out;
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
if (!S_ISDIR(inode->i_mode)) {
|
|
|
|
if (!parent || !parent->d_inode || sb != parent->d_inode->i_sb)
|
|
|
|
goto out;
|
|
|
|
inode = parent->d_inode;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
BTRFS_I(inode)->logged_trans = trans->transid;
|
|
|
|
smp_mb();
|
|
|
|
|
|
|
|
if (BTRFS_I(inode)->last_unlink_trans > last_committed) {
|
|
|
|
root = BTRFS_I(inode)->root;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* make sure any commits to the log are forced
|
|
|
|
* to be full commits
|
|
|
|
*/
|
|
|
|
root->fs_info->last_trans_log_full_commit =
|
|
|
|
trans->transid;
|
|
|
|
ret = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!parent || !parent->d_inode || sb != parent->d_inode->i_sb)
|
|
|
|
break;
|
|
|
|
|
2009-09-22 03:00:26 +07:00
|
|
|
if (IS_ROOT(parent))
|
2009-03-24 21:24:20 +07:00
|
|
|
break;
|
|
|
|
|
2010-11-20 16:48:00 +07:00
|
|
|
parent = dget_parent(parent);
|
|
|
|
dput(old_parent);
|
|
|
|
old_parent = parent;
|
2009-03-24 21:24:20 +07:00
|
|
|
inode = parent->d_inode;
|
|
|
|
|
|
|
|
}
|
2010-11-20 16:48:00 +07:00
|
|
|
dput(old_parent);
|
2009-03-24 21:24:20 +07:00
|
|
|
out:
|
2008-09-06 03:13:11 +07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* helper function around btrfs_log_inode to make sure newly created
|
|
|
|
* parent directories also end up in the log. A minimal inode and backref
|
|
|
|
* only logging is done of any parent directories that are older than
|
|
|
|
* the last committed transaction
|
|
|
|
*/
|
2013-04-26 03:41:01 +07:00
|
|
|
static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root, struct inode *inode,
|
|
|
|
struct dentry *parent, int exists_only)
|
2008-09-06 03:13:11 +07:00
|
|
|
{
|
2009-03-24 21:24:20 +07:00
|
|
|
int inode_only = exists_only ? LOG_INODE_EXISTS : LOG_INODE_ALL;
|
2008-09-06 03:13:11 +07:00
|
|
|
struct super_block *sb;
|
2010-11-20 16:48:00 +07:00
|
|
|
struct dentry *old_parent = NULL;
|
2009-03-24 21:24:20 +07:00
|
|
|
int ret = 0;
|
|
|
|
u64 last_committed = root->fs_info->last_trans_committed;
|
|
|
|
|
|
|
|
sb = inode->i_sb;
|
|
|
|
|
2009-04-03 03:49:40 +07:00
|
|
|
if (btrfs_test_opt(root, NOTREELOG)) {
|
|
|
|
ret = 1;
|
|
|
|
goto end_no_trans;
|
|
|
|
}
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
if (root->fs_info->last_trans_log_full_commit >
|
|
|
|
root->fs_info->last_trans_committed) {
|
|
|
|
ret = 1;
|
|
|
|
goto end_no_trans;
|
|
|
|
}
|
|
|
|
|
2009-09-22 03:00:26 +07:00
|
|
|
if (root != BTRFS_I(inode)->root ||
|
|
|
|
btrfs_root_refs(&root->root_item) == 0) {
|
|
|
|
ret = 1;
|
|
|
|
goto end_no_trans;
|
|
|
|
}
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
ret = check_parent_dirs_for_sync(trans, inode, parent,
|
|
|
|
sb, last_committed);
|
|
|
|
if (ret)
|
|
|
|
goto end_no_trans;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2012-05-30 03:57:49 +07:00
|
|
|
if (btrfs_inode_in_log(inode, trans->transid)) {
|
2009-10-14 00:21:08 +07:00
|
|
|
ret = BTRFS_NO_LOG_SYNC;
|
|
|
|
goto end_no_trans;
|
|
|
|
}
|
|
|
|
|
2010-05-16 21:49:59 +07:00
|
|
|
ret = start_log_trans(trans, root);
|
|
|
|
if (ret)
|
|
|
|
goto end_trans;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
ret = btrfs_log_inode(trans, root, inode, inode_only);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret)
|
|
|
|
goto end_trans;
|
2009-03-24 21:24:20 +07:00
|
|
|
|
2009-03-24 21:24:31 +07:00
|
|
|
/*
|
|
|
|
* for regular files, if its inode is already on disk, we don't
|
|
|
|
* have to worry about the parents at all. This is because
|
|
|
|
* we can use the last_unlink_trans field to record renames
|
|
|
|
* and other fun in this file.
|
|
|
|
*/
|
|
|
|
if (S_ISREG(inode->i_mode) &&
|
|
|
|
BTRFS_I(inode)->generation <= last_committed &&
|
2010-05-16 21:49:59 +07:00
|
|
|
BTRFS_I(inode)->last_unlink_trans <= last_committed) {
|
|
|
|
ret = 0;
|
|
|
|
goto end_trans;
|
|
|
|
}
|
2009-03-24 21:24:31 +07:00
|
|
|
|
|
|
|
inode_only = LOG_INODE_EXISTS;
|
2009-03-24 21:24:20 +07:00
|
|
|
while (1) {
|
|
|
|
if (!parent || !parent->d_inode || sb != parent->d_inode->i_sb)
|
2008-09-06 03:13:11 +07:00
|
|
|
break;
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
inode = parent->d_inode;
|
2009-09-22 03:00:26 +07:00
|
|
|
if (root != BTRFS_I(inode)->root)
|
|
|
|
break;
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
if (BTRFS_I(inode)->generation >
|
|
|
|
root->fs_info->last_trans_committed) {
|
|
|
|
ret = btrfs_log_inode(trans, root, inode, inode_only);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret)
|
|
|
|
goto end_trans;
|
2009-03-24 21:24:20 +07:00
|
|
|
}
|
2009-09-22 03:00:26 +07:00
|
|
|
if (IS_ROOT(parent))
|
2008-09-06 03:13:11 +07:00
|
|
|
break;
|
2009-03-24 21:24:20 +07:00
|
|
|
|
2010-11-20 16:48:00 +07:00
|
|
|
parent = dget_parent(parent);
|
|
|
|
dput(old_parent);
|
|
|
|
old_parent = parent;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2009-03-24 21:24:20 +07:00
|
|
|
ret = 0;
|
2010-05-16 21:49:59 +07:00
|
|
|
end_trans:
|
2010-11-20 16:48:00 +07:00
|
|
|
dput(old_parent);
|
2010-05-16 21:49:59 +07:00
|
|
|
if (ret < 0) {
|
|
|
|
root->fs_info->last_trans_log_full_commit = trans->transid;
|
|
|
|
ret = 1;
|
|
|
|
}
|
2009-03-24 21:24:20 +07:00
|
|
|
btrfs_end_log_trans(root);
|
|
|
|
end_no_trans:
|
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* it is not safe to log dentry if the chunk root has added new
|
|
|
|
* chunks. This returns 0 if the dentry was logged, and 1 otherwise.
|
|
|
|
* If this returns 1, you must commit the transaction to safely get your
|
|
|
|
* data on disk.
|
|
|
|
*/
|
|
|
|
int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans,
|
|
|
|
struct btrfs_root *root, struct dentry *dentry)
|
|
|
|
{
|
2010-11-20 16:48:00 +07:00
|
|
|
struct dentry *parent = dget_parent(dentry);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = btrfs_log_inode_parent(trans, root, dentry->d_inode, parent, 0);
|
|
|
|
dput(parent);
|
|
|
|
|
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* should be called during mount to recover any replay any log trees
|
|
|
|
* from the FS
|
|
|
|
*/
|
|
|
|
int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct btrfs_path *path;
|
|
|
|
struct btrfs_trans_handle *trans;
|
|
|
|
struct btrfs_key key;
|
|
|
|
struct btrfs_key found_key;
|
|
|
|
struct btrfs_key tmp_key;
|
|
|
|
struct btrfs_root *log;
|
|
|
|
struct btrfs_fs_info *fs_info = log_root_tree->fs_info;
|
|
|
|
struct walk_control wc = {
|
|
|
|
.process_func = process_one_buffer,
|
|
|
|
.stage = 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
path = btrfs_alloc_path();
|
2011-03-23 15:14:16 +07:00
|
|
|
if (!path)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
fs_info->log_root_recovering = 1;
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2010-05-16 21:49:59 +07:00
|
|
|
trans = btrfs_start_transaction(fs_info->tree_root, 0);
|
2012-03-12 22:03:00 +07:00
|
|
|
if (IS_ERR(trans)) {
|
|
|
|
ret = PTR_ERR(trans);
|
|
|
|
goto error;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
wc.trans = trans;
|
|
|
|
wc.pin = 1;
|
|
|
|
|
2011-03-23 15:14:16 +07:00
|
|
|
ret = walk_log_tree(trans, log_root_tree, &wc);
|
2012-03-12 22:03:00 +07:00
|
|
|
if (ret) {
|
|
|
|
btrfs_error(fs_info, ret, "Failed to pin buffers while "
|
|
|
|
"recovering log root tree.");
|
|
|
|
goto error;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
again:
|
|
|
|
key.objectid = BTRFS_TREE_LOG_OBJECTID;
|
|
|
|
key.offset = (u64)-1;
|
|
|
|
btrfs_set_key_type(&key, BTRFS_ROOT_ITEM_KEY);
|
|
|
|
|
2009-01-06 09:25:51 +07:00
|
|
|
while (1) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = btrfs_search_slot(NULL, log_root_tree, &key, path, 0, 0);
|
2012-03-12 22:03:00 +07:00
|
|
|
|
|
|
|
if (ret < 0) {
|
|
|
|
btrfs_error(fs_info, ret,
|
|
|
|
"Couldn't find tree log root.");
|
|
|
|
goto error;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
if (ret > 0) {
|
|
|
|
if (path->slots[0] == 0)
|
|
|
|
break;
|
|
|
|
path->slots[0]--;
|
|
|
|
}
|
|
|
|
btrfs_item_key_to_cpu(path->nodes[0], &found_key,
|
|
|
|
path->slots[0]);
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
if (found_key.objectid != BTRFS_TREE_LOG_OBJECTID)
|
|
|
|
break;
|
|
|
|
|
2013-05-15 14:48:19 +07:00
|
|
|
log = btrfs_read_fs_root(log_root_tree, &found_key);
|
2012-03-12 22:03:00 +07:00
|
|
|
if (IS_ERR(log)) {
|
|
|
|
ret = PTR_ERR(log);
|
|
|
|
btrfs_error(fs_info, ret,
|
|
|
|
"Couldn't read tree log root.");
|
|
|
|
goto error;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
tmp_key.objectid = found_key.offset;
|
|
|
|
tmp_key.type = BTRFS_ROOT_ITEM_KEY;
|
|
|
|
tmp_key.offset = (u64)-1;
|
|
|
|
|
|
|
|
wc.replay_dest = btrfs_read_fs_root_no_name(fs_info, &tmp_key);
|
2012-03-12 22:03:00 +07:00
|
|
|
if (IS_ERR(wc.replay_dest)) {
|
|
|
|
ret = PTR_ERR(wc.replay_dest);
|
2013-04-26 02:55:30 +07:00
|
|
|
free_extent_buffer(log->node);
|
|
|
|
free_extent_buffer(log->commit_root);
|
|
|
|
kfree(log);
|
2012-03-12 22:03:00 +07:00
|
|
|
btrfs_error(fs_info, ret, "Couldn't read target root "
|
|
|
|
"for tree log recovery.");
|
|
|
|
goto error;
|
|
|
|
}
|
2008-09-06 03:13:11 +07:00
|
|
|
|
2009-01-06 23:42:00 +07:00
|
|
|
wc.replay_dest->log_root = log;
|
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)
This commit introduces a new kind of back reference for btrfs metadata.
Once a filesystem has been mounted with this commit, IT WILL NO LONGER
BE MOUNTABLE BY OLDER KERNELS.
When a tree block in subvolume tree is cow'd, the reference counts of all
extents it points to are increased by one. At transaction commit time,
the old root of the subvolume is recorded in a "dead root" data structure,
and the btree it points to is later walked, dropping reference counts
and freeing any blocks where the reference count goes to 0.
The increments done during cow and decrements done after commit cancel out,
and the walk is a very expensive way to go about freeing the blocks that
are no longer referenced by the new btree root. This commit reduces the
transaction overhead by avoiding the need for dead root records.
When a non-shared tree block is cow'd, we free the old block at once, and the
new block inherits old block's references. When a tree block with reference
count > 1 is cow'd, we increase the reference counts of all extents
the new block points to by one, and decrease the old block's reference count by
one.
This dead tree avoidance code removes the need to modify the reference
counts of lower level extents when a non-shared tree block is cow'd.
But we still need to update back ref for all pointers in the block.
This is because the location of the block is recorded in the back ref
item.
We can solve this by introducing a new type of back ref. The new
back ref provides information about pointer's key, level and in which
tree the pointer lives. This information allow us to find the pointer
by searching the tree. The shortcoming of the new back ref is that it
only works for pointers in tree blocks referenced by their owner trees.
This is mostly a problem for snapshots, where resolving one of these
fuzzy back references would be O(number_of_snapshots) and quite slow.
The solution used here is to use the fuzzy back references in the common
case where a given tree block is only referenced by one root,
and use the full back references when multiple roots have a reference
on a given block.
This commit adds per subvolume red-black tree to keep trace of cached
inodes. The red-black tree helps the balancing code to find cached
inodes whose inode numbers within a given range.
This commit improves the balancing code by introducing several data
structures to keep the state of balancing. The most important one
is the back ref cache. It caches how the upper level tree blocks are
referenced. This greatly reduce the overhead of checking back ref.
The improved balancing code scales significantly better with a large
number of snapshots.
This is a very large commit and was written in a number of
pieces. But, they depend heavily on the disk format change and were
squashed together to make sure git bisect didn't end up in a
bad state wrt space balancing or the format change.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
2009-06-10 21:45:14 +07:00
|
|
|
btrfs_record_root_in_trans(trans, wc.replay_dest);
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = walk_log_tree(trans, log, &wc);
|
|
|
|
|
2013-04-26 02:55:30 +07:00
|
|
|
if (!ret && wc.stage == LOG_WALK_REPLAY_ALL) {
|
2008-09-06 03:13:11 +07:00
|
|
|
ret = fixup_inode_link_counts(trans, wc.replay_dest,
|
|
|
|
path);
|
|
|
|
}
|
|
|
|
|
|
|
|
key.offset = found_key.offset - 1;
|
2009-01-06 23:42:00 +07:00
|
|
|
wc.replay_dest->log_root = NULL;
|
2008-09-06 03:13:11 +07:00
|
|
|
free_extent_buffer(log->node);
|
2009-06-11 22:24:47 +07:00
|
|
|
free_extent_buffer(log->commit_root);
|
2008-09-06 03:13:11 +07:00
|
|
|
kfree(log);
|
|
|
|
|
2013-04-26 02:55:30 +07:00
|
|
|
if (ret)
|
|
|
|
goto error;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
if (found_key.offset == 0)
|
|
|
|
break;
|
|
|
|
}
|
2011-04-21 06:20:15 +07:00
|
|
|
btrfs_release_path(path);
|
2008-09-06 03:13:11 +07:00
|
|
|
|
|
|
|
/* step one is to pin it all, step two is to replay just inodes */
|
|
|
|
if (wc.pin) {
|
|
|
|
wc.pin = 0;
|
|
|
|
wc.process_func = replay_one_buffer;
|
|
|
|
wc.stage = LOG_WALK_REPLAY_INODES;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
/* step three is to replay everything */
|
|
|
|
if (wc.stage < LOG_WALK_REPLAY_ALL) {
|
|
|
|
wc.stage++;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
|
|
|
|
btrfs_free_path(path);
|
|
|
|
|
2013-04-25 03:40:05 +07:00
|
|
|
/* step 4: commit the transaction, which also unpins the blocks */
|
|
|
|
ret = btrfs_commit_transaction(trans, fs_info->tree_root);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2008-09-06 03:13:11 +07:00
|
|
|
free_extent_buffer(log_root_tree->node);
|
|
|
|
log_root_tree->log_root = NULL;
|
|
|
|
fs_info->log_root_recovering = 0;
|
|
|
|
kfree(log_root_tree);
|
2012-03-12 22:03:00 +07:00
|
|
|
|
2013-04-25 03:40:05 +07:00
|
|
|
return 0;
|
2012-03-12 22:03:00 +07:00
|
|
|
error:
|
2013-04-26 02:55:30 +07:00
|
|
|
if (wc.trans)
|
|
|
|
btrfs_end_transaction(wc.trans, fs_info->tree_root);
|
2012-03-12 22:03:00 +07:00
|
|
|
btrfs_free_path(path);
|
|
|
|
return ret;
|
2008-09-06 03:13:11 +07:00
|
|
|
}
|
2009-03-24 21:24:20 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* there are some corner cases where we want to force a full
|
|
|
|
* commit instead of allowing a directory to be logged.
|
|
|
|
*
|
|
|
|
* They revolve around files there were unlinked from the directory, and
|
|
|
|
* this function updates the parent directory so that a full commit is
|
|
|
|
* properly done if it is fsync'd later after the unlinks are done.
|
|
|
|
*/
|
|
|
|
void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,
|
|
|
|
struct inode *dir, struct inode *inode,
|
|
|
|
int for_rename)
|
|
|
|
{
|
2009-03-24 21:24:31 +07:00
|
|
|
/*
|
|
|
|
* when we're logging a file, if it hasn't been renamed
|
|
|
|
* or unlinked, and its inode is fully committed on disk,
|
|
|
|
* we don't have to worry about walking up the directory chain
|
|
|
|
* to log its parents.
|
|
|
|
*
|
|
|
|
* So, we use the last_unlink_trans field to put this transid
|
|
|
|
* into the file. When the file is logged we check it and
|
|
|
|
* don't log the parents if the file is fully on disk.
|
|
|
|
*/
|
|
|
|
if (S_ISREG(inode->i_mode))
|
|
|
|
BTRFS_I(inode)->last_unlink_trans = trans->transid;
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
/*
|
|
|
|
* if this directory was already logged any new
|
|
|
|
* names for this file/dir will get recorded
|
|
|
|
*/
|
|
|
|
smp_mb();
|
|
|
|
if (BTRFS_I(dir)->logged_trans == trans->transid)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* if the inode we're about to unlink was logged,
|
|
|
|
* the log will be properly updated for any new names
|
|
|
|
*/
|
|
|
|
if (BTRFS_I(inode)->logged_trans == trans->transid)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* when renaming files across directories, if the directory
|
|
|
|
* there we're unlinking from gets fsync'd later on, there's
|
|
|
|
* no way to find the destination directory later and fsync it
|
|
|
|
* properly. So, we have to be conservative and force commits
|
|
|
|
* so the new name gets discovered.
|
|
|
|
*/
|
|
|
|
if (for_rename)
|
|
|
|
goto record;
|
|
|
|
|
|
|
|
/* we can safely do the unlink without any special recording */
|
|
|
|
return;
|
|
|
|
|
|
|
|
record:
|
|
|
|
BTRFS_I(dir)->last_unlink_trans = trans->transid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Call this after adding a new name for a file and it will properly
|
|
|
|
* update the log to reflect the new name.
|
|
|
|
*
|
|
|
|
* It will return zero if all goes well, and it will return 1 if a
|
|
|
|
* full transaction commit is required.
|
|
|
|
*/
|
|
|
|
int btrfs_log_new_name(struct btrfs_trans_handle *trans,
|
|
|
|
struct inode *inode, struct inode *old_dir,
|
|
|
|
struct dentry *parent)
|
|
|
|
{
|
|
|
|
struct btrfs_root * root = BTRFS_I(inode)->root;
|
|
|
|
|
2009-03-24 21:24:31 +07:00
|
|
|
/*
|
|
|
|
* this will force the logging code to walk the dentry chain
|
|
|
|
* up for the file
|
|
|
|
*/
|
|
|
|
if (S_ISREG(inode->i_mode))
|
|
|
|
BTRFS_I(inode)->last_unlink_trans = trans->transid;
|
|
|
|
|
2009-03-24 21:24:20 +07:00
|
|
|
/*
|
|
|
|
* if this inode hasn't been logged and directory we're renaming it
|
|
|
|
* from hasn't been logged, we don't need to log it
|
|
|
|
*/
|
|
|
|
if (BTRFS_I(inode)->logged_trans <=
|
|
|
|
root->fs_info->last_trans_committed &&
|
|
|
|
(!old_dir || BTRFS_I(old_dir)->logged_trans <=
|
|
|
|
root->fs_info->last_trans_committed))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return btrfs_log_inode_parent(trans, root, inode, parent, 1);
|
|
|
|
}
|
|
|
|
|