]> git.ozlabs.org Git - ccan/blobdiff - ccan/tdb2/check.c
tdb2: rework some io.c functions to encode errors in their pointer returns.
[ccan] / ccan / tdb2 / check.c
index ca5479b56d06fbf9650982a6c7b34325b11dc62e..1b3516720d13c95708e6dce8ece152ab9833372d 100644 (file)
@@ -1,7 +1,7 @@
- /* 
+ /*
    Trivial Database 2: free list/block handling
    Copyright (C) Rusty Russell 2010
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -30,167 +30,404 @@ static bool append(tdb_off_t **arr, size_t *num, tdb_off_t off)
        return true;
 }
 
-static bool check_header(struct tdb_context *tdb)
+static bool check_header(struct tdb_context *tdb, tdb_off_t *recovery)
 {
        uint64_t hash_test;
+       struct tdb_header hdr;
+       enum TDB_ERROR ecode;
+
+       ecode = tdb_read_convert(tdb, 0, &hdr, sizeof(hdr));
+       if (ecode != TDB_SUCCESS) {
+               tdb->ecode = ecode;
+               return false;
+       }
+       /* magic food should not be converted, so convert back. */
+       tdb_convert(tdb, hdr.magic_food, sizeof(hdr.magic_food));
 
        hash_test = TDB_HASH_MAGIC;
        hash_test = tdb_hash(tdb, &hash_test, sizeof(hash_test));
-       if (tdb->header.hash_test != hash_test) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "check: hash test %llu should be %llu\n",
-                        tdb->header.hash_test, hash_test);
+       if (hdr.hash_test != hash_test) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "check: hash test %llu should be %llu",
+                          (long long)hdr.hash_test,
+                          (long long)hash_test);
                return false;
        }
-       if (strcmp(tdb->header.magic_food, TDB_MAGIC_FOOD) != 0) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "check: bad magic '%.*s'\n",
-                        sizeof(tdb->header.magic_food),
-                        tdb->header.magic_food);
+
+       if (strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "check: bad magic '%.*s'",
+                          (unsigned)sizeof(hdr.magic_food), hdr.magic_food);
                return false;
        }
-       if (tdb->header.v.hash_bits < INITIAL_HASH_BITS) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "check: bad hash bits %llu\n",
-                        (long long)tdb->header.v.hash_bits);
+
+       *recovery = hdr.recovery;
+       if (*recovery) {
+               if (*recovery < sizeof(hdr) || *recovery > tdb->map_size) {
+                       tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                                "tdb_check: invalid recovery offset %zu",
+                                (size_t)*recovery);
+                       return false;
+               }
+       }
+
+       /* Don't check reserved: they *can* be used later. */
+       return true;
+}
+
+static bool check_hash_tree(struct tdb_context *tdb,
+                           tdb_off_t off, unsigned int group_bits,
+                           uint64_t hprefix,
+                           unsigned hprefix_bits,
+                           tdb_off_t used[],
+                           size_t num_used,
+                           size_t *num_found,
+                           int (*check)(TDB_DATA, TDB_DATA, void *),
+                           void *private_data);
+
+static bool check_hash_chain(struct tdb_context *tdb,
+                            tdb_off_t off,
+                            uint64_t hash,
+                            tdb_off_t used[],
+                            size_t num_used,
+                            size_t *num_found,
+                            int (*check)(TDB_DATA, TDB_DATA, void *),
+                            void *private_data)
+{
+       struct tdb_used_record rec;
+       enum TDB_ERROR ecode;
+
+       ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec));
+       if (ecode != TDB_SUCCESS) {
+               tdb->ecode = ecode;
                return false;
        }
-       if (tdb->header.v.zone_bits < INITIAL_ZONE_BITS) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "check: bad zone_bits %llu\n",
-                        (long long)tdb->header.v.zone_bits);
+
+       if (rec_magic(&rec) != TDB_CHAIN_MAGIC) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: Bad hash chain magic %llu",
+                          (long long)rec_magic(&rec));
                return false;
        }
-       if (tdb->header.v.free_buckets < INITIAL_FREE_BUCKETS) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "check: bad free_buckets %llu\n",
-                        (long long)tdb->header.v.free_buckets);
+
+       if (rec_data_length(&rec) != sizeof(struct tdb_chain)) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: Bad hash chain length %llu vs %zu",
+                          (long long)rec_data_length(&rec),
+                          sizeof(struct tdb_chain));
                return false;
        }
-       if ((1ULL << tdb->header.v.zone_bits) * tdb->header.v.num_zones
-           < tdb->map_size) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "check: %llu zones size %llu don't cover %llu\n",
-                        (long long)(1ULL << tdb->header.v.zone_bits),
-                        (long long)tdb->header.v.num_zones,
-                        (long long)tdb->map_size);
+       if (rec_key_length(&rec) != 0) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                        "tdb_check: Bad hash chain key length %llu",
+                        (long long)rec_key_length(&rec));
+               return false;
+       }
+       if (rec_hash(&rec) != 0) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                        "tdb_check: Bad hash chain hash value %llu",
+                        (long long)rec_hash(&rec));
                return false;
        }
 
-       /* We check hash_off and free_off later. */
-
-       /* Don't check reserved: they *can* be used later. */
-       return true;
-}
+       off += sizeof(rec);
+       if (!check_hash_tree(tdb, off, 0, hash, 64,
+                            used, num_used, num_found, check, private_data))
+               return false;
 
-static int off_cmp(const tdb_off_t *a, const tdb_off_t *b)
-{
-       /* Can overflow an int. */
-       return *a > *b ? 1
-               : *a < *b ? -1
-               : 0;
+       off = tdb_read_off(tdb, off + offsetof(struct tdb_chain, next));
+       if (off == TDB_OFF_ERR)
+               return false;
+       if (off == 0)
+               return true;
+       (*num_found)++;
+       return check_hash_chain(tdb, off, hash, used, num_used, num_found,
+                               check, private_data);
 }
 
-static bool check_hash_list(struct tdb_context *tdb,
-                           tdb_off_t used[],
-                           size_t num_used)
+static bool check_hash_record(struct tdb_context *tdb,
+                             tdb_off_t off,
+                             uint64_t hprefix,
+                             unsigned hprefix_bits,
+                             tdb_off_t used[],
+                             size_t num_used,
+                             size_t *num_found,
+                             int (*check)(TDB_DATA, TDB_DATA, void *),
+                             void *private_data)
 {
        struct tdb_used_record rec;
-       tdb_len_t hashlen, i, num_nonzero;
-       tdb_off_t h;
-       size_t num_found;
+       enum TDB_ERROR ecode;
 
-       hashlen = sizeof(tdb_off_t) << tdb->header.v.hash_bits;
+       if (hprefix_bits >= 64)
+               return check_hash_chain(tdb, off, hprefix, used, num_used,
+                                       num_found, check, private_data);
 
-       if (tdb_read_convert(tdb, tdb->header.v.hash_off - sizeof(rec),
-                            &rec, sizeof(rec)) == -1)
+       ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec));
+       if (ecode != TDB_SUCCESS) {
+               tdb->ecode = ecode;
                return false;
+       }
 
-       if (rec_data_length(&rec) != hashlen) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: Bad hash table length %llu vs %llu\n",
-                        (long long)rec_data_length(&rec),
-                        (long long)hashlen);
+       if (rec_magic(&rec) != TDB_HTABLE_MAGIC) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: Bad hash table magic %llu",
+                          (long long)rec_magic(&rec));
+               return false;
+       }
+       if (rec_data_length(&rec)
+           != sizeof(tdb_off_t) << TDB_SUBLEVEL_HASH_BITS) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: Bad hash table length %llu vs %llu",
+                          (long long)rec_data_length(&rec),
+                          (long long)sizeof(tdb_off_t)
+                          << TDB_SUBLEVEL_HASH_BITS);
                return false;
        }
        if (rec_key_length(&rec) != 0) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: Bad hash table key length %llu\n",
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                        "tdb_check: Bad hash table key length %llu",
                         (long long)rec_key_length(&rec));
                return false;
        }
        if (rec_hash(&rec) != 0) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: Bad hash table hash value %llu\n",
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                        "tdb_check: Bad hash table hash value %llu",
                         (long long)rec_hash(&rec));
                return false;
        }
 
-       num_found = 0;
-       num_nonzero = 0;
-       for (i = 0, h = tdb->header.v.hash_off;
-            i < (1ULL << tdb->header.v.hash_bits);
-            i++, h += sizeof(tdb_off_t)) {
-               tdb_off_t off, *p, pos;
-               struct tdb_used_record rec;
-               uint64_t hash;
+       off += sizeof(rec);
+       return check_hash_tree(tdb, off,
+                              TDB_SUBLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS,
+                              hprefix, hprefix_bits,
+                              used, num_used, num_found, check, private_data);
+}
 
