Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
7b512638
Commit
7b512638
authored
Mar 29, 2019
by
Kent Overstreet
Committed by
Kent Overstreet
Oct 22, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bcachefs: Refactor bch2_fs_recovery()
Signed-off-by:
Kent Overstreet
<
kent.overstreet@linux.dev
>
parent
4c1c1e39
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
179 additions
and
135 deletions
+179
-135
fs/bcachefs/recovery.c
fs/bcachefs/recovery.c
+179
-135
No files found.
fs/bcachefs/recovery.c
View file @
7b512638
...
@@ -52,6 +52,84 @@ static struct bkey_i *btree_root_find(struct bch_fs *c,
...
@@ -52,6 +52,84 @@ static struct bkey_i *btree_root_find(struct bch_fs *c,
return
k
;
return
k
;
}
}
static
int
verify_superblock_clean
(
struct
bch_fs
*
c
,
struct
bch_sb_field_clean
**
cleanp
,
struct
jset
*
j
)
{
unsigned
i
;
struct
bch_sb_field_clean
*
clean
=
*
cleanp
;
int
ret
=
0
;
if
(
!
clean
||
!
j
)
return
0
;
if
(
mustfix_fsck_err_on
(
j
->
seq
!=
clean
->
journal_seq
,
c
,
"superblock journal seq (%llu) doesn't match journal (%llu) after clean shutdown"
,
le64_to_cpu
(
clean
->
journal_seq
),
le64_to_cpu
(
j
->
seq
)))
{
kfree
(
clean
);
*
cleanp
=
NULL
;
return
0
;
}
mustfix_fsck_err_on
(
j
->
read_clock
!=
clean
->
read_clock
,
c
,
"superblock read clock doesn't match journal after clean shutdown"
);
mustfix_fsck_err_on
(
j
->
write_clock
!=
clean
->
write_clock
,
c
,
"superblock read clock doesn't match journal after clean shutdown"
);
for
(
i
=
0
;
i
<
BTREE_ID_NR
;
i
++
)
{
struct
bkey_i
*
k1
,
*
k2
;
unsigned
l1
=
0
,
l2
=
0
;
k1
=
btree_root_find
(
c
,
clean
,
NULL
,
i
,
&
l1
);
k2
=
btree_root_find
(
c
,
NULL
,
j
,
i
,
&
l2
);
if
(
!
k1
&&
!
k2
)
continue
;
mustfix_fsck_err_on
(
!
k1
||
!
k2
||
IS_ERR
(
k1
)
||
IS_ERR
(
k2
)
||
k1
->
k
.
u64s
!=
k2
->
k
.
u64s
||
memcmp
(
k1
,
k2
,
bkey_bytes
(
k1
))
||
l1
!=
l2
,
c
,
"superblock btree root doesn't match journal after clean shutdown"
);
}
fsck_err:
return
ret
;
}
static
struct
bch_sb_field_clean
*
read_superblock_clean
(
struct
bch_fs
*
c
)
{
struct
bch_sb_field_clean
*
clean
,
*
sb_clean
;
if
(
!
c
->
sb
.
clean
)
return
NULL
;
mutex_lock
(
&
c
->
sb_lock
);
sb_clean
=
bch2_sb_get_clean
(
c
->
disk_sb
.
sb
);
if
(
!
sb_clean
)
{
mutex_unlock
(
&
c
->
sb_lock
);
bch_err
(
c
,
"superblock marked clean but clean section not present"
);
return
NULL
;
}
clean
=
kmemdup
(
sb_clean
,
vstruct_bytes
(
&
sb_clean
->
field
),
GFP_KERNEL
);
if
(
!
clean
)
{
mutex_unlock
(
&
c
->
sb_lock
);
return
ERR_PTR
(
-
ENOMEM
);
}
if
(
le16_to_cpu
(
c
->
disk_sb
.
sb
->
version
)
<
bcachefs_metadata_version_bkey_renumber
)
bch2_sb_clean_renumber
(
clean
,
READ
);
mutex_unlock
(
&
c
->
sb_lock
);
return
clean
;
}
static
int
journal_replay_entry_early
(
struct
bch_fs
*
c
,
static
int
journal_replay_entry_early
(
struct
bch_fs
*
c
,
struct
jset_entry
*
entry
)
struct
jset_entry
*
entry
)
{
{
...
@@ -106,49 +184,85 @@ static int journal_replay_entry_early(struct bch_fs *c,
...
@@ -106,49 +184,85 @@ static int journal_replay_entry_early(struct bch_fs *c,
return
ret
;
return
ret
;
}
}
static
int
verify_superblock_clean
(
struct
bch_fs
*
c
,
static
int
load_journal_metadata
(
struct
bch_fs
*
c
,
struct
bch_sb_field_clean
**
cleanp
,
struct
bch_sb_field_clean
*
clean
,
struct
jset
*
j
)
struct
list_head
*
journal
)
{
{
unsigned
i
;
struct
jset_entry
*
entry
;
struct
bch_sb_field_clean
*
clean
=
*
cleanp
;
int
ret
;
int
ret
=
0
;
if
(
!
clean
||
!
j
)
if
(
clean
)
{
return
0
;
c
->
bucket_clock
[
READ
].
hand
=
le16_to_cpu
(
clean
->
read_clock
);
c
->
bucket_clock
[
WRITE
].
hand
=
le16_to_cpu
(
clean
->
write_clock
);
if
(
mustfix_fsck_err_on
(
j
->
seq
!=
clean
->
journal_seq
,
c
,
for
(
entry
=
clean
->
start
;
"superblock journal seq (%llu) doesn't match journal (%llu) after clean shutdown"
,
entry
!=
vstruct_end
(
&
clean
->
field
);
le64_to_cpu
(
clean
->
journal_seq
),
entry
=
vstruct_next
(
entry
))
{
le64_to_cpu
(
j
->
seq
)))
{
ret
=
journal_replay_entry_early
(
c
,
entry
);
kfree
(
clean
);
if
(
ret
)
*
cleanp
=
NULL
;
return
ret
;
return
0
;
}
}
}
else
{
struct
journal_replay
*
i
=
list_last_entry
(
journal
,
struct
journal_replay
,
list
);
mustfix_fsck_err_on
(
j
->
read_clock
!=
clean
->
read_clock
,
c
,
c
->
bucket_clock
[
READ
].
hand
=
le16_to_cpu
(
i
->
j
.
read_clock
);
"superblock read clock doesn't match journal after clean shutdown"
);
c
->
bucket_clock
[
WRITE
].
hand
=
le16_to_cpu
(
i
->
j
.
write_clock
);
mustfix_fsck_err_on
(
j
->
write_clock
!=
clean
->
write_clock
,
c
,
"superblock read clock doesn't match journal after clean shutdown"
);
list_for_each_entry
(
i
,
journal
,
list
)
vstruct_for_each
(
&
i
->
j
,
entry
)
{
ret
=
journal_replay_entry_early
(
c
,
entry
);
if
(
ret
)
return
ret
;
}
}
bch2_fs_usage_initialize
(
c
);
return
0
;
}
static
int
read_btree_roots
(
struct
bch_fs
*
c
)
{
unsigned
i
;
int
ret
=
0
;
for
(
i
=
0
;
i
<
BTREE_ID_NR
;
i
++
)
{
for
(
i
=
0
;
i
<
BTREE_ID_NR
;
i
++
)
{
struct
bkey_i
*
k1
,
*
k2
;
struct
btree_root
*
r
=
&
c
->
btree_roots
[
i
];
unsigned
l1
=
0
,
l2
=
0
;
k1
=
btree_root_find
(
c
,
clean
,
NULL
,
i
,
&
l1
);
if
(
!
r
->
alive
)
k2
=
btree_root_find
(
c
,
NULL
,
j
,
i
,
&
l2
)
;
continue
;
if
(
!
k1
&&
!
k2
)
if
(
i
==
BTREE_ID_ALLOC
&&
test_reconstruct_alloc
(
c
))
{
c
->
sb
.
compat
&=
~
(
1ULL
<<
BCH_COMPAT_FEAT_ALLOC_INFO
);
continue
;
continue
;
}
mustfix_fsck_err_on
(
!
k1
||
!
k2
||
IS_ERR
(
k1
)
||
if
(
r
->
error
)
{
IS_ERR
(
k2
)
||
__fsck_err
(
c
,
i
==
BTREE_ID_ALLOC
k1
->
k
.
u64s
!=
k2
->
k
.
u64s
||
?
FSCK_CAN_IGNORE
:
0
,
memcmp
(
k1
,
k2
,
bkey_bytes
(
k1
))
||
"invalid btree root %s"
,
l1
!=
l2
,
c
,
bch2_btree_ids
[
i
]);
"superblock btree root doesn't match journal after clean shutdown"
);
if
(
i
==
BTREE_ID_ALLOC
)
c
->
sb
.
compat
&=
~
(
1ULL
<<
BCH_COMPAT_FEAT_ALLOC_INFO
);
}
ret
=
bch2_btree_root_read
(
c
,
i
,
&
r
->
key
,
r
->
level
);
if
(
ret
)
{
__fsck_err
(
c
,
i
==
BTREE_ID_ALLOC
?
FSCK_CAN_IGNORE
:
0
,
"error reading btree root %s"
,
bch2_btree_ids
[
i
]);
if
(
i
==
BTREE_ID_ALLOC
)
c
->
sb
.
compat
&=
~
(
1ULL
<<
BCH_COMPAT_FEAT_ALLOC_INFO
);
}
}
}
for
(
i
=
0
;
i
<
BTREE_ID_NR
;
i
++
)
if
(
!
c
->
btree_roots
[
i
].
b
)
bch2_btree_root_alloc
(
c
,
i
);
fsck_err:
fsck_err:
return
ret
;
return
ret
;
}
}
...
@@ -186,38 +300,11 @@ static bool journal_empty(struct list_head *journal)
...
@@ -186,38 +300,11 @@ static bool journal_empty(struct list_head *journal)
int
bch2_fs_recovery
(
struct
bch_fs
*
c
)
int
bch2_fs_recovery
(
struct
bch_fs
*
c
)
{
{
const
char
*
err
=
"cannot allocate memory"
;
const
char
*
err
=
"cannot allocate memory"
;
struct
bch_sb_field_clean
*
clean
=
NULL
,
*
sb_clean
=
NULL
;
struct
bch_sb_field_clean
*
clean
;
struct
jset_entry
*
entry
;
LIST_HEAD
(
journal
);
LIST_HEAD
(
journal
);
struct
jset
*
j
=
NULL
;
unsigned
i
;
bool
run_gc
=
c
->
opts
.
fsck
||
!
(
c
->
sb
.
compat
&
(
1ULL
<<
BCH_COMPAT_FEAT_ALLOC_INFO
));
int
ret
;
int
ret
;
mutex_lock
(
&
c
->
sb_lock
);
clean
=
read_superblock_clean
(
c
);
if
(
!
c
->
replicas
.
entries
)
{
bch_info
(
c
,
"building replicas info"
);
set_bit
(
BCH_FS_REBUILD_REPLICAS
,
&
c
->
flags
);
}
if
(
c
->
sb
.
clean
)
sb_clean
=
bch2_sb_get_clean
(
c
->
disk_sb
.
sb
);
if
(
sb_clean
)
{
clean
=
kmemdup
(
sb_clean
,
vstruct_bytes
(
&
sb_clean
->
field
),
GFP_KERNEL
);
if
(
!
clean
)
{
ret
=
-
ENOMEM
;
mutex_unlock
(
&
c
->
sb_lock
);
goto
err
;
}
if
(
le16_to_cpu
(
c
->
disk_sb
.
sb
->
version
)
<
bcachefs_metadata_version_bkey_renumber
)
bch2_sb_clean_renumber
(
clean
,
READ
);
}
mutex_unlock
(
&
c
->
sb_lock
);
if
(
clean
)
if
(
clean
)
bch_info
(
c
,
"recovering from clean shutdown, journal seq %llu"
,
bch_info
(
c
,
"recovering from clean shutdown, journal seq %llu"
,
le64_to_cpu
(
clean
->
journal_seq
));
le64_to_cpu
(
clean
->
journal_seq
));
...
@@ -227,78 +314,29 @@ int bch2_fs_recovery(struct bch_fs *c)
...
@@ -227,78 +314,29 @@ int bch2_fs_recovery(struct bch_fs *c)
if
(
ret
)
if
(
ret
)
goto
err
;
goto
err
;
j
=
&
list_entry
(
journal
.
prev
,
struct
journal_replay
,
list
)
->
j
;
ret
=
verify_superblock_clean
(
c
,
&
clean
,
&
list_last_entry
(
&
journal
,
struct
journal_replay
,
list
)
->
j
);
if
(
ret
)
goto
err
;
}
else
{
}
else
{
ret
=
bch2_journal_set_seq
(
c
,
ret
=
bch2_journal_set_seq
(
c
,
le64_to_cpu
(
clean
->
journal_seq
),
le64_to_cpu
(
clean
->
journal_seq
),
le64_to_cpu
(
clean
->
journal_seq
));
le64_to_cpu
(
clean
->
journal_seq
));
BUG_ON
(
ret
);
}
ret
=
verify_superblock_clean
(
c
,
&
clean
,
j
);
if
(
ret
)
if
(
ret
)
goto
err
;
goto
err
;
}
fsck_err_on
(
clean
&&
!
journal_empty
(
&
journal
),
c
,
fsck_err_on
(
clean
&&
!
journal_empty
(
&
journal
),
c
,
"filesystem marked clean but journal not empty"
);
"filesystem marked clean but journal not empty"
);
err
=
"insufficient memory"
;
ret
=
load_journal_metadata
(
c
,
clean
,
&
journal
);
if
(
clean
)
{
c
->
bucket_clock
[
READ
].
hand
=
le16_to_cpu
(
clean
->
read_clock
);
c
->
bucket_clock
[
WRITE
].
hand
=
le16_to_cpu
(
clean
->
write_clock
);
for
(
entry
=
clean
->
start
;
entry
!=
vstruct_end
(
&
clean
->
field
);
entry
=
vstruct_next
(
entry
))
{
ret
=
journal_replay_entry_early
(
c
,
entry
);
if
(
ret
)
if
(
ret
)
goto
err
;
goto
err
;
}
}
else
{
struct
journal_replay
*
i
;
c
->
bucket_clock
[
READ
].
hand
=
le16_to_cpu
(
j
->
read_clock
);
c
->
bucket_clock
[
WRITE
].
hand
=
le16_to_cpu
(
j
->
write_clock
);
list_for_each_entry
(
i
,
&
journal
,
list
)
ret
=
read_btree_roots
(
c
);
vstruct_for_each
(
&
i
->
j
,
entry
)
{
ret
=
journal_replay_entry_early
(
c
,
entry
);
if
(
ret
)
if
(
ret
)
goto
err
;
goto
err
;
}
}
bch2_fs_usage_initialize
(
c
);
for
(
i
=
0
;
i
<
BTREE_ID_NR
;
i
++
)
{
struct
btree_root
*
r
=
&
c
->
btree_roots
[
i
];
if
(
!
r
->
alive
)
continue
;
err
=
"invalid btree root pointer"
;
ret
=
-
1
;
if
(
r
->
error
)
goto
err
;
if
(
i
==
BTREE_ID_ALLOC
&&
test_reconstruct_alloc
(
c
))
continue
;
err
=
"error reading btree root"
;
ret
=
bch2_btree_root_read
(
c
,
i
,
&
r
->
key
,
r
->
level
);
if
(
ret
)
{
if
(
i
!=
BTREE_ID_ALLOC
)
goto
err
;
mustfix_fsck_err
(
c
,
"error reading btree root"
);
run_gc
=
true
;
}
}
for
(
i
=
0
;
i
<
BTREE_ID_NR
;
i
++
)
if
(
!
c
->
btree_roots
[
i
].
b
)
bch2_btree_root_alloc
(
c
,
i
);
err
=
"error reading allocation information"
;
err
=
"error reading allocation information"
;
ret
=
bch2_alloc_read
(
c
,
&
journal
);
ret
=
bch2_alloc_read
(
c
,
&
journal
);
...
@@ -313,7 +351,14 @@ int bch2_fs_recovery(struct bch_fs *c)
...
@@ -313,7 +351,14 @@ int bch2_fs_recovery(struct bch_fs *c)
set_bit
(
BCH_FS_ALLOC_READ_DONE
,
&
c
->
flags
);
set_bit
(
BCH_FS_ALLOC_READ_DONE
,
&
c
->
flags
);
if
(
run_gc
)
{
if
(
!
c
->
replicas
.
entries
)
{
bch_info
(
c
,
"building replicas info"
);
set_bit
(
BCH_FS_REBUILD_REPLICAS
,
&
c
->
flags
);
}
if
(
c
->
opts
.
fsck
||
!
(
c
->
sb
.
compat
&
(
1ULL
<<
BCH_COMPAT_FEAT_ALLOC_INFO
))
||
test_bit
(
BCH_FS_REBUILD_REPLICAS
,
&
c
->
flags
))
{
bch_verbose
(
c
,
"starting mark and sweep:"
);
bch_verbose
(
c
,
"starting mark and sweep:"
);
err
=
"error in recovery"
;
err
=
"error in recovery"
;
ret
=
bch2_gc
(
c
,
&
journal
,
true
);
ret
=
bch2_gc
(
c
,
&
journal
,
true
);
...
@@ -332,9 +377,6 @@ int bch2_fs_recovery(struct bch_fs *c)
...
@@ -332,9 +377,6 @@ int bch2_fs_recovery(struct bch_fs *c)
if
(
c
->
sb
.
encryption_type
&&
!
c
->
sb
.
clean
)
if
(
c
->
sb
.
encryption_type
&&
!
c
->
sb
.
clean
)
atomic64_add
(
1
<<
16
,
&
c
->
key_version
);
atomic64_add
(
1
<<
16
,
&
c
->
key_version
);
if
(
c
->
opts
.
noreplay
)
goto
out
;
/*
/*
* bch2_fs_journal_start() can't happen sooner, or btree_gc_finish()
* bch2_fs_journal_start() can't happen sooner, or btree_gc_finish()
* will give spurious errors about oldest_gen > bucket_gen -
* will give spurious errors about oldest_gen > bucket_gen -
...
@@ -342,6 +384,9 @@ int bch2_fs_recovery(struct bch_fs *c)
...
@@ -342,6 +384,9 @@ int bch2_fs_recovery(struct bch_fs *c)
*/
*/
bch2_fs_journal_start
(
&
c
->
journal
);
bch2_fs_journal_start
(
&
c
->
journal
);
if
(
c
->
opts
.
noreplay
)
goto
out
;
bch_verbose
(
c
,
"starting journal replay:"
);
bch_verbose
(
c
,
"starting journal replay:"
);
err
=
"journal replay failed"
;
err
=
"journal replay failed"
;
ret
=
bch2_journal_replay
(
c
,
&
journal
);
ret
=
bch2_journal_replay
(
c
,
&
journal
);
...
@@ -357,6 +402,14 @@ int bch2_fs_recovery(struct bch_fs *c)
...
@@ -357,6 +402,14 @@ int bch2_fs_recovery(struct bch_fs *c)
if
(
ret
)
if
(
ret
)
goto
err
;
goto
err
;
if
(
enabled_qtypes
(
c
))
{
bch_verbose
(
c
,
"reading quotas:"
);
ret
=
bch2_fs_quota_read
(
c
);
if
(
ret
)
goto
err
;
bch_verbose
(
c
,
"quotas done"
);
}
mutex_lock
(
&
c
->
sb_lock
);
mutex_lock
(
&
c
->
sb_lock
);
if
(
c
->
opts
.
version_upgrade
)
{
if
(
c
->
opts
.
version_upgrade
)
{
if
(
c
->
sb
.
version
<
bcachefs_metadata_version_new_versioning
)
if
(
c
->
sb
.
version
<
bcachefs_metadata_version_new_versioning
)
...
@@ -371,15 +424,6 @@ int bch2_fs_recovery(struct bch_fs *c)
...
@@ -371,15 +424,6 @@ int bch2_fs_recovery(struct bch_fs *c)
SET_BCH_SB_HAS_ERRORS
(
c
->
disk_sb
.
sb
,
0
);
SET_BCH_SB_HAS_ERRORS
(
c
->
disk_sb
.
sb
,
0
);
}
}
mutex_unlock
(
&
c
->
sb_lock
);
mutex_unlock
(
&
c
->
sb_lock
);
if
(
enabled_qtypes
(
c
))
{
bch_verbose
(
c
,
"reading quotas:"
);
ret
=
bch2_fs_quota_read
(
c
);
if
(
ret
)
goto
err
;
bch_verbose
(
c
,
"quotas done"
);
}
out:
out:
bch2_journal_entries_free
(
&
journal
);
bch2_journal_entries_free
(
&
journal
);
kfree
(
clean
);
kfree
(
clean
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment