From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1114D1FC8 for ; Sat, 16 Aug 2025 00:01:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755302485; cv=none; b=agSKIUbYanccs8uhaYroC6kVAtAzInXBDYAI4rybkFeRtgCBUxbXwCDOFkC3xcWA47x5WdP5EUMMfMwk1W3p4wVe77LEBceCQKmsOrtU1qubB0l7N4z65ZOSEZrZlcF9wXNkqNF6F3h2MHeURG92vnx4nbtEvP5aIvm/4Z/fKA0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755302485; c=relaxed/simple; bh=VK4S2GlL6JKY5KWyXylHmHgS9MyIikS9VMxqibTl+3Q=; h=Message-ID:Date:MIME-Version:Subject:To:References:From: In-Reply-To:Content-Type; b=tj4J4nRUWXKxsLJkVAGRmAYS8NlqE+wYu6au8ApcAa6z2++3iIF80klLUmD02YZ+VZZarm0YH01h/0Pbj7Kes2w8W7CJKPIJiXWACmERmQK1Q6SEhkc16p08dHjkNyLpgoqCOzv5vha1AYQKUGr/EMqf22OKBJ3WF5VUO/antaA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=XjBwsQXP; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="XjBwsQXP" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3b9e4147690so1460426f8f.2 for ; Fri, 15 Aug 2025 17:01:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1755302481; x=1755907281; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=1Hicit36+lK8XyjT71DlQ6OK4pCHqTL5VhRrKiESahE=; b=XjBwsQXPz1JSBVZDl+v1FNCdfMKefB+n2MowwLwyqkVnB7gwB+acjCftMpXL+8Mn7a yWLv92YrFcRmgcJlF9l+cFCsB7xMaqf7FKRlU3OOEBTNYjgeP44L/3n0rAO3c5LHOn8C 4kqDKerpl6H5VUfxRfrWxn+WYaX7Y7zxOMU2nN1yr1Gji/0tTSjFpcNVehA6M/q23cLm 3J0fSHY0gkzc/DWghwnOA0AsFOOizAY2PVJSKXgwj4B7VFHMdgHqL+ZK7WdXcLzBk8zP nbT55eohaa4LryHno+kDjFbdSNHZnPAsIjiWcjW9/uxkNdeghVhJmV65rDeKbRZL9aT8 xZtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755302481; x=1755907281; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1Hicit36+lK8XyjT71DlQ6OK4pCHqTL5VhRrKiESahE=; b=xQqv9gRg7KDcicW4RrNth6NuM3RRKK1y6OUyzoWJmXZT6RKuknHFCb3RU4+ld6Pu9n o3Q91233CTdntoDcTgBt5ltqEf7fz4RKolqJspsX6HYMYT/TE8QETkyGCNfGPrKnLk1L fQzd6SuhduZHlSPlQemyatdEB6Df6x3FyJjd0eufxKyqD9YKLtemn34l8e1eV/QtLW1c HWDroF1+l/eXgTHMH6TBFg2hDcKf7uuk2cokFQCDdTD2DAGEyYsiNwZynz582LPL2hrq ERWzHd5qjazm3fo62jZzs446r859i6oUughk/vDABpxDwttRrsUo/3242eOB7ikgtsFc Bxow== X-Forwarded-Encrypted: i=1; AJvYcCUFOpA7sN8+4J1cxx3njB916h2CCSmLOZIPjvvz1SdexfYrx3aePgGWqOZ3LxLWS8hBpjZ025y/juH+xw==@vger.kernel.org X-Gm-Message-State: AOJu0YyUBI+UZvbHnYBaurTmTamKt+h/90FG/72WqFvTtCqk53vaKKuv IqTrEn8CjMB8m8if1/vMQfp/w73BDCHsH/XrlkdjbCI6AkljdGa6a+3500iTw1Lrn+RJfKz3zDo fTRVf X-Gm-Gg: ASbGncuM+mW6/aPs/PFazsi5nvGhWNCwufOafIspmq835Bqx4/nVC2k8U3WQZUC5uYV 3teBkDn/W1QfRGJCd7mbHNTQ+lCebYrIchCtNAnWSN8zMV+6BH/KnP2BCMfk00AR/ecFBmf9yK4 FIlHQaywzlCcyg+p0pGKjKHOLL7dz2Z0Y9esMOvPSPpc5Im7/udtT+tOjfdE9jBBwikGLs7eA8/ pllFINfaE1Yo2pCaL7XlBlvWD6PzOIGSyEIdUm8sa1yr4rZtV0v0HFyQ86FukYQJboe4+crESJP cKOM5t8IzgGbeUm0RruSPQ1GN8ACiPzAWuqGv8GlaU29/F++l1/1briMUpSzS06lGi+fTaBW1Lm W2seg5yL7XZmDv6DORqADWipYglYyfDojuBuACf3UHvZWRK6Drg== X-Google-Smtp-Source: AGHT+IEyMBzVFaF9qpgMyHQQcgs7WeTsigHfIwlwRqHd1JU2doEXNO3ZQ6E3iLYdvP3LPumKq4Icyg== X-Received: by 2002:a05:6000:240b:b0:3b7:54b3:c512 with SMTP id ffacd0b85a97d-3bc6afea9b4mr634173f8f.58.1755302481136; Fri, 15 Aug 2025 17:01:21 -0700 (PDT) Received: from ?IPV6:2403:580d:fda1::299? (2403-580d-fda1--299.ip6.aussiebb.net. [2403:580d:fda1::299]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d5457a2sm23068095ad.121.2025.08.15.17.01.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Aug 2025 17:01:20 -0700 (PDT) Message-ID: <329f94a3-fef9-4d5f-acb1-362a1dd6ec68@suse.com> Date: Sat, 16 Aug 2025 09:31:16 +0930 Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 01/16] btrfs: add definitions and constants for remap-tree To: Mark Harmstone , linux-btrfs@vger.kernel.org References: <20250813143509.31073-1-mark@harmstone.com> <20250813143509.31073-2-mark@harmstone.com> Content-Language: en-US From: Qu Wenruo Autocrypt: addr=wqu@suse.com; keydata= xsBNBFnVga8BCACyhFP3ExcTIuB73jDIBA/vSoYcTyysFQzPvez64TUSCv1SgXEByR7fju3o 8RfaWuHCnkkea5luuTZMqfgTXrun2dqNVYDNOV6RIVrc4YuG20yhC1epnV55fJCThqij0MRL 1NxPKXIlEdHvN0Kov3CtWA+R1iNN0RCeVun7rmOrrjBK573aWC5sgP7YsBOLK79H3tmUtz6b 9Imuj0ZyEsa76Xg9PX9Hn2myKj1hfWGS+5og9Va4hrwQC8ipjXik6NKR5GDV+hOZkktU81G5 gkQtGB9jOAYRs86QG/b7PtIlbd3+pppT0gaS+wvwMs8cuNG+Pu6KO1oC4jgdseFLu7NpABEB AAHNGFF1IFdlbnJ1byA8d3F1QHN1c2UuY29tPsLAlAQTAQgAPgIbAwULCQgHAgYVCAkKCwIE FgIDAQIeAQIXgBYhBC3fcuWlpVuonapC4cI9kfOhJf6oBQJnEXVgBQkQ/lqxAAoJEMI9kfOh Jf6o+jIH/2KhFmyOw4XWAYbnnijuYqb/obGae8HhcJO2KIGcxbsinK+KQFTSZnkFxnbsQ+VY fvtWBHGt8WfHcNmfjdejmy9si2jyy8smQV2jiB60a8iqQXGmsrkuR+AM2V360oEbMF3gVvim 2VSX2IiW9KERuhifjseNV1HLk0SHw5NnXiWh1THTqtvFFY+CwnLN2GqiMaSLF6gATW05/sEd V17MdI1z4+WSk7D57FlLjp50F3ow2WJtXwG8yG8d6S40dytZpH9iFuk12Sbg7lrtQxPPOIEU rpmZLfCNJJoZj603613w/M8EiZw6MohzikTWcFc55RLYJPBWQ+9puZtx1DopW2jOwE0EWdWB rwEIAKpT62HgSzL9zwGe+WIUCMB+nOEjXAfvoUPUwk+YCEDcOdfkkM5FyBoJs8TCEuPXGXBO Cl5P5B8OYYnkHkGWutAVlUTV8KESOIm/KJIA7jJA+Ss9VhMjtePfgWexw+P8itFRSRrrwyUf E+0WcAevblUi45LjWWZgpg3A80tHP0iToOZ5MbdYk7YFBE29cDSleskfV80ZKxFv6koQocq0 vXzTfHvXNDELAuH7Ms/WJcdUzmPyBf3Oq6mKBBH8J6XZc9LjjNZwNbyvsHSrV5bgmu/THX2n g/3be+iqf6OggCiy3I1NSMJ5KtR0q2H2Nx2Vqb1fYPOID8McMV9Ll6rh8S8AEQEAAcLAfAQY AQgAJgIbDBYhBC3fcuWlpVuonapC4cI9kfOhJf6oBQJnEXWBBQkQ/lrSAAoJEMI9kfOhJf6o cakH+QHwDszsoYvmrNq36MFGgvAHRjdlrHRBa4A1V1kzd4kOUokongcrOOgHY9yfglcvZqlJ qfa4l+1oxs1BvCi29psteQTtw+memmcGruKi+YHD7793zNCMtAtYidDmQ2pWaLfqSaryjlzR /3tBWMyvIeWZKURnZbBzWRREB7iWxEbZ014B3gICqZPDRwwitHpH8Om3eZr7ygZck6bBa4MU o1XgbZcspyCGqu1xF/bMAY2iCDcq6ULKQceuKkbeQ8qxvt9hVxJC2W3lHq8dlK1pkHPDg9wO JoAXek8MF37R8gpLoGWl41FIUb3hFiu3zhDDvslYM4BmzI18QgQTQnotJH8= In-Reply-To: <20250813143509.31073-2-mark@harmstone.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 在 2025/8/14 00:04, Mark Harmstone 写道: > Add an incompat flag for the new remap-tree feature, and the constants > and definitions needed to support it. > > Signed-off-by: Mark Harmstone > --- > fs/btrfs/accessors.h | 3 +++ > fs/btrfs/locking.c | 1 + > fs/btrfs/sysfs.c | 2 ++ > fs/btrfs/tree-checker.c | 6 ++---- > fs/btrfs/tree-checker.h | 5 +++++ > fs/btrfs/volumes.c | 1 + > include/uapi/linux/btrfs.h | 1 + > include/uapi/linux/btrfs_tree.h | 12 ++++++++++++ > 8 files changed, 27 insertions(+), 4 deletions(-) > > diff --git a/fs/btrfs/accessors.h b/fs/btrfs/accessors.h > index 99b3ced12805..95a1ca8c099b 100644 > --- a/fs/btrfs/accessors.h > +++ b/fs/btrfs/accessors.h > @@ -1009,6 +1009,9 @@ BTRFS_SETGET_STACK_FUNCS(stack_verity_descriptor_encryption, > BTRFS_SETGET_STACK_FUNCS(stack_verity_descriptor_size, > struct btrfs_verity_descriptor_item, size, 64); > > +BTRFS_SETGET_FUNCS(remap_address, struct btrfs_remap, address, 64); > +BTRFS_SETGET_STACK_FUNCS(stack_remap_address, struct btrfs_remap, address, 64); > + > /* Cast into the data area of the leaf. */ > #define btrfs_item_ptr(leaf, slot, type) \ > ((type *)(btrfs_item_nr_offset(leaf, 0) + btrfs_item_offset(leaf, slot))) > diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c > index a3e6d9616e60..26f810258486 100644 > --- a/fs/btrfs/locking.c > +++ b/fs/btrfs/locking.c > @@ -73,6 +73,7 @@ static struct btrfs_lockdep_keyset { > { .id = BTRFS_FREE_SPACE_TREE_OBJECTID, DEFINE_NAME("free-space") }, > { .id = BTRFS_BLOCK_GROUP_TREE_OBJECTID, DEFINE_NAME("block-group") }, > { .id = BTRFS_RAID_STRIPE_TREE_OBJECTID, DEFINE_NAME("raid-stripe") }, > + { .id = BTRFS_REMAP_TREE_OBJECTID, DEFINE_NAME("remap-tree") }, > { .id = 0, DEFINE_NAME("tree") }, > }; > > diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c > index 81f52c1f55ce..857d2772db1c 100644 > --- a/fs/btrfs/sysfs.c > +++ b/fs/btrfs/sysfs.c > @@ -291,6 +291,7 @@ BTRFS_FEAT_ATTR_COMPAT_RO(free_space_tree, FREE_SPACE_TREE); > BTRFS_FEAT_ATTR_COMPAT_RO(block_group_tree, BLOCK_GROUP_TREE); > BTRFS_FEAT_ATTR_INCOMPAT(raid1c34, RAID1C34); > BTRFS_FEAT_ATTR_INCOMPAT(simple_quota, SIMPLE_QUOTA); > +BTRFS_FEAT_ATTR_INCOMPAT(remap_tree, REMAP_TREE); > #ifdef CONFIG_BLK_DEV_ZONED > BTRFS_FEAT_ATTR_INCOMPAT(zoned, ZONED); > #endif > @@ -325,6 +326,7 @@ static struct attribute *btrfs_supported_feature_attrs[] = { > BTRFS_FEAT_ATTR_PTR(raid1c34), > BTRFS_FEAT_ATTR_PTR(block_group_tree), > BTRFS_FEAT_ATTR_PTR(simple_quota), > + BTRFS_FEAT_ATTR_PTR(remap_tree), > #ifdef CONFIG_BLK_DEV_ZONED > BTRFS_FEAT_ATTR_PTR(zoned), > #endif > diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c > index 0f556f4de3f9..76ec3698f197 100644 > --- a/fs/btrfs/tree-checker.c > +++ b/fs/btrfs/tree-checker.c > @@ -912,12 +912,10 @@ int btrfs_check_chunk_valid(const struct btrfs_fs_info *fs_info, > length, btrfs_stripe_nr_to_offset(U32_MAX)); > return -EUCLEAN; > } > - if (unlikely(type & ~(BTRFS_BLOCK_GROUP_TYPE_MASK | > - BTRFS_BLOCK_GROUP_PROFILE_MASK))) { > + if (unlikely(type & ~BTRFS_BLOCK_GROUP_VALID)) { > chunk_err(fs_info, leaf, chunk, logical, > "unrecognized chunk type: 0x%llx", > - ~(BTRFS_BLOCK_GROUP_TYPE_MASK | > - BTRFS_BLOCK_GROUP_PROFILE_MASK) & type); > + type & ~BTRFS_BLOCK_GROUP_VALID); > return -EUCLEAN; > } > > diff --git a/fs/btrfs/tree-checker.h b/fs/btrfs/tree-checker.h > index eb201f4ec3c7..833e2fd989eb 100644 > --- a/fs/btrfs/tree-checker.h > +++ b/fs/btrfs/tree-checker.h > @@ -57,6 +57,11 @@ enum btrfs_tree_block_status { > BTRFS_TREE_BLOCK_WRITTEN_NOT_SET, > }; > > + > +#define BTRFS_BLOCK_GROUP_VALID (BTRFS_BLOCK_GROUP_TYPE_MASK | \ > + BTRFS_BLOCK_GROUP_PROFILE_MASK | \ > + BTRFS_BLOCK_GROUP_REMAPPED) So far it looks like the remapped flag is a new bg type. Can we just put it into BLOCK_GROUP_TYPE_MASK? Otherwise looks good to me. Thanks, Qu > + > /* > * Exported simply for btrfs-progs which wants to have the > * btrfs_tree_block_status return codes. > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index fa7a929a0461..e067e9cd68a5 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -231,6 +231,7 @@ void btrfs_describe_block_groups(u64 bg_flags, char *buf, u32 size_buf) > DESCRIBE_FLAG(BTRFS_BLOCK_GROUP_DATA, "data"); > DESCRIBE_FLAG(BTRFS_BLOCK_GROUP_SYSTEM, "system"); > DESCRIBE_FLAG(BTRFS_BLOCK_GROUP_METADATA, "metadata"); > + DESCRIBE_FLAG(BTRFS_BLOCK_GROUP_REMAPPED, "remapped"); > > DESCRIBE_FLAG(BTRFS_AVAIL_ALLOC_BIT_SINGLE, "single"); > for (i = 0; i < BTRFS_NR_RAID_TYPES; i++) > diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h > index 8e710bbb688e..fba303ed49e6 100644 > --- a/include/uapi/linux/btrfs.h > +++ b/include/uapi/linux/btrfs.h > @@ -336,6 +336,7 @@ struct btrfs_ioctl_fs_info_args { > #define BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 (1ULL << 13) > #define BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE (1ULL << 14) > #define BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA (1ULL << 16) > +#define BTRFS_FEATURE_INCOMPAT_REMAP_TREE (1ULL << 17) > > struct btrfs_ioctl_feature_flags { > __u64 compat_flags; > diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h > index fc29d273845d..4439d77a7252 100644 > --- a/include/uapi/linux/btrfs_tree.h > +++ b/include/uapi/linux/btrfs_tree.h > @@ -76,6 +76,9 @@ > /* Tracks RAID stripes in block groups. */ > #define BTRFS_RAID_STRIPE_TREE_OBJECTID 12ULL > > +/* Holds details of remapped addresses after relocation. */ > +#define BTRFS_REMAP_TREE_OBJECTID 13ULL > + > /* device stats in the device tree */ > #define BTRFS_DEV_STATS_OBJECTID 0ULL > > @@ -282,6 +285,10 @@ > > #define BTRFS_RAID_STRIPE_KEY 230 > > +#define BTRFS_IDENTITY_REMAP_KEY 234 > +#define BTRFS_REMAP_KEY 235 > +#define BTRFS_REMAP_BACKREF_KEY 236 > + > /* > * Records the overall state of the qgroups. > * There's only one instance of this key present, > @@ -1161,6 +1168,7 @@ struct btrfs_dev_replace_item { > #define BTRFS_BLOCK_GROUP_RAID6 (1ULL << 8) > #define BTRFS_BLOCK_GROUP_RAID1C3 (1ULL << 9) > #define BTRFS_BLOCK_GROUP_RAID1C4 (1ULL << 10) > +#define BTRFS_BLOCK_GROUP_REMAPPED (1ULL << 11) > #define BTRFS_BLOCK_GROUP_RESERVED (BTRFS_AVAIL_ALLOC_BIT_SINGLE | \ > BTRFS_SPACE_INFO_GLOBAL_RSV) > > @@ -1323,4 +1331,8 @@ struct btrfs_verity_descriptor_item { > __u8 encryption; > } __attribute__ ((__packed__)); > > +struct btrfs_remap { > + __le64 address; > +} __attribute__ ((__packed__)); > + > #endif /* _BTRFS_CTREE_H_ */