-               off = tdb_read_off(tdb, h);
-               if (off == TDB_OFF_ERR)
-                       return false;
-               if (!off) {
-                       num_nonzero = 0;
-                       continue;
-               }
-               /* FIXME: Check hash bits */
-               p = asearch(&off, used, num_used, off_cmp);
-               if (!p) {
-                       tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                                "tdb_check: Invalid offset %llu in hash\n",
-                                (long long)off);
-                       return false;
-               }
-               /* Mark it invalid. */
-               *p ^= 1;
-               num_found++;
+static int off_cmp(const tdb_off_t *a, const tdb_off_t *b)
+{
+       /* Can overflow an int. */
+       return *a > *b ? 1
+               : *a < *b ? -1
+               : 0;
+}
 
-               if (tdb_read_convert(tdb, off, &rec, sizeof(rec)) == -1)
-                       return false;
+static uint64_t get_bits(uint64_t h, unsigned num, unsigned *used)
+{
+       *used += num;
 
-               /* Check it is hashed correctly. */
-               hash = hash_record(tdb, off);
+       return (h >> (64 - *used)) & ((1U << num) - 1);
+}
 
-               /* Top bits must match header. */
-               if (hash >> (64 - 11) != rec_hash(&rec)) {
-                       tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                                "tdb_check: Bad hash magic at offset %llu"
-                                " (0x%llx vs 0x%llx)\n",
-                                (long long)off,
-                                (long long)hash, (long long)rec_hash(&rec));
-                       return false;
-               }
+static bool check_hash_tree(struct tdb_context *tdb,
+                           tdb_off_t off, unsigned int group_bits,
+                           uint64_t hprefix,
+                           unsigned hprefix_bits,
+                           tdb_off_t used[],
+                           size_t num_used,
+                           size_t *num_found,
+                           int (*check)(TDB_DATA, TDB_DATA, void *),
+                           void *private_data)
+{
+       unsigned int g, b;
+       const tdb_off_t *hash;
+       struct tdb_used_record rec;
+       enum TDB_ERROR ecode;
+
+       hash = tdb_access_read(tdb, off,
+                              sizeof(tdb_off_t)
+                              << (group_bits + TDB_HASH_GROUP_BITS),
+                              true);
+       if (TDB_PTR_IS_ERR(hash)) {
+               tdb->ecode = TDB_PTR_ERR(hash);
+               return false;
+       }
 
-               /* It must be in the right place in hash array. */
-               pos = hash & ((1ULL << tdb->header.v.hash_bits)-1);
-               if (pos < i - num_nonzero || pos > i) {
-                       /* Could be wrap from end of array?  FIXME: check? */
-                       if (i != num_nonzero) {
-                               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                                        "tdb_check: Bad hash position %llu at"
-                                        " offset %llu hash 0x%llx\n",
-                                        (long long)i,
-                                        (long long)off,
-                                        (long long)hash);
-                               return false;
+       for (g = 0; g < (1 << group_bits); g++) {
+               const tdb_off_t *group = hash + (g << TDB_HASH_GROUP_BITS);
+               for (b = 0; b < (1 << TDB_HASH_GROUP_BITS); b++) {
+                       unsigned int bucket, i, used_bits;
+                       uint64_t h;
+                       tdb_off_t *p;
+                       if (group[b] == 0)
+                               continue;
+
+                       off = group[b] & TDB_OFF_MASK;
+                       p = asearch(&off, used, num_used, off_cmp);
+                       if (!p) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: Invalid offset %llu "
+                                          "in hash", (long long)off);
+                               goto fail;
+                       }
+                       /* Mark it invalid. */
+                       *p ^= 1;
+                       (*num_found)++;
+
+                       if (hprefix_bits == 64) {
+                               /* Chained entries are unordered. */
+                               if (is_subhash(group[b])) {
+                                       tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                                  TDB_LOG_ERROR,
+                                                  "tdb_check: Invalid chain"
+                                                  " entry subhash");
+                                       goto fail;
+                               }
+                               h = hash_record(tdb, off);
+                               if (h != hprefix) {
+                                       tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                                  TDB_LOG_ERROR,
+                                                  "check: bad hash chain"
+                                                  " placement"
+                                                  " 0x%llx vs 0x%llx",
+                                                  (long long)h,
+                                                  (long long)hprefix);
+                                       goto fail;
+                               }
+                               ecode = tdb_read_convert(tdb, off, &rec,
+                                                        sizeof(rec));
+                               if (ecode != TDB_SUCCESS) {
+                                       tdb->ecode = ecode;
+                                       goto fail;
+                               }
+                               goto check;
+                       }
+
+                       if (is_subhash(group[b])) {
+                               uint64_t subprefix;
+                               subprefix = (hprefix
+                                    << (group_bits + TDB_HASH_GROUP_BITS))
+                                       + g * (1 << TDB_HASH_GROUP_BITS) + b;
+
+                               if (!check_hash_record(tdb,
+                                              group[b] & TDB_OFF_MASK,
+                                              subprefix,
+                                              hprefix_bits
+                                                      + group_bits
+                                                      + TDB_HASH_GROUP_BITS,
+                                              used, num_used, num_found,
+                                              check, private_data))
+                                       goto fail;
+                               continue;
+                       }
+                       /* A normal entry */
+
+                       /* Does it belong here at all? */
+                       h = hash_record(tdb, off);
+                       used_bits = 0;
+                       if (get_bits(h, hprefix_bits, &used_bits) != hprefix
+                           && hprefix_bits) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "check: bad hash placement"
+                                          " 0x%llx vs 0x%llx",
+                                        (long long)h, (long long)hprefix);
+                               goto fail;
+                       }
+
+                       /* Does it belong in this group? */
+                       if (get_bits(h, group_bits, &used_bits) != g) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "check: bad group %llu vs %u",
+                                          (long long)h, g);
+                               goto fail;
+                       }
+
+                       /* Are bucket bits correct? */
+                       bucket = group[b] & TDB_OFF_HASH_GROUP_MASK;
+                       if (get_bits(h, TDB_HASH_GROUP_BITS, &used_bits)
+                           != bucket) {
+                               used_bits -= TDB_HASH_GROUP_BITS;
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                        "check: bad bucket %u vs %u",
+                                        (unsigned)get_bits(h,
+                                                       TDB_HASH_GROUP_BITS,
+                                                       &used_bits),
+                                        bucket);
+                               goto fail;
+                       }
+
+                       /* There must not be any zero entries between
+                        * the bucket it belongs in and this one! */
+                       for (i = bucket;
+                            i != b;
+                            i = (i + 1) % (1 << TDB_HASH_GROUP_BITS)) {
+                               if (group[i] == 0) {
+                                       tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                                  TDB_LOG_ERROR,
+                                                  "check: bad group placement"
+                                                  " %u vs %u",
+                                                  b, bucket);
+                                       goto fail;
+                               }
+                       }
+
+                       ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec));
+                       if (ecode != TDB_SUCCESS) {
+                               tdb->ecode = ecode;
+                               goto fail;
+                       }
+
+                       /* Bottom bits must match header. */
+                       if ((h & ((1 << 11)-1)) != rec_hash(&rec)) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: Bad hash magic at"
+                                          " offset %llu (0x%llx vs 0x%llx)",
+                                          (long long)off,
+                                          (long long)h,
+                                          (long long)rec_hash(&rec));
+                               goto fail;
+                       }
+
+               check:
+                       if (check) {
+                               TDB_DATA key, data;
+                               key.dsize = rec_key_length(&rec);
+                               data.dsize = rec_data_length(&rec);
+                               key.dptr = (void *)tdb_access_read(tdb,
+                                                  off + sizeof(rec),
+                                                  key.dsize + data.dsize,
+                                                  false);
+                               if (TDB_PTR_IS_ERR(key.dptr)) {
+                                       tdb->ecode = TDB_PTR_ERR(key.dptr);
+                                       goto fail;
+                               }
+                               data.dptr = key.dptr + key.dsize;
+                               if (check(key, data, private_data) != 0)
+                                       goto fail;
+                               tdb_access_release(tdb, key.dptr);
                        }
                }
