]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/bkey_methods.c
Update bcachefs sources to bed61fae3b bcachefs: Delete a faulty assertion
[bcachefs-tools-debian] / libbcachefs / bkey_methods.c
index 574c668a9841fa695d0a529cc3d2ab70d77555cb..6547142db42806cfebfa92e5bca81bba600287df 100644 (file)
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include "bcachefs.h"
+#include "backpointers.h"
 #include "bkey_methods.h"
 #include "btree_types.h"
 #include "alloc_background.h"
@@ -12,6 +13,7 @@
 #include "lru.h"
 #include "quota.h"
 #include "reflink.h"
+#include "snapshot.h"
 #include "subvolume.h"
 #include "xattr.h"
 
@@ -23,57 +25,52 @@ const char * const bch2_bkey_types[] = {
 };
 
 static int deleted_key_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                              int rw, struct printbuf *err)
+                              unsigned flags, struct printbuf *err)
 {
        return 0;
 }
 
-#define bch2_bkey_ops_deleted (struct bkey_ops) {      \
+#define bch2_bkey_ops_deleted ((struct bkey_ops) {     \
        .key_invalid = deleted_key_invalid,             \
-}
+})
 
-#define bch2_bkey_ops_whiteout (struct bkey_ops) {     \
+#define bch2_bkey_ops_whiteout ((struct bkey_ops) {    \
        .key_invalid = deleted_key_invalid,             \
-}
+})
 
 static int empty_val_key_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                                int rw, struct printbuf *err)
+                                unsigned flags, struct printbuf *err)
 {
        if (bkey_val_bytes(k.k)) {
-               pr_buf(err, "incorrect value size (%zu != 0)",
+               prt_printf(err, "incorrect value size (%zu != 0)",
                       bkey_val_bytes(k.k));
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        return 0;
 }
 
-#define bch2_bkey_ops_error (struct bkey_ops) {                \
+#define bch2_bkey_ops_error ((struct bkey_ops) {       \
        .key_invalid = empty_val_key_invalid,           \
-}
+})
 
 static int key_type_cookie_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                                  int rw, struct printbuf *err)
+                                  unsigned flags, struct printbuf *err)
 {
-       if (bkey_val_bytes(k.k) != sizeof(struct bch_cookie)) {
-               pr_buf(err, "incorrect value size (%zu != %zu)",
-                      bkey_val_bytes(k.k), sizeof(struct bch_cookie));
-               return -EINVAL;
-       }
-
        return 0;
 }
 
-#define bch2_bkey_ops_cookie (struct bkey_ops) {       \
-       .key_invalid = key_type_cookie_invalid,         \
-}
+#define bch2_bkey_ops_cookie ((struct bkey_ops) {      \
+       .key_invalid    = key_type_cookie_invalid,      \
+       .min_val_size   = 8,                            \
+})
 
-#define bch2_bkey_ops_hash_whiteout (struct bkey_ops) {        \
+#define bch2_bkey_ops_hash_whiteout ((struct bkey_ops) {\
        .key_invalid = empty_val_key_invalid,           \
-}
+})
 
 static int key_type_inline_data_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                                       int rw, struct printbuf *err)
+                                       unsigned flags, struct printbuf *err)
 {
        return 0;
 }
@@ -84,22 +81,22 @@ static void key_type_inline_data_to_text(struct printbuf *out, struct bch_fs *c,
        struct bkey_s_c_inline_data d = bkey_s_c_to_inline_data(k);
        unsigned datalen = bkey_inline_data_bytes(k.k);
 
-       pr_buf(out, "datalen %u: %*phN",
+       prt_printf(out, "datalen %u: %*phN",
               datalen, min(datalen, 32U), d.v->data);
 }
 
-#define bch2_bkey_ops_inline_data (struct bkey_ops) {  \
+#define bch2_bkey_ops_inline_data ((struct bkey_ops) { \
        .key_invalid    = key_type_inline_data_invalid, \
        .val_to_text    = key_type_inline_data_to_text, \
-}
+})
 
 static int key_type_set_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                               int rw, struct printbuf *err)
