For extent encryption we have to use a logical block nr as input for the
IV. For btrfs we're using the offset into the extent we're operating
on. For most ordered extents this is the same as the file_offset,
however for prealloc and NOCOW we have to use the original offset.
Add this as an argument and plumb it through everywhere, this will be
used when setting up the bio.
Signed-off-by: Josef Bacik <jo...@toxicpanda.com>
---
fs/btrfs/inode.c | 15 ++++++++++-----
fs/btrfs/ordered-data.c | 22 ++++++++++++----------
fs/btrfs/ordered-data.h | 12 +++++++++---
3 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b0109b313217..1b844a27a0d1 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1165,6 +1165,7 @@ static void submit_one_async_extent(struct async_chunk
*async_chunk,
ordered = btrfs_alloc_ordered_extent(inode, em->fscrypt_info,
start, /* file_offset
*/
+ start, /* orig_start */
async_extent->ram_size, /* num_bytes */
async_extent->ram_size, /* ram_bytes */
ins.objectid, /* disk_bytenr
*/
@@ -1428,8 +1429,8 @@ static noinline int cow_file_range(struct btrfs_inode
*inode,
}
ordered = btrfs_alloc_ordered_extent(inode, em->fscrypt_info,
- start, ram_size, ram_size, ins.objectid,
- cur_alloc_size, 0,
+ start, start, ram_size, ram_size,
+ ins.objectid, cur_alloc_size, 0,
1 << BTRFS_ORDERED_REGULAR,
BTRFS_COMPRESS_NONE);
free_extent_map(em);
@@ -2178,7 +2179,9 @@ static noinline int run_delalloc_nocow(struct btrfs_inode
*inode,
}
ordered = btrfs_alloc_ordered_extent(inode, fscrypt_info,
- cur_offset, nocow_args.num_bytes,
+ cur_offset,
+ found_key.offset - nocow_args.extent_offset,
+ nocow_args.num_bytes,
nocow_args.num_bytes, nocow_args.disk_bytenr,
nocow_args.num_bytes, 0,
is_prealloc
@@ -7087,8 +7090,9 @@ static struct extent_map *btrfs_create_dio_extent(struct
btrfs_inode *inode,
fscrypt_info = orig_em->fscrypt_info;
}
- ordered = btrfs_alloc_ordered_extent(inode, fscrypt_info, start, len,
- len, block_start, block_len, 0,
+ ordered = btrfs_alloc_ordered_extent(inode, fscrypt_info, start,
+ orig_start, len, len, block_start,
+ block_len, 0,
(1 << type) |
(1 << BTRFS_ORDERED_DIRECT),
BTRFS_COMPRESS_NONE);
@@ -10612,6 +10616,7 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb,
struct iov_iter *from,
}
ordered = btrfs_alloc_ordered_extent(inode, em->fscrypt_info, start,
+ start - encoded->unencoded_offset,
num_bytes, ram_bytes, ins.objectid,
ins.offset, encoded->unencoded_offset,
(1 << BTRFS_ORDERED_ENCODED) |
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index ee3138a6d11e..75eb42b5c95b 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -148,9 +148,9 @@ static inline struct rb_node *ordered_tree_search(struct
btrfs_inode *inode,
static struct btrfs_ordered_extent *alloc_ordered_extent(
struct btrfs_inode *inode,
struct fscrypt_extent_info *fscrypt_info,
- u64 file_offset, u64 num_bytes, u64 ram_bytes,
- u64 disk_bytenr, u64 disk_num_bytes, u64 offset,
- unsigned long flags, int compress_type)
+ u64 file_offset, u64 orig_offset, u64 num_bytes,
+ u64 ram_bytes, u64 disk_bytenr, u64 disk_num_bytes,
+ u64 offset, unsigned long flags, int compress_type)
{
struct btrfs_ordered_extent *entry;
int ret;
@@ -175,6 +175,7 @@ static struct btrfs_ordered_extent *alloc_ordered_extent(
return ERR_PTR(-ENOMEM);
entry->file_offset = file_offset;
+ entry->orig_offset = orig_offset;
entry->num_bytes = num_bytes;
entry->ram_bytes = ram_bytes;
entry->disk_bytenr = disk_bytenr;
@@ -253,6 +254,7 @@ static void insert_ordered_extent(struct
btrfs_ordered_extent *entry)
* @inode: Inode that this extent is for.
* @fscrypt_info: The fscrypt_extent_info for this extent, if necessary.
* @file_offset: Logical offset in file where the extent starts.
+ * @orig_offset: Logical offset of the original extent (PREALLOC or NOCOW)
* @num_bytes: Logical length of extent in file.
* @ram_bytes: Full length of unencoded data.
* @disk_bytenr: Offset of extent on disk.
@@ -270,17 +272,17 @@ static void insert_ordered_extent(struct
btrfs_ordered_extent *entry)
struct btrfs_ordered_extent *btrfs_alloc_ordered_extent(
struct btrfs_inode *inode,
struct fscrypt_extent_info *fscrypt_info,
- u64 file_offset, u64 num_bytes, u64 ram_bytes,
- u64 disk_bytenr, u64 disk_num_bytes, u64 offset,
- unsigned long flags, int compress_type)
+ u64 file_offset, u64 orig_offset, u64 num_bytes,
+ u64 ram_bytes, u64 disk_bytenr, u64 disk_num_bytes,
+ u64 offset, unsigned long flags, int compress_type)
{
struct btrfs_ordered_extent *entry;
ASSERT((flags & ~BTRFS_ORDERED_TYPE_FLAGS) == 0);
entry = alloc_ordered_extent(inode, fscrypt_info, file_offset,
- num_bytes, ram_bytes, disk_bytenr,
- disk_num_bytes, offset, flags,
+ orig_offset, num_bytes, ram_bytes,
+ disk_bytenr, disk_num_bytes, offset, flags,
compress_type);
if (!IS_ERR(entry))
insert_ordered_extent(entry);
@@ -1174,8 +1176,8 @@ struct btrfs_ordered_extent *btrfs_split_ordered_extent(
return ERR_PTR(-EINVAL);
new = alloc_ordered_extent(inode, ordered->fscrypt_info, file_offset,
- len, len, disk_bytenr, len, 0, flags,
- ordered->compress_type);
+ ordered->orig_offset, len, len, disk_bytenr,
+ len, 0, flags, ordered->compress_type);
if (IS_ERR(new))
return new;
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 767efcd74bee..af8b51c255ee 100644
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -83,6 +83,12 @@ struct btrfs_ordered_extent {
/* logical offset in the file */
u64 file_offset;
+ /*
+ * The original logical offset of the extent, this is for NOCOW and
+ * PREALLOC extents, otherwise it'll be the same as file_offset.
+ */
+ u64 orig_offset;
+
/*
* These fields directly correspond to the same fields in
* btrfs_file_extent_item.
@@ -172,9 +178,9 @@ bool btrfs_dec_test_ordered_pending(struct btrfs_inode
*inode,
struct btrfs_ordered_extent *btrfs_alloc_ordered_extent(
struct btrfs_inode *inode,
struct fscrypt_extent_info *fscrypt_info,
- u64 file_offset, u64 num_bytes, u64 ram_bytes,
- u64 disk_bytenr, u64 disk_num_bytes, u64 offset,
- unsigned long flags, int compress_type);
+ u64 file_offset, u64 orig_offset, u64 num_bytes,
+ u64 ram_bytes, u64 disk_bytenr, u64 disk_num_bytes,
+ u64 offset, unsigned long flags, int compress_type);
void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,
struct btrfs_ordered_sum *sum);
struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode
*inode,
--
2.41.0