-               num_nonzero++;
        }
+       tdb_access_release(tdb, hash);
+       return true;
+
+fail:
+       tdb_access_release(tdb, hash);
+       return false;
+}
+
+static bool check_hash(struct tdb_context *tdb,
+                      tdb_off_t used[],
+                      size_t num_used, size_t num_ftables,
+                      int (*check)(TDB_DATA, TDB_DATA, void *),
+                      void *private_data)
+{
+       /* Free tables also show up as used. */
+       size_t num_found = num_ftables;
 
-       /* free table and hash table are two of the used blocks. */
-       if (num_found != num_used - 2) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: Not all entries are in hash\n");
+       if (!check_hash_tree(tdb, offsetof(struct tdb_header, hashtable),
+                            TDB_TOPLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS,
+                            0, 0, used, num_used, &num_found,
+                            check, private_data))
+               return false;
+
+       if (num_found != num_used) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: Not all entries are in hash");
                return false;
        }
        return true;
@@ -199,213 +436,343 @@ static bool check_hash_list(struct tdb_context *tdb,
 static bool check_free(struct tdb_context *tdb,
                       tdb_off_t off,
                       const struct tdb_free_record *frec,
-                      tdb_off_t prev,
-                      tdb_off_t zone, unsigned int bucket)
+                      tdb_off_t prev, unsigned int ftable,
+                      unsigned int bucket)
 {
-       if (frec->magic != TDB_FREE_MAGIC) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: offset %llu bad magic 0x%llx\n",
-                        (long long)off, (long long)frec->magic);
+       enum TDB_ERROR ecode;
+
+       if (frec_magic(frec) != TDB_FREE_MAGIC) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: offset %llu bad magic 0x%llx",
+                          (long long)off, (long long)frec->magic_and_prev);
                return false;
        }