+                               unsigned flags, struct printbuf *err)
 {
        if (bkey_val_bytes(k.k)) {
-               pr_buf(err, "incorrect value size (%zu != %zu)",
+               prt_printf(err, "incorrect value size (%zu != %zu)",
                       bkey_val_bytes(k.k), sizeof(struct bch_cookie));
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        return 0;
@@ -111,10 +108,10 @@ static bool key_type_set_merge(struct bch_fs *c, struct bkey_s l, struct bkey_s_
        return true;
 }
 
-#define bch2_bkey_ops_set (struct bkey_ops) {          \
+#define bch2_bkey_ops_set ((struct bkey_ops) {         \
        .key_invalid    = key_type_set_invalid,         \
        .key_merge      = key_type_set_merge,           \
-}
+})
 
 const struct bkey_ops bch2_bkey_ops[] = {
 #define x(name, nr) [KEY_TYPE_##name]  = bch2_bkey_ops_##name,
@@ -122,132 +119,90 @@ const struct bkey_ops bch2_bkey_ops[] = {
 #undef x
 };
 
+const struct bkey_ops bch2_bkey_null_ops = {
+       .min_val_size = U8_MAX,
+};
+
 int bch2_bkey_val_invalid(struct bch_fs *c, struct bkey_s_c k,
-                         int rw, struct printbuf *err)
+                         enum bkey_invalid_flags flags,
+                         struct printbuf *err)
 {
-       if (k.k->type >= KEY_TYPE_MAX) {
-               pr_buf(err, "invalid type (%u >= %u)", k.k->type, KEY_TYPE_MAX);
-               return -EINVAL;
+       const struct bkey_ops *ops = bch2_bkey_type_ops(k.k->type);
+
+       if (bkey_val_bytes(k.k) < ops->min_val_size) {
+               prt_printf(err, "bad val size (%zu < %u)",
+                          bkey_val_bytes(k.k), ops->min_val_size);
+               return -BCH_ERR_invalid_bkey;
        }
 
-       return bch2_bkey_ops[k.k->type].key_invalid(c, k, rw, err);
+       if (!ops->key_invalid)
+               return 0;
+
+       return ops->key_invalid(c, k, flags, err);
 }
 
-static unsigned bch2_key_types_allowed[] = {
-       [BKEY_TYPE_extents] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_whiteout)|
-               (1U << KEY_TYPE_error)|
-               (1U << KEY_TYPE_cookie)|
-               (1U << KEY_TYPE_extent)|
-               (1U << KEY_TYPE_reservation)|
-               (1U << KEY_TYPE_reflink_p)|
-               (1U << KEY_TYPE_inline_data),
-       [BKEY_TYPE_inodes] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_whiteout)|
-               (1U << KEY_TYPE_inode)|
-               (1U << KEY_TYPE_inode_v2)|
-               (1U << KEY_TYPE_inode_generation),
-       [BKEY_TYPE_dirents] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_whiteout)|
-               (1U << KEY_TYPE_hash_whiteout)|
-               (1U << KEY_TYPE_dirent),
-       [BKEY_TYPE_xattrs] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_whiteout)|
-               (1U << KEY_TYPE_cookie)|
-               (1U << KEY_TYPE_hash_whiteout)|
-               (1U << KEY_TYPE_xattr),
-       [BKEY_TYPE_alloc] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_alloc)|
-               (1U << KEY_TYPE_alloc_v2)|
-               (1U << KEY_TYPE_alloc_v3)|
-               (1U << KEY_TYPE_alloc_v4),
-       [BKEY_TYPE_quotas] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_quota),
-       [BKEY_TYPE_stripes] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_stripe),
-       [BKEY_TYPE_reflink] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_reflink_v)|
-               (1U << KEY_TYPE_indirect_inline_data),
-       [BKEY_TYPE_subvolumes] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_subvolume),
-       [BKEY_TYPE_snapshots] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_snapshot),
-       [BKEY_TYPE_lru] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_lru),
-       [BKEY_TYPE_freespace] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_set),
-       [BKEY_TYPE_need_discard] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_set),
+static u64 bch2_key_types_allowed[] = {
+#define x(name, nr, flags, keys)       [BKEY_TYPE_##name] = BIT_ULL(KEY_TYPE_deleted)|keys,
+       BCH_BTREE_IDS()
+#undef x
        [BKEY_TYPE_btree] =
-               (1U << KEY_TYPE_deleted)|
-               (1U << KEY_TYPE_btree_ptr)|
-               (1U << KEY_TYPE_btree_ptr_v2),
+               BIT_ULL(KEY_TYPE_deleted)|
+               BIT_ULL(KEY_TYPE_btree_ptr)|
+               BIT_ULL(KEY_TYPE_btree_ptr_v2),
 };
 
 int __bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,
                        enum btree_node_type type,
