bcachefs: fix deadlock in journal_entry_open()
PATCH v3 1/1 bcachefs: fix deadlock in journal_entry_open()
In the previous commit b3d82c2f2761, code was added to prevent journal sequence overflow. Among them, the code added to journal_entry_open() uses the bch2_fs_fatal_err_on() function to handle errors.
However, __journal_res_get() , which calls journal_entry_open() , calls journal_entry_open() while holding journal->lock , but bch2_fs_fatal_err_on() internally tries to acquire journal->lock , which results in a deadlock.
So we need to add a locked helper like bch2_journal_halt_locked() to handle fatal errors even when the journal->lock is held.
--- fs/bcachefs/error.c | 6 +++--- fs/bcachefs/fs-ioctl.c | 4 ++-- fs/bcachefs/journal.c | 22 +++++++++++++++++----- fs/bcachefs/journal.h | 3 ++- fs/bcachefs/recovery.c | 2 +- fs/bcachefs/super.c | 4 ++-- fs/bcachefs/super.h | 2 +- 7 files changed, 28 insertions(+), 15 deletions(-)
fs/bcachefs/error.c +3 -3
@@ -20,7 +20,7 @@ bool bch2_inconsistent_error(struct bch_fs *c)return false;case BCH_ON_ERROR_fix_safe:case BCH_ON_ERROR_ro: -if (bch2_fs_emergency_read_only (c)) +if (bch2_fs_emergency_read_only (c, false))bch_err (c,"inconsistency detected - emergency read only at journal seq %llu" ,journal_cur_seq (&c->journal));return true;
@@ -46,7 +46,7 @@ int bch2_topology_error(struct bch_fs *c)void bch2_fatal_error (struct bch_fs *c) { -if (bch2_fs_emergency_read_only (c)) +if (bch2_fs_emergency_read_only (c, false))bch_err (c,"fatal error - emergency read only" ); }
@@ -62,7 +62,7 @@ void bch2_io_error_work(struct work_struct *work)if (dev ?__bch2_dev_set_state (c, ca, BCH_MEMBER_STATE_ro,BCH_FORCE_IF_DEGRADED ) - :bch2_fs_emergency_read_only (c)) + :bch2_fs_emergency_read_only (c, false))bch_err (ca,"too many IO errors, setting %s RO" , dev ?"device" :"filesystem" );
fs/bcachefs/fs-ioctl.c +2 -2
@@ -354,14 +354,14 @@ static int bch2_ioc_goingdown(struct bch_fs *c, u32 __user *arg)if (ret)break ;bch2_journal_flush (&c->journal); -bch2_fs_emergency_read_only (c); +bch2_fs_emergency_read_only (c, false);bdev_thaw (c->vfs_sb->s_bdev);break ;case FSOP_GOING_FLAGS_LOGFLUSH :bch2_journal_flush (&c->journal); fallthrough;case FSOP_GOING_FLAGS_NOLOGFLUSH : -bch2_fs_emergency_read_only (c); +bch2_fs_emergency_read_only (c, false);break ;default : ret = -EINVAL ;
fs/bcachefs/journal.c +17 -5
@@ -310,14 +310,23 @@ static void __journal_entry_close(struct journal *j, unsigned closed_val, bool t__bch2_journal_buf_put (j, old.idx,le64_to_cpu (buf->data->seq)); } -void bch2_journal_halt (struct journal *j) +void bch2_journal_halt_locked (struct journal *j) { -spin_lock (&j->lock); +lockdep_assert_held (&j->lock); +__journal_entry_close (j,JOURNAL_ENTRY_ERROR_VAL , true);if (!j->err_seq) j->err_seq =journal_cur_seq (j);journal_wake (j); -spin_unlock (&j->lock); +} + +void bch2_journal_halt (struct journal *j,bool locked) +{ +if (!locked) +spin_lock (&j->lock); +bch2_journal_halt_locked (j); +if (!locked) +spin_unlock (&j->lock); }static bool journal_entry_want_write (struct journal *j)
@@ -382,9 +391,12 @@ static int journal_entry_open(struct journal *j)if (nr_unwritten_journal_entries (j) ==ARRAY_SIZE (j->buf))return JOURNAL_ERR_max_in_flight; -if (bch2_fs_fatal_err_on (journal_cur_seq (j) >=JOURNAL_SEQ_MAX , - c,"cannot start: journal seq overflow" )) +if (journal_cur_seq (j) >=JOURNAL_SEQ_MAX ) { +bch_err (c,"cannot start: journal seq overflow" ); +if (bch2_fs_emergency_read_only (c, true)) +bch_err (c,"fatal error - emergency read only" );return JOURNAL_ERR_insufficient_devices;/* -EROFS */ + }BUG_ON (!j->cur_entry_sectors);
fs/bcachefs/journal.h +2 -1
@@ -407,7 +407,8 @@ int bch2_journal_flush(struct journal *);bool bch2_journal_noflush_seq (struct journal *,u64 ,u64 );int bch2_journal_meta (struct journal *); -void bch2_journal_halt (struct journal *); +void bch2_journal_halt (struct journal *,bool ); +void bch2_journal_halt_locked (struct journal *);static inline int bch2_journal_error (struct journal *j) {
fs/bcachefs/recovery.c +1 -1
@@ -1076,7 +1076,7 @@ int bch2_fs_recovery(struct bch_fs *c)return ret; err: fsck_err: -bch2_fs_emergency_read_only (c); +bch2_fs_emergency_read_only (c, false); goto out; }
fs/bcachefs/super.c +2 -2
@@ -400,11 +400,11 @@ static void bch2_fs_read_only_async(struct bch_fs *c)queue_work (system_long_wq, &c->read_only_work); } -bool bch2_fs_emergency_read_only (struct bch_fs *c) +bool bch2_fs_emergency_read_only (struct bch_fs *c,bool locked) {bool ret = !test_and_set_bit (BCH_FS_emergency_ro, &c->flags); -bch2_journal_halt (&c->journal); +bch2_journal_halt (&c->journal, locked);bch2_fs_read_only_async (c);wake_up (&bch2_read_only_wait);
fs/bcachefs/super.h +1 -1
@@ -28,7 +28,7 @@ int bch2_dev_offline(struct bch_fs *, struct bch_dev *, int);int bch2_dev_resize (struct bch_fs *,struct bch_dev *,u64 );struct bch_dev *bch2_dev_lookup (struct bch_fs *,const char *); -bool bch2_fs_emergency_read_only (struct bch_fs *); +bool bch2_fs_emergency_read_only (struct bch_fs *,bool );void bch2_fs_read_only (struct bch_fs *);int bch2_fs_read_write (struct bch_fs *);
--
Quoted 28 lines · Jeongjun Park
In the previous commit
b3d82c2f2761, code was added to prevent journal sequence overflow. Among them, the code added tojournal_entry_open()uses thebch2_fs_fatal_err_on()function to handle errors.However,
__journal_res_get(), which callsjournal_entry_open(), callsjournal_entry_open()while holdingjournal->lock, butbch2_fs_fatal_err_on()internally tries to acquirejournal->lock, which results in a deadlock.So we need to add a locked helper like
bch2_journal_halt_locked()to handle fatal errors even when thejournal->lockis held.Fixes b3d82c2f2761 ("bcachefs: Guard against journal seq overflow")Signed-off-by Jeongjun Park <[email protected]>--- fs/bcachefs/error.c | 6 +++--- fs/bcachefs/fs-ioctl.c | 4 ++-- fs/bcachefs/journal.c | 22 +++++++++++++++++----- fs/bcachefs/journal.h | 3 ++- fs/bcachefs/recovery.c | 2 +- fs/bcachefs/super.c | 4 ++-- fs/bcachefs/super.h | 2 +- 7 files changed, 28 insertions(+), 15 deletions(-)fs/bcachefs/error.c +0
-0
fs/bcachefs/error.c bool bch2_inconsistent_error(struct bch_fs *c) · line 23
Quoted 5 lines
fs/bcachefs/error.c +1
-1@@ -20,7 +20,7 @@ bool bch2_inconsistent_error(struct bch_fs *c)return false;case BCH_ON_ERROR_fix_safe:case BCH_ON_ERROR_ro: -if (bch2_fs_emergency_read_only (c)) +if (bch2_fs_emergency_read_only (c, false))
No, don't add a bool parameter. It'll be a lot less churny, and clearer reading, if you add a separate
bch2_fs_emergency_read_only_locked()
helper
Quoted 147 lines
fs/bcachefs/error.c +2
-2bch_err (c,"inconsistency detected - emergency read only at journal seq %llu" ,journal_cur_seq (&c->journal));return true;@@ -46,7 +46,7 @@ int bch2_topology_error(struct bch_fs *c)void bch2_fatal_error (struct bch_fs *c) { -if (bch2_fs_emergency_read_only (c)) +if (bch2_fs_emergency_read_only (c, false))bch_err (c,"fatal error - emergency read only" ); }@@ -62,7 +62,7 @@ void bch2_io_error_work(struct work_struct *work)if (dev ?__bch2_dev_set_state (c, ca, BCH_MEMBER_STATE_ro,BCH_FORCE_IF_DEGRADED ) - :bch2_fs_emergency_read_only (c)) + :bch2_fs_emergency_read_only (c, false))bch_err (ca,"too many IO errors, setting %s RO" , dev ?"device" :"filesystem" );fs/bcachefs/fs-ioctl.c +2
-2@@ -354,14 +354,14 @@ static int bch2_ioc_goingdown(struct bch_fs *c, u32 __user *arg)if (ret)break ;bch2_journal_flush (&c->journal); -bch2_fs_emergency_read_only (c); +bch2_fs_emergency_read_only (c, false);bdev_thaw (c->vfs_sb->s_bdev);break ;case FSOP_GOING_FLAGS_LOGFLUSH :bch2_journal_flush (&c->journal); fallthrough;case FSOP_GOING_FLAGS_NOLOGFLUSH : -bch2_fs_emergency_read_only (c); +bch2_fs_emergency_read_only (c, false);break ;default : ret = -EINVAL ;fs/bcachefs/journal.c +17
-5@@ -310,14 +310,23 @@ static void __journal_entry_close(struct journal *j, unsigned closed_val, bool t__bch2_journal_buf_put (j, old.idx,le64_to_cpu (buf->data->seq)); } -void bch2_journal_halt (struct journal *j) +void bch2_journal_halt_locked (struct journal *j) { -spin_lock (&j->lock); +lockdep_assert_held (&j->lock); +__journal_entry_close (j,JOURNAL_ENTRY_ERROR_VAL , true);if (!j->err_seq) j->err_seq =journal_cur_seq (j);journal_wake (j); -spin_unlock (&j->lock); +} + +void bch2_journal_halt (struct journal *j,bool locked) +{ +if (!locked) +spin_lock (&j->lock); +bch2_journal_halt_locked (j); +if (!locked) +spin_unlock (&j->lock); }static bool journal_entry_want_write (struct journal *j)@@ -382,9 +391,12 @@ static int journal_entry_open(struct journal *j)if (nr_unwritten_journal_entries (j) ==ARRAY_SIZE (j->buf))return JOURNAL_ERR_max_in_flight; -if (bch2_fs_fatal_err_on (journal_cur_seq (j) >=JOURNAL_SEQ_MAX , - c,"cannot start: journal seq overflow" )) +if (journal_cur_seq (j) >=JOURNAL_SEQ_MAX ) { +bch_err (c,"cannot start: journal seq overflow" ); +if (bch2_fs_emergency_read_only (c, true)) +bch_err (c,"fatal error - emergency read only" );return JOURNAL_ERR_insufficient_devices;/* -EROFS */ + }BUG_ON (!j->cur_entry_sectors);fs/bcachefs/journal.h +2
-1@@ -407,7 +407,8 @@ int bch2_journal_flush(struct journal *);bool bch2_journal_noflush_seq (struct journal *,u64 ,u64 );int bch2_journal_meta (struct journal *); -void bch2_journal_halt (struct journal *); +void bch2_journal_halt (struct journal *,bool ); +void bch2_journal_halt_locked (struct journal *);static inline int bch2_journal_error (struct journal *j) {fs/bcachefs/recovery.c +1
-1@@ -1076,7 +1076,7 @@ int bch2_fs_recovery(struct bch_fs *c)return ret; err: fsck_err: -bch2_fs_emergency_read_only (c); +bch2_fs_emergency_read_only (c, false); goto out; }fs/bcachefs/super.c +2
-2@@ -400,11 +400,11 @@ static void bch2_fs_read_only_async(struct bch_fs *c)queue_work (system_long_wq, &c->read_only_work); } -bool bch2_fs_emergency_read_only (struct bch_fs *c) +bool bch2_fs_emergency_read_only (struct bch_fs *c,bool locked) {bool ret = !test_and_set_bit (BCH_FS_emergency_ro, &c->flags); -bch2_journal_halt (&c->journal); +bch2_journal_halt (&c->journal, locked);bch2_fs_read_only_async (c);wake_up (&bch2_read_only_wait);fs/bcachefs/super.h +1
-2@@ -28,7 +28,7 @@ int bch2_dev_offline(struct bch_fs *, struct bch_dev *, int);int bch2_dev_resize (struct bch_fs *,struct bch_dev *,u64 );struct bch_dev *bch2_dev_lookup (struct bch_fs *,const char *); -bool bch2_fs_emergency_read_only (struct bch_fs *); +bool bch2_fs_emergency_read_only (struct bch_fs *,bool );void bch2_fs_read_only (struct bch_fs *);int bch2_fs_read_write (struct bch_fs *); --