Btrfs: do not loop through raid types when looking for free extent
PATCH 1/1 Btrfs: do not loop through raid types when looking for free extent
There is a bug in find_free_extent where if we don't find a free extent in the raid type we are looking for, we loop through to the next raid type. This is not ok since we need to make sure we honor the raid types we are given. So instead kill this check and get the proper index for the raid type we want from the allocator. Thanks,
--- fs/btrfs/extent-tree.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-)
fs/btrfs/extent-tree.c +8 -12
@@ -4785,16 +4785,16 @@ wait_block_group_cache_done(struct btrfs_block_group_cache *cache)return 0 ; } -static int get_block_group_index (struct btrfs_block_group_cache *cache) +static int get_block_group_index (u64 flags) {int index; -if (cache->flags &BTRFS_BLOCK_GROUP_RAID10 ) +if (flags &BTRFS_BLOCK_GROUP_RAID10 ) index =0 ; -else if (cache->flags &BTRFS_BLOCK_GROUP_RAID1 ) +else if (flags &BTRFS_BLOCK_GROUP_RAID1 ) index =1 ; -else if (cache->flags &BTRFS_BLOCK_GROUP_DUP ) +else if (flags &BTRFS_BLOCK_GROUP_DUP ) index =2 ; -else if (cache->flags &BTRFS_BLOCK_GROUP_RAID0 ) +else if (flags &BTRFS_BLOCK_GROUP_RAID0 ) index =3 ;else index =4 ;
@@ -4834,7 +4834,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,struct btrfs_space_info *space_info;int last_ptr_loop =0 ;int loop =0 ; -int index =0 ; +int index =get_block_group_index (data);bool found_uncached_bg = false;bool failed_cluster_refill = false;bool failed_alloc = false;
@@ -4913,7 +4913,6 @@ ideal_cache:btrfs_put_block_group (block_group);up_read (&space_info->groups_sem); }else { - index =get_block_group_index (block_group); goto have_block_group; } }else if (block_group) {
@@ -5145,14 +5144,11 @@ checks: loop: failed_cluster_refill = false; failed_alloc = false; -BUG_ON (index !=get_block_group_index (block_group)); +BUG_ON (index !=get_block_group_index (block_group->flags));btrfs_put_block_group (block_group); }up_read (&space_info->groups_sem); -if (!ins->objectid && ++index <BTRFS_NR_RAID_TYPES ) - goto search; -/* LOOP_FIND_IDEAL, only search caching/cached bg's, and don't wait for * for them to make caching progress. Also * determine the best possible bg to cache
@@ -8204,7 +8200,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)static void __link_block_group (struct btrfs_space_info *space_info,struct btrfs_block_group_cache *cache) { -int index =get_block_group_index (cache); +int index =get_block_group_index (cache->flags);down_write (&space_info->groups_sem);list_add_tail (&cache->list, &space_info->block_groups[index]);
Signature · 1 line
1.6.6.1
Quoted 1 line · Josef Bacik
There is a bug in
find_free_extentwhere if we don't find a free exte=
nt in the
Quoted 1 line
raid type we are looking for, we loop through to the next raid type. =
=A0This is
Quoted 1 line
not ok since we need to make sure we honor the raid types we are give=
n. =A0So
Quoted 1 line
instead kill this check and get the proper index for the raid type we=
want from
Quoted 2 lines
the allocator. =A0Thanks,
Loop through raid types is for handling failure in the middle of raid t= ype
conversion.
Yan, Zheng
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 1 line · Zheng
On Wed, Nov 17, 2010 at 5:22 AM, Josef Bacik <[email protected]> wrote=
:
Quoted 1 line
Quoted 1 line
There is a bug in
find_free_extentwhere if we don't find a free ex=
tent in the
Quoted 1 line
Quoted 1 line
raid type we are looking for, we loop through to the next raid type=
=2E =A0This is
Quoted 1 line
Quoted 1 line
not ok since we need to make sure we honor the raid types we are gi=
ven. =A0So
Quoted 1 line
Quoted 1 line
instead kill this check and get the proper index for the raid type =
we want from
Quoted 4 lines
Quoted 2 lines
the allocator. =A0Thanks,
=20
Loop through raid types is for handling failure in the middle of raid=
type
Quoted 2 lines
conversion.
We need to figure out a different way to deal with it then, at the mome= nt we
have users getting all of the different raid types across their disks b= ecause
it's really easy to exit out of the main loop without an allocation, fo= r example
when doing the ideal caching stuff, we just look for the best block gro= up to
cache before even trying to make an allocation, so doing that loop will automatically make us change the raid type from what we asked for. Or = in the
case that the hint doesn't actually point at a compatible block group w= e'll get
the first index, and if thats metadata we'll end up not using DUP if th= ats the
allocation policy.
We can deal with raid type conversion later, as it stands this stuff is=
broken.
Thanks,
Josef=20
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 1 line · Josef Bacik
There is a bug in
find_free_extentwhere if we don't find a free exte=
nt in the
Quoted 1 line
raid type we are looking for, we loop through to the next raid type. =
=A0This is
Quoted 1 line
not ok since we need to make sure we honor the raid types we are give=
n. =A0So
Quoted 1 line
instead kill this check and get the proper index for the raid type we=
want from
Quoted 2 lines
the allocator. =A0Thanks,
Loop through raid types is for handling failure in the middle of raid t= ype
conversion.
Yan, Zheng
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Excerpts from Yan, Zheng's message of 2010-11-16 20:38:23 -0500:
Quoted 1 line
On Wed, Nov 17, 2010 at 5:22 AM, Josef Bacik <[email protected]> wrote=
:
Quoted 1 line
Quoted 1 line
There is a bug in
find_free_extentwhere if we don't find a free ex=
tent in the
Quoted 1 line
Quoted 1 line
raid type we are looking for, we loop through to the next raid type=
=2E =C2=A0This is
Quoted 1 line
Quoted 1 line
not ok since we need to make sure we honor the raid types we are gi=
ven. =C2=A0So
Quoted 1 line
Quoted 1 line
instead kill this check and get the proper index for the raid type =
we want from
Quoted 4 lines
Quoted 2 lines
the allocator. =C2=A0Thanks,
=20
Loop through raid types is for handling failure in the middle of raid=
type
Quoted 1 line
conversion.
The problem is that nothing prevents it from looping back to a raid0 chunk when we really want raid1 or raid10. And mkfs leaves behind a small raid0 chunk (4MB) that is uses as it assembles all the devices.
I confirmed that we often use the small raid0 chunk even in raid1 or raid10.
Please take a look at this commit:
http://git.kernel.org/?p=3Dlinux/kernel/git/mason/btrfs-unstable.git;a=3D=
commit;h=3D83a50de97fe96aca82389e061862ed760ece2283
-chris
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Dec 14, 2010 at 9:33 AM, Chris Mason <[email protected]> w= rote:
Quoted 2 lines
Excerpts from Yan, Zheng's message of 2010-11-16 20:38:23 -0500:
Quoted 1 line
On Wed, Nov 17, 2010 at 5:22 AM, Josef Bacik <[email protected]> wrot=
e:
Quoted 1 line
Quoted 1 line
Quoted 1 line
There is a bug in
find_free_extentwhere if we don't find a free e=
xtent in the
Quoted 1 line
Quoted 1 line
Quoted 1 line
raid type we are looking for, we loop through to the next raid typ=
e. =A0This is
Quoted 1 line
Quoted 1 line
Quoted 1 line
not ok since we need to make sure we honor the raid types we are g=
iven. =A0So
Quoted 1 line
Quoted 1 line
Quoted 1 line
instead kill this check and get the proper index for the raid type=
we want from
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
the allocator. =A0Thanks,
Loop through raid types is for handling failure in the middle of rai=
d type
Quoted 4 lines
Quoted 1 line
conversion.
The problem is that nothing prevents it from looping back to a raid0 chunk when we really want raid1 or raid10. =A0And mkfs leaves behind =
a
Quoted 1 line
small raid0 chunk (4MB) that is uses as it assembles all the devices.
check code at end of btrfs_read_block_groups, it prevents allocating from raid0 when there are mirrored block groups.
Quoted 7 lines
I confirmed that we often use the small raid0 chunk even in raid1 or raid10.
Please take a look at this commit:
http://git.kernel.org/?p=3Dlinux/kernel/git/mason/btrfs-unstable.git;=
a=3Dcommit;h=3D83a50de97fe96aca82389e061862ed760ece2283
Quoted 4 lines
-chris
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs=
" in
Quoted 3 lines
the body of a message to [email protected]
More majordomo info at =A0http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Excerpts from Yan, Zheng's message of 2010-12-13 20:54:12 -0500:
Quoted 1 line
On Tue, Dec 14, 2010 at 9:33 AM, Chris Mason <[email protected]>=
Quoted 2 lines · wrote:
Quoted 2 lines
Excerpts from Yan, Zheng's message of 2010-11-16 20:38:23 -0500:
Quoted 1 line
On Wed, Nov 17, 2010 at 5:22 AM, Josef Bacik <[email protected]> wr=
ote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
There is a bug in
find_free_extentwhere if we don't find a free=
extent in the
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
raid type we are looking for, we loop through to the next raid t=
ype. =C2=A0This is
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
not ok since we need to make sure we honor the raid types we are=
given. =C2=A0So
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
instead kill this check and get the proper index for the raid ty=
pe we want from
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
the allocator. =C2=A0Thanks,
Loop through raid types is for handling failure in the middle of r=
aid type
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
conversion.
The problem is that nothing prevents it from looping back to a raid=
0
Quoted 1 line
Quoted 1 line
chunk when we really want raid1 or raid10. =C2=A0And mkfs leaves be=
hind a
Quoted 1 line
Quoted 1 line
small raid0 chunk (4MB) that is uses as it assembles all the device=
s.
Quoted 3 lines
=20
check code at end ofbtrfs_read_block_groups, it prevents allocating from raid0 when there are mirrored block groups.
We're still allocating from them though. It's a big problem when we mount degraded.
-chris
Quoted 3 lines
=20
Quoted 2 lines
I confirmed that we often use the small raid0 chunk even in raid1 o=
r
Quoted 5 lines
Quoted 5 lines
raid10.
Please take a look at this commit:
http://git.kernel.org/?p=3Dlinux/kernel/git/mason/btrfs-unstable.gi=
t;a=3Dcommit;h=3D83a50de97fe96aca82389e061862ed760ece2283
Quoted 4 lines
Quoted 4 lines
-chris
--
To unsubscribe from this list: send the line "unsubscribe linux-btr=
fs" in
Quoted 2 lines
Quoted 2 lines
the body of a message to [email protected]
More majordomo info at =C2=A0http://vger.kernel.org/majordomo-info.=
html
Quoted 1 line
Quoted 1 line
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html