Btrfs: add IO error device stats
v3 cover Btrfs: add IO error device stats
Changes v1-v2:
- Remove restriction that BTRFS_IOC_GET_DEVICE_STATS is a privileged operation
- Cast u64 to unsigned long long for printf()
Changes v2-v3:
- Rebased on Chris' current master
The goal is to detect when drives start to get an increased error rate, when drives should be replaced soon. Therefore statistic counters are added that count IO errors (read, write and flush). Additionally, the software detected errors like checksum errors and corrupted blocks are counted.
An ioctl interface is added to get the device statistic counters. A second ioctl is added to atomically get and reset these counters.
The device statistics are written into the device tree with each transaction commit. Only modified statistics are written. When a filesystem is mounted, the device statistics for each involved device are read from the device tree and used to initialize the counters.
A patch for the btrfs-progs world will also be sent.
Stefan Behrens (3):
Btrfs: add device counters for detected IO and checksum errors
Btrfs: add ioctl to get and reset the device stats
Btrfs: read device stats on mount, write modified ones during commit
fs/btrfs/ctree.h | 51 ++++++++ fs/btrfs/disk-io.c | 25 +++- fs/btrfs/extent_io.c | 27 +++- fs/btrfs/ioctl.c | 26 ++++ fs/btrfs/ioctl.h | 27 ++++ fs/btrfs/print-tree.c | 3 + fs/btrfs/scrub.c | 72 ++++++++--- fs/btrfs/transaction.c | 4 + fs/btrfs/volumes.c | 335 +++++++++++++++++++++++++++++++++++++++++++++++- fs/btrfs/volumes.h | 43 +++++++ 10 files changed, 588 insertions(+), 25 deletions(-)
Signature · 1 line
1.7.10.2
PATCH v3 1/3 Btrfs: add device counters for detected IO and checksum errors
The goal is to detect when drives start to get an increased error rate, when drives should be replaced soon. Therefore statistic counters are added that count IO errors (read, write and flush). Additionally, the software detected errors like checksum errors and corrupted blocks are counted.
--- fs/btrfs/disk-io.c | 18 ++++++++++--- fs/btrfs/extent_io.c | 27 +++++++++++++++++-- fs/btrfs/scrub.c | 72 +++++++++++++++++++++++++++++++++++++++----------- fs/btrfs/volumes.c | 61 +++++++++++++++++++++++++++++++++++++++--- fs/btrfs/volumes.h | 21 +++++++++++++++ 5 files changed, 174 insertions(+), 25 deletions(-)
fs/btrfs/disk-io.c +14 -4
@@ -2556,18 +2556,21 @@ recovery_tree_root:static void btrfs_end_buffer_write_sync (struct buffer_head *bh,int uptodate) { -char b[BDEVNAME_SIZE ]; -if (uptodate) {set_buffer_uptodate (bh); }else { +struct btrfs_device *device = (struct btrfs_device *) + bh->b_private; +printk_ratelimited (KERN_WARNING "lost page write due to " -"I/O error on %s\n" , -bdevname (bh->b_bdev, b)); +"I/O error on %s\n" , device->name);/* note, we dont' set_buffer_write_io_error because we have * our own ways of dealing with the IO errors */ clear_buffer_uptodate (bh); +btrfs_device_stat_inc (&device->cnt_write_io_errs); + device->device_stats_dirty =1 ; +btrfs_device_stat_print_on_error (device); }unlock_buffer (bh);put_bh (bh);
@@ -2682,6 +2685,7 @@ static int write_dev_supers(struct btrfs_device *device,set_buffer_uptodate (bh);lock_buffer (bh); bh->b_end_io = btrfs_end_buffer_write_sync; + bh->b_private = device; }/*
@@ -2740,6 +2744,12 @@ static int write_dev_flush(struct btrfs_device *device, int wait) }if (!bio_flagged (bio,BIO_UPTODATE )) { ret = -EIO ; +if (!bio_flagged (bio,BIO_EOPNOTSUPP )) { +btrfs_device_stat_inc ( + &device->cnt_flush_io_errs); + device->device_stats_dirty =1 ; +btrfs_device_stat_print_on_error (device); + } }/* drop the reference from the wait == 0 run */
fs/btrfs/extent_io.c +25 -2
@@ -1923,6 +1923,9 @@ int repair_io_failure(struct btrfs_mapping_tree *map_tree, u64 start,if (!test_bit (BIO_UPTODATE , &bio->bi_flags)) {/* try to remap that extent elsewhere? */ bio_put (bio); +btrfs_device_stat_inc (&dev->cnt_write_io_errs); + dev->device_stats_dirty =1 ; +btrfs_device_stat_print_on_error (dev);return -EIO ; }
@@ -2347,10 +2350,30 @@ static void end_bio_extent_readpage(struct bio *bio, int err)if (uptodate && tree->ops && tree->ops->readpage_end_io_hook) { ret = tree->ops->readpage_end_io_hook (page, start, end, state, mirror); -if (ret) +if (ret) { +/* no IO indicated but software detected errors +* in the block, either checksum errors or +* issues with the contents */ +int failed_mirror = (int )(uintptr_t ) + bio->bi_bdev; +struct btrfs_root *root = +BTRFS_I (page->mapping->host)->root; +struct btrfs_device *device; + uptodate =0 ; -else + device =btrfs_find_device_for_logical ( + root, start, + (int )failed_mirror); +if (device) { +btrfs_device_stat_inc ( + &device->cnt_corruption_errs); + device->device_stats_dirty =1 ; +btrfs_device_stat_print_on_error ( + device); + } + }else {clean_io_failure (start, page); + } }if (!uptodate && tree->ops && tree->ops->readpage_io_failed_hook) {
fs/btrfs/scrub.c +56 -16
196 lines not on this page · raw message
fs/btrfs/volumes.c +58 -3
91 lines not on this page · raw message
fs/btrfs/volumes.h +21 -0
@@ -106,6 +106,14 @@ struct btrfs_device {struct completion flush_wait;int nobarriers; +/* disk I/O failure stats. For detailed description refer to +* struct btrfs_device_stats_item in ctree.h */ +int device_stats_dirty;/* counters need to be written to disk */ +atomic_t cnt_write_io_errs; +atomic_t cnt_read_io_errs; +atomic_t cnt_flush_io_errs; +atomic_t cnt_corruption_errs; +atomic_t cnt_generation_errs; };struct btrfs_fs_devices {
@@ -281,4 +289,17 @@ int btrfs_cancel_balance(struct btrfs_fs_info *fs_info);int btrfs_chunk_readonly (struct btrfs_root *root,u64 chunk_offset);int find_free_dev_extent (struct btrfs_device *device,u64 num_bytes,u64 *start,u64 *max_avail); +struct btrfs_device *btrfs_find_device_for_logical (struct btrfs_root *root, +u64 logical,int mirror_num); +void btrfs_device_stat_print_on_error (struct btrfs_device *device); + +static inline void btrfs_device_stat_inc (atomic_t *cnt) +{ +atomic_inc (cnt); +} + +static inline int btrfs_device_stat_read (atomic_t *cnt) +{ +return atomic_read (cnt); +}#endif
Signature · 1 line
1.7.10.2
PATCH v3 2/3 Btrfs: add ioctl to get and reset the device stats
In reply to Stefan BehrensAn ioctl interface is added to get the device statistic counters. A second ioctl is added to atomically get and reset these counters.
--- fs/btrfs/ioctl.c | 26 ++++++++++++++++++++ fs/btrfs/ioctl.h | 27 ++++++++++++++++++++ fs/btrfs/volumes.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/volumes.h | 13 ++++++++++ 4 files changed, 135 insertions(+)
fs/btrfs/ioctl.c +26 -0
@@ -3042,6 +3042,28 @@ static long btrfs_ioctl_scrub_progress(struct btrfs_root *root,return ret; } +static long btrfs_ioctl_get_device_stats (struct btrfs_root *root, +void __user *arg,int reset_after_read) +{ +struct btrfs_ioctl_get_device_stats *sa; +int ret; + +if (reset_after_read && !capable (CAP_SYS_ADMIN )) +return -EPERM ; + + sa =memdup_user (arg,sizeof (*sa)); +if (IS_ERR (sa)) +return PTR_ERR (sa); + + ret =btrfs_get_device_stats (root, sa, reset_after_read); + +if (copy_to_user (arg, sa,sizeof (*sa))) + ret = -EFAULT ; + +kfree (sa); +return ret; +} +static long btrfs_ioctl_ino_to_path (struct btrfs_root *root,void __user *arg) {int ret =0 ;
@@ -3424,6 +3446,10 @@ long btrfs_ioctl(struct file *file, unsigned intreturn btrfs_ioctl_balance_ctl (root, arg);case BTRFS_IOC_BALANCE_PROGRESS :return btrfs_ioctl_balance_progress (root, argp); +case BTRFS_IOC_GET_DEVICE_STATS : +return btrfs_ioctl_get_device_stats (root, argp,0 ); +case BTRFS_IOC_GET_AND_RESET_DEVICE_STATS : +return btrfs_ioctl_get_device_stats (root, argp,1 ); }return -ENOTTY ;
fs/btrfs/ioctl.h +27 -0
@@ -266,6 +266,29 @@ struct btrfs_ioctl_logical_ino_args {__u64 inodes; }; +#define BTRFS_IOCTL_GET_DEVICE_STATS_MAX_NR_ITEMS 5 +struct btrfs_ioctl_get_device_stats { +__u64 devid;/* in */ +__u64 nr_items;/* in/out */ + +/* out values: */ + +/* disk I/O failure stats */ +__u64 cnt_write_io_errs;/* EIO or EREMOTEIO from lower layers */ +__u64 cnt_read_io_errs;/* EIO or EREMOTEIO from lower layers */ +__u64 cnt_flush_io_errs;/* EIO or EREMOTEIO from lower layers */ + +/* stats for indirect indications for I/O failures */ +__u64 cnt_corruption_errs;/* checksum error, bytenr error or +* contents is illegal: this is an +* indication that the block was damaged +* during read or write, or written to +* wrong location or read from wrong +* location */ +__u64 cnt_generation_errs;/* an indication that blocks have not +* been written */ +}; +#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ struct btrfs_ioctl_vol_args)#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
@@ -330,5 +353,9 @@ struct btrfs_ioctl_logical_ino_args { struct btrfs_ioctl_ino_path_args)#define BTRFS_IOC_LOGICAL_INO _IOWR(BTRFS_IOCTL_MAGIC, 36, \ struct btrfs_ioctl_ino_path_args) +#define BTRFS_IOC_GET_DEVICE_STATS _IOWR(BTRFS_IOCTL_MAGIC, 52, \ + struct btrfs_ioctl_get_device_stats) +#define BTRFS_IOC_GET_AND_RESET_DEVICE_STATS _IOWR(BTRFS_IOCTL_MAGIC, 53, \ + struct btrfs_ioctl_get_device_stats)#endif
fs/btrfs/volumes.c +69 -0
72 lines not on this page · raw message
fs/btrfs/volumes.h +13 -0
@@ -292,6 +292,9 @@ int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes,struct btrfs_device *btrfs_find_device_for_logical (struct btrfs_root *root,u64 logical,int mirror_num);void btrfs_device_stat_print_on_error (struct btrfs_device *device); +int btrfs_get_device_stats (struct btrfs_root *root, +struct btrfs_ioctl_get_device_stats *stats, +int reset_after_read);static inline void btrfs_device_stat_inc (atomic_t *cnt) {
@@ -302,4 +305,14 @@ static inline int btrfs_device_stat_read(atomic_t *cnt) {return atomic_read (cnt); } + +static inline int btrfs_device_stat_read_and_reset (atomic_t *cnt) +{ +return atomic_xchg (cnt,0 ); +} + +static inline void btrfs_device_stat_reset (atomic_t *cnt) +{ +atomic_set (cnt,0 ); +}#endif
Signature · 1 line
1.7.10.2
PATCH v3 3/3 Btrfs: read device stats on mount, write modified ones during commit
In reply to Stefan BehrensThe device statistics are written into the device tree with each transaction commit. Only modified statistics are written. When a filesystem is mounted, the device statistics for each involved device are read from the device tree and used to initialize the counters.
--- fs/btrfs/ctree.h | 51 ++++++++++++ fs/btrfs/disk-io.c | 7 ++ fs/btrfs/print-tree.c | 3 + fs/btrfs/transaction.c | 4 + fs/btrfs/volumes.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/volumes.h | 9 +++ 6 files changed, 279 insertions(+)
fs/btrfs/ctree.h +51 -0
@@ -823,6 +823,26 @@ struct btrfs_csum_item {u8 csum; } __attribute__ ((__packed__)); +struct btrfs_device_stats_item { +/* +* grow this item struct at the end for future enhancements and keep +* the existing values unchanged +*/ +__le64 cnt_write_io_errs;/* EIO or EREMOTEIO from lower layers */ +__le64 cnt_read_io_errs;/* EIO or EREMOTEIO from lower layers */ +__le64 cnt_flush_io_errs;/* EIO or EREMOTEIO from lower layers */ + +/* stats for indirect indications for I/O failures */ +__le64 cnt_corruption_errs;/* checksum error, bytenr error or +* contents is illegal: this is an +* indication that the block was damaged +* during read or write, or written to +* wrong location or read from wrong +* location */ +__le64 cnt_generation_errs;/* an indication that blocks have not +* been written */ +} __attribute__ ((__packed__ )); +/* different types of block groups (and chunks) */ #define BTRFS_BLOCK_GROUP_DATA (1ULL << 0)#define BTRFS_BLOCK_GROUP_SYSTEM (1ULL << 1)
@@ -1508,6 +1528,12 @@ struct btrfs_ioctl_defrag_range_args {#define BTRFS_BALANCE_ITEM_KEY 248/* +* Persistantly stores the io stats in the device tree. +* One key for all stats, (0, BTRFS_DEVICE_STATS_KEY, devid). +*/ +#define BTRFS_DEVICE_STATS_KEY 249 + +/* * string items are for debugging. They just store a short string of * data in the FS */
@@ -2415,6 +2441,31 @@ static inline u32 btrfs_file_extent_inline_item_len(struct extent_buffer *eb,return btrfs_item_size (eb, e) - offset; } +/* btrfs_device_stats_item */ +BTRFS_SETGET_FUNCS (device_stats_cnt_write_io_errs, + struct btrfs_device_stats_item, cnt_write_io_errs, 64); +BTRFS_SETGET_FUNCS (device_stats_cnt_read_io_errs, + struct btrfs_device_stats_item, cnt_read_io_errs, 64); +BTRFS_SETGET_FUNCS (device_stats_cnt_flush_io_errs, + struct btrfs_device_stats_item, cnt_flush_io_errs, 64); +BTRFS_SETGET_FUNCS (device_stats_cnt_corruption_errs, + struct btrfs_device_stats_item, cnt_corruption_errs, 64); +BTRFS_SETGET_FUNCS (device_stats_cnt_generation_errs, + struct btrfs_device_stats_item, cnt_generation_errs, 64); + +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_write_io_errs, + struct btrfs_device_stats_item, cnt_write_io_errs, 64); +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_read_io_errs, + struct btrfs_device_stats_item, cnt_read_io_errs, 64); +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_flush_io_errs, + struct btrfs_device_stats_item, cnt_flush_io_errs, 64); +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_corruption_errs, + struct btrfs_device_stats_item, cnt_corruption_errs, +64 ); +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_generation_errs, + struct btrfs_device_stats_item, cnt_generation_errs, +64 ); +static inline struct btrfs_fs_info *btrfs_sb (struct super_block *sb) {return sb->s_fs_info;
fs/btrfs/disk-io.c +7 -0
@@ -2353,6 +2353,13 @@ retry_root_backup: fs_info->generation = generation; fs_info->last_trans_committed = generation; + ret =btrfs_init_device_stats (fs_info); +if (ret) { +printk (KERN_ERR "btrfs: failed to init device_stats: %d\n" , + ret); + goto fail_block_groups; + } + ret =btrfs_init_space_info (fs_info);if (ret) {printk (KERN_ERR "Failed to initial space info: %d\n" , ret);
fs/btrfs/print-tree.c +3 -0
@@ -294,6 +294,9 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)btrfs_dev_extent_chunk_offset (l, dev_extent), (unsigned long long ) btrfs_dev_extent_length(l, dev_extent)); +case BTRFS_DEVICE_STATS_KEY : +printk (KERN_INFO "\t\tdevice stats\n" ); +break ; }; } }
fs/btrfs/transaction.c +4 -0
@@ -28,6 +28,7 @@#include "locking.h" #include "tree-log.h" #include "inode-map.h" +#include "volumes.h" #define BTRFS_ROOT_TRANS_TAG 0
@@ -758,6 +759,9 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans,if (ret)return ret; + ret =btrfs_run_device_stats (trans, root->fs_info); +BUG_ON (ret); +while (!list_empty (&fs_info->dirty_cowonly_roots)) { next = fs_info->dirty_cowonly_roots.next;list_del_init (next);
fs/btrfs/volumes.c +205 -0
237 lines not on this page · raw message
fs/btrfs/volumes.h +9 -0
@@ -108,6 +108,7 @@ struct btrfs_device {/* disk I/O failure stats. For detailed description refer to * struct btrfs_device_stats_item in ctree.h */ +int device_stats_valid;int device_stats_dirty;/* counters need to be written to disk */ atomic_t cnt_write_io_errs;atomic_t cnt_read_io_errs;
@@ -291,6 +292,9 @@ int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes, u64 *start, u64 *max_avail);struct btrfs_device *btrfs_find_device_for_logical (struct btrfs_root *root,u64 logical,int mirror_num); +int btrfs_init_device_stats (struct btrfs_fs_info *fs_info); +int btrfs_run_device_stats (struct btrfs_trans_handle *trans, +struct btrfs_fs_info *fs_info);void btrfs_device_stat_print_on_error (struct btrfs_device *device); int btrfs_get_device_stats(struct btrfs_root *root, struct btrfs_ioctl_get_device_stats *stats,
@@ -315,4 +319,9 @@ static inline void btrfs_device_stat_reset(atomic_t *cnt) {atomic_set (cnt,0 ); } + +static inline void btrfs_device_stat_set (atomic_t *cnt,unsigned long val) +{ +atomic_set (cnt, val); +}#endif
Signature · 1 line
1.7.10.2
Re: [PATCH v3 3/3] Btrfs: read device stats on mount, write modified ones during commit
Quoted 6 lines · Stefan Behrens
The device statistics are written into the device tree with each transaction commit. Only modified statistics are written. When a filesystem is mounted, the device statistics for each involved device are read from the device tree and used to initialize the counters.
Hi Stefan,
Just scaned the patch for a while and got a question:
Adding a new key type usually means changing the disk format, so have you done something for this?
thanks,
liubo
Quoted 418 lines
Signed-off-by Stefan Behrens <[email protected]>--- fs/btrfs/ctree.h | 51 ++++++++++++ fs/btrfs/disk-io.c | 7 ++ fs/btrfs/print-tree.c | 3 + fs/btrfs/transaction.c | 4 + fs/btrfs/volumes.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/volumes.h | 9 +++ 6 files changed, 279 insertions(+)fs/btrfs/ctree.h +51
-0@@ -823,6 +823,26 @@ struct btrfs_csum_item {u8 csum; } __attribute__ ((__packed__)); +struct btrfs_device_stats_item { +/* +* grow this item struct at the end for future enhancements and keep +* the existing values unchanged +*/ +__le64 cnt_write_io_errs;/* EIO or EREMOTEIO from lower layers */ +__le64 cnt_read_io_errs;/* EIO or EREMOTEIO from lower layers */ +__le64 cnt_flush_io_errs;/* EIO or EREMOTEIO from lower layers */ + +/* stats for indirect indications for I/O failures */ +__le64 cnt_corruption_errs;/* checksum error, bytenr error or +* contents is illegal: this is an +* indication that the block was damaged +* during read or write, or written to +* wrong location or read from wrong +* location */ +__le64 cnt_generation_errs;/* an indication that blocks have not +* been written */ +} __attribute__ ((__packed__ )); +/* different types of block groups (and chunks) */ #define BTRFS_BLOCK_GROUP_DATA (1ULL << 0)#define BTRFS_BLOCK_GROUP_SYSTEM (1ULL << 1)@@ -1508,6 +1528,12 @@ struct btrfs_ioctl_defrag_range_args {#define BTRFS_BALANCE_ITEM_KEY 248/* +* Persistantly stores the io stats in the device tree. +* One key for all stats, (0, BTRFS_DEVICE_STATS_KEY, devid). +*/ +#define BTRFS_DEVICE_STATS_KEY 249 + +/* * string items are for debugging. They just store a short string of * data in the FS */ @@ -2415,6 +2441,31 @@ static inline u32 btrfs_file_extent_inline_item_len(struct extent_buffer *eb,return btrfs_item_size (eb, e) - offset; } +/* btrfs_device_stats_item */ +BTRFS_SETGET_FUNCS (device_stats_cnt_write_io_errs, + struct btrfs_device_stats_item, cnt_write_io_errs, 64); +BTRFS_SETGET_FUNCS (device_stats_cnt_read_io_errs, + struct btrfs_device_stats_item, cnt_read_io_errs, 64); +BTRFS_SETGET_FUNCS (device_stats_cnt_flush_io_errs, + struct btrfs_device_stats_item, cnt_flush_io_errs, 64); +BTRFS_SETGET_FUNCS (device_stats_cnt_corruption_errs, + struct btrfs_device_stats_item, cnt_corruption_errs, 64); +BTRFS_SETGET_FUNCS (device_stats_cnt_generation_errs, + struct btrfs_device_stats_item, cnt_generation_errs, 64); + +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_write_io_errs, + struct btrfs_device_stats_item, cnt_write_io_errs, 64); +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_read_io_errs, + struct btrfs_device_stats_item, cnt_read_io_errs, 64); +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_flush_io_errs, + struct btrfs_device_stats_item, cnt_flush_io_errs, 64); +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_corruption_errs, + struct btrfs_device_stats_item, cnt_corruption_errs, +64 ); +BTRFS_SETGET_STACK_FUNCS (stack_device_stats_cnt_generation_errs, + struct btrfs_device_stats_item, cnt_generation_errs, +64 ); +static inline struct btrfs_fs_info *btrfs_sb (struct super_block *sb) {return sb->s_fs_info;fs/btrfs/disk-io.c +7
-0@@ -2353,6 +2353,13 @@ retry_root_backup: fs_info->generation = generation; fs_info->last_trans_committed = generation; + ret =btrfs_init_device_stats (fs_info); +if (ret) { +printk (KERN_ERR "btrfs: failed to init device_stats: %d\n" , + ret); + goto fail_block_groups; + } + ret =btrfs_init_space_info (fs_info);if (ret) {printk (KERN_ERR "Failed to initial space info: %d\n" , ret);fs/btrfs/print-tree.c +3
-0@@ -294,6 +294,9 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)btrfs_dev_extent_chunk_offset (l, dev_extent), (unsigned long long ) btrfs_dev_extent_length(l, dev_extent)); +case BTRFS_DEVICE_STATS_KEY : +printk (KERN_INFO "\t\tdevice stats\n" ); +break ; }; } }fs/btrfs/transaction.c +4
-0@@ -28,6 +28,7 @@#include "locking.h" #include "tree-log.h" #include "inode-map.h" +#include "volumes.h" #define BTRFS_ROOT_TRANS_TAG 0@@ -758,6 +759,9 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans,if (ret)return ret; + ret =btrfs_run_device_stats (trans, root->fs_info); +BUG_ON (ret); +while (!list_empty (&fs_info->dirty_cowonly_roots)) { next = fs_info->dirty_cowonly_roots.next;list_del_init (next);fs/btrfs/volumes.c +205
-0@@ -40,6 +40,8 @@ static int init_first_rw_device(struct btrfs_trans_handle *trans,struct btrfs_root *root, struct btrfs_device *device);static int btrfs_relocate_sys_chunks (struct btrfs_root *root); +static void __btrfs_reset_device_stats (struct btrfs_device *dev); +static void btrfs_device_stat_print_on_load (struct btrfs_device *device);static DEFINE_MUTEX (uuid_mutex);static LIST_HEAD (fs_uuids);@@ -362,6 +364,7 @@ static noinline int device_list_add(const char *path,return -ENOMEM ; } device->devid = devid; + device->device_stats_valid =0 ; device->work.func = pending_bios_fn;memcpy (device->uuid, disk_super->dev_item.uuid,BTRFS_UUID_SIZE );@@ -4626,8 +4629,194 @@ error:return ret; } +static void __btrfs_reset_device_stats (struct btrfs_device *device) +{ +btrfs_device_stat_reset (&device->cnt_write_io_errs); +btrfs_device_stat_reset (&device->cnt_read_io_errs); +btrfs_device_stat_reset (&device->cnt_flush_io_errs); +btrfs_device_stat_reset (&device->cnt_corruption_errs); +btrfs_device_stat_reset (&device->cnt_generation_errs); +} + +int btrfs_init_device_stats (struct btrfs_fs_info *fs_info) +{ +struct btrfs_key key; +struct btrfs_key found_key; +struct btrfs_root *dev_root = fs_info->dev_root; +struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; +struct extent_buffer *eb; +int slot; +int ret =0 ; +struct btrfs_device *device; +struct btrfs_path *path =NULL ; + + path =btrfs_alloc_path (); +if (!path) { + ret = -ENOMEM ; + goto out; + } + +mutex_lock (&fs_devices->device_list_mutex); +list_for_each_entry (device, &fs_devices->devices, dev_list) { +int item_size; +struct btrfs_device_stats_item *ptr; + + key.objectid =0 ; + key.type =BTRFS_DEVICE_STATS_KEY ; + key.offset = device->devid; + ret =btrfs_search_slot (NULL , dev_root, &key, path,0 ,0 ); +if (ret) { +printk (KERN_WARNING "btrfs: no device_stats entry found for device %s (devid %llu) (OK on first mount after mkfs)\n" , + device->name, (unsigned long long )device->devid); +__btrfs_reset_device_stats (device); + device->device_stats_valid =1 ; + device->device_stats_dirty =1 ; +btrfs_release_path (path); +continue ; + } + slot = path->slots[0 ]; + eb = path->nodes[0 ]; +btrfs_item_key_to_cpu (eb, &found_key, slot); + item_size =btrfs_item_size_nr (eb, slot); + + ptr =btrfs_item_ptr (eb, slot, + struct btrfs_device_stats_item); + +if (item_size >=1 *sizeof (__le64)) +btrfs_device_stat_set (&device->cnt_write_io_errs, +btrfs_device_stats_cnt_write_io_errs (eb, ptr)); +else +btrfs_device_stat_reset (&device->cnt_write_io_errs); +if (item_size >=2 *sizeof (__le64)) +btrfs_device_stat_set (&device->cnt_read_io_errs, +btrfs_device_stats_cnt_read_io_errs (eb, ptr)); +else +btrfs_device_stat_reset (&device->cnt_read_io_errs); +if (item_size >=3 *sizeof (__le64)) +btrfs_device_stat_set (&device->cnt_flush_io_errs, +btrfs_device_stats_cnt_flush_io_errs (eb, ptr)); +else +btrfs_device_stat_reset (&device->cnt_flush_io_errs); +if (item_size >=4 *sizeof (__le64)) +btrfs_device_stat_set (&device->cnt_corruption_errs, +btrfs_device_stats_cnt_corruption_errs (eb, + ptr)); +else +btrfs_device_stat_reset (&device->cnt_corruption_errs); +if (item_size >=5 *sizeof (__le64)) +btrfs_device_stat_set (&device->cnt_generation_errs, +btrfs_device_stats_cnt_generation_errs (eb, + ptr)); +else +btrfs_device_stat_reset (&device->cnt_generation_errs); + +btrfs_device_stat_print_on_load (device); + device->device_stats_valid =1 ; +btrfs_release_path (path); + } +mutex_unlock (&fs_devices->device_list_mutex); + +out: +btrfs_free_path (path); +return ret <0 ? ret :0 ; +} + +static int update_device_stat_item (struct btrfs_trans_handle *trans, +struct btrfs_root *dev_root, +struct btrfs_device *device) +{ +struct btrfs_path *path; +struct btrfs_key key; +struct extent_buffer *eb; +struct btrfs_device_stats_item *ptr; +int ret; + + key.objectid =0 ; + key.type =BTRFS_DEVICE_STATS_KEY ; + key.offset = device->devid; + + path =btrfs_alloc_path (); +BUG_ON (!path); + ret =btrfs_search_slot (trans, dev_root, &key, path,0 ,1 ); +if (ret <0 ) { +printk (KERN_WARNING "btrfs: error %d while searching for device_stats item for device %s!\n" , + ret, device->name); + goto out; + } + +if (0 == ret && +btrfs_item_size_nr (path->nodes[0 ], path->slots[0 ]) <sizeof (*ptr)) { +/* need to delete old one and insert a new one */ + ret =btrfs_del_item (trans, dev_root, path); +if (0 != ret) { +printk (KERN_WARNING "btrfs: delete too small device_stats item for device %s failed %d!\n" , + device->name, ret); + goto out; + } + ret =1 ; + } + +if (1 == ret) { +/* need to insert a new item */ +btrfs_release_path (path); + ret =btrfs_insert_empty_item (trans, dev_root, path, + &key,sizeof (*ptr)); +if (ret <0 ) { +printk (KERN_WARNING "btrfs: insert device_stats item for device %s failed %d!\n" , + device->name, ret); + goto out; + } + } + + eb = path->nodes[0 ]; + ptr =btrfs_item_ptr (eb, path->slots[0 ], + struct btrfs_device_stats_item); +btrfs_set_device_stats_cnt_write_io_errs (eb, ptr, +btrfs_device_stat_read (&device->cnt_write_io_errs)); +btrfs_set_device_stats_cnt_read_io_errs (eb, ptr, +btrfs_device_stat_read (&device->cnt_read_io_errs)); +btrfs_set_device_stats_cnt_flush_io_errs (eb, ptr, +btrfs_device_stat_read (&device->cnt_flush_io_errs)); +btrfs_set_device_stats_cnt_corruption_errs (eb, ptr, +btrfs_device_stat_read (&device->cnt_corruption_errs)); +btrfs_set_device_stats_cnt_generation_errs (eb, ptr, +btrfs_device_stat_read (&device->cnt_generation_errs)); +btrfs_mark_buffer_dirty (eb); + +out: +btrfs_free_path (path); +return ret; +} + +/* +* called from commit_transaction. Writes all changed device stats to disk. +*/ +int btrfs_run_device_stats (struct btrfs_trans_handle *trans, +struct btrfs_fs_info *fs_info) +{ +struct btrfs_root *dev_root = fs_info->dev_root; +struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; +struct btrfs_device *device; +int ret =0 ; + +mutex_lock (&fs_devices->device_list_mutex); +list_for_each_entry (device, &fs_devices->devices, dev_list) { +if (!device->device_stats_valid || !device->device_stats_dirty) +continue ; + + ret =update_device_stat_item (trans, dev_root, device); +if (!ret) + device->device_stats_dirty =0 ; + } +mutex_unlock (&fs_devices->device_list_mutex); + +return ret; +} +void btrfs_device_stat_print_on_error (struct btrfs_device *device) { +if (!device->device_stats_valid) +return ; printk_ratelimited(KERN_ERR "btrfs: bdev %s errs: wr %u, rd %u, flush %u, corrupt %u, gen %u\n", device->name,@@ -4639,6 +4828,18 @@ void btrfs_device_stat_print_on_error(struct btrfs_device *device) &device->cnt_generation_errs)); } +static void btrfs_device_stat_print_on_load (struct btrfs_device *device) +{ +printk (KERN_INFO "btrfs: bdev %s errs: wr %u, rd %u, flush %u," +" corrupt %u, gen %u\n" , + device->name, +btrfs_device_stat_read (&device->cnt_write_io_errs), +btrfs_device_stat_read (&device->cnt_read_io_errs), +btrfs_device_stat_read (&device->cnt_flush_io_errs), +btrfs_device_stat_read (&device->cnt_corruption_errs), +btrfs_device_stat_read (&device->cnt_generation_errs)); +} +int btrfs_get_device_stats (struct btrfs_root *root,struct btrfs_ioctl_get_device_stats *stats,int reset_after_read)@@ -4654,6 +4855,10 @@ int btrfs_get_device_stats(struct btrfs_root *root,printk (KERN_WARNING "btrfs: get device_stats failed, device not found\n" );return -ENODEV ; + }else if (!dev->device_stats_valid) { +printk (KERN_WARNING +"btrfs: get device_stats failed, not yet valid\n" ); +return -ENODEV ; }else if (reset_after_read) {if (stats->nr_items >=1 ) stats->cnt_write_io_errs =fs/btrfs/volumes.h +9
-0@@ -108,6 +108,7 @@ struct btrfs_device {/* disk I/O failure stats. For detailed description refer to * struct btrfs_device_stats_item in ctree.h */ +int device_stats_valid;int device_stats_dirty;/* counters need to be written to disk */ atomic_t cnt_write_io_errs;atomic_t cnt_read_io_errs;@@ -291,6 +292,9 @@ int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes, u64 *start, u64 *max_avail);struct btrfs_device *btrfs_find_device_for_logical (struct btrfs_root *root,u64 logical,int mirror_num); +int btrfs_init_device_stats (struct btrfs_fs_info *fs_info); +int btrfs_run_device_stats (struct btrfs_trans_handle *trans, +struct btrfs_fs_info *fs_info);void btrfs_device_stat_print_on_error (struct btrfs_device *device); int btrfs_get_device_stats(struct btrfs_root *root, struct btrfs_ioctl_get_device_stats *stats,@@ -315,4 +319,9 @@ static inline void btrfs_device_stat_reset(atomic_t *cnt) {atomic_set (cnt,0 ); } + +static inline void btrfs_device_stat_set (atomic_t *cnt,unsigned long val) +{ +atomic_set (cnt, val); +}#endif
Re: [PATCH v3 3/3] Btrfs: read device stats on mount, write modified ones during commit
Quoted 9 lines · Liu Bo
Quoted 5 lines · Stefan Behrens
The device statistics are written into the device tree with each transaction commit. Only modified statistics are written. When a filesystem is mounted, the device statistics for each involved device are read from the device tree and used to initialize the counters.
Quoted 6 lines
Hi Stefan,
Just scaned the patch for a while and got a question:
Adding a new key type usually means changing the disk format, so have you done something for this?
Hi Liu,
New tree entries with new keys are added to the device tree. Old kernels do not search for these keys and therefore ignore them. New kernels (with this patch) search for these keys and read and write them, or create them when required. That works fine.
Re: [PATCH v3 3/3] Btrfs: read device stats on mount, write modified ones during commit
In reply to Stefan BehrensQuoted 14 lines · Stefan Behrens
fs/btrfs/ctree.h +8
-0@@ -823,6 +823,26 @@ struct btrfs_csum_item {u8 csum; } __attribute__ ((__packed__)); +struct btrfs_device_stats_item { +/* +* grow this item struct at the end for future enhancements and keep +* the existing values unchanged +*/ +__le64 cnt_write_io_errs;/* EIO or EREMOTEIO from lower layers */ +__le64 cnt_read_io_errs;/* EIO or EREMOTEIO from lower layers */ +__le64 cnt_flush_io_errs;/* EIO or EREMOTEIO from lower layers */
fs/btrfs/ctree.h struct btrfs_csum_item { · line 843
Quoted 10 lines
fs/btrfs/ctree.h +10
-0+ +/* stats for indirect indications for I/O failures */ +__le64 cnt_corruption_errs;/* checksum error, bytenr error or +* contents is illegal: this is an +* indication that the block was damaged +* during read or write, or written to +* wrong location or read from wrong +* location */ +__le64 cnt_generation_errs;/* an indication that blocks have not +* been written */
A few spare u64 would come handy in the future. Currently there are 5, so add like 7 or 11. We might be interested in collecting more types of stats, ore more fine-grained.
I see the comment above about enhancing the structure, but then you need to version this stucture. Let's say this kernel at version 3.5 add this structre as you propose it now, and kernel 3.6 adds another item 'cnt_exploded'.
Accessing the 3.6-created image with a 3.5 will be ok (older kernel will not touch the new items).
Accessing the 3.5-created image with a 3.6 will be problematic, as the kernel would try to access ->cnt_exploded .
So, either the 3.6 kernel needs to know not to touch the missing item (ie. via reading the struct version from somewhere, stored on disk).
Or, there are spare items, which are zeroed in versions that do not use them and naturally used otherwise, but when new kernel uses old image, it finds zeros (and will be safe).
Quoted 2 lines
fs/btrfs/ctree.h +2
-0+} __attribute__ ((__packed__)); +
Re: [PATCH v3 3/3] Btrfs: read device stats on mount, write modified ones during commit
Quoted 30 lines · David Sterba
Quoted 14 lines · Stefan Behrens
fs/btrfs/ctree.h +8
-0@@ -823,6 +823,26 @@ struct btrfs_csum_item {u8 csum; } __attribute__ ((__packed__)); +struct btrfs_device_stats_item { +/* +* grow this item struct at the end for future enhancements and keep +* the existing values unchanged +*/ +__le64 cnt_write_io_errs;/* EIO or EREMOTEIO from lower layers */ +__le64 cnt_read_io_errs;/* EIO or EREMOTEIO from lower layers */ +__le64 cnt_flush_io_errs;/* EIO or EREMOTEIO from lower layers */ fs/btrfs/ctree.h struct btrfs_csum_item { · line 843
Quoted 10 lines
fs/btrfs/ctree.h +10
-0+ +/* stats for indirect indications for I/O failures */ +__le64 cnt_corruption_errs;/* checksum error, bytenr error or +* contents is illegal: this is an +* indication that the block was damaged +* during read or write, or written to +* wrong location or read from wrong +* location */ +__le64 cnt_generation_errs;/* an indication that blocks have not +* been written */ A few spare u64 would come handy in the future. Currently there are 5, so add like 7 or 11. We might be interested in collecting more types of stats, ore more fine-grained.
Quoted 4 lines
I see the comment above about enhancing the structure, but then you need to version this stucture. Let's say this kernel at version 3.5 add this structre as you propose it now, and kernel 3.6 adds another item '
cnt_exploded'.
The size of the item is part of the information that is stored on disk. This is used to downgrade and upgrade the item, and to support downgrading and upgrading the kernel.
In btrfs_init_device_stats(), where the items are read from disk while mounting, if the read item is too small, the missing statistic members at the end are filled with zero. If the item is larger than expected, the additional values are ignored.
And in update_device_stat_item(), where the items are written to disk with each commit (only if they have been modified), if the disk item is too small, it is removed and replaced by a larger one. If the disk item is larger than expected, the additional values are ignored and not modified.
The ioctl() works similar. In the user mode, the max number of statistic members is set before the ioctl(). The kernel code uses this parameter to determine, how much values to write and at the end replaces it with the number of values written. Then the btrfs tool prints all the values that it knows by name, but at most the number of values that the kernel has set.
If I compare this solution to the one that just pads the item size to a well known size, the disadvantage are the extra lines of code. The advantage is that no limit at all is set.
Rereading the code, I recognized that I will need to send a v4. The ioctl structure needs to be padded, or copy_to_user(..., sizeof(struct ...)) would overwrite memory when the kernel struct is grown and the btrfs tool is old.
Quoted 15 lines
Accessing the 3.6-created image with a 3.5 will be ok (older kernel will not touch the new items).
Accessing the 3.5-created image with a 3.6 will be problematic, as the kernel would try to access ->cnt_exploded .
So, either the 3.6 kernel needs to know not to touch the missing item (ie. via reading the struct version from somewhere, stored on disk).
Or, there are spare items, which are zeroed in versions that do not use them and naturally used otherwise, but when new kernel uses old image, it finds zeros (and will be safe).
Quoted 2 lines
fs/btrfs/ctree.h +2
-0+} __attribute__ ((__packed__)); +