summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-06-20 06:03:07 +0300
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-23 00:09:34 +0300
commit7bb61e8c0e37fdf5684bc1fa1f6e0b5644cc7f75 (patch)
tree8db504a24a0e06bd18f192d2c2f9613d4b21a4bd
parentb5f73fd79f4c710024ef4385626aecbaee6fc3f1 (diff)
downloadlinux-7bb61e8c0e37fdf5684bc1fa1f6e0b5644cc7f75.tar.xz
bcachefs: Make IO in flight by copygc/rebalance configurable
This adds a new option, move_bytes_in_flight, for configuring the amount of IO in flight by copygc/rebalance - users with many devices in their filesystem will want to increase this. In the future we should be smarter about this, but this is an easy improvement. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--fs/bcachefs/move.c6
-rw-r--r--fs/bcachefs/opts.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index a852e07affdc..08fb8c71893f 100644
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -22,8 +22,6 @@
#include <linux/ioprio.h>
#include <linux/kthread.h>
-#define SECTORS_IN_FLIGHT_PER_DEVICE 2048
-
struct moving_io {
struct list_head list;
struct closure cl;
@@ -693,11 +691,11 @@ static int __bch2_move_data(struct bch_fs *c,
move_ctxt_wait_event(ctxt, &trans,
atomic_read(&ctxt->write_sectors) <
- SECTORS_IN_FLIGHT_PER_DEVICE);
+ c->opts.move_bytes_in_flight >> 9);
move_ctxt_wait_event(ctxt, &trans,
atomic_read(&ctxt->read_sectors) <
- SECTORS_IN_FLIGHT_PER_DEVICE);
+ c->opts.move_bytes_in_flight >> 9);
bch2_trans_begin(&trans);
diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h
index dee75d7e6fe8..43b4488b8c6f 100644
--- a/fs/bcachefs/opts.h
+++ b/fs/bcachefs/opts.h
@@ -290,6 +290,11 @@ enum opt_type {
OPT_UINT(0, U32_MAX), \
BCH_SB_JOURNAL_RECLAIM_DELAY, 100, \
NULL, "Delay in milliseconds before automatic journal reclaim")\
+ x(move_bytes_in_flight, u32, \
+ OPT_HUMAN_READABLE|OPT_FS|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_UINT(1024, U32_MAX), \
+ BCH2_NO_SB_OPT, 1U << 20, \
+ NULL, "Amount of IO in flight to keep in flight by the move path")\
x(fsck, u8, \
OPT_FS|OPT_MOUNT, \
OPT_BOOL(), \