From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202502 header.b=UKaJuehJ; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 6C5655A026F for ; Thu, 06 Feb 2025 06:49:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1738820984; bh=nBE5frXzBIeR1KTU4WL+lGoE48PT5q/MDhEugMnsKWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UKaJuehJaX6WBHjWzryRiyZXRBmbQhknZ9Eg6kmcVr1JOuLosPytIXqcASpQSHhUH 5N0FJw+ZzP5UBcoqAsNEnt7fOGYmx8R10HwlcYIDnQJmVmf6OJK4csZyDzrPnGXf9n 7+lr8I3+TOTBtYFGIVHi/UQOone7UXr5CFsc2pUBxwiswaev/3fUJnw8vkUD+OkY5e tTrBm7Ol1HSzBi0gOMZERVRN09nd3qWwxuMMGUDPjfjSrPqzooE+b3JYB4GaqwJbIk TLHzNzFK9OEAG5aAqOrHsI9rx3zbOUPVZUVzO/HY0EqalhH3SafuRB9sgXCjpKC+y6 cCQu64f3QmqKA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4YpR543sf5z4wyw; Thu, 6 Feb 2025 16:49:44 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v10 04/10] migrate: Migrate guest observed addresses Date: Thu, 6 Feb 2025 16:49:45 +1100 Message-ID: <20250206054951.1041610-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250206054951.1041610-1-david@gibson.dropbear.id.au> References: <20250206054951.1041610-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: T7GBKKFMHZTR5QAKZH5JEKSUVP7JH4LC X-Message-ID-Hash: T7GBKKFMHZTR5QAKZH5JEKSUVP7JH4LC X-MailFrom: dgibson@gandalf.ozlabs.org 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: David Gibson 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: Most of the information in struct ctx doesn't need to be migrated. Either it's strictly back end information which is allowed to differ between the two ends, or it must already be configured identically on the two ends. There are a few exceptions though. In particular passt learns several addresses of the guest by observing what it sends out. If we lose this information across migration we might get away with it, but if there are active flows we might misdirect some packets before re-learning the guest address. Avoid this by migrating the guest's observed addresses. Signed-off-by: David Gibson --- migrate.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/migrate.c b/migrate.c index b5d87547..ba8332df 100644 --- a/migrate.c +++ b/migrate.c @@ -27,8 +27,58 @@ /* Magic identifier for migration data */ #define MIGRATE_MAGIC 0xB1BB1D1B0BB1D1B0 +/** + * struct migrate_seen_addrs_v1 - Migratable guest addresses for v1 state stream + * @addr6: Observed guest IPv6 address + * @addr6_ll: Observed guest IPv6 link-local address + * @addr4: Observed guest IPv4 address + * @mac: Observed guest MAC address + */ +struct migrate_seen_addrs_v1 { + struct in6_addr addr6; + struct in6_addr addr6_ll; + struct in_addr addr4; + unsigned char mac[ETH_ALEN]; +} __attribute__((packed)); + +static int seen_addrs_source_v1(struct ctx *c, + const struct migrate_stage *stage, int fd) +{ + struct migrate_seen_addrs_v1 addrs = { + .addr6 = c->ip6.addr_seen, + .addr6_ll = c->ip6.addr_ll_seen, + .addr4 = c->ip4.addr_seen, + }; + + (void)stage; + memcpy(addrs.mac, c->guest_mac, sizeof(addrs.mac)); + return write_all_buf(fd, &addrs, sizeof(addrs)); +} + +static int seen_addrs_target_v1(struct ctx *c, + const struct migrate_stage *stage, int fd) +{ + struct migrate_seen_addrs_v1 addrs; + + (void)stage; + + if (read_all_buf(fd, &addrs, sizeof(addrs))) + return errno; + + c->ip6.addr_seen = addrs.addr6; + c->ip6.addr_ll_seen = addrs.addr6_ll; + c->ip4.addr_seen = addrs.addr4; + memcpy(c->guest_mac, addrs.mac, sizeof(c->guest_mac)); + return 0; +} + /* Stages for version 1 */ static const struct migrate_stage stages_v1[] = { + { + .name = "seen addresses", + .source = seen_addrs_source_v1, + .target = seen_addrs_target_v1, + }, { 0 }, }; -- 2.48.1