Commit a2de733c authored by Arne Jansen's avatar Arne Jansen
Browse files

btrfs: scrub 



This adds an initial implementation for scrub. It works quite
straightforward. The usermode issues an ioctl for each device in the
fs. For each device, it enumerates the allocated device chunks. For
each chunk, the contained extents are enumerated and the data checksums
fetched. The extents are read sequentially and the checksums verified.
If an error occurs (checksum or EIO), a good copy is searched for. If
one is found, the bad copy will be rewritten.
All enumerations happen from the commit roots. During a transaction
commit, the scrubs get paused and afterwards continue from the new
roots.

This commit is based on the series originally posted to linux-btrfs
with some improvements that resulted from comments from David Sterba,
Ilya Dryomov and Jan Schmidt.

Signed-off-by: default avatarArne Jansen <sensille@gmx.net>
parent 7cf96da3

fs/btrfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \

	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \

	   export.o tree-log.o acl.o free-space-cache.o zlib.o lzo.o \

	   compression.o delayed-ref.o relocation.o
 
	   compression.o delayed-ref.o relocation.o scrub.o

fs/btrfs/ctree.h

+35 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/mm.h>

#include <linux/highmem.h>

#include <linux/fs.h>

#include <linux/rwsem.h>

#include <linux/completion.h>

#include <linux/backing-dev.h>

#include <linux/wait.h>
@@ -33,6 +34,7 @@ 
#include "extent_io.h"

#include "extent_map.h"

#include "async-thread.h"

#include "ioctl.h"



struct btrfs_trans_handle;

struct btrfs_transaction;
@@ -510,6 +512,12 @@ struct btrfs_extent_item_v0 { 
/* use full backrefs for extent pointers in the block */

#define BTRFS_BLOCK_FLAG_FULL_BACKREF	(1ULL << 8)



/*

 * this flag is only used internally by scrub and may be changed at any time

 * it is only declared here to avoid collisions

 */

#define BTRFS_EXTENT_FLAG_SUPER		(1ULL << 48)



struct btrfs_tree_block_info {

	struct btrfs_disk_key key;

	u8 level;
@@ -1077,6 +1085,17 @@ struct btrfs_fs_info { 


	void *bdev_holder;



	/* private scrub information */

	struct mutex scrub_lock;

	atomic_t scrubs_running;

	atomic_t scrub_pause_req;

	atomic_t scrubs_paused;

	atomic_t scrub_cancel_req;

	wait_queue_head_t scrub_pause_wait;

	struct rw_semaphore scrub_super_lock;

	int scrub_workers_refcnt;

	struct btrfs_workers scrub_workers;



	/* filesystem state */

	u64 fs_state;

};
@@ -2472,8 +2491,8 @@ struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans, 
int btrfs_csum_truncate(struct btrfs_trans_handle *trans,

			struct btrfs_root *root, struct btrfs_path *path,

			u64 isize);

int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start,

			     u64 end, struct list_head *list);

int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,

			     struct list_head *list, int search_commit);

/* inode.c */



/* RHEL and EL kernels have a patch that renames PG_checked to FsMisc */
@@ -2637,4 +2656,18 @@ void btrfs_reloc_pre_snapshot(struct btrfs_trans_handle *trans, 
			      u64 *bytes_to_reserve);

void btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,

			      struct btrfs_pending_snapshot *pending);



/* scrub.c */

int btrfs_scrub_dev(struct btrfs_root *root, u64 devid, u64 start, u64 end,

		    struct btrfs_scrub_progress *progress);

int btrfs_scrub_pause(struct btrfs_root *root);

int btrfs_scrub_pause_super(struct btrfs_root *root);

int btrfs_scrub_continue(struct btrfs_root *root);

int btrfs_scrub_continue_super(struct btrfs_root *root);

int btrfs_scrub_cancel(struct btrfs_root *root);

int btrfs_scrub_cancel_dev(struct btrfs_root *root, struct btrfs_device *dev);

int btrfs_scrub_cancel_devid(struct btrfs_root *root, u64 devid);

int btrfs_scrub_progress(struct btrfs_root *root, u64 devid,

			 struct btrfs_scrub_progress *progress);



#endif

fs/btrfs/disk-io.c

+12 −0
Original line number Diff line number Diff line
@@ -1773,6 +1773,17 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	INIT_LIST_HEAD(&fs_info->ordered_extents);

	spin_lock_init(&fs_info->ordered_extent_lock);



	mutex_init(&fs_info->scrub_lock);

	atomic_set(&fs_info->scrubs_running, 0);

	atomic_set(&fs_info->scrub_pause_req, 0);

	atomic_set(&fs_info->scrubs_paused, 0);

	atomic_set(&fs_info->scrub_cancel_req, 0);

	init_waitqueue_head(&fs_info->scrub_pause_wait);

	init_rwsem(&fs_info->scrub_super_lock);

	fs_info->scrub_workers_refcnt = 0;

	btrfs_init_workers(&fs_info->scrub_workers, "scrub",

			   fs_info->thread_pool_size, &fs_info->generic_worker);



	sb->s_blocksize = 4096;

	sb->s_blocksize_bits = blksize_bits(4096);

	sb->s_bdi = &fs_info->bdi;
@@ -2599,6 +2610,7 @@ int close_ctree(struct btrfs_root *root) 
	fs_info->closing = 1;

	smp_mb();



	btrfs_scrub_cancel(root);

	btrfs_put_block_group_cache(fs_info);



	/*

fs/btrfs/file-item.c

+7 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ int btrfs_lookup_bio_sums_dio(struct btrfs_root *root, struct inode *inode, 
}



int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,

			     struct list_head *list)

			     struct list_head *list, int search_commit)

{

	struct btrfs_key key;

	struct btrfs_path *path;
@@ -283,6 +283,12 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, 
	path = btrfs_alloc_path();

	BUG_ON(!path);



	if (search_commit) {

		path->skip_locking = 1;

		path->reada = 2;

		path->search_commit_root = 1;

	}



	key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;

	key.offset = start;

	key.type = BTRFS_EXTENT_CSUM_KEY;

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ static noinline int csum_exist_in_range(struct btrfs_root *root, 
	LIST_HEAD(list);



	ret = btrfs_lookup_csums_range(root->fs_info->csum_root, bytenr,

				       bytenr + num_bytes - 1, &list);

				       bytenr + num_bytes - 1, &list, 0);

	if (ret == 0 && list_empty(&list))

		return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE