RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
32bit 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>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Boris Burkov 2022-03-17 10:25:44 -07:00 committed by David Sterba
parent 47b5cf867f
commit cf269aa47b
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/send-stream.c
View File

@ -24,13 +24,23 @@
#include "crypto/crc32c.h" #include "crypto/crc32c.h"
#include "common/utils.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 { struct btrfs_send_stream {
char read_buf[BTRFS_SEND_BUF_SIZE]; char read_buf[BTRFS_SEND_BUF_SIZE];
int fd; int fd;
int cmd; int cmd;
struct btrfs_cmd_header *cmd_hdr; 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; u32 version;
/* /*
@ -152,6 +162,7 @@ static int read_cmd(struct btrfs_send_stream *sctx)
struct btrfs_tlv_header *tlv_hdr; struct btrfs_tlv_header *tlv_hdr;
u16 tlv_type; u16 tlv_type;
u16 tlv_len; u16 tlv_len;
struct btrfs_send_attribute *send_attr;
tlv_hdr = (struct btrfs_tlv_header *)data; tlv_hdr = (struct btrfs_tlv_header *)data;
tlv_type = le16_to_cpu(tlv_hdr->tlv_type); tlv_type = le16_to_cpu(tlv_hdr->tlv_type);
@ -164,10 +175,15 @@ static int read_cmd(struct btrfs_send_stream *sctx)
goto out; 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; send_attr->data = data;
pos += sizeof(*tlv_hdr) + tlv_len; pos += send_attr->tlv_len;
data += send_attr->tlv_len;
} }
sctx->cmd = cmd; sctx->cmd = cmd;
@ -180,7 +196,7 @@ out:
static int tlv_get(struct btrfs_send_stream *sctx, int attr, void **data, int *len) static int tlv_get(struct btrfs_send_stream *sctx, int attr, void **data, int *len)
{ {
int ret; int ret;
struct btrfs_tlv_header *hdr; struct btrfs_send_attribute *send_attr;
if (attr <= 0 || attr > BTRFS_SEND_A_MAX) { if (attr <= 0 || attr > BTRFS_SEND_A_MAX) {
error("invalid attribute requested, attr = %d", attr); 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; goto out;
} }
hdr = sctx->cmd_attrs[attr]; send_attr = &sctx->cmd_attrs[attr];
if (!hdr) { if (!send_attr->data) {
error("attribute %d requested but not present", attr); error("attribute %d requested but not present", attr);
ret = -ENOENT; ret = -ENOENT;
goto out; goto out;
} }
*len = le16_to_cpu(hdr->tlv_len); *len = send_attr->tlv_len;
*data = hdr + 1; *data = send_attr->data;
ret = 0; ret = 0;