From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id BD7C45A061B; Fri, 07 Feb 2025 23:54:15 +0100 (CET) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH v12 2/6] migrate: Migrate guest observed addresses Date: Fri, 7 Feb 2025 23:54:11 +0100 Message-ID: <20250207225415.1067296-3-sbrivio@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250207225415.1067296-1-sbrivio@redhat.com> References: <20250207225415.1067296-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: I752X76CTGV5NADFTUYVIDY6R7GDLIRJ X-Message-ID-Hash: I752X76CTGV5NADFTUYVIDY6R7GDLIRJ X-MailFrom: sbrivio@passt.top 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: From: David Gibson 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 [sbrivio: Coding style stuff, comments, etc.] Signed-off-by: Stefano Brivio --- migrate.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/migrate.c b/migrate.c index aeac872..72a6d40 100644 --- a/migrate.c +++ b/migrate.c @@ -27,8 +27,81 @@ /* 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)); + +/** + * seen_addrs_source_v1() - Copy and send guest observed addresses from source + * @c: Execution context + * @stage: Migration stage, unused + * @fd: File descriptor for state transfer + * + * Return: 0 on success, positive error code on failure + */ +/* cppcheck-suppress [constParameterCallback, unmatchedSuppression] */ +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)); + + if (write_all_buf(fd, &addrs, sizeof(addrs))) + return errno; + + return 0; +} + +/** + * seen_addrs_target_v1() - Receive and use guest observed addresses on target + * @c: Execution context + * @stage: Migration stage, unused + * @fd: File descriptor for state transfer + * + * Return: 0 on success, positive error code on failure + */ +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 = "observed addresses", + .source = seen_addrs_source_v1, + .target = seen_addrs_target_v1, + }, { 0 }, }; -- 2.43.0