-                       int rw, struct printbuf *err)
+                       enum bkey_invalid_flags flags,
+                       struct printbuf *err)
 {
        if (k.k->u64s < BKEY_U64s) {
-               pr_buf(err, "u64s too small (%u < %zu)", k.k->u64s, BKEY_U64s);
-               return -EINVAL;
+               prt_printf(err, "u64s too small (%u < %zu)", k.k->u64s, BKEY_U64s);
+               return -BCH_ERR_invalid_bkey;
        }
 
-       if (!(bch2_key_types_allowed[type] & (1U << k.k->type))) {
-               pr_buf(err, "invalid key type for this btree (%s)",
-                      bch2_bkey_types[type]);
-               return -EINVAL;
+       if (flags & BKEY_INVALID_COMMIT  &&
+           !(bch2_key_types_allowed[type] & BIT_ULL(k.k->type))) {
+               prt_printf(err, "invalid key type for btree %s (%s)",
+                          bch2_btree_ids[type], bch2_bkey_types[k.k->type]);
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (btree_node_type_is_extents(type) && !bkey_whiteout(k.k)) {
                if (k.k->size == 0) {
-                       pr_buf(err, "size == 0");
-                       return -EINVAL;
+                       prt_printf(err, "size == 0");
+                       return -BCH_ERR_invalid_bkey;
                }
 
                if (k.k->size > k.k->p.offset) {
-                       pr_buf(err, "size greater than offset (%u > %llu)",
+                       prt_printf(err, "size greater than offset (%u > %llu)",
                               k.k->size, k.k->p.offset);
-                       return -EINVAL;
+                       return -BCH_ERR_invalid_bkey;
                }
        } else {
                if (k.k->size) {
-                       pr_buf(err, "size != 0");
-                       return -EINVAL;
+                       prt_printf(err, "size != 0");
+                       return -BCH_ERR_invalid_bkey;
                }
        }
 
-       if (type != BKEY_TYPE_btree &&
-           !btree_type_has_snapshots(type) &&
-           k.k->p.snapshot) {
-               pr_buf(err, "nonzero snapshot");
-               return -EINVAL;
-       }
+       if (type != BKEY_TYPE_btree) {
+               if (!btree_type_has_snapshots((enum btree_id) type) &&
+                   k.k->p.snapshot) {
+                       prt_printf(err, "nonzero snapshot");
+                       return -BCH_ERR_invalid_bkey;
+               }
 
-       if (type != BKEY_TYPE_btree &&
-           btree_type_has_snapshots(type) &&
-           !k.k->p.snapshot) {
-               pr_buf(err, "snapshot == 0");
-               return -EINVAL;
-       }
+               if (btree_type_has_snapshots((enum btree_id) type) &&
+                   !k.k->p.snapshot) {
+                       prt_printf(err, "snapshot == 0");
+                       return -BCH_ERR_invalid_bkey;
+               }
 
-       if (type != BKEY_TYPE_btree &&
-           !bkey_cmp(k.k->p, POS_MAX)) {
-               pr_buf(err, "key at POS_MAX");
-               return -EINVAL;
+               if (bkey_eq(k.k->p, POS_MAX)) {
+                       prt_printf(err, "key at POS_MAX");
+                       return -BCH_ERR_invalid_bkey;
+               }
        }
 
        return 0;
@@ -255,23 +210,24 @@ int __bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,
 
 int bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,
                      enum btree_node_type type,
-                     int rw, struct printbuf *err)
+                     enum bkey_invalid_flags flags,
+                     struct printbuf *err)
 {
-       return __bch2_bkey_invalid(c, k, type, rw, err) ?:
-               bch2_bkey_val_invalid(c, k, rw, err);
+       return __bch2_bkey_invalid(c, k, type, flags, err) ?:
+               bch2_bkey_val_invalid(c, k, flags, err);
 }
 
 int bch2_bkey_in_btree_node(struct btree *b, struct bkey_s_c k,
                            struct printbuf *err)
 {
-       if (bpos_cmp(k.k->p, b->data->min_key) < 0) {
-               pr_buf(err, "key before start of btree node");
-               return -EINVAL;
+       if (bpos_lt(k.k->p, b->data->min_key)) {
+               prt_printf(err, "key before start of btree node");
+               return -BCH_ERR_invalid_bkey;
        }
 
-       if (bpos_cmp(k.k->p, b->data->max_key) > 0) {
-               pr_buf(err, "key past end of btree node");
-               return -EINVAL;
+       if (bpos_gt(k.k->p, b->data->max_key)) {
+               prt_printf(err, "key past end of btree node");
+               return -BCH_ERR_invalid_bkey;
        }
 
        return 0;
@@ -279,59 +235,55 @@ int bch2_bkey_in_btree_node(struct btree *b, struct bkey_s_c k,
 
 void bch2_bpos_to_text(struct printbuf *out, struct bpos pos)
 {
-       if (!bpos_cmp(pos, POS_MIN))
-               pr_buf(out, "POS_MIN");
-       else if (!bpos_cmp(pos, POS_MAX))
-               pr_buf(out, "POS_MAX");
-       else if (!bpos_cmp(pos, SPOS_MAX))
-               pr_buf(out, "SPOS_MAX");
+       if (bpos_eq(pos, POS_MIN))
+               prt_printf(out, "POS_MIN");
+       else if (bpos_eq(pos, POS_MAX))
+               prt_printf(out, "POS_MAX");
+       else if (bpos_eq(pos, SPOS_MAX))
+               prt_printf(out, "SPOS_MAX");
        else {
                if (pos.inode == U64_MAX)
-                       pr_buf(out, "U64_MAX");
+                       prt_printf(out, "U64_MAX");
                else
-                       pr_buf(out, "%llu", pos.inode);
-               pr_buf(out, ":");
+                       prt_printf(out, "%llu", pos.inode);
+               prt_printf(out, ":");
                if (pos.offset == U64_MAX)
-                       pr_buf(out, "U64_MAX");
+                       prt_printf(out, "U64_MAX");
                else
-                       pr_buf(out, "%llu", pos.offset);
-               pr_buf(out, ":");
+                       prt_printf(out, "%llu", pos.offset);
+               prt_printf(out, ":");
                if (pos.snapshot == U32_MAX)
-                       pr_buf(out, "U32_MAX");
+                       prt_printf(out, "U32_MAX");
                else
-                       pr_buf(out, "%u", pos.snapshot);
+                       prt_printf(out, "%u", pos.snapshot);
        }
 }
 
 void bch2_bkey_to_text(struct printbuf *out, const struct bkey *k)
 {
        if (k) {
-               pr_buf(out, "u64s %u type ", k->u64s);
+               prt_printf(out, "u64s %u type ", k->u64s);
 
                if (k->type < KEY_TYPE_MAX)
-                       pr_buf(out, "%s ", bch2_bkey_types[k->type]);
+                       prt_printf(out, "%s ", bch2_bkey_types[k->type]);
                else
-                       pr_buf(out, "%u ", k->type);
+                       prt_printf(out, "%u ", k->type);
 
                bch2_bpos_to_text(out, k->p);
 
-               pr_buf(out, " len %u ver %llu", k->size, k->version.lo);
+               prt_printf(out, " len %u ver %llu", k->size, k->version.lo);
        } else {
-               pr_buf(out, "(null)");
+               prt_printf(out, "(null)");
        }
 }
 
 void bch2_val_to_text(struct printbuf *out, struct bch_fs *c,
                      struct bkey_s_c k)
 {
-       if (k.k->type < KEY_TYPE_MAX) {
-               const struct bkey_ops *ops = &bch2_bkey_ops[k.k->type];
+       const struct bkey_ops *ops = bch2_bkey_type_ops(k.k->type);
 
-               if (likely(ops->val_to_text))
-                       ops->val_to_text(out, c, k);
-       } else {
-               pr_buf(out, "(invalid type %u)", k.k->type);
-       }
+       if (likely(ops->val_to_text))
+               ops->val_to_text(out, c, k);
 }
 
 void bch2_bkey_val_to_text(struct printbuf *out, struct bch_fs *c,
@@ -340,14 +292,14 @@ void bch2_bkey_val_to_text(struct printbuf *out, struct bch_fs *c,
        bch2_bkey_to_text(out, k.k);
 
        if (bkey_val_bytes(k.k)) {
-               pr_buf(out, ": ");
+               prt_printf(out, ": ");
                bch2_val_to_text(out, c, k);
        }
 }
 
 void bch2_bkey_swab_val(struct bkey_s k)
 {
-       const struct bkey_ops *ops = &bch2_bkey_ops[k.k->type];
+       const struct bkey_ops *ops = bch2_bkey_type_ops(k.k->type);
 
        if (ops->swab)
                ops->swab(k);
@@ -355,7 +307,7 @@ void bch2_bkey_swab_val(struct bkey_s k)
 
 bool bch2_bkey_normalize(struct bch_fs *c, struct bkey_s k)
 {
-       const struct bkey_ops *ops = &bch2_bkey_ops[k.k->type];
+       const struct bkey_ops *ops = bch2_bkey_type_ops(k.k->type);
 
        return ops->key_normalize
                ? ops->key_normalize(c, k)
@@ -364,9 +316,13 @@ bool bch2_bkey_normalize(struct bch_fs *c, struct bkey_s k)
 
 bool bch2_bkey_merge(struct bch_fs *c, struct bkey_s l, struct bkey_s_c r)
 {
-       const struct bkey_ops *ops = &bch2_bkey_ops[l.k->type];
+       const struct bkey_ops *ops = bch2_bkey_type_ops(l.k->type);
 
-       return bch2_bkey_maybe_mergable(l.k, r.k) && ops->key_merge(c, l, r);
+       return ops->key_merge &&
+               bch2_bkey_maybe_mergable(l.k, r.k) &&
+               (u64) l.k->size + r.k->size <= KEY_SIZE_MAX &&
+               !bch2_key_merging_disabled &&
+               ops->key_merge(c, l, r);
 }
 
 static const struct old_bkey_type {
@@ -435,6 +391,7 @@ void __bch2_bkey_compat(unsigned level, enum btree_id btree_id,
                    btree_id == BTREE_ID_inodes) {
                        if (!bkey_packed(k)) {
                                struct bkey_i *u = packed_to_bkey(k);
+
                                swap(u->k.p.inode, u->k.p.offset);
                        } else if (f->bits_per_field[BKEY_FIELD_INODE] &&
                                   f->bits_per_field[BKEY_FIELD_OFFSET]) {
@@ -463,7 +420,7 @@ void __bch2_bkey_compat(unsigned level, enum btree_id btree_id,
                                u->k.p.snapshot = write
                                        ? 0 : U32_MAX;
                        } else {
-                               u64 min_packed = f->field_offset[BKEY_FIELD_SNAPSHOT];
+                               u64 min_packed = le64_to_cpu(f->field_offset[BKEY_FIELD_SNAPSHOT]);
                                u64 max_packed = min_packed +
                                        ~(~0ULL << f->bits_per_field[BKEY_FIELD_SNAPSHOT]);
 
@@ -488,7 +445,7 @@ void __bch2_bkey_compat(unsigned level, enum btree_id btree_id,
                if (big_endian != CPU_BIG_ENDIAN)
                        bch2_bkey_swab_val(u);
 
-               ops = &bch2_bkey_ops[k->type];
+               ops = bch2_bkey_type_ops(k->type);
 
                if (ops->compat)
                        ops->compat(btree_id, version, big_endian, write, u);