linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Omar Sandoval <osandov@osandov.com>
To: linux-btrfs@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH v3 5/5] btrfs: send: enable support for stream v2 and compressed writes
Date: Fri, 22 Jan 2021 12:47:52 -0800	[thread overview]
Message-ID: <d8e787b3ee721d404ac56ed2af65a6bbe06b14c4.1611347187.git.osandov@fb.com> (raw)
In-Reply-To: <cover.1611347187.git.osandov@fb.com>

From: Omar Sandoval <osandov@fb.com>

Now that the new support is implemented, allow the ioctl to accept the
flags and update the version in sysfs.

Signed-off-by: Omar Sandoval <osandov@fb.com>
---
 fs/btrfs/send.c            | 10 +++++++++-
 fs/btrfs/send.h            |  2 +-
 include/uapi/linux/btrfs.h |  4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 7516eba701af..cb824d1271fa 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -671,7 +671,10 @@ static int send_header(struct send_ctx *sctx)
 	struct btrfs_stream_header hdr;
 
 	strcpy(hdr.magic, BTRFS_SEND_STREAM_MAGIC);
-	hdr.version = cpu_to_le32(BTRFS_SEND_STREAM_VERSION);
+	if (sctx->flags & BTRFS_SEND_FLAG_STREAM_V2)
+		hdr.version = cpu_to_le32(2);
+	else
+		hdr.version = cpu_to_le32(1);
 
 	return write_buf(sctx->send_filp, &hdr, sizeof(hdr),
 					&sctx->send_off);
@@ -7446,6 +7449,11 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
 		ret = -EINVAL;
 		goto out;
 	}
+	if ((arg->flags & BTRFS_SEND_FLAG_COMPRESSED) &&
+	    !(arg->flags & BTRFS_SEND_FLAG_STREAM_V2)) {
+		ret = -EINVAL;
+		goto out;
+	}
 
 	sctx = kzalloc(sizeof(struct send_ctx), GFP_KERNEL);
 	if (!sctx) {
diff --git a/fs/btrfs/send.h b/fs/btrfs/send.h
index 9f4f7b96b1eb..9c83e14a43b2 100644
--- a/fs/btrfs/send.h
+++ b/fs/btrfs/send.h
@@ -10,7 +10,7 @@
 #include "ctree.h"
 
 #define BTRFS_SEND_STREAM_MAGIC "btrfs-stream"
-#define BTRFS_SEND_STREAM_VERSION 1
+#define BTRFS_SEND_STREAM_VERSION 2
 
 /*
  * In send stream v1, no command is larger than 64k. In send stream v2, no limit
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index 93aa0932234e..b12a9a1a106c 100644
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -786,7 +786,9 @@ struct btrfs_ioctl_received_subvol_args {
 #define BTRFS_SEND_FLAG_MASK \
 	(BTRFS_SEND_FLAG_NO_FILE_DATA | \
 	 BTRFS_SEND_FLAG_OMIT_STREAM_HEADER | \
-	 BTRFS_SEND_FLAG_OMIT_END_CMD)
+	 BTRFS_SEND_FLAG_OMIT_END_CMD | \
+	 BTRFS_SEND_FLAG_STREAM_V2 | \
+	 BTRFS_SEND_FLAG_COMPRESSED)
 
 struct btrfs_ioctl_send_args {
 	__s64 send_fd;			/* in */
-- 
2.30.0


  parent reply	other threads:[~2021-01-22 21:11 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-22 20:47 [PATCH v3 0/5] btrfs: implement send/receive of compressed extents without decompressing Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 1/5] btrfs: add send stream v2 definitions Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 01/11] btrfs-progs: receive: support v2 send stream larger tlv_len Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 02/11] btrfs-progs: receive: dynamically allocate sctx->read_buf Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 2/5] btrfs: send: write larger chunks when using stream v2 Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 03/11] btrfs-progs: receive: support v2 send stream DATA tlv format Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 3/5] btrfs: send: allocate send buffer with alloc_page() and vmap() for v2 Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 04/11] btrfs-progs: receive: add send stream v2 cmds and attrs to send.h Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 4/5] btrfs: send: send compressed extents with encoded writes Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 05/11] btrfs-progs: receive: add stub implementation for pwritev2 Omar Sandoval
2021-01-22 20:47 ` Omar Sandoval [this message]
2021-01-22 20:47 ` [PATCH v3 06/11] btrfs-progs: receive: process encoded_write commands Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 07/11] btrfs-progs: receive: encoded_write fallback to explicit decode and write Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 08/11] btrfs-progs: receive: process fallocate commands Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 09/11] btrfs-progs: receive: process setflags ioctl commands Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 10/11] btrfs-progs: send: stream v2 ioctl flags Omar Sandoval
2021-01-22 20:47 ` [PATCH v3 11/11] btrfs-progs: receive: add tests for basic encoded_write send/receive Omar Sandoval

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d8e787b3ee721d404ac56ed2af65a6bbe06b14c4.1611347187.git.osandov@fb.com \
    --to=osandov@osandov.com \
    --cc=kernel-team@fb.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).