Commit 4fca6c60 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Long Li
Browse files

btrfs: zoned: factor out DUP bg handling from btrfs_load_block_group_zone_info 

mainline inclusion
from mainline-v6.6-rc5
commit 87463f7e0250d471fac41e7c9c45ae21d83b5f85
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IACZX0
CVE: CVE-2024-39496

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=87463f7e0250d471fac41e7c9c45ae21d83b5f85



--------------------------------

Split the code handling a type DUP block group from
btrfs_load_block_group_zone_info to make the code more readable.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 34c9e7dc

fs/btrfs/zoned.c

+42 −37
Original line number Diff line number Diff line
@@ -1392,6 +1392,47 @@ static int btrfs_load_block_group_single(struct btrfs_block_group *bg, 
	return 0;

}



static int btrfs_load_block_group_dup(struct btrfs_block_group *bg,

				      struct map_lookup *map,

				      struct zone_info *zone_info,

				      unsigned long *active)

{

	if (map->type & BTRFS_BLOCK_GROUP_DATA) {

		btrfs_err(bg->fs_info,

			  "zoned: profile DUP not yet supported on data bg");

		return -EINVAL;

	}



	if (zone_info[0].alloc_offset == WP_MISSING_DEV) {

		btrfs_err(bg->fs_info,

			  "zoned: cannot recover write pointer for zone %llu",

			  zone_info[0].physical);

		return -EIO;

	}

	if (zone_info[1].alloc_offset == WP_MISSING_DEV) {

		btrfs_err(bg->fs_info,

			  "zoned: cannot recover write pointer for zone %llu",

			  zone_info[1].physical);

		return -EIO;

	}

	if (zone_info[0].alloc_offset != zone_info[1].alloc_offset) {

		btrfs_err(bg->fs_info,

			  "zoned: write pointer offset mismatch of zones in DUP profile");

		return -EIO;

	}



	if (test_bit(0, active) != test_bit(1, active)) {

		if (!btrfs_zone_activate(bg))

			return -EIO;

	} else if (test_bit(0, active)) {

		set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &bg->runtime_flags);

	}



	bg->alloc_offset = zone_info[0].alloc_offset;

	bg->zone_capacity = min(zone_info[0].capacity, zone_info[1].capacity);

	return 0;

}



int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)

{

	struct btrfs_fs_info *fs_info = cache->fs_info;
@@ -1481,43 +1522,7 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new) 
		ret = btrfs_load_block_group_single(cache, &zone_info[0], active);

		break;

	case BTRFS_BLOCK_GROUP_DUP:

		if (map->type & BTRFS_BLOCK_GROUP_DATA) {

			btrfs_err(fs_info, "zoned: profile DUP not yet supported on data bg");

			ret = -EINVAL;

			goto out;

		}

		if (zone_info[0].alloc_offset == WP_MISSING_DEV) {

			btrfs_err(fs_info,

			"zoned: cannot recover write pointer for zone %llu",

				zone_info[0].physical);

			ret = -EIO;

			goto out;

		}

		if (zone_info[1].alloc_offset == WP_MISSING_DEV) {

			btrfs_err(fs_info,

			"zoned: cannot recover write pointer for zone %llu",

				zone_info[1].physical);

			ret = -EIO;

			goto out;

		}

		if (zone_info[0].alloc_offset != zone_info[1].alloc_offset) {

			btrfs_err(fs_info,

			"zoned: write pointer offset mismatch of zones in DUP profile");

			ret = -EIO;

			goto out;

		}

		if (test_bit(0, active) != test_bit(1, active)) {

			if (!btrfs_zone_activate(cache)) {

				ret = -EIO;

				goto out;

			}

		} else {

			if (test_bit(0, active))

				set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE,

					&cache->runtime_flags);

		}

		cache->alloc_offset = zone_info[0].alloc_offset;

		cache->zone_capacity = min(zone_info[0].capacity, zone_info[1].capacity);

		ret = btrfs_load_block_group_dup(cache, map, zone_info, active);

		break;

	case BTRFS_BLOCK_GROUP_RAID1:

	case BTRFS_BLOCK_GROUP_RAID0: