progs: add new FEATURE_INCOMPAT_ENCRYPT flag
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/8 progs: add new FEATURE_INCOMPAT_ENCRYPT flag
Matches kernel change by the same name.
--- kernel-shared/ctree.h | 3 ++- kernel-shared/uapi/btrfs.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
kernel-shared/ctree.h +2 -1
@@ -103,7 +103,8 @@ static inline u32 __BTRFS_LEAF_DATA_SIZE(u32 nodesize) BTRFS_FEATURE_INCOMPAT_RAID1C34 | \ BTRFS_FEATURE_INCOMPAT_METADATA_UUID | \ BTRFS_FEATURE_INCOMPAT_ZONED | \ - BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2) + BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 | \ + BTRFS_FEATURE_INCOMPAT_ENCRYPT)#else #define BTRFS_FEATURE_INCOMPAT_SUPP \ (BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF | \
kernel-shared/uapi/btrfs.h +1 -0
@@ -356,6 +356,7 @@ _static_assert(sizeof(struct btrfs_ioctl_fs_info_args) == 1024);#define BTRFS_FEATURE_INCOMPAT_RAID1C34 (1ULL << 11)#define BTRFS_FEATURE_INCOMPAT_ZONED (1ULL << 12)#define BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 (1ULL << 13) +#define BTRFS_FEATURE_INCOMPAT_ENCRYPT (1ULL << 14)struct btrfs_ioctl_feature_flags {__u64 compat_flags;
Signature · 1 line
2.40.1
Apparently I sent half the change twice under slightly different titles; the ones that start with 'progs' aren't supposed to exist, sorry about that :/
PATCH 2/8 progs: start tracking extent encryption context info
In reply to a message not in the archiveThis recapitulates the kernel change named 'btrfs: start tracking extent encryption context info".
--- kernel-shared/accessors.h | 31 ++++++++++++++++++++++++++++++ kernel-shared/fscrypt.h | 30 +++++++++++++++++++++++++++++ kernel-shared/tree-checker.c | 37 ++++++++++++++++++++++++++++-------- 3 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 kernel-shared/fscrypt.h
kernel-shared/accessors.h +31 -0
@@ -3,6 +3,8 @@#ifndef BTRFS_ACCESSORS_H #define BTRFS_ACCESSORS_H +#include "fscrypt.h" +#include "kerncompat.h" #ifndef _static_assert
@@ -949,6 +951,16 @@ BTRFS_SETGET_STACK_FUNCS(stack_file_extent_disk_num_bytes, struct btrfs_file_extent_item, disk_num_bytes, 64);BTRFS_SETGET_STACK_FUNCS (stack_file_extent_compression , struct btrfs_file_extent_item, compression, 8); +BTRFS_SETGET_STACK_FUNCS (stack_file_extent_encryption, + struct btrfs_file_extent_item, encryption, 8); +static inline u8 btrfs_stack_file_extent_encryption_ctxsize ( +struct btrfs_file_extent_item *e) +{ +u8 ctxsize; + +btrfs_unpack_encryption (e->encryption,NULL , &ctxsize); +return ctxsize; +} BTRFS_SETGET_FUNCS(file_extent_type, struct btrfs_file_extent_item, type, 8); BTRFS_SETGET_FUNCS(file_extent_disk_bytenr, struct btrfs_file_extent_item,
@@ -970,6 +982,25 @@ BTRFS_SETGET_FUNCS(file_extent_encryption, struct btrfs_file_extent_item, BTRFS_SETGET_FUNCS(file_extent_other_encoding, struct btrfs_file_extent_item, other_encoding,16 ); +static inline u8 +btrfs_file_extent_encryption_ctxsize (const struct extent_buffer *eb, +struct btrfs_file_extent_item *e) +{ +u8 ctxsize; + +btrfs_unpack_encryption (btrfs_file_extent_encryption (eb, e), +NULL , &ctxsize); +return ctxsize; +} + +static inline u8 +btrfs_file_extent_ctxsize_from_item (const struct extent_buffer *leaf, +int nr) +{ +return (btrfs_item_size (leaf, nr) - +sizeof (struct btrfs_file_extent_item )); +} +/* btrfs_qgroup_status_item */ BTRFS_SETGET_FUNCS(qgroup_status_generation, struct btrfs_qgroup_status_item, generation,64 );
kernel-shared/fscrypt.h new file +30 -0
@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef BTRFS_FSCRYPT_H +#define BTRFS_FSCRYPT_H + +#define BTRFS_ENCRYPTION_POLICY_BITS 2 +#define BTRFS_ENCRYPTION_CTXSIZE_BITS 6 + +#define BTRFS_ENCRYPTION_POLICY_MASK ((1 << BTRFS_ENCRYPTION_POLICY_BITS) - 1) +#define BTRFS_ENCRYPTION_CTXSIZE_MASK \ + (((1 << BTRFS_ENCRYPTION_CTXSIZE_BITS) - 1) << \ + BTRFS_ENCRYPTION_POLICY_BITS) + +static inline void btrfs_unpack_encryption (u8 encryption, +u8 *policy, +u8 *ctxsize) +{ +if (policy) + *policy = encryption &BTRFS_ENCRYPTION_POLICY_MASK ; +if (ctxsize) + *ctxsize = ((encryption &BTRFS_ENCRYPTION_CTXSIZE_MASK ) >> +BTRFS_ENCRYPTION_POLICY_BITS ); +} + +static inline u8 btrfs_pack_encryption (u8 policy,u8 ctxsize) +{ +return policy | (ctxsize <<BTRFS_ENCRYPTION_POLICY_BITS ); +} + +#endif
kernel-shared/tree-checker.c +29 -8
@@ -229,6 +229,7 @@ static int check_extent_data_item(struct extent_buffer *leaf,u32 sectorsize = fs_info->sectorsize;u32 item_size =btrfs_item_size (leaf, slot);u64 extent_end; +u8 policy;if (unlikely (!IS_ALIGNED (key->offset, sectorsize))) { file_extent_err(leaf, slot,
@@ -280,10 +281,12 @@ static int check_extent_data_item(struct extent_buffer *leaf, BTRFS_NR_COMPRESS_TYPES - 1);return -EUCLEAN ; } -if (unlikely (btrfs_file_extent_encryption (leaf, fi))) { +btrfs_unpack_encryption (btrfs_file_extent_encryption (leaf, fi), + &policy,NULL ); +if (unlikely (policy >=BTRFS_NR_ENCRYPTION_TYPES )) {file_extent_err (leaf, slot, -"invalid encryption for file extent, have %u expect 0" , -btrfs_file_extent_encryption (leaf, fi)); +"invalid encryption for file extent, have %u expect range [0, %u]" , + policy,BTRFS_NR_ENCRYPTION_TYPES -1 );return -EUCLEAN ; }if (btrfs_file_extent_type (leaf, fi) ==BTRFS_FILE_EXTENT_INLINE ) {
@@ -312,12 +315,30 @@ static int check_extent_data_item(struct extent_buffer *leaf,return 0 ; } -/* Regular or preallocated extent has fixed item size */ -if (unlikely (item_size !=sizeof (*fi))) { -file_extent_err (leaf, slot, +if (policy ==BTRFS_ENCRYPTION_FSCRYPT ) { +u8 ctxsize =btrfs_file_extent_encryption_ctxsize (leaf, fi); + +if (unlikely (item_size !=sizeof (*fi) + ctxsize)) { +file_extent_err (leaf, slot, +"invalid item size for encrypted file extent, have %u expect = %zu + context of size %u" , + item_size,sizeof (*fi), ctxsize); +return -EUCLEAN ; + } +/* Only regular extents should be encrypted. */ +if (btrfs_file_extent_type (leaf, fi) !=BTRFS_FILE_EXTENT_REG ) { +file_extent_err (leaf, slot, +"invalid type for encrypted file extent, have %u expect %u" , +btrfs_file_extent_type (leaf, fi), +BTRFS_FILE_EXTENT_REG ); +return -EUCLEAN ; + } + }else { +if (unlikely (item_size !=sizeof (*fi))) { +file_extent_err (leaf, slot,"invalid item size for reg/prealloc file extent, have %u expect %zu" , - item_size,sizeof (*fi)); -return -EUCLEAN ; + item_size,sizeof (*fi)); +return -EUCLEAN ; + } } if (unlikely(CHECK_FE_ALIGNED(leaf, slot, fi, ram_bytes, sectorsize) || CHECK_FE_ALIGNED(leaf, slot, fi, disk_bytenr, sectorsize) ||
Signature · 1 line
2.40.1
PATCH 3/8 progs: add inode encryption contexts
In reply to a message not in the archiveFrom: Omar Sandoval <[email protected]>
Recapitulates relevant parts of kernel change 'btrfs: add inode encryption contexts'.
--- kernel-shared/uapi/btrfs_tree.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
kernel-shared/uapi/btrfs_tree.h +10 -0
@@ -162,6 +162,8 @@#define BTRFS_VERITY_DESC_ITEM_KEY 36#define BTRFS_VERITY_MERKLE_ITEM_KEY 37 +#define BTRFS_FSCRYPT_CTXT_ITEM_KEY 41 +#define BTRFS_ORPHAN_ITEM_KEY 48/* reserve 2-15 close to the inode for later flexibility */
@@ -400,6 +402,7 @@ static inline __u8 btrfs_dir_flags_to_ftype(__u8 flags)#define BTRFS_INODE_NOATIME (1U << 9)#define BTRFS_INODE_DIRSYNC (1U << 10)#define BTRFS_INODE_COMPRESS (1U << 11) +#define BTRFS_INODE_ENCRYPT (1U << 12)#define BTRFS_INODE_ROOT_ITEM_INIT (1U << 31)
@@ -416,6 +419,7 @@ static inline __u8 btrfs_dir_flags_to_ftype(__u8 flags)BTRFS_INODE_NOATIME | \BTRFS_INODE_DIRSYNC | \BTRFS_INODE_COMPRESS | \ +BTRFS_INODE_ENCRYPT | \ BTRFS_INODE_ROOT_ITEM_INIT) #define BTRFS_INODE_RO_VERITY (1U << 0)
@@ -1016,6 +1020,12 @@ enum { BTRFS_NR_FILE_EXTENT_TYPES = 3, }; +enum { +BTRFS_ENCRYPTION_NONE , +BTRFS_ENCRYPTION_FSCRYPT , +BTRFS_NR_ENCRYPTION_TYPES , +}; +struct btrfs_file_extent_item {/* * transaction id that created this extent
Signature · 1 line
2.40.1
PATCH 4/8 progs: save and load fscrypt extent contexts
In reply to a message not in the archiveMirrors the relevant part of kernel change 'btrfs: save and load fscrypt extent contexts' to progs.
--- kernel-shared/uapi/btrfs_tree.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel-shared/uapi/btrfs_tree.h +5 -1
@@ -1075,7 +1075,11 @@ struct btrfs_file_extent_item {* always reflects the size uncompressed and without encoding. */ __le64 num_bytes; - +/* +* fscrypt extent encryption context. Only present if extent is +* encrypted (stored in the encryption field). +*/ +__u8 fscrypt_context[0 ]; } __attribute__ ((__packed__));struct btrfs_csum_item {
Signature · 1 line
2.40.1