From patchwork Wed Jan 24 17:18:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13529476 Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) (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 95D8B86AFD for ; Wed, 24 Jan 2024 17:19:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706116793; cv=none; b=qtVrB33T9OcJ9g4Njz/9OB9+1jFGxrGhaGXlcybl4QniXnuzwEi+jI74qtMJim7vj4McXcNu/oWtXWtedNBOUfSFsWUIKEGuKc30x9AJoI4OyRqARYHdSUeAiU0EiY/xHPR1DvX9m+oarDUVyPxO5lHd0NQGfX08Y+E1AM+Q/WU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706116793; c=relaxed/simple; bh=O48UEJErUB8bzqwTavFiM0JWcH59AFGhNcNbVzuUGnY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=atYv2xMSv2IxcgzY0AhAjdGowdyAQTQDCKDjBM99JtzVL32N7x+yzNa5fZzw+NA+piBAakiCG4qKWhTPbDaMp4g6NsRDxMDdszpWCrER8OdBB6XG8qalJIl9ob/Tcy+HrvFl7iunfYhHLNkHP2Y0xLNKoHqJTb1/nrjW77pHC00= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com; spf=none smtp.mailfrom=toxicpanda.com; dkim=pass (2048-bit key) header.d=toxicpanda-com.20230601.gappssmtp.com header.i=@toxicpanda-com.20230601.gappssmtp.com header.b=z0hT4iHL; arc=none smtp.client-ip=209.85.219.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda-com.20230601.gappssmtp.com header.i=@toxicpanda-com.20230601.gappssmtp.com header.b="z0hT4iHL" Received: by mail-yb1-f180.google.com with SMTP id 3f1490d57ef6-dc239f84ba4so4803089276.3 for ; Wed, 24 Jan 2024 09:19:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1706116790; x=1706721590; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1hiuLdL1spfs5ZgNwlx+7nWRX6d/XFRFdqqlEe/nroE=; b=z0hT4iHLIxX7cT8luKVDvzI+pYaJ5Hj06i2FdXjrBeyWxO4sqvmR6f8Be9/LzGz/+p JDvH3itvjtx7it7opPEHK2zSs6AjRSG/wdlheyw2oKYt27W1XFooxxueVESzfSXH15OZ Tpwx3iVUTAF/Wh95pxJABwbcXwH78r0+MN6rl5StPzhmHiiApzCo6BJ83uvIzQNOX6eM BJUXGVuT1d7sirTeeHHH7bHIMMZm3Vdb9UYDZutM84HhYJUxdxP98bbszTquzGqla2c0 wlwMo/t2pbdfLxRIzMW3hm/n2bEtYY+3C2gKHg6He0gzXAqJErexjK7N5anOydnyH4y2 CSYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706116790; x=1706721590; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1hiuLdL1spfs5ZgNwlx+7nWRX6d/XFRFdqqlEe/nroE=; b=PoEzq+71xhSi9+/j2O22tXavG1sntauz5Hovh+k8oXn4IviaEKNp91K1vXsETYYtir InDBY95PzcEpDjx6c0op27uEoDrrRZ2HYquhgGnpOHLBO43eiXmwl3APd1mVsprCeymz pWhbE/IXGN13qS+3gOwMkl6AbCwaBsTk/Fy5n5ZyxYmKa8OIKNqIm/nJzr3B+Z76k9GB NT3V+QW2h/1vVbDWKRt6+70ltLXluYIUF6LbrsRNxR+otUoqomDIxcB3RhnS4C+S/6Pz giGJzyqK3/1N+JnB+E8JKsW09mjnZFCIK85y3onDPa/fSqVvTH8o8QlBoN0SrssEXQJx IWPw== X-Gm-Message-State: AOJu0YyOpf5Ui940Hicgp1TKrkSS4NcV/cOELnpJpx0C2cfPhyr0L3J9 Y+ZBhJ96lqgrpmgNOhS7wldkOZFKxQ95MsHFceuCMsJIOK4gCtUlG5Ijt8IAT7zonBpmBVoDr3/ M X-Google-Smtp-Source: AGHT+IH0OSV+urp1/SUDU7rLT11FRzRn8Qeor50OQYdhUe7ox2H7Si1js9tk87BzB6JGDf/FAX54bg== X-Received: by 2002:a5b:dce:0:b0:dbe:3c67:f018 with SMTP id t14-20020a5b0dce000000b00dbe3c67f018mr942868ybr.63.1706116790341; Wed, 24 Jan 2024 09:19:50 -0800 (PST) Received: from localhost (076-182-020-124.res.spectrum.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id j3-20020a25ec03000000b00dc25d5f4c75sm2852251ybh.10.2024.01.24.09.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 09:19:50 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Cc: Sweet Tea Dorminy Subject: [PATCH v5 29/52] btrfs: explicitly track file extent length for replace and drop Date: Wed, 24 Jan 2024 12:18:51 -0500 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Sweet Tea Dorminy With the advent of storing fscrypt contexts with each encrypted extent, extents will have a variable length depending on encryption status. Make sure the replace and drop file extent item helpers encode this information so that everything gets updated properly. Signed-off-by: Sweet Tea Dorminy Signed-off-by: Josef Bacik --- fs/btrfs/ctree.h | 2 ++ fs/btrfs/file.c | 4 ++-- fs/btrfs/inode.c | 7 +++++-- fs/btrfs/reflink.c | 1 + fs/btrfs/tree-log.c | 5 +++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 70e828d33177..34ecf5966a5a 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -367,6 +367,8 @@ struct btrfs_replace_extent_info { u64 file_offset; /* Pointer to a file extent item of type regular or prealloc. */ char *extent_buf; + /* The length of @extent_buf */ + u32 extent_buf_size; /* * Set to true when attempting to replace a file range with a new extent * described by this structure, set to false when attempting to clone an diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 252b6fae29f8..2471b37ad57e 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2264,14 +2264,14 @@ static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans, key.type = BTRFS_EXTENT_DATA_KEY; key.offset = extent_info->file_offset; ret = btrfs_insert_empty_item(trans, root, path, &key, - sizeof(struct btrfs_file_extent_item)); + extent_info->extent_buf_size); if (ret) return ret; leaf = path->nodes[0]; slot = path->slots[0]; write_extent_buffer(leaf, extent_info->extent_buf, btrfs_item_ptr_offset(leaf, slot), - sizeof(struct btrfs_file_extent_item)); + extent_info->extent_buf_size); extent = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); ASSERT(btrfs_file_extent_type(leaf, extent) != BTRFS_FILE_EXTENT_INLINE); btrfs_set_file_extent_offset(leaf, extent, extent_info->data_offset); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index cabcf03fe01f..cf22be63dcc6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -2913,6 +2913,7 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans, u64 num_bytes = btrfs_stack_file_extent_num_bytes(stack_fi); u64 ram_bytes = btrfs_stack_file_extent_ram_bytes(stack_fi); struct btrfs_drop_extents_args drop_args = { 0 }; + size_t fscrypt_context_size = 0; int ret; path = btrfs_alloc_path(); @@ -2932,7 +2933,7 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans, drop_args.start = file_pos; drop_args.end = file_pos + num_bytes; drop_args.replace_extent = true; - drop_args.extent_item_size = sizeof(*stack_fi); + drop_args.extent_item_size = sizeof(*stack_fi) + fscrypt_context_size; ret = btrfs_drop_extents(trans, root, inode, &drop_args); if (ret) goto out; @@ -2943,7 +2944,7 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans, ins.type = BTRFS_EXTENT_DATA_KEY; ret = btrfs_insert_empty_item(trans, root, path, &ins, - sizeof(*stack_fi)); + sizeof(*stack_fi) + fscrypt_context_size); if (ret) goto out; } @@ -9735,6 +9736,7 @@ static struct btrfs_trans_handle *insert_prealloc_file_extent( u64 len = ins->offset; u64 qgroup_released = 0; int ret; + size_t fscrypt_context_size = 0; memset(&stack_fi, 0, sizeof(stack_fi)); @@ -9767,6 +9769,7 @@ static struct btrfs_trans_handle *insert_prealloc_file_extent( extent_info.data_len = len; extent_info.file_offset = file_offset; extent_info.extent_buf = (char *)&stack_fi; + extent_info.extent_buf_size = sizeof(stack_fi) + fscrypt_context_size; extent_info.is_new_extent = true; extent_info.update_times = true; extent_info.qgroup_reserved = qgroup_released; diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c index c61e54983faf..8995bb8832e4 100644 --- a/fs/btrfs/reflink.c +++ b/fs/btrfs/reflink.c @@ -500,6 +500,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode, clone_info.data_len = datal; clone_info.file_offset = new_key.offset; clone_info.extent_buf = buf; + clone_info.extent_buf_size = size; clone_info.is_new_extent = false; clone_info.update_times = !no_time_update; ret = btrfs_replace_file_extents(BTRFS_I(inode), path, diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 51059e5a282c..43c3b972a4b1 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -4627,6 +4627,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans, u64 extent_offset = em->start - em->orig_start; u64 block_len; int ret; + size_t fscrypt_context_size = 0; u8 encryption = BTRFS_ENCRYPTION_NONE; btrfs_set_stack_file_extent_generation(&fi, trans->transid); @@ -4670,7 +4671,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans, drop_args.start = em->start; drop_args.end = em->start + em->len; drop_args.replace_extent = true; - drop_args.extent_item_size = sizeof(fi); + drop_args.extent_item_size = sizeof(fi) + fscrypt_context_size; ret = btrfs_drop_extents(trans, log, inode, &drop_args); if (ret) return ret; @@ -4682,7 +4683,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans, key.offset = em->start; ret = btrfs_insert_empty_item(trans, log, path, &key, - sizeof(fi)); + sizeof(fi) + fscrypt_context_size); if (ret) return ret; }