From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Li8leEQL; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id 77AC35A061E for ; Thu, 30 Jan 2025 05:55:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738212932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=07fLwY43ZWkO7dPusGfZTPMUKkwqDaptORvTlG7kbTc=; b=Li8leEQLXUagCjiGC1Dssc6nuGx3+RnYz1NEIIkf6ZvIE1n1LWJBixOLh52+qer8SEvj7E OErg3S9hR1NrWMh5j48CEzUrBrMIAJ1hNITrm3wKxIko5ko5hcc/7Pe+C5U8IPZLCEs/5H RLFdMM0m33HHmisc3QlfnqxsyYDMiJw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-ZhOANKBnMzK9h9QQUkFHZQ-1; Wed, 29 Jan 2025 23:55:30 -0500 X-MC-Unique: ZhOANKBnMzK9h9QQUkFHZQ-1 X-Mimecast-MFC-AGG-ID: ZhOANKBnMzK9h9QQUkFHZQ Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-436225d4389so6407195e9.1 for ; Wed, 29 Jan 2025 20:55:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738212928; x=1738817728; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=07fLwY43ZWkO7dPusGfZTPMUKkwqDaptORvTlG7kbTc=; b=clleLvheMnscZoaqB1X3BGJAPz3+ppf8PoI+RfRb8h5Op5lBgVVYB6TBoJTIfAYofU ggMKsjlM+Qm2IGlGSA9Adr2S9VA9zAlp6eZd3wbmrc7YQS5JCK1RIOu542sw2AaKPDRo ur6Y2atSwJzsFuBKgVErlJkF8dFljoTc8S7VocYxn5/52nbq95IyIpQWFrvblx+tl4nd lm7QWc+kQFoqs75oKKGpUIJKta/loP/QdLrxQnBYSyJjafVvGD7C705JuRZda0djrjVn 3jas6AUepWLHIkY5RK7QLZdf1rtPnuGJKJ9tuKiRHSrX6TImbGdSPeK2eu6aFBjuNk/d CZ+g== X-Gm-Message-State: AOJu0Ywb8+ZV03ocR7yWEDiP60u3DLEeXXSm+P/vNZjNDLXCvw8j4NMj qP5Rug03bI7pGMZubgS4kXieTy14n89svjBiSFKWU6j0pwSCxKr2pFsaa/iToQ1wHVmM1KhvtzW o6PCIBzLC0wjjAqvQERn9VKLNrjNAF21NPKVLbnH3r6prMYX3KzuRpxQPQA== X-Gm-Gg: ASbGncthHOwza1SkgxWpaUe4T+tzzBVv4WTL/Fgl6UXNkb61jp5LIFKz9KHHJdCPAz+ foG8RDJ4IPT0g3gbPiHr4gnEijTfFEh2ZO/EiXWEgDqJzDPf0Vsfi44jCpW4HprizfLtRliWaiz R8R4wlWsxu/dQiKLoWca1JM4ta5GW6NFv2UduJfz9fZbuwDdVfCgOnUEb+TuuMpwM1h3WWNe8ZA tW0L/HdOQiZhklRk91fddRsNOTpkP6I+N6FovBe+fMCWeaMPMWN4ZpuvZvJ9v+sIhG5/LQ2ZpT5 1405UD5bz7+rei3S X-Received: by 2002:a05:600c:1f8c:b0:434:ffb2:f9cf with SMTP id 5b1f17b1804b1-438e1708a35mr12768605e9.14.1738212927819; Wed, 29 Jan 2025 20:55:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IEW95jdww05H/5horclNUSM6pNWZbSF9p+rRXejxUr30Uy9m9EwWxDilXknOAQjpUufD+uWeA== X-Received: by 2002:a05:600c:1f8c:b0:434:ffb2:f9cf with SMTP id 5b1f17b1804b1-438e1708a35mr12768495e9.14.1738212927340; Wed, 29 Jan 2025 20:55:27 -0800 (PST) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [2a10:fc81:a806:d6a9::1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc2c4ddsm44048065e9.17.2025.01.29.20.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 20:55:25 -0800 (PST) Date: Thu, 30 Jan 2025 05:55:22 +0100 From: Stefano Brivio To: David Gibson Subject: Re: [PATCH 6/7] Introduce facilities for guest migration on top of vhost-user infrastructure Message-ID: <20250130055522.39acb265@elisabeth> In-Reply-To: References: <20250127231532.672363-1-sbrivio@redhat.com> <20250127231532.672363-7-sbrivio@redhat.com> <20250128075001.3557d398@elisabeth> <20250129083350.220a7ab0@elisabeth> Organization: Red Hat X-Mailer: Claws Mail 4.2.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Qg5vJJJ8PZEXF9KcxTtncU-h9R5QwuUr7R6-JdNd-F0_1738212929 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: XF6MT22XITCZOH6W6FND4X5DLM3YB5QG X-Message-ID-Hash: XF6MT22XITCZOH6W6FND4X5DLM3YB5QG X-MailFrom: sbrivio@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top, Laurent Vivier X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Thu, 30 Jan 2025 11:48:19 +1100 David Gibson wrote: > On Wed, Jan 29, 2025 at 08:33:50AM +0100, Stefano Brivio wrote: > > On Wed, 29 Jan 2025 12:16:58 +1100 > > David Gibson wrote: > > > > > On Tue, Jan 28, 2025 at 07:50:01AM +0100, Stefano Brivio wrote: > > > > On Tue, 28 Jan 2025 12:40:12 +1100 > > > > David Gibson wrote: > > > > > > > > > On Tue, Jan 28, 2025 at 12:15:31AM +0100, Stefano Brivio wrote: > > > > > > Add two sets (source or target) of three functions each for passt in > > > > > > vhost-user mode, triggered by activity on the file descriptor passed > > > > > > via VHOST_USER_PROTOCOL_F_DEVICE_STATE: > > > > > > > > > > > > - migrate_source_pre() and migrate_target_pre() are called to prepare > > > > > > for migration, before data is transferred > > > > > > > > > > > > - migrate_source() sends, and migrate_target() receives migration data > > > > > > > > > > > > - migrate_source_post() and migrate_target_post() are responsible for > > > > > > any post-migration task > > > > > > > > > > > > Callbacks are added to these functions with arrays of function > > > > > > pointers in migrate.c. Migration handlers are versioned. > > > > > > > > > > > > Versioned descriptions of data sections will be added to the > > > > > > data_versions array, which points to versioned iovec arrays. Version > > > > > > 1 is currently empty and will be filled in in subsequent patches. > > > > > > > > > > > > The source announces the data version to be used and informs the peer > > > > > > about endianness, and the size of void *, time_t, flow entries and > > > > > > flow hash table entries. > > > > > > > > > > > > The target checks if the version of the source is still supported. If > > > > > > it's not, it aborts the migration. > > > > > > > > > > > > Signed-off-by: Stefano Brivio > > > > > > --- > > > > > > Makefile | 12 +-- > > > > > > migrate.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > > migrate.h | 90 ++++++++++++++++++ > > > > > > passt.c | 2 +- > > > > > > vu_common.c | 122 ++++++++++++++++--------- > > > > > > vu_common.h | 2 +- > > > > > > 6 files changed, 438 insertions(+), 49 deletions(-) > > > > > > create mode 100644 migrate.c > > > > > > create mode 100644 migrate.h > > > > > > > > > > > > diff --git a/Makefile b/Makefile > > > > > > index 464eef1..1383875 100644 > > > > > > --- a/Makefile > > > > > > +++ b/Makefile > > > > > > @@ -38,8 +38,8 @@ FLAGS += -DDUAL_STACK_SOCKETS=$(DUAL_STACK_SOCKETS) > > > > > > > > > > > > PASST_SRCS = arch.c arp.c checksum.c conf.c dhcp.c dhcpv6.c flow.c fwd.c \ > > > > > > icmp.c igmp.c inany.c iov.c ip.c isolation.c lineread.c log.c mld.c \ > > > > > > - ndp.c netlink.c packet.c passt.c pasta.c pcap.c pif.c tap.c tcp.c \ > > > > > > - tcp_buf.c tcp_splice.c tcp_vu.c udp.c udp_flow.c udp_vu.c util.c \ > > > > > > + ndp.c netlink.c migrate.c packet.c passt.c pasta.c pcap.c pif.c tap.c \ > > > > > > + tcp.c tcp_buf.c tcp_splice.c tcp_vu.c udp.c udp_flow.c udp_vu.c util.c \ > > > > > > vhost_user.c virtio.c vu_common.c > > > > > > QRAP_SRCS = qrap.c > > > > > > SRCS = $(PASST_SRCS) $(QRAP_SRCS) > > > > > > @@ -48,10 +48,10 @@ MANPAGES = passt.1 pasta.1 qrap.1 > > > > > > > > > > > > PASST_HEADERS = arch.h arp.h checksum.h conf.h dhcp.h dhcpv6.h flow.h fwd.h \ > > > > > > flow_table.h icmp.h icmp_flow.h inany.h iov.h ip.h isolation.h \ > > > > > > - lineread.h log.h ndp.h netlink.h packet.h passt.h pasta.h pcap.h pif.h \ > > > > > > - siphash.h tap.h tcp.h tcp_buf.h tcp_conn.h tcp_internal.h tcp_splice.h \ > > > > > > - tcp_vu.h udp.h udp_flow.h udp_internal.h udp_vu.h util.h vhost_user.h \ > > > > > > - virtio.h vu_common.h > > > > > > + lineread.h log.h migrate.h ndp.h netlink.h packet.h passt.h pasta.h \ > > > > > > + pcap.h pif.h siphash.h tap.h tcp.h tcp_buf.h tcp_conn.h tcp_internal.h \ > > > > > > + tcp_splice.h tcp_vu.h udp.h udp_flow.h udp_internal.h udp_vu.h util.h \ > > > > > > + vhost_user.h virtio.h vu_common.h > > > > > > HEADERS = $(PASST_HEADERS) seccomp.h > > > > > > > > > > > > C := \#include \nint main(){int a=getrandom(0, 0, 0);} > > > > > > diff --git a/migrate.c b/migrate.c > > > > > > new file mode 100644 > > > > > > index 0000000..bee9653 > > > > > > --- /dev/null > > > > > > +++ b/migrate.c > > > > > > @@ -0,0 +1,259 @@ > > > > > > +// SPDX-License-Identifier: GPL-2.0-or-later > > > > > > + > > > > > > +/* PASST - Plug A Simple Socket Transport > > > > > > + * for qemu/UNIX domain socket mode > > > > > > + * > > > > > > + * PASTA - Pack A Subtle Tap Abstraction > > > > > > + * for network namespace/tap device mode > > > > > > + * > > > > > > + * migrate.c - Migration sections, layout, and routines > > > > > > + * > > > > > > + * Copyright (c) 2025 Red Hat GmbH > > > > > > + * Author: Stefano Brivio > > > > > > + */ > > > > > > + > > > > > > +#include > > > > > > +#include > > > > > > + > > > > > > +#include "util.h" > > > > > > +#include "ip.h" > > > > > > +#include "passt.h" > > > > > > +#include "inany.h" > > > > > > +#include "flow.h" > > > > > > +#include "flow_table.h" > > > > > > + > > > > > > +#include "migrate.h" > > > > > > + > > > > > > +/* Current version of migration data */ > > > > > > +#define MIGRATE_VERSION 1 > > > > > > + > > > > > > +/* Magic as we see it and as seen with reverse endianness */ > > > > > > +#define MIGRATE_MAGIC 0xB1BB1D1B0BB1D1B0 > > > > > > +#define MIGRATE_MAGIC_SWAPPED 0xB0D1B10B1B1DBBB1 > > > > > > > > > > As noted, I'm hoping we can get rid of "either endian" migration. But > > > > > if this stays, we should define it using __bswap_constant_32() to > > > > > avoid embarrassing mistakes. > > > > > > > > Those always give me issues on musl, > > > > > > What sort of issues? We're already using them, and have fallback > > > versions defined in util.h > > > > The very issues that brought me to introduce those fallback versions, > > so I'm instinctively reluctant to use them. > > > > Actually, I think it's even clearer to have this spelt out (I always > > need to stop for a moment and think: what happens when I cross the > > 32-bit boundary?). > > Oh, yes, we'd need to add a __bswap_constant_64() for this. ...which doesn't exist on musl. On current Alpine Edge: util.h:131:34: error: implicit declaration of function '__bswap_constant_64' [-Wimplicit-function-declaration] 131 | #define htonll_constant(x) (__bswap_constant_64(x)) | ^~~~~~~~~~~~~~~~~~~ ...so rather than adding an implementation for this single usage, which makes it actually less clear to me, I would keep it like it is. > [snip] > > > > > > +/** > > > > > > + * union migrate_header - Migration header from source > > > > > > + * @magic: 0xB1BB1D1B0BB1D1B0, host order > > > > > > + * @version: Source sends highest known, target aborts if unsupported > > > > > > + * @voidp_size: sizeof(void *), network order > > > > > > + * @time_t_size: sizeof(time_t), network order > > > > > > + * @flow_size: sizeof(union flow), network order > > > > > > + * @flow_sidx_size: sizeof(struct flow_sidx_t), network order > > > > > > + * @unused: Go figure > > > > > > + */ > > > > > > +union migrate_header { > > > > > > + struct { > > > > > > + uint64_t magic; > > > > > > + uint32_t version; > > > > > > + uint32_t voidp_size; > > > > > > + uint32_t time_t_size; > > > > > > + uint32_t flow_size; > > > > > > + uint32_t flow_sidx_size; > > > > > > + }; > > > > > > + uint8_t unused[65536]; > > > > > > > > > > So, having looked at this, I no longer think padding the header to 64kiB > > > > > is a good idea. The structure means we're basically stuck always > > > > > having that chunky header. Instead, I think the header should be > > > > > absolutely minimal: basically magic and version only. v1 (and maybe > > > > > others) can add a "metadata" or whatever section for additional > > > > > information like this they need. > > > > > > > > The header is processed by the target in a separate, preliminary step, > > > > though. > > > > > > > > That's why I added metadata right in the header: if the target needs to > > > > abort the migration because, say, the size of a flow entry is too big > > > > to handle for a particular version, then we should know that before > > > > migrate_target_pre(). > > > > > > Ah, yes, I missed that, we'd need a more complex design to do > > > additional transfers and checks before making the target_pre > > > callbacks. > > > > > > > As long as we check the version first, we can always shrink the header > > > > later on. > > > > > > *thinks*.. I guess so, though it's kind of awkward; a future version > > > would have to read the "header of the header", check the version, then > > > if it's the old one, read the remainder of the 64kiB block. > > > > > > I still think we should clearly separate the part that we're > > > committing to being in every future version (which I think should just > > > be magic and version), from the stuff that's just v1. > > > > Sure, I can add a comment. > > > > > > But having 64 KiB reserved looks more robust because it's a > > > > safe place to add this kind of metadata. > > > > > > > > Note that 64 KiB is typically transferred in a single read/write > > > > from/to the vhost-user back-end. > > > > > > Ok, but it also has to go over the qemu migration channel, which will > > > often be a physical link, not a super-fast local/virtual one, and may > > > be bandwidth capped as well. I'm not actually certain if 64kiB is > > > likely to be a problem there, but it *is* large compared to the state > > > blobs of most qemu devices (usually only a few hundred bytes). > > > > Even if we transfer just what we need of a flow, it's still something > > well in excess of 50 bytes each. 100k flows would be 5 megs. > > Just transferring the in-use flows would be higher priority than being > selective about what we send within each flow. Well, of course, I meant that we would only transfer used flows at that point, because it's not about transferring the flow table as a whole, with none of the advantages and disadvantages of it. But still one can have 128k flows at the moment. > It's both easier to do > and a bigger win in most cases. That would dramatically reduce the > size sent here. Yep, feel free. > > Well, anyway, let's cut this down to 4k, which should be enough, so > > that it's not a topic anymore. > > I still think it's ugly, but whatever. Same here. -- Stefano