From 7e5cd32fbb38103b11a8a87ca5af943d0fb2804a Mon Sep 17 00:00:00 2001

From: Boris Burkov <borisb@fb.com>

Date: Fri, 21 Aug 2020 00:40:00 -0700

Subject: [PATCH] btrfs-progs: receive: support v2 send stream larger tlv_len

An encoded extent can be up to 128K in length, which exceeds the largest

value expressible by the current send stream format's 16 bit tlv_len

field. Since encoded writes cannot be split into multiple writes by

btrfs send, the send stream format must change to accommodate encoded

writes.

Supporting this changed format requires retooling how we store the

commands we have processed. We currently store pointers to the struct

btrfs_tlv_headers in the command buffer. This is not sufficient to

represent the new BTRFS_SEND_A_DATA format. Instead, parse the attribute

headers and store them in a new struct btrfs_send_attribute which has a

32-bit length field. This is transparent to users of the various TLV_GET

macros.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>

Signed-off-by: Boris Burkov <boris@bur.io>

---

 common/send-stream.c | 34 +++++++++++++++++++++++++---------

 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/common/send-stream.c b/common/send-stream.c

index e9be922b..7d182238 100644

--- a/common/send-stream.c

+++ b/common/send-stream.c

@@ -24,13 +24,23 @@

 #include "crypto/crc32c.h"

 #include "common/utils.h"

+struct btrfs_send_attribute {

+	u16 tlv_type;

+	/*

+	 * Note: in btrfs_tlv_header, this is __le16, but we need 32 bits for

+	 * attributes with file data as of version 2 of the send stream format

+	 */

+	u32 tlv_len;

+	char *data;

+};

+

 struct btrfs_send_stream {

 	char read_buf[BTRFS_SEND_BUF_SIZE];

 	int fd;

 	int cmd;

 	struct btrfs_cmd_header *cmd_hdr;

-	struct btrfs_tlv_header *cmd_attrs[BTRFS_SEND_A_MAX + 1];

+	struct btrfs_send_attribute cmd_attrs[BTRFS_SEND_A_MAX + 1];

 	u32 version;

 	/*

@@ -152,6 +162,7 @@ static int read_cmd(struct btrfs_send_stream *sctx)

 		struct btrfs_tlv_header *tlv_hdr;

 		u16 tlv_type;

 		u16 tlv_len;

+		struct btrfs_send_attribute *send_attr;

 		tlv_hdr = (struct btrfs_tlv_header *)data;

 		tlv_type = le16_to_cpu(tlv_hdr->tlv_type);

@@ -164,10 +175,15 @@ static int read_cmd(struct btrfs_send_stream *sctx)

 			goto out;

 		}

-		sctx->cmd_attrs[tlv_type] = tlv_hdr;

+		send_attr = &sctx->cmd_attrs[tlv_type];

+		send_attr->tlv_type = tlv_type;

+		send_attr->tlv_len = tlv_len;

+		pos += sizeof(*tlv_hdr);

+		data += sizeof(*tlv_hdr);

-		data += sizeof(*tlv_hdr) + tlv_len;

-		pos += sizeof(*tlv_hdr) + tlv_len;

+		send_attr->data = data;

+		pos += send_attr->tlv_len;

+		data += send_attr->tlv_len;

 	}

 	sctx->cmd = cmd;

@@ -180,7 +196,7 @@ out:

 static int tlv_get(struct btrfs_send_stream *sctx, int attr, void **data, int *len)

 {

 	int ret;

-	struct btrfs_tlv_header *hdr;

+	struct btrfs_send_attribute *send_attr;

 	if (attr <= 0 || attr > BTRFS_SEND_A_MAX) {

 		error("invalid attribute requested, attr = %d", attr);

@@ -188,15 +204,15 @@ static int tlv_get(struct btrfs_send_stream *sctx, int attr, void **data, int *l

 		goto out;

 	}

-	hdr = sctx->cmd_attrs[attr];

-	if (!hdr) {

+	send_attr = &sctx->cmd_attrs[attr];

+	if (!send_attr->data) {

 		error("attribute %d requested but not present", attr);

 		ret = -ENOENT;

 		goto out;

 	}

-	*len = le16_to_cpu(hdr->tlv_len);

-	*data = hdr + 1;

+	*len = send_attr->tlv_len;

+	*data = send_attr->data;

 	ret = 0;

-- 

2.35.1