alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-22 00:00:03 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update bcachefs sources to a623b3063d5d bcachefs: Fix check_snapshot() memcpy

Browse Source
This commit is contained in:
Kent Overstreet 2024-02-24 01:26:40 -05:00
parent 010182e790
commit 03272a1e55
17 changed files with 68 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
c887148ebf9989ce8bdf6f814d4342ba5bf465fa a623b3063d5d6ab6652314028531060d5a0d192e

9
libbcachefs/alloc_background.c
View File

@ -1878,10 +1878,11 @@ static void bch2_do_discards_fast_work(struct work_struct *work)
if (!got_bucket) if (!got_bucket)
break; break;
blkdev_issue_discard(ca->disk_sb.bdev, if (ca->mi.discard && !c->opts.nochanges)
bucket.offset * ca->mi.bucket_size, blkdev_issue_discard(ca->disk_sb.bdev,
ca->mi.bucket_size, bucket.offset * ca->mi.bucket_size,
GFP_KERNEL); ca->mi.bucket_size,
GFP_KERNEL);
int ret = bch2_trans_do(c, NULL, NULL, int ret = bch2_trans_do(c, NULL, NULL,
BCH_WATERMARK_btree| BCH_WATERMARK_btree|

8
libbcachefs/backpointers.c
View File

@ -68,9 +68,11 @@ void bch2_backpointer_to_text(struct printbuf *out, const struct bch_backpointer
void bch2_backpointer_k_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c k) void bch2_backpointer_k_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c k)
{ {
prt_str(out, "bucket="); if (bch2_dev_exists2(c, k.k->p.inode)) {
bch2_bpos_to_text(out, bp_pos_to_bucket(c, k.k->p)); prt_str(out, "bucket=");
prt_str(out, " "); bch2_bpos_to_text(out, bp_pos_to_bucket(c, k.k->p));
prt_str(out, " ");
}
bch2_backpointer_to_text(out, bkey_s_c_to_backpointer(k).v); bch2_backpointer_to_text(out, bkey_s_c_to_backpointer(k).v);
} }

2
libbcachefs/bcachefs_format.h
View File

@ -653,7 +653,7 @@ struct bch_encrypted_key {
/* /*
* If this field is present in the superblock, it stores an encryption key which * If this field is present in the superblock, it stores an encryption key which
* is used to encrypt all other data/metadata. The key will normally be encrypted * is used encrypt all other data/metadata. The key will normally be encrypted
* with the key userspace provides, but if encryption has been turned off we'll * with the key userspace provides, but if encryption has been turned off we'll
* just store the master key unencrypted in the superblock so we can access the * just store the master key unencrypted in the superblock so we can access the
* previously encrypted data. * previously encrypted data.

2
libbcachefs/btree_update.c
View File

@ -848,7 +848,7 @@ __bch2_fs_log_msg(struct bch_fs *c, unsigned commit_flags, const char *fmt,
if (ret) if (ret)
goto err; goto err;
if (!test_bit(JOURNAL_STARTED, &c->journal.flags)) { if (!test_bit(JOURNAL_RUNNING, &c->journal.flags)) {
ret = darray_make_room(&c->journal.early_journal_entries, jset_u64s(u64s)); ret = darray_make_room(&c->journal.early_journal_entries, jset_u64s(u64s));
if (ret) if (ret)
goto err; goto err;

15
libbcachefs/errcode.c
View File

@ -2,6 +2,7 @@
#include "bcachefs.h" #include "bcachefs.h"
#include "errcode.h" #include "errcode.h"
#include "trace.h"
#include <linux/errname.h> #include <linux/errname.h>
@ -49,15 +50,17 @@ bool __bch2_err_matches(int err, int class)
return err == class; return err == class;
} }
int __bch2_err_class(int err) int __bch2_err_class(int bch_err)
{ {
err = -err; int std_err = -bch_err;
BUG_ON((unsigned) err >= BCH_ERR_MAX); BUG_ON((unsigned) std_err >= BCH_ERR_MAX);
while (err >= BCH_ERR_START && bch2_errcode_parents[err - BCH_ERR_START]) while (std_err >= BCH_ERR_START && bch2_errcode_parents[std_err - BCH_ERR_START])
err = bch2_errcode_parents[err - BCH_ERR_START]; std_err = bch2_errcode_parents[std_err - BCH_ERR_START];
return -err; trace_error_downcast(bch_err, std_err, _RET_IP_);
return -std_err;
} }
const char *bch2_blk_status_to_str(blk_status_t status) const char *bch2_blk_status_to_str(blk_status_t status)

1
libbcachefs/errcode.h
View File

@ -78,6 +78,7 @@
x(ENOMEM, ENOMEM_fs_name_alloc) \ x(ENOMEM, ENOMEM_fs_name_alloc) \
x(ENOMEM, ENOMEM_fs_other_alloc) \ x(ENOMEM, ENOMEM_fs_other_alloc) \
x(ENOMEM, ENOMEM_dev_alloc) \ x(ENOMEM, ENOMEM_dev_alloc) \
x(ENOMEM, ENOMEM_disk_accounting) \
x(ENOSPC, ENOSPC_disk_reservation) \ x(ENOSPC, ENOSPC_disk_reservation) \
x(ENOSPC, ENOSPC_bucket_alloc) \ x(ENOSPC, ENOSPC_bucket_alloc) \
x(ENOSPC, ENOSPC_disk_label_add) \ x(ENOSPC, ENOSPC_disk_label_add) \

21
libbcachefs/fs-io-buffered.c
View File

@ -303,18 +303,6 @@ void bch2_readahead(struct readahead_control *ractl)
darray_exit(&readpages_iter.folios); darray_exit(&readpages_iter.folios);
} }
static void __bchfs_readfolio(struct bch_fs *c, struct bch_read_bio *rbio,
subvol_inum inum, struct folio *folio)
{
bch2_folio_create(folio, __GFP_NOFAIL);
rbio->bio.bi_opf = REQ_OP_READ|REQ_SYNC;
rbio->bio.bi_iter.bi_sector = folio_sector(folio);
BUG_ON(!bio_add_folio(&rbio->bio, folio, folio_size(folio), 0));
bch2_trans_run(c, (bchfs_read(trans, rbio, inum, NULL), 0));
}
static void bch2_read_single_folio_end_io(struct bio *bio) static void bch2_read_single_folio_end_io(struct bio *bio)
{ {
complete(bio->bi_private); complete(bio->bi_private);
@ -329,6 +317,9 @@ int bch2_read_single_folio(struct folio *folio, struct address_space *mapping)
int ret; int ret;
DECLARE_COMPLETION_ONSTACK(done); DECLARE_COMPLETION_ONSTACK(done);
if (!bch2_folio_create(folio, GFP_KERNEL))
return -ENOMEM;
bch2_inode_opts_get(&opts, c, &inode->ei_inode); bch2_inode_opts_get(&opts, c, &inode->ei_inode);
rbio = rbio_init(bio_alloc_bioset(NULL, 1, REQ_OP_READ, GFP_KERNEL, &c->bio_read), rbio = rbio_init(bio_alloc_bioset(NULL, 1, REQ_OP_READ, GFP_KERNEL, &c->bio_read),
@ -336,7 +327,11 @@ int bch2_read_single_folio(struct folio *folio, struct address_space *mapping)
rbio->bio.bi_private = &done; rbio->bio.bi_private = &done;
rbio->bio.bi_end_io = bch2_read_single_folio_end_io; rbio->bio.bi_end_io = bch2_read_single_folio_end_io;
__bchfs_readfolio(c, rbio, inode_inum(inode), folio); rbio->bio.bi_opf = REQ_OP_READ|REQ_SYNC;
rbio->bio.bi_iter.bi_sector = folio_sector(folio);
BUG_ON(!bio_add_folio(&rbio->bio, folio, folio_size(folio), 0));
bch2_trans_run(c, (bchfs_read(trans, rbio, inode_inum(inode), NULL), 0));
wait_for_completion(&done); wait_for_completion(&done);
ret = blk_status_to_errno(rbio->bio.bi_status); ret = blk_status_to_errno(rbio->bio.bi_status);

5
libbcachefs/journal.c
View File

@ -1183,12 +1183,13 @@ void bch2_fs_journal_stop(struct journal *j)
bch2_journal_meta(j); bch2_journal_meta(j);
journal_quiesce(j); journal_quiesce(j);
cancel_delayed_work_sync(&j->write_work);
BUG_ON(!bch2_journal_error(j) && BUG_ON(!bch2_journal_error(j) &&
test_bit(JOURNAL_REPLAY_DONE, &j->flags) && test_bit(JOURNAL_REPLAY_DONE, &j->flags) &&
j->last_empty_seq != journal_cur_seq(j)); j->last_empty_seq != journal_cur_seq(j));
cancel_delayed_work_sync(&j->write_work); clear_bit(JOURNAL_RUNNING, &j->flags);
} }
int bch2_fs_journal_start(struct journal *j, u64 cur_seq) int bch2_fs_journal_start(struct journal *j, u64 cur_seq)
@ -1262,7 +1263,7 @@ int bch2_fs_journal_start(struct journal *j, u64 cur_seq)
spin_lock(&j->lock); spin_lock(&j->lock);
set_bit(JOURNAL_STARTED, &j->flags); set_bit(JOURNAL_RUNNING, &j->flags);
j->last_flush_write = jiffies; j->last_flush_write = jiffies;
j->reservations.idx = j->reservations.unwritten_idx = journal_cur_seq(j); j->reservations.idx = j->reservations.unwritten_idx = journal_cur_seq(j);

4
libbcachefs/journal.h
View File

@ -372,7 +372,7 @@ static inline int bch2_journal_res_get(struct journal *j, struct journal_res *re
int ret; int ret;
EBUG_ON(res->ref); EBUG_ON(res->ref);
EBUG_ON(!test_bit(JOURNAL_STARTED, &j->flags)); EBUG_ON(!test_bit(JOURNAL_RUNNING, &j->flags));
res->u64s = u64s; res->u64s = u64s;
@ -418,7 +418,7 @@ struct bch_dev;
static inline void bch2_journal_set_replay_done(struct journal *j) static inline void bch2_journal_set_replay_done(struct journal *j)
{ {
BUG_ON(!test_bit(JOURNAL_STARTED, &j->flags)); BUG_ON(!test_bit(JOURNAL_RUNNING, &j->flags));
set_bit(JOURNAL_REPLAY_DONE, &j->flags); set_bit(JOURNAL_REPLAY_DONE, &j->flags);
} }

2
libbcachefs/journal_reclaim.c
View File

@ -831,7 +831,7 @@ bool bch2_journal_flush_pins(struct journal *j, u64 seq_to_flush)
/* time_stats this */ /* time_stats this */
bool did_work = false; bool did_work = false;
if (!test_bit(JOURNAL_STARTED, &j->flags)) if (!test_bit(JOURNAL_RUNNING, &j->flags))
return false; return false;
closure_wait_event(&j->async_wait, closure_wait_event(&j->async_wait,

2
libbcachefs/journal_types.h
View File

@ -131,7 +131,7 @@ enum journal_space_from {
enum journal_flags { enum journal_flags {
JOURNAL_REPLAY_DONE, JOURNAL_REPLAY_DONE,
JOURNAL_STARTED, JOURNAL_RUNNING,
JOURNAL_MAY_SKIP_FLUSH, JOURNAL_MAY_SKIP_FLUSH,
JOURNAL_NEED_FLUSH_WRITE, JOURNAL_NEED_FLUSH_WRITE,
}; };

2
libbcachefs/snapshot.c
View File

@ -728,7 +728,7 @@ static int check_snapshot(struct btree_trans *trans,
return 0; return 0;
memset(&s, 0, sizeof(s)); memset(&s, 0, sizeof(s));
memcpy(&s, k.v, bkey_val_bytes(k.k)); memcpy(&s, k.v, min(sizeof(s), bkey_val_bytes(k.k)));
id = le32_to_cpu(s.parent); id = le32_to_cpu(s.parent);
if (id) { if (id) {

1
libbcachefs/super-io.c
View File

@ -804,7 +804,6 @@ got_super:
goto err; goto err;
} }
ret = 0;
sb->have_layout = true; sb->have_layout = true;
ret = bch2_sb_validate(sb, &err, READ); ret = bch2_sb_validate(sb, &err, READ);

6
libbcachefs/super.c
View File

@ -286,8 +286,13 @@ static void __bch2_fs_read_only(struct bch_fs *c)
if (test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags) && if (test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags) &&
!test_bit(BCH_FS_emergency_ro, &c->flags)) !test_bit(BCH_FS_emergency_ro, &c->flags))
set_bit(BCH_FS_clean_shutdown, &c->flags); set_bit(BCH_FS_clean_shutdown, &c->flags);
bch2_fs_journal_stop(&c->journal); bch2_fs_journal_stop(&c->journal);
bch_info(c, "%sshutdown complete, journal seq %llu",
test_bit(BCH_FS_clean_shutdown, &c->flags) ? "" : "un",
c->journal.seq_ondisk);
/* /*
* After stopping journal: * After stopping journal:
*/ */
@ -461,6 +466,7 @@ static int __bch2_fs_read_write(struct bch_fs *c, bool early)
* at least one non-flush write in the journal or recovery will fail: * at least one non-flush write in the journal or recovery will fail:
*/ */
set_bit(JOURNAL_NEED_FLUSH_WRITE, &c->journal.flags); set_bit(JOURNAL_NEED_FLUSH_WRITE, &c->journal.flags);
set_bit(JOURNAL_RUNNING, &c->journal.flags);
for_each_rw_member(c, ca) for_each_rw_member(c, ca)
bch2_dev_allocator_add(c, ca); bch2_dev_allocator_add(c, ca);

19
libbcachefs/trace.h
View File

@ -1431,6 +1431,25 @@ DEFINE_EVENT(fs_str, data_update,
TP_ARGS(c, str) TP_ARGS(c, str)
); );
TRACE_EVENT(error_downcast,
TP_PROTO(int bch_err, int std_err, unsigned long ip),
TP_ARGS(bch_err, std_err, ip),
TP_STRUCT__entry(
__array(char, bch_err, 32 )
__array(char, std_err, 32 )
__array(char, ip, 32 )
),
TP_fast_assign(
strscpy(__entry->bch_err, bch2_err_str(bch_err), sizeof(__entry->bch_err));
strscpy(__entry->std_err, bch2_err_str(std_err), sizeof(__entry->std_err));
snprintf(__entry->ip, sizeof(__entry->ip), "%ps", (void *) ip);
),
TP_printk("%s -> %s %s", __entry->bch_err, __entry->std_err, __entry->ip)
);
#endif /* _TRACE_BCACHEFS_H */ #endif /* _TRACE_BCACHEFS_H */
/* This part must be outside protection */ /* This part must be outside protection */

8
linux/time_stats.c
View File

@ -313,7 +313,7 @@ void time_stats_to_json(struct seq_buf *out, struct time_stats *stats,
seq_buf_printf(out, " \"stddev\": %llu\n", d_stddev); seq_buf_printf(out, " \"stddev\": %llu\n", d_stddev);
seq_buf_printf(out, " },\n"); seq_buf_printf(out, " },\n");
seq_buf_printf(out, " \"frequency_ns\": {\n"); seq_buf_printf(out, " \"between_ns\": {\n");
seq_buf_printf(out, " \"min\": %llu,\n", stats->min_freq); seq_buf_printf(out, " \"min\": %llu,\n", stats->min_freq);
seq_buf_printf(out, " \"max\": %llu,\n", stats->max_freq); seq_buf_printf(out, " \"max\": %llu,\n", stats->max_freq);
seq_buf_printf(out, " \"mean\": %llu,\n", f_mean); seq_buf_printf(out, " \"mean\": %llu,\n", f_mean);
@ -323,14 +323,14 @@ void time_stats_to_json(struct seq_buf *out, struct time_stats *stats,
f_mean = mean_and_variance_weighted_get_mean(stats->freq_stats_weighted, TIME_STATS_MV_WEIGHT); f_mean = mean_and_variance_weighted_get_mean(stats->freq_stats_weighted, TIME_STATS_MV_WEIGHT);
f_stddev = mean_and_variance_weighted_get_stddev(stats->freq_stats_weighted, TIME_STATS_MV_WEIGHT); f_stddev = mean_and_variance_weighted_get_stddev(stats->freq_stats_weighted, TIME_STATS_MV_WEIGHT);
seq_buf_printf(out, " \"frequency_ewma_ns\": {\n"); seq_buf_printf(out, " \"between_ewma_ns\": {\n");
seq_buf_printf(out, " \"mean\": %llu,\n", f_mean); seq_buf_printf(out, " \"mean\": %llu,\n", f_mean);
seq_buf_printf(out, " \"stddev\": %llu\n", f_stddev); seq_buf_printf(out, " \"stddev\": %llu\n", f_stddev);
if (quantiles) { if (quantiles) {
u64 last_q = 0; u64 last_q = 0;
/* close frequency_ewma_ns but signal more items */ /* close between_ewma_ns but signal more items */
seq_buf_printf(out, " },\n"); seq_buf_printf(out, " },\n");
seq_buf_printf(out, " \"quantiles_ns\": [\n"); seq_buf_printf(out, " \"quantiles_ns\": [\n");
@ -345,7 +345,7 @@ void time_stats_to_json(struct seq_buf *out, struct time_stats *stats,
} }
seq_buf_printf(out, " ]\n"); seq_buf_printf(out, " ]\n");
} else { } else {
/* close frequency_ewma_ns without dumping further */ /* close between_ewma_ns without dumping further */
seq_buf_printf(out, " }\n"); seq_buf_printf(out, " }\n");
} }