-       if (tdb->methods->oob(tdb, off
-                             + frec->data_len-sizeof(struct tdb_used_record),
-                             true))
+       if (frec_ftable(frec) != ftable) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: offset %llu bad freetable %u",
+                          (long long)off, frec_ftable(frec));
                return false;
-       if (zone_of(tdb, off) != zone) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: offset %llu in wrong zone %llu vs %llu\n",
-                        (long long)off,
-                        (long long)zone, (long long)zone_of(tdb, off));
+       }
+
+       ecode = tdb->methods->oob(tdb, off
+                                 + frec_len(frec)
+                                 + sizeof(struct tdb_used_record),
+                                 false);
+       if (ecode != TDB_SUCCESS) {
+               tdb->ecode = ecode;
                return false;
        }
-       if (size_to_bucket(tdb, frec->data_len) != bucket) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: offset %llu in wrong bucket %u vs %u\n",
-                        (long long)off,
-                        bucket, size_to_bucket(tdb, frec->data_len));
+       if (size_to_bucket(frec_len(frec)) != bucket) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: offset %llu in wrong bucket %u vs %u",
+                          (long long)off,
+                          bucket, size_to_bucket(frec_len(frec)));
                return false;
        }
-       if (prev != frec->prev) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: offset %llu bad prev %llu vs %llu\n",
-                        (long long)off,
-                        (long long)prev, (long long)frec->prev);
+       if (prev != frec_prev(frec)) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: offset %llu bad prev %llu vs %llu",
+                          (long long)off,
+                          (long long)prev, (long long)frec_len(frec));
                return false;
        }
        return true;
 }
-                      
-static bool check_free_list(struct tdb_context *tdb,
-                           tdb_off_t free[],
-                           size_t num_free)
+
+static bool check_free_table(struct tdb_context *tdb,
+                            tdb_off_t ftable_off,
+                            unsigned ftable_num,
+                            tdb_off_t fr[],
+                            size_t num_free,
+                            size_t *num_found)
 {
-       struct tdb_used_record rec;
-       tdb_len_t freelen, i, j;
+       struct tdb_freetable ft;
        tdb_off_t h;
-       size_t num_found;
-
-       freelen = sizeof(tdb_off_t) * tdb->header.v.num_zones
-               * (tdb->header.v.free_buckets + 1);
-
-       if (tdb_read_convert(tdb, tdb->header.v.free_off - sizeof(rec),
-                            &rec, sizeof(rec)) == -1)
-               return false;
+       unsigned int i;
+       enum TDB_ERROR ecode;
 
-       if (rec_data_length(&rec) != freelen) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: Bad free table length %llu vs %llu\n",
-                        (long long)rec_data_length(&rec),
-                        (long long)freelen);
+       ecode = tdb_read_convert(tdb, ftable_off, &ft, sizeof(ft));
+       if (ecode != TDB_SUCCESS) {
+               tdb->ecode = ecode;
                return false;
        }
