From patchwork Fri Dec 1 22:11:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13476514 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="mPl+enRh" Received: from mail-yw1-x1129.google.com (mail-yw1-x1129.google.com [IPv6:2607:f8b0:4864:20::1129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1304410DB for ; Fri, 1 Dec 2023 14:12:28 -0800 (PST) Received: by mail-yw1-x1129.google.com with SMTP id 00721157ae682-5cd81e76164so29418627b3.1 for ; Fri, 01 Dec 2023 14:12:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1701468747; x=1702073547; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9mgqq6E721isnoR2dH2C/hG8cphDsR22LsNDoTUSxfc=; b=mPl+enRhConyUzPaV8kPHSruBzynmVEIJuUeKWTGvTROkAmgKOIjhQiLw6An8DkP/8 Mw4hH6PzDEQ0+cKOGkA2GGk/l0cNxqoPVjXPcl/2dUt6/aDWbgc+FSJSvy1T0nrbw5JY iLdVj4RgGiMgoBkGbIq7P7q09cSrw+VKPqrrzX9xZVTLbwDg66JRWtVbT9zsiKoJHYOm 0cERtPNYojpjnew83rkBdT3X+iAvPtdwa7KhXSfHq449/JrpnUwRoCYpHego7K5dgv9T HqyutrYi7/27B612SjPF0vqC615s3BX3PtSWZqzT5XIroRF1WJOyr6If2z/eorR/gSb4 dpmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701468747; x=1702073547; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9mgqq6E721isnoR2dH2C/hG8cphDsR22LsNDoTUSxfc=; b=eh3SCdbVZKLt88/4p4ivFGVwcWbiMw0GlmwBew//FKL/3La2xleskrtgs77TvvG7oG dcImNjWlX1AvX3cNb1ZiYinuk4QVQLgMg6MbsHfeuzxRlwHaXykuZ2UqPHCHAYIQklC6 qyHWj2UkcQDppKOiXh4lrsctXmBMqaizCWMiLUItQR9m6BGiXl/83sqRATNd+zIM0ROg lZ1kLDA50RSwKZRZ3jwC+OUeVIXLcUsEnlWbwBXWzJ7xtTEiJVj2exccVVWdPle/eVn6 KgiIEODiVFE7EwlmYnxmOJ9W6kosocgTSjnpczzqVhJZAsznu8I+qCzgaD9Hu9fvcqbI LErA== X-Gm-Message-State: AOJu0Yx7Ke/qhnuhrIGHLC+ZJojXZPrtVbGRf6Jksa/XKE/Xl8i1PP4c 73CwR/2qpdjK1mclBI+GEEPORpq5X3bRg782yYISKQ== X-Google-Smtp-Source: AGHT+IHt7hvUvh7DsYdtQPnlAuZ8fHvTnnhmbNy558zezYxZ3eRdR17HSWBvqeyrMYhURbY+W1G15g== X-Received: by 2002:a0d:eaca:0:b0:5d7:1940:dd7f with SMTP id t193-20020a0deaca000000b005d71940dd7fmr176879ywe.85.1701468747192; Fri, 01 Dec 2023 14:12:27 -0800 (PST) Received: from localhost (076-182-020-124.res.spectrum.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id i2-20020a816d02000000b005d721755ca8sm64192ywc.29.2023.12.01.14.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 14:12:26 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com, linux-fsdevel@vger.kernel.org Subject: [PATCH v4 26/46] btrfs: keep track of fscrypt info and orig_start for dio reads Date: Fri, 1 Dec 2023 17:11:23 -0500 Message-ID: <5e74c0395e4f58082b9446fb0105c0cb99e8338d.1701468306.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.41.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 We keep track of this information in the ordered extent for writes, but we need it for reads as well. Add fscrypt_extent_info and orig_start to the dio_data so we can populate this on reads. This will be used later when we attach the fscrypt context to the bios. Signed-off-by: Josef Bacik --- fs/btrfs/inode.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 9c704b1cfe05..dbdc01f25215 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -83,6 +83,8 @@ struct btrfs_dio_data { ssize_t submitted; struct extent_changeset *data_reserved; struct btrfs_ordered_extent *ordered; + struct fscrypt_extent_info *fscrypt_info; + u64 orig_start; bool data_space_reserved; bool nocow_done; }; @@ -7767,6 +7769,10 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start, release_len); } } else { + dio_data->fscrypt_info = + fscrypt_get_extent_info(em->fscrypt_info); + dio_data->orig_start = em->orig_start; + /* * We need to unlock only the end area that we aren't using. * The rest is going to be unlocked by the endio routine. @@ -7848,6 +7854,11 @@ static int btrfs_dio_iomap_end(struct inode *inode, loff_t pos, loff_t length, dio_data->ordered = NULL; } + if (dio_data->fscrypt_info) { + fscrypt_put_extent_info(dio_data->fscrypt_info); + dio_data->fscrypt_info = NULL; + } + if (write) extent_changeset_free(dio_data->data_reserved); return ret;