better error messages for ioctls
cover better error messages for ioctls
This fixes a common user complaint - uninformative error messages from various bcachefs-tools commands.
Add v2 versions of various ioctls that include a 'struct bch_ioctl_err_mesg', a pointer to a userspace buffer for an error message - and plumb a printbuf through various code for returning errors.
Kent Overstreet (3):
bcachefs: Add v2 ioctls that return error strings
bcachefs: v2 versions of subvolume ioctls
bcachefs: Plumb error messages through data drop paths
fs/bcachefs/bcachefs_ioctl.h | 87 ++++++++++++++----- fs/bcachefs/chardev.c | 159 +++++++++++++++++++++++++++++++++-- fs/bcachefs/chardev.h | 3 + fs/bcachefs/ec.c | 23 +++-- fs/bcachefs/ec.h | 5 +- fs/bcachefs/fs-ioctl.c | 91 ++++++++++++++++++-- fs/bcachefs/migrate.c | 55 ++++++------ fs/bcachefs/migrate.h | 4 +- fs/bcachefs/super.c | 6 +- 9 files changed, 359 insertions(+), 74 deletions(-)
Signature · 1 line
2.50.1
PATCH 1/3 bcachefs: Add v2 ioctls that return error strings
Like BCH_IOCTL_DISK_SET_STATE_v2, implement v2 of other device ioctls that return error messages via 'struct bch_ioctl_err_msg'.
--- fs/bcachefs/bcachefs_ioctl.h | 75 ++++++++++++----- fs/bcachefs/chardev.c | 159 +++++++++++++++++++++++++++++++++-- 2 files changed, 204 insertions(+), 30 deletions(-)
fs/bcachefs/bcachefs_ioctl.h +52 -23
@@ -66,29 +66,35 @@ struct bch_ioctl_incremental {#define BCH_IOCTL_STOP _IO(0xbc, 3)#endif -#define BCH_IOCTL_DISK_ADD _IOW(0xbc, 4, struct bch_ioctl_disk) -#define BCH_IOCTL_DISK_REMOVE _IOW(0xbc, 5, struct bch_ioctl_disk) -#define BCH_IOCTL_DISK_ONLINE _IOW(0xbc, 6, struct bch_ioctl_disk) -#define BCH_IOCTL_DISK_OFFLINE _IOW(0xbc, 7, struct bch_ioctl_disk) -#define BCH_IOCTL_DISK_SET_STATE _IOW(0xbc, 8, struct bch_ioctl_disk_set_state) -#define BCH_IOCTL_DISK_SET_STATE_v2 _IOW(0xbc, 22, struct bch_ioctl_disk_set_state_v2) -#define BCH_IOCTL_DATA _IOW(0xbc, 10, struct bch_ioctl_data) -#define BCH_IOCTL_FS_USAGE _IOWR(0xbc, 11, struct bch_ioctl_fs_usage) -#define BCH_IOCTL_DEV_USAGE _IOWR(0xbc, 11, struct bch_ioctl_dev_usage) -#define BCH_IOCTL_READ_SUPER _IOW(0xbc, 12, struct bch_ioctl_read_super) -#define BCH_IOCTL_DISK_GET_IDX _IOW(0xbc, 13, struct bch_ioctl_disk_get_idx) -#define BCH_IOCTL_DISK_RESIZE _IOW(0xbc, 14, struct bch_ioctl_disk_resize) -#define BCH_IOCTL_DISK_RESIZE_JOURNAL _IOW(0xbc,15, struct bch_ioctl_disk_resize_journal) - -#define BCH_IOCTL_SUBVOLUME_CREATE _IOW(0xbc, 16, struct bch_ioctl_subvolume) -#define BCH_IOCTL_SUBVOLUME_DESTROY _IOW(0xbc, 17, struct bch_ioctl_subvolume) - -#define BCH_IOCTL_DEV_USAGE_V2 _IOWR(0xbc, 18, struct bch_ioctl_dev_usage_v2) - -#define BCH_IOCTL_FSCK_OFFLINE _IOW(0xbc, 19, struct bch_ioctl_fsck_offline) -#define BCH_IOCTL_FSCK_ONLINE _IOW(0xbc, 20, struct bch_ioctl_fsck_online) -#define BCH_IOCTL_QUERY_ACCOUNTING _IOW(0xbc, 21, struct bch_ioctl_query_accounting) -#define BCH_IOCTL_QUERY_COUNTERS _IOW(0xbc, 21, struct bch_ioctl_query_counters) +#define BCH_IOCTL_DISK_ADD _IOW(0xbc, 4, struct bch_ioctl_disk) +#define BCH_IOCTL_DISK_ADD_v2 _IOW(0xbc, 23, struct bch_ioctl_disk_v2) +#define BCH_IOCTL_DISK_REMOVE _IOW(0xbc, 5, struct bch_ioctl_disk) +#define BCH_IOCTL_DISK_REMOVE_v2 _IOW(0xbc, 24, struct bch_ioctl_disk_v2) +#define BCH_IOCTL_DISK_ONLINE _IOW(0xbc, 6, struct bch_ioctl_disk) +#define BCH_IOCTL_DISK_ONLINE_v2 _IOW(0xbc, 25, struct bch_ioctl_disk_v2) +#define BCH_IOCTL_DISK_OFFLINE _IOW(0xbc, 7, struct bch_ioctl_disk) +#define BCH_IOCTL_DISK_OFFLINE_v2 _IOW(0xbc, 26, struct bch_ioctl_disk_v2) +#define BCH_IOCTL_DISK_SET_STATE _IOW(0xbc, 8, struct bch_ioctl_disk_set_state) +#define BCH_IOCTL_DISK_SET_STATE_v2 _IOW(0xbc, 22, struct bch_ioctl_disk_set_state_v2) +#define BCH_IOCTL_DATA _IOW(0xbc, 10, struct bch_ioctl_data) +#define BCH_IOCTL_FS_USAGE _IOWR(0xbc, 11, struct bch_ioctl_fs_usage) +#define BCH_IOCTL_DEV_USAGE _IOWR(0xbc, 11, struct bch_ioctl_dev_usage) +#define BCH_IOCTL_READ_SUPER _IOW(0xbc, 12, struct bch_ioctl_read_super) +#define BCH_IOCTL_DISK_GET_IDX _IOW(0xbc, 13, struct bch_ioctl_disk_get_idx) +#define BCH_IOCTL_DISK_RESIZE _IOW(0xbc, 14, struct bch_ioctl_disk_resize) +#define BCH_IOCTL_DISK_RESIZE_v2 _IOW(0xbc, 27, struct bch_ioctl_disk_resize_v2) +#define BCH_IOCTL_DISK_RESIZE_JOURNAL _IOW(0xbc, 15, struct bch_ioctl_disk_resize_journal) +#define BCH_IOCTL_DISK_RESIZE_JOURNAL_v2 _IOW(0xbc, 28, struct bch_ioctl_disk_resize_journal_v2) + +#define BCH_IOCTL_SUBVOLUME_CREATE _IOW(0xbc, 16, struct bch_ioctl_subvolume) +#define BCH_IOCTL_SUBVOLUME_DESTROY _IOW(0xbc, 17, struct bch_ioctl_subvolume) + +#define BCH_IOCTL_DEV_USAGE_V2 _IOWR(0xbc, 18, struct bch_ioctl_dev_usage_v2) + +#define BCH_IOCTL_FSCK_OFFLINE _IOW(0xbc, 19, struct bch_ioctl_fsck_offline) +#define BCH_IOCTL_FSCK_ONLINE _IOW(0xbc, 20, struct bch_ioctl_fsck_online) +#define BCH_IOCTL_QUERY_ACCOUNTING _IOW(0xbc, 21, struct bch_ioctl_query_accounting) +#define BCH_IOCTL_QUERY_COUNTERS _IOW(0xbc, 21, struct bch_ioctl_query_counters)/* ioctl below act on a particular file, not the filesystem as a whole: */
@@ -164,6 +170,13 @@ struct bch_ioctl_disk {__u64 dev; }; +struct bch_ioctl_disk_v2 { +__u32 flags; +__u32 pad; +__u64 dev; +struct bch_ioctl_err_msg err; +}; +/* * BCH_IOCTL_DISK_SET_STATE: modify state of a member device of a filesystem *
@@ -400,6 +413,14 @@ struct bch_ioctl_disk_resize {__u64 nbuckets; }; +struct bch_ioctl_disk_resize_v2 { +__u32 flags; +__u32 pad; +__u64 dev; +__u64 nbuckets; +struct bch_ioctl_err_msg err; +}; +/* * BCH_IOCTL_DISK_RESIZE_JOURNAL: resize journal on a device *
@@ -413,6 +434,14 @@ struct bch_ioctl_disk_resize_journal {__u64 nbuckets; }; +struct bch_ioctl_disk_resize_journal_v2 { +__u32 flags; +__u32 pad; +__u64 dev; +__u64 nbuckets; +struct bch_ioctl_err_msg err; +}; +struct bch_ioctl_subvolume {__u32 flags;__u32 dirfd;
fs/bcachefs/chardev.c +152 -7
227 lines not on this page · raw message
Signature · 1 line
2.50.1
PATCH 2/3 bcachefs: v2 versions of subvolume ioctls
In reply to Kent OverstreetLike we recently did for the device ioctl, add v2 versions that can return error strings.
--- fs/bcachefs/bcachefs_ioctl.h | 12 +++++ fs/bcachefs/chardev.c | 16 +++---- fs/bcachefs/chardev.h | 3 ++ fs/bcachefs/fs-ioctl.c | 91 +++++++++++++++++++++++++++++++++--- 4 files changed, 108 insertions(+), 14 deletions(-)
fs/bcachefs/bcachefs_ioctl.h +12 -0
@@ -87,7 +87,9 @@ struct bch_ioctl_incremental {#define BCH_IOCTL_DISK_RESIZE_JOURNAL_v2 _IOW(0xbc, 28, struct bch_ioctl_disk_resize_journal_v2)#define BCH_IOCTL_SUBVOLUME_CREATE _IOW(0xbc, 16, struct bch_ioctl_subvolume) +#define BCH_IOCTL_SUBVOLUME_CREATE_v2 _IOW(0xbc, 29, struct bch_ioctl_subvolume_v2)#define BCH_IOCTL_SUBVOLUME_DESTROY _IOW(0xbc, 17, struct bch_ioctl_subvolume) +#define BCH_IOCTL_SUBVOLUME_DESTROY_v2 _IOW(0xbc, 30, struct bch_ioctl_subvolume_v2)#define BCH_IOCTL_DEV_USAGE_V2 _IOWR(0xbc, 18, struct bch_ioctl_dev_usage_v2)
@@ -451,6 +453,16 @@ struct bch_ioctl_subvolume {__u64 src_ptr; }; +struct bch_ioctl_subvolume_v2 { +__u32 flags; +__u32 dirfd; +__u16 mode; +__u16 pad[3 ]; +__u64 dst_ptr; +__u64 src_ptr; +struct bch_ioctl_err_msg err; +}; +#define BCH_SUBVOL_SNAPSHOT_CREATE (1U << 0)#define BCH_SUBVOL_SNAPSHOT_RO (1U << 1)
fs/bcachefs/chardev.c +8 -8
@@ -187,7 +187,7 @@ static long bch2_ioctl_stop(struct bch_fs *c) }#endif -static int copy_ioctl_err_msg (struct bch_ioctl_err_msg *dst,struct printbuf *src,int ret) +int bch2_copy_ioctl_err_msg (struct bch_ioctl_err_msg *dst,struct printbuf *src,int ret) {if (ret) {prt_printf (src,"error=%s" ,bch2_err_str (ret));
@@ -243,7 +243,7 @@ static long bch2_ioctl_disk_add_v2(struct bch_fs *c, struct bch_ioctl_disk_v2 arCLASS (printbuf, err)(); ret =bch2_dev_add (c, path, &err);kfree (path); -return copy_ioctl_err_msg (&arg.err, &err, ret); +return bch2_copy_ioctl_err_msg (&arg.err, &err, ret); }static long bch2_ioctl_disk_remove (struct bch_fs *c,struct bch_ioctl_disk arg)
@@ -287,7 +287,7 @@ static long bch2_ioctl_disk_remove_v2(struct bch_fs *c, struct bch_ioctl_disk_v2CLASS (printbuf, err)();int ret =bch2_dev_remove (c, ca, arg.flags, &err); -return copy_ioctl_err_msg (&arg.err, &err, ret); +return bch2_copy_ioctl_err_msg (&arg.err, &err, ret); }static long bch2_ioctl_disk_online (struct bch_fs *c,struct bch_ioctl_disk arg)
@@ -333,7 +333,7 @@ static long bch2_ioctl_disk_online_v2(struct bch_fs *c, struct bch_ioctl_disk_v2CLASS (printbuf, err)(); ret =bch2_dev_online (c, path, &err);kfree (path); -return copy_ioctl_err_msg (&arg.err, &err, ret); +return bch2_copy_ioctl_err_msg (&arg.err, &err, ret); }static long bch2_ioctl_disk_offline (struct bch_fs *c,struct bch_ioctl_disk arg)
@@ -377,7 +377,7 @@ static long bch2_ioctl_disk_offline_v2(struct bch_fs *c, struct bch_ioctl_disk_vCLASS (printbuf, err)();int ret =bch2_dev_offline (c, ca, arg.flags, &err); -return copy_ioctl_err_msg (&arg.err, &err, ret); +return bch2_copy_ioctl_err_msg (&arg.err, &err, ret); } static long bch2_ioctl_disk_set_state(struct bch_fs *c,
@@ -429,7 +429,7 @@ static long bch2_ioctl_disk_set_state_v2(struct bch_fs *c, ret =bch2_dev_set_state (c, ca, arg.new_state, arg.flags, &err); err: -return copy_ioctl_err_msg (&arg.err, &err, ret); +return bch2_copy_ioctl_err_msg (&arg.err, &err, ret); }struct bch_data_ctx {
@@ -783,7 +783,7 @@ static long bch2_ioctl_disk_resize_v2(struct bch_fs *c,CLASS (printbuf, err)();int ret =bch2_dev_resize (c, ca, arg.nbuckets, &err); -return copy_ioctl_err_msg (&arg.err, &err, ret); +return bch2_copy_ioctl_err_msg (&arg.err, &err, ret); } static long bch2_ioctl_disk_resize_journal(struct bch_fs *c,
@@ -825,7 +825,7 @@ static long bch2_ioctl_disk_resize_journal_v2(struct bch_fs *c,CLASS (printbuf, err)();int ret =bch2_set_nr_journal_buckets (c, ca, arg.nbuckets); -return copy_ioctl_err_msg (&arg.err, &err, ret); +return bch2_copy_ioctl_err_msg (&arg.err, &err, ret); }#define BCH_IOCTL (_name, _argtype) \
fs/bcachefs/chardev.h +3 -0
@@ -4,6 +4,9 @@#ifndef NO_BCACHEFS_FS +struct printbuf ; +int bch2_copy_ioctl_err_msg (struct bch_ioctl_err_msg *,struct printbuf *,int ); +long bch2_fs_ioctl (struct bch_fs *,unsigned ,void __user *);void bch2_fs_chardev_exit (struct bch_fs *);
fs/bcachefs/fs-ioctl.c +85 -6
150 lines not on this page · raw message
Signature · 1 line
2.50.1
PATCH 3/3 bcachefs: Plumb error messages through data drop paths
In reply to Kent OverstreetThe ioctl v2 rework added the ability to return error messages to userspace directly - instead of via the dmesg log.
This lets us return more informative error messages: we can now return a message with the key we failed on.
--- fs/bcachefs/ec.c | 23 ++++++++++++------ fs/bcachefs/ec.h | 5 ++-- fs/bcachefs/migrate.c | 55 ++++++++++++++++++++++++------------------- fs/bcachefs/migrate.h | 4 ++-- fs/bcachefs/super.c | 6 ++--- 5 files changed, 55 insertions(+), 38 deletions(-)
fs/bcachefs/ec.c +16 -7
@@ -2040,7 +2040,7 @@ int bch2_invalidate_stripe_to_dev(struct btree_trans *trans, struct btree_iter *iter, struct bkey_s_c k, unsigned dev_idx, - unsigned flags) + unsigned flags, struct printbuf *err) { if (k.k->type != KEY_TYPE_stripe) return 0;
@@ -2081,13 +2081,21 @@ int bch2_invalidate_stripe_to_dev(struct btree_trans *trans, nr_good += ca && ca->mi.state != BCH_MEMBER_STATE_failed; } -if (nr_good < s->v.nr_blocks && !(flags &BCH_FORCE_IF_DATA_DEGRADED )) +if (nr_good < s->v.nr_blocks && !(flags &BCH_FORCE_IF_DATA_DEGRADED )) { +prt_str (err,"cannot drop device without degrading\n " ); +bch2_bkey_val_to_text (err, c, k); +prt_newline (err);return bch_err_throw (c, remove_would_lose_data); + }unsigned nr_data = s->v.nr_blocks - s->v.nr_redundant; -if (nr_good < nr_data && !(flags &BCH_FORCE_IF_DATA_LOST )) +if (nr_good < nr_data && !(flags &BCH_FORCE_IF_DATA_LOST )) { +prt_str (err,"cannot drop device without losing data\n " ); +bch2_bkey_val_to_text (err, c, k); +prt_newline (err);return bch_err_throw (c, remove_would_lose_data); + } sectors = -sectors;
@@ -2099,7 +2107,7 @@ int bch2_invalidate_stripe_to_dev(struct btree_trans *trans, }static int bch2_invalidate_stripe_to_dev_from_alloc (struct btree_trans *trans,struct bkey_s_c k_a, -unsigned flags) +unsigned flags,struct printbuf *err) {struct bch_alloc_v4 a_convert;const struct bch_alloc_v4 *a =bch2_alloc_to_v4 (k_a, &a_convert);
@@ -2119,17 +2127,18 @@ static int bch2_invalidate_stripe_to_dev_from_alloc(struct btree_trans *trans, sif (ret)return ret; -return bch2_invalidate_stripe_to_dev (trans, &iter, s.s_c, k_a.k->p.inode, flags); +return bch2_invalidate_stripe_to_dev (trans, &iter, s.s_c, k_a.k->p.inode, flags, err); } -int bch2_dev_remove_stripes (struct bch_fs *c,unsigned dev_idx,unsigned flags) +int bch2_dev_remove_stripes (struct bch_fs *c,unsigned dev_idx, +unsigned flags,struct printbuf *err) {CLASS (btree_trans, trans)(c);int ret =for_each_btree_key_max_commit (trans, iter, BTREE_ID_alloc,POS (dev_idx,0 ),POS (dev_idx,U64_MAX ), BTREE_ITER_intent, k,NULL ,NULL ,0 , ({ -bch2_invalidate_stripe_to_dev_from_alloc (trans, k, flags); +bch2_invalidate_stripe_to_dev_from_alloc (trans, k, flags, err); }));bch_err_fn (c, ret);return ret;
fs/bcachefs/ec.h +3 -2
@@ -289,8 +289,9 @@ static inline void ec_stripe_new_put(struct bch_fs *c, struct ec_stripe_new *s, }int bch2_invalidate_stripe_to_dev (struct btree_trans *,struct btree_iter *, -struct bkey_s_c ,unsigned ,unsigned ); -int bch2_dev_remove_stripes (struct bch_fs *,unsigned ,unsigned ); +struct bkey_s_c ,unsigned , +unsigned ,struct printbuf *); +int bch2_dev_remove_stripes (struct bch_fs *,unsigned ,unsigned ,struct printbuf *);void bch2_ec_stop_dev (struct bch_fs *,struct bch_dev *);void bch2_fs_ec_stop (struct bch_fs *);
fs/bcachefs/migrate.c +31 -24
165 lines not on this page · raw message
fs/bcachefs/migrate.h +2 -2
@@ -2,7 +2,7 @@#ifndef _BCACHEFS_MIGRATE_H#define _BCACHEFS_MIGRATE_H -int bch2_dev_data_drop_by_backpointers (struct bch_fs *,unsigned ,unsigned ); -int bch2_dev_data_drop (struct bch_fs *,unsigned ,unsigned ); +int bch2_dev_data_drop_by_backpointers (struct bch_fs *,unsigned ,unsigned ,struct printbuf *); +int bch2_dev_data_drop (struct bch_fs *,unsigned ,unsigned ,struct printbuf *);#endif /* _BCACHEFS_MIGRATE_H */
fs/bcachefs/super.c +3 -3
@@ -1992,9 +1992,9 @@ int bch2_dev_remove(struct bch_fs *c, struct bch_dev *ca, int flags,__bch2_dev_read_only (c, ca); ret = fast_device_removal - ?bch2_dev_data_drop_by_backpointers (c, ca->dev_idx, flags) - : (bch2_dev_data_drop (c, ca->dev_idx, flags) ?: -bch2_dev_remove_stripes (c, ca->dev_idx, flags)); + ?bch2_dev_data_drop_by_backpointers (c, ca->dev_idx, flags, err) + : (bch2_dev_data_drop (c, ca->dev_idx, flags, err) ?: +bch2_dev_remove_stripes (c, ca->dev_idx, flags, err));if (ret) goto err;
Signature · 1 line
2.50.1