-       if (rec_key_length(&rec) != 0) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: Bad free table key length %llu\n",
-                        (long long)rec_key_length(&rec));
-               return false;
-       }
-       if (rec_hash(&rec) != 0) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: Bad free table hash value %llu\n",
-                        (long long)rec_hash(&rec));
+
+       if (rec_magic(&ft.hdr) != TDB_FTABLE_MAGIC
+           || rec_key_length(&ft.hdr) != 0
+           || rec_data_length(&ft.hdr) != sizeof(ft) - sizeof(ft.hdr)
+           || rec_hash(&ft.hdr) != 0) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: Invalid header on free table");
                return false;
        }
 
-       num_found = 0;
-       h = tdb->header.v.free_off;
-       for (i = 0; i < tdb->header.v.num_zones; i++) {
-               for (j = 0; j <= tdb->header.v.free_buckets;
-                    j++, h += sizeof(tdb_off_t)) {
-                       tdb_off_t off, prev = 0, *p;
-                       struct tdb_free_record f;
+       for (i = 0; i < TDB_FREE_BUCKETS; i++) {
+               tdb_off_t off, prev = 0, *p;
+               struct tdb_free_record f;
 
-                       for (off = tdb_read_off(tdb, h); off; off = f.next) {
-                               if (off == TDB_OFF_ERR)
-                                       return false;
-                               if (tdb_read_convert(tdb, off, &f, sizeof(f)))
-                                       return false;
-                               if (!check_free(tdb, off, &f, prev, i, j))
-                                       return false;
+               h = bucket_off(ftable_off, i);
+               for (off = tdb_read_off(tdb, h); off; off = f.next) {
+                       if (off == TDB_OFF_ERR)
+                               return false;
+                       ecode = tdb_read_convert(tdb, off, &f, sizeof(f));
+                       if (ecode != TDB_SUCCESS) {
+                               tdb->ecode = ecode;
+                               return false;
+                       }
+                       if (!check_free(tdb, off, &f, prev, ftable_num, i))
+                               return false;
 
-                               /* FIXME: Check hash bits */
-                               p = asearch(&off, free, num_free, off_cmp);
-                               if (!p) {
-                                       tdb->log(tdb, TDB_DEBUG_ERROR,
-                                                tdb->log_priv,
-                                                "tdb_check: Invalid offset"
-                                                " %llu in free table\n",
-                                                (long long)off);
-                                       return false;
-                               }
-                               /* Mark it invalid. */
-                               *p ^= 1;
-                               num_found++;
-                               prev = off;
+                       /* FIXME: Check hash bits */
+                       p = asearch(&off, fr, num_free, off_cmp);
+                       if (!p) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: Invalid offset"
+                                          " %llu in free table",
+                                          (long long)off);
+                               return false;
                        }
+                       /* Mark it invalid. */
+                       *p ^= 1;
+                       (*num_found)++;
+                       prev = off;
                }
        }
-       if (num_found != num_free) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: Not all entries are in free table\n");
-               return false;
-       }
        return true;
 }
 
-/* FIXME: call check() function. */
-int tdb_check(struct tdb_context *tdb,
-             int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
-             void *private_data)
+/* Slow, but should be very rare. */
+size_t dead_space(struct tdb_context *tdb, tdb_off_t off)
 {
-       tdb_off_t *free = NULL, *used = NULL, off;
-       tdb_len_t len;
-       size_t num_free = 0, num_used = 0;
-       bool hash_found = false, free_found = false;
-
-       /* This always ensures the header is uptodate. */
-       if (tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false) != 0)
-               return -1;
+       size_t len;
+       enum TDB_ERROR ecode;
+
+       for (len = 0; off + len < tdb->map_size; len++) {
+               char c;
+               ecode = tdb->methods->tread(tdb, off, &c, 1);
+               if (ecode != TDB_SUCCESS) {
+                       tdb->ecode = ecode;
+                       return 0;
+               }
+               if (c != 0 && c != 0x43)
+                       break;
+       }
+       return len;
+}
 
-       if (!check_header(tdb))
-               goto fail;
+static bool check_linear(struct tdb_context *tdb,
+                        tdb_off_t **used, size_t *num_used,
+                        tdb_off_t **fr, size_t *num_free,
+                        tdb_off_t recovery)
+{
+       tdb_off_t off;
+       tdb_len_t len;
+       enum TDB_ERROR ecode;
+       bool found_recovery = false;
 
-       /* First we do a linear scan, checking all records. */
-       for (off = sizeof(struct tdb_header);
-            off < tdb->map_size;
-            off += len) {
+       for (off = sizeof(struct tdb_header); off < tdb->map_size; off += len) {
                union {
                        struct tdb_used_record u;
                        struct tdb_free_record f;
-               } pad, *p;
-               p = tdb_get(tdb, off, &pad, sizeof(pad));
-               if (!p)
-                       goto fail;
-               if (p->f.magic == TDB_FREE_MAGIC) {
-                       /* This record is free! */
-                       if (!append(&free, &num_free, off))
-                               goto fail;
-                       len = sizeof(p->u) + p->f.data_len;
-                       if (tdb->methods->oob(tdb, off + len, false))
-                               goto fail;
-               } else {
+                       struct tdb_recovery_record r;
+               } rec;
+               /* r is larger: only get that if we need to. */
+               ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec.f));
+               if (ecode != TDB_SUCCESS) {
+                       tdb->ecode = ecode;
+                       return false;
+               }
+
+               /* If we crash after ftruncate, we can get zeroes or fill. */
+               if (rec.r.magic == TDB_RECOVERY_INVALID_MAGIC
+                   || rec.r.magic ==  0x4343434343434343ULL) {
+                       ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec.r));
+                       if (ecode != TDB_SUCCESS) {
+                               tdb->ecode = ecode;
+                               return false;
+                       }
+                       if (recovery == off) {
+                               found_recovery = true;
+                               len = sizeof(rec.r) + rec.r.max_len;
+                       } else {
+                               len = dead_space(tdb, off);
+                               if (len < sizeof(rec.r)) {
+                                       tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                                  TDB_LOG_ERROR,
+                                                  "tdb_check: invalid dead"
+                                                  " space at %zu",
+                                                  (size_t)off);
+                                       return false;
+                               }
+
+                               tdb_logerr(tdb, TDB_SUCCESS, TDB_LOG_WARNING,
+                                          "Dead space at %zu-%zu (of %zu)",
+                                          (size_t)off, (size_t)(off + len),
+                                          (size_t)tdb->map_size);
+                       }
+               } else if (rec.r.magic == TDB_RECOVERY_MAGIC) {
+                       ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec.r));
+                       if (ecode != TDB_SUCCESS) {
+                               tdb->ecode = ecode;
+                               return false;
+                       }
+                       if (recovery != off) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: unexpected recovery"
+                                          " record at offset %zu",
+                                          (size_t)off);
+                               return false;
+                       }
+                       if (rec.r.len > rec.r.max_len) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: invalid recovery length"
+                                          " %zu", (size_t)rec.r.len);
+                               return false;
+                       }
+                       if (rec.r.eof > tdb->map_size) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: invalid old EOF"
+                                          " %zu", (size_t)rec.r.eof);
+                               return false;
+                       }
+                       found_recovery = true;
+                       len = sizeof(rec.r) + rec.r.max_len;
+               } else if (frec_magic(&rec.f) == TDB_FREE_MAGIC) {
+                       len = sizeof(rec.u) + frec_len(&rec.f);
+                       if (off + len > tdb->map_size) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: free overlength %llu"
+                                          " at offset %llu",
+                                          (long long)len, (long long)off);
+                               return false;
+                       }
+                       /* This record should be in free lists. */
+                       if (frec_ftable(&rec.f) != TDB_FTABLE_NONE
+                           && !append(fr, num_free, off)) {
+                               tdb_logerr(tdb, TDB_ERR_OOM,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: tracking %zu'th"
+                                          " free record.", *num_free);
+                               return false;
+                       }
+               } else if (rec_magic(&rec.u) == TDB_USED_MAGIC
+                          || rec_magic(&rec.u) == TDB_CHAIN_MAGIC
+                          || rec_magic(&rec.u) == TDB_HTABLE_MAGIC
+                          || rec_magic(&rec.u) == TDB_FTABLE_MAGIC) {
                        uint64_t klen, dlen, extra;
 
                        /* This record is used! */
-                       if (rec_magic(&p->u) != TDB_MAGIC) {
-                               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                                        "tdb_check: Bad magic 0x%llx"
-                                        " at offset %llu\n",
-                                        (long long)rec_magic(&p->u),
-                                        (long long)off);
-                               goto fail;
+                       if (!append(used, num_used, off)) {
+                               tdb_logerr(tdb, TDB_ERR_OOM,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: tracking %zu'th"
+                                          " used record.", *num_used);
+                               return false;
                        }
-                       
-                       if (!append(&used, &num_used, off))
-                               goto fail;
-
-                       klen = rec_key_length(&p->u);
-                       dlen = rec_data_length(&p->u);
-                       extra = rec_extra_padding(&p->u);
 
-                       len = sizeof(p->u) + klen + dlen + extra;
-                       if (tdb->methods->oob(tdb, off + len, false))
-                               goto fail;
+                       klen = rec_key_length(&rec.u);
+                       dlen = rec_data_length(&rec.u);
+                       extra = rec_extra_padding(&rec.u);
+
+                       len = sizeof(rec.u) + klen + dlen + extra;
+                       if (off + len > tdb->map_size) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: used overlength %llu"
+                                          " at offset %llu",
+                                          (long long)len, (long long)off);
+                               return false;
+                       }
 
-                       if (off + sizeof(p->u) == tdb->header.v.hash_off) {
-                               hash_found = true;
-                       } else if (off + sizeof(p->u)
-                                  == tdb->header.v.free_off) {
-                               free_found = true;
+                       if (len < sizeof(rec.f)) {
+                               tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                          TDB_LOG_ERROR,
+                                          "tdb_check: too short record %llu"
+                                          " at %llu",
+                                          (long long)len, (long long)off);
+                               return false;
                        }
+               } else {
+                       tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                  TDB_LOG_ERROR,
+                                  "tdb_check: Bad magic 0x%llx at offset %zu",
+                                  (long long)rec_magic(&rec.u), (size_t)off);
+                       return false;
                }
        }
 
-       if (!hash_found) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: hash table not found at %llu\n",
-                        (long long)tdb->header.v.hash_off);
-               goto fail;
+       /* We must have found recovery area if there was one. */
+       if (recovery != 0 && !found_recovery) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: expected a recovery area at %zu",
+                          (size_t)recovery);
+               return false;
        }
 
-       if (!free_found) {
-               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
-                        "tdb_check: free table not found at %llu\n",
-                        (long long)tdb->header.v.free_off);
+       return true;
+}
+
+int tdb_check(struct tdb_context *tdb,
+             int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
+             void *private_data)
+{
+       tdb_off_t *fr = NULL, *used = NULL, ft, recovery;
+       size_t num_free = 0, num_used = 0, num_found = 0, num_ftables = 0;
+       enum TDB_ERROR ecode;
+
+       ecode = tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false);
+       if (ecpde != TDB_SUCCESS) {
+               tdb->ecode = ecode;
+               return -1;
+       }
+
+       ecode = tdb_lock_expand(tdb, F_RDLCK);
+       if (ecode != TDB_SUCCESS) {
+               tdb->ecode = ecode;
+               tdb_allrecord_unlock(tdb, F_RDLCK);
+               return -1;
+       }
+
+       if (!check_header(tdb, &recovery))
+               goto fail;
+
+       /* First we do a linear scan, checking all records. */
+       if (!check_linear(tdb, &used, &num_used, &fr, &num_free, recovery))
                goto fail;
+
+       for (ft = first_ftable(tdb); ft; ft = next_ftable(tdb, ft)) {
+               if (ft == TDB_OFF_ERR)
+                       goto fail;
+               if (!check_free_table(tdb, ft, num_ftables, fr, num_free,
+                                     &num_found))
+                       goto fail;
+               num_ftables++;
        }
 
        /* FIXME: Check key uniqueness? */
-       if (!check_hash_list(tdb, used, num_used))
+       if (!check_hash(tdb, used, num_used, num_ftables, check, private_data))
                goto fail;
 
-       if (!check_free_list(tdb, free, num_free))
-               goto fail;
+       if (num_found != num_free) {
+               tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+                          "tdb_check: Not all entries are in free table");
+               return -1;
+       }
 
        tdb_allrecord_unlock(tdb, F_RDLCK);
+       tdb_unlock_expand(tdb, F_RDLCK);
+       free(fr);
+       free(used);
        return 0;
 
 fail:
+       free(fr);
+       free(used);
        tdb_allrecord_unlock(tdb, F_RDLCK);
+       tdb_unlock_expand(tdb, F_RDLCK);
        return -1;
 }