Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68DFCC433FE for ; Mon, 21 Nov 2022 06:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229480AbiKUG6H (ORCPT ); Mon, 21 Nov 2022 01:58:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbiKUG54 (ORCPT ); Mon, 21 Nov 2022 01:57:56 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 312DC175A9 for ; Sun, 20 Nov 2022 22:57:51 -0800 (PST) Received: from [0.0.0.0] ([149.28.201.231]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N4hvb-1p6GMF2qwR-011lFd; Mon, 21 Nov 2022 07:57:41 +0100 Message-ID: Date: Mon, 21 Nov 2022 14:57:33 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH v1] btrfs-progs:Support send and receive to remote host Content-Language: en-US To: hmsjwzb , linux-btrfs@vger.kernel.org Cc: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com, sunzhipeng.scsmile@bytedance.com, strongbox8@zoho.com References: <20221121053407.1810-1-hmsjwzb@zoho.com> <18111402-636b-f2c2-bca7-95317c7f3f74@zoho.com> From: Qu Wenruo In-Reply-To: <18111402-636b-f2c2-bca7-95317c7f3f74@zoho.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K1:WJXIWA9peNzZgbyxGQ3qu3PCV3gbTyuLVBZGDwNlaZu0p0NWDM1 n0xnK26skhN/TIGWMqRngmSFqq0hLC8yAFfaiITbNBjLg2NyZoxrz+n+7CUwgY0zD3Ma1hv 3zIs8VJ2kaLkD1RNhaHikGqSTGXjFKTrMaOSipj3xM067jj/TxRaRUNJ684t2L++4cNUq/W /dFKYHy640MHOWv91uLCw== UI-OutboundReport: notjunk:1;M01:P0:vniKTRLyvX4=;8kt3rPWCe3No7pg26R/z8A7w8iw 9K6Smh+5goTsE1wiUPGq6yFXuG4wgIbzgdxF/5eySaL5Lhwl4AGt0B/aTy80qozIfPJw+piFA qT6pl9l60Hd9kmSadk2NqDReCjbckw2yj56nGdechBGN5D67Y4iMDTyQld8/V16w7Nfag16Kb Ot+iG9+EfVnAtlx2QD5rq38aY2SIxa8Nb7IcNTVnkzQc0Tn3ViNO5EZpPLa+7IXXC44Atn3eV KaM8aZX0HXO7Klccl0l8Xh+yYFDiu8cX82o9SW+TBid9XGgQilh+PpJ1r2ZU/UN0r7hQMjd0Y zzAIIjDH7Ih3H04cm1a0TyKacC6tIG+RM6z17qauBZ0mMaVVerX8srqf2gkkoLY61cdDE75Kn QEwE+m2BFWn8exV6sAqoh6UZ8BrgCOQ38EzbRt+2JcALiSMUhwPw5dxKM0v82mYImNNNSGz5l US5fFMxUxeVSUAVx39G0cqI3kQc5OswWXsa35VgjVR/PoUf+WVYuO0pe+w82lZeC1jsfR+JsC 0Q5GtH2iO8RHEzQ5+A38wsuM1cYFxPUfAq573thRQIax6vu9W13y5Ag8+0qbSdIIQlnWwwqk3 8UOTGMHs58H38S5axLn0Oh3fhYK0n4qcOdlSAjwF5XdcHLH9WnTK3+1Beksy6eL5xccfZAskE HG2a0VGk9iUa8CzNlRZQo7r99tGypxxc6QoZjz2qTdb0gZZ3EvJUS4HJ43baZR1ue+2V6ZdKz V4csgPgAaLqL1QmbS1mZ/D2MMpj2sTE1tZDoEZcgzARECEws0QSs144jwmfx6mNS6gMQXkqjE qKpxFCDO5kCCTM4ekJFf4rJvv576HKPGx2CLYt42I6eaCtzNLDkjLsXPTj3UbX5u9VeQ6gswq cK9PcDE70my36VjdCKnOV4Hak4TegkFP20dffLeUnDizbQWHhVr2ls0Pn2+udf2qWhRKuRUXc GMjYKPGjRbzWynpUSaiyvYFxank= Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On 2022/11/21 13:42, hmsjwzb wrote: > Hi Guys, > > This patch intend to send and receive through TCP connection. I have tested it on localhost. It seems works. What's the problem of the original pipe based remote send and why your version is any better? A quick glance shows no special error handling or network specific behavior change, thus why we should bother something can already be done by the very basic pipe? Thanks, Qu > > Thanks > > On 11/21/22 00:34, Flint.Wang wrote: >> Support send and receive through TCP >> >> start server: >> btrfs server start >> >> stop server: >> btrfs server stop >> >> send: >> btrfs send --remote : >> >> receive: >> btrfs receive --remote : >> >> Signed-off-by: Flint.Wang >> --- >> Makefile | 2 +- >> btrfs.c | 1 + >> cmds/commands.h | 1 + >> cmds/receive.c | 21 ++- >> cmds/send.c | 22 +++- >> cmds/server.c | 311 ++++++++++++++++++++++++++++++++++++++++++++ >> common/send-utils.h | 6 + >> 7 files changed, 361 insertions(+), 3 deletions(-) >> create mode 100644 cmds/server.c >> >> diff --git a/Makefile b/Makefile >> index c74a2ea9..33798e1d 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -208,7 +208,7 @@ cmds_objects = cmds/subvolume.o cmds/subvolume-list.o \ >> cmds/property.o cmds/filesystem-usage.o cmds/inspect-dump-tree.o \ >> cmds/inspect-dump-super.o cmds/inspect-tree-stats.o cmds/filesystem-du.o \ >> mkfs/common.o check/mode-common.o check/mode-lowmem.o \ >> - check/clear-cache.o >> + check/clear-cache.o cmds/server.o >> >> libbtrfs_objects = \ >> kernel-lib/rbtree.o \ >> diff --git a/btrfs.c b/btrfs.c >> index a1db7109..28bf6c00 100644 >> --- a/btrfs.c >> +++ b/btrfs.c >> @@ -353,6 +353,7 @@ static const struct cmd_group btrfs_cmd_group = { >> /* Help and version stay last */ >> &cmd_struct_help, >> &cmd_struct_version, >> + &cmd_struct_server, >> NULL >> }, >> }; >> diff --git a/cmds/commands.h b/cmds/commands.h >> index 42291a35..27828588 100644 >> --- a/cmds/commands.h >> +++ b/cmds/commands.h >> @@ -150,5 +150,6 @@ DECLARE_COMMAND(qgroup); >> DECLARE_COMMAND(replace); >> DECLARE_COMMAND(restore); >> DECLARE_COMMAND(rescue); >> +DECLARE_COMMAND(server); >> >> #endif >> diff --git a/cmds/receive.c b/cmds/receive.c >> index af3138d5..11910ade 100644 >> --- a/cmds/receive.c >> +++ b/cmds/receive.c >> @@ -1638,6 +1638,7 @@ static int cmd_receive(const struct cmd_struct *cmd, int argc, char **argv) >> { >> char *tomnt = NULL; >> char fromfile[PATH_MAX]; >> + char fromnet[PATH_MAX]; >> char realmnt[PATH_MAX]; >> struct btrfs_receive rctx; >> int receive_fd = fileno(stdin); >> @@ -1678,10 +1679,11 @@ static int cmd_receive(const struct cmd_struct *cmd, int argc, char **argv) >> { "dump", no_argument, NULL, GETOPT_VAL_DUMP }, >> { "quiet", no_argument, NULL, 'q' }, >> { "force-decompress", no_argument, NULL, GETOPT_VAL_FORCE_DECOMPRESS }, >> + { "remote", required_argument, NULL, 'r'}, >> { NULL, 0, NULL, 0 } >> }; >> >> - c = getopt_long(argc, argv, "Cevqf:m:E:", long_opts, NULL); >> + c = getopt_long(argc, argv, "Cevqf:m:E:n:r:", long_opts, NULL); >> if (c < 0) >> break; >> >> @@ -1717,6 +1719,15 @@ static int cmd_receive(const struct cmd_struct *cmd, int argc, char **argv) >> goto out; >> } >> break; >> + case 'r': >> + if (arg_copy_path(fromnet, optarg, sizeof(fromnet))) { >> + error("input file location too long (%zu)", >> + strlen(optarg)); >> + ret = 1; >> + goto out; >> + } >> + break; >> + >> case GETOPT_VAL_DUMP: >> dump = true; >> break; >> @@ -1743,6 +1754,14 @@ static int cmd_receive(const struct cmd_struct *cmd, int argc, char **argv) >> } >> } >> >> + if (fromnet[0]) { >> + receive_fd = setup_connection(fromnet, RECEIVE); >> + if (receive_fd < 0) { >> + error("cannot setup connection %s", fromnet); >> + goto out; >> + } >> + } >> + >> if (dump) { >> struct btrfs_dump_send_args dump_args; >> >> diff --git a/cmds/send.c b/cmds/send.c >> index 41658899..3dc4dcb8 100644 >> --- a/cmds/send.c >> +++ b/cmds/send.c >> @@ -18,6 +18,9 @@ >> >> #include "kerncompat.h" >> #include >> +#include >> +#include >> +#include >> #include >> #include >> #include >> @@ -464,6 +467,7 @@ static u32 get_sysfs_proto_supported(void) >> return version; >> } >> >> + >> static const char * const cmd_send_usage[] = { >> "btrfs send [-ve] [-p ] [-c ] [-f ] [...]", >> "Send the subvolume(s) to stdout.", >> @@ -510,6 +514,7 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv) >> char *subvol = NULL; >> int ret; >> char outname[PATH_MAX]; >> + char remotename[PATH_MAX]; >> struct btrfs_send send; >> u32 i; >> char *mount_root = NULL; >> @@ -520,11 +525,13 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv) >> bool new_end_cmd_semantic = false; >> u64 send_flags = 0; >> u64 proto = 0; >> + int sockfd; >> >> memset(&send, 0, sizeof(send)); >> send.dump_fd = fileno(stdout); >> send.proto = 1; >> outname[0] = 0; >> + remotename[0] = 0; >> >> /* >> * For send, verbose default is 1 (insteasd of 0) for historical reasons, >> @@ -550,9 +557,10 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv) >> { "no-data", no_argument, NULL, GETOPT_VAL_SEND_NO_DATA }, >> { "proto", required_argument, NULL, GETOPT_VAL_PROTO }, >> { "compressed-data", no_argument, NULL, GETOPT_VAL_COMPRESSED_DATA }, >> + { "remote", required_argument, NULL, 'r' }, >> { NULL, 0, NULL, 0 } >> }; >> - int c = getopt_long(argc, argv, "vqec:f:i:p:", long_options, NULL); >> + int c = getopt_long(argc, argv, "vqec:f:i:p:r:", long_options, NULL); >> >> if (c < 0) >> break; >> @@ -631,6 +639,13 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv) >> >> full_send = false; >> break; >> + case 'r': >> + if (arg_copy_path(remotename, optarg, sizeof(remotename))) { >> + error("remote file path too long (%zu)", strlen(optarg)); >> + ret = 1; >> + goto out; >> + } >> + break; >> case 'i': >> error("option -i was removed, use -c instead"); >> ret = 1; >> @@ -680,6 +695,11 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv) >> } >> } >> >> + if (remotename[0]) { >> + sockfd = setup_connection(remotename, SEND); >> + send.dump_fd = sockfd; >> + } >> + >> if (isatty(send.dump_fd)) { >> error( >> "not dumping send stream into a terminal, redirect it into a file"); >> diff --git a/cmds/server.c b/cmds/server.c >> new file mode 100644 >> index 00000000..e9031c61 >> --- /dev/null >> +++ b/cmds/server.c >> @@ -0,0 +1,311 @@ >> +#include "kerncompat.h" >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include "kernel-lib/sizes.h" >> +#include "cmds/commands.h" >> +#include "common/string-utils.h" >> +#include "common/path-utils.h" >> +#include "common/send-utils.h" >> +#include "common/messages.h" >> +#include "kernel-shared/send.h" >> + >> +#define BTRFSPORT 385 >> +#define INITPAKLEN (PATH_MAX + 3) >> + >> +static int create_socket(void) >> +{ >> + int sockfd; >> + >> + sockfd = socket(AF_INET, SOCK_STREAM, 0); >> + if (sockfd == -1) { >> + error("socket creation failed"); >> + return errno; >> + } >> + return sockfd; >> +} >> + >> +int setup_connection(char *remote, enum request req) >> +{ >> + char *pathname; >> + struct sockaddr_in servaddr; >> + int ret = 0; >> + int retcode = -1; >> + int pathlen; >> + int sockfd; >> + char buff[INITPAKLEN]; >> + >> + pathname = strchr(remote, ':'); >> + if (pathname == NULL) { >> + error("illegal remote pathname"); >> + ret = 1; >> + goto out; >> + } >> + *pathname = '\0'; >> + pathname += 1; >> + >> + pathlen = strlen(pathname); >> + buff[0] = req; >> + buff[1] = pathlen; >> + memcpy(&buff[2], pathname, pathlen); >> + buff[pathlen + 2] = '\0'; >> + >> + sockfd = create_socket(); >> + if (sockfd == -1) >> + goto out; >> + >> + servaddr.sin_family = AF_INET; >> + servaddr.sin_addr.s_addr = inet_addr(remote); >> + servaddr.sin_port = htons(BTRFSPORT); >> + >> + if (connect(sockfd, (struct sockaddr *)&servaddr, >> + sizeof(servaddr)) != 0) { >> + error("connection failed"); >> + ret = errno; >> + goto out; >> + } >> + >> + ret = write(sockfd, buff, INITPAKLEN); >> + if (ret != INITPAKLEN) { >> + error("write failed"); >> + ret = errno; >> + goto out; >> + } >> + >> + if (req == STOP) { >> + error("illegal request"); >> + return -1; >> + } >> + >> + ret = read(sockfd, &retcode, sizeof(int)); >> + if (ret != sizeof(int)) { >> + error("read failed"); >> + ret = errno; >> + goto out; >> + } >> + >> + if (retcode == -1) { >> + error("server open failed"); >> + ret = retcode; >> + goto out; >> + } >> + return sockfd; >> +out: >> + return ret; >> +} >> + >> +struct req_info { >> + enum request req; >> + int pathlen; >> + int filefd; >> + int connfd; >> +}; >> + >> +static void *snapsave_func(void *arg) >> +{ >> + int len; >> + struct req_info *ri = (struct req_info *) arg; >> + int ret; >> + int buffsize = BTRFS_SEND_BUF_SIZE_V1; >> + char tmpbuff[BTRFS_SEND_BUF_SIZE_V1]; >> + >> + switch (ri->req) { >> + case SEND: >> + while ((len = read(ri->connfd, tmpbuff, buffsize))) { >> + ret = write(ri->filefd, tmpbuff, len); >> + if (ret == -1) { >> + error("write failed"); >> + exit(-1); >> + } >> + } >> + break; >> + case RECEIVE: >> + while ((len = read(ri->filefd, tmpbuff, buffsize))) { >> + ret = write(ri->connfd, tmpbuff, len); >> + if (ret == -1) { >> + perror("write failed"); >> + exit(-1); >> + } >> + } >> + break; >> + default: >> + error("illegal request"); >> + exit(-1); >> + } >> + close(ri->connfd); >> + free(ri); >> + return NULL; >> +} >> + >> +static struct req_info *handle_request(int connfd) >> +{ >> + int tmpfd; >> + int ret; >> + char outname[PATH_MAX]; >> + char buff[INITPAKLEN]; >> + int flags; >> + struct req_info *ri; >> + >> + ri = malloc(sizeof(*ri)); >> + if (!ri) { >> + error("malloc failed"); >> + exit(-1); >> + } >> + >> + ret = read(connfd, buff, INITPAKLEN); >> + if (ret != INITPAKLEN) { >> + error("read failed"); >> + exit(-1); >> + } >> + >> + ri->req = (enum request) buff[0]; >> + ri->pathlen = buff[1]; >> + if (ri->pathlen < 0) { >> + error("illegal path length"); >> + exit(-1); >> + } >> + >> + memcpy(outname, &buff[2], ri->pathlen); >> + switch (ri->req) { >> + case SEND: >> + flags = O_WRONLY | O_TRUNC; >> + tmpfd = open(outname, flags); >> + if (tmpfd < 0) { >> + if (errno == ENOENT) >> + tmpfd = open(outname, >> + O_CREAT | flags, 0600); >> + } >> + break; >> + case RECEIVE: >> + flags = O_RDONLY; >> + tmpfd = open(outname, flags); >> + if (tmpfd < 0) { >> + error("open failed"); >> + exit(-1); >> + } >> + break; >> + case STOP: >> + exit(1); >> + } >> + >> + ri->filefd = tmpfd; >> + ret = write(connfd, &tmpfd, sizeof(int)); >> + if (ret < 0) { >> + error("write failed"); >> + exit(-1); >> + } >> + ri->connfd = connfd; >> + return ri; >> +} >> + >> +static int btrfs_server(void) >> +{ >> + int ret; >> + socklen_t addr_len; >> + int connfd; >> + int sockfd; >> + pthread_t thread_id; >> + struct sockaddr_in servaddr; >> + struct sockaddr_in cli; >> + struct req_info *ri; >> + >> + sockfd = create_socket(); >> + if (sockfd == -1) >> + goto out; >> + >> + servaddr.sin_family = AF_INET; >> + servaddr.sin_addr.s_addr = htonl(INADDR_ANY); >> + servaddr.sin_port = htons(BTRFSPORT); >> + >> + ret = bind(sockfd, (struct sockaddr *) &servaddr, >> + sizeof(servaddr)); >> + if (ret) { >> + error("socket bind failed\n"); >> + ret = errno; >> + goto out; >> + } >> + >> + if ((listen(sockfd, 5)) != 0) { >> + error("listen failed\n"); >> + ret = errno; >> + goto out; >> + } >> + >> + addr_len = sizeof(cli); >> + >> + while (true) { >> + connfd = accept(sockfd, (struct sockaddr *) &cli, >> + &addr_len); >> + if (connfd < 0) { >> + error("server accept failed"); >> + ret = errno; >> + goto out; >> + } >> + ri = handle_request(connfd); >> + ret = pthread_create(&thread_id, NULL, snapsave_func, (void *) ri); >> + if (ret != 0) { >> + error("pthread create failed:%d\n", ret); >> + goto out; >> + } >> + } >> + >> +out: >> + return ret; >> +} >> + >> +static const char * const server_cmd_group_usage[] = { >> + "btrfs server ", >> + NULL >> +}; >> + >> +static const char * const cmd_server_start_usage[] = { >> + "btrfs server start", >> + NULL >> +}; >> + >> +static int cmd_server_start(const struct cmd_struct *cmd, >> + int argc, char **argv) >> +{ >> + int ret; >> + >> + ret = daemon(1, 0); >> + if (ret) { >> + error("daemon errno:%d\n", errno); >> + exit(-1); >> + } >> + btrfs_server(); >> + return 0; >> +} >> +static DEFINE_SIMPLE_COMMAND(server_start, "start"); >> + >> +static const char * const cmd_server_stop_usage[] = { >> + "btrfs server stop", >> + NULL >> +}; >> + >> +static int cmd_server_stop(const struct cmd_struct *cmd, >> + int argc, char **argv) >> +{ >> + char dummy[16]; >> + arg_copy_path(dummy, "127.0.0.1:dummy", 16); >> + setup_connection(dummy, STOP); >> + return 0; >> +} >> +static DEFINE_SIMPLE_COMMAND(server_stop, "stop"); >> + >> +static const char server_cmd_group_info[] = >> +"save and restore snapshot from remote"; >> + >> +static const struct cmd_group server_cmd_group = { >> + server_cmd_group_usage, server_cmd_group_info, { >> + &cmd_struct_server_start, >> + &cmd_struct_server_stop, >> + NULL >> + } >> +}; >> + >> +DEFINE_GROUP_COMMAND_TOKEN(server); >> diff --git a/common/send-utils.h b/common/send-utils.h >> index 7bff81a1..124d668b 100644 >> --- a/common/send-utils.h >> +++ b/common/send-utils.h >> @@ -55,4 +55,10 @@ struct subvol_info *subvol_uuid_search(int mnt_fd, >> >> int btrfs_subvolid_resolve(int fd, char *path, size_t path_len, u64 subvol_id); >> >> +enum request { >> + SEND = 1, >> + RECEIVE, >> + STOP, >> +}; >> +int setup_connection(char *remote, enum request req); >> #endif