public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v14 14/14] WIP: migrate, tcp: Shrink windows before migration
Date: Mon, 10 Feb 2025 20:18:05 +1100	[thread overview]
Message-ID: <20250210091805.2261228-15-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20250210091805.2261228-1-david@gibson.dropbear.id.au>

From: Stefano Brivio <sbrivio@redhat.com>

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 flow.c     | 36 ++++++++++++++++++++++++++++++++++++
 flow.h     |  2 ++
 migrate.c  |  9 +++++++++
 tcp.c      | 30 ++++++++++++++++++++++++++++++
 tcp_conn.h |  1 +
 5 files changed, 78 insertions(+)

diff --git a/flow.c b/flow.c
index dbe57082..4807653a 100644
--- a/flow.c
+++ b/flow.c
@@ -956,6 +956,42 @@ static int flow_migrate_repair_all(struct ctx *c, bool enable)
 	return 0;
 }
 
+/**
+ * flow_migrate_source_early() - Early tasks: shrink (RFC 7323 2.2) TCP windows
+ * @c:		Execution context
+ * @stage:	Migration stage information, unused
+ * @fd:		Migration file descriptor, unused
+ *
+ * Return: 0 on success, positive error code on failure
+ */
+int flow_migrate_source_early(struct ctx *c, const struct migrate_stage *stage,
+			      int fd)
+{
+	union flow *flow;
+	unsigned i;
+	int rc;
+
+	(void)stage;
+	(void)fd;
+
+	/* We need repair mode to dump and set (some) window parameters */
+	if ((rc = flow_migrate_repair_all(c, true)))
+		return -rc;
+
+	foreach_tcp_flow(i, flow, FLOW_MAX) {
+		if ((rc = tcp_flow_migrate_shrink_window(i, &flow->tcp))) {
+			err("Shrinking window, flow %u: %s", i, strerror_(-rc));
+			return flow_migrate_source_rollback(c, i, -rc);
+		}
+	}
+
+	/* Now send window updates. We'll flip repair mode back on in a bit */
+	if ((rc = flow_migrate_repair_all(c, false)))
+		return -rc;
+
+	return 0;
+}
+
 /**
  * flow_migrate_source_pre() - Prepare flows for migration: enable repair mode
  * @c:		Execution context
diff --git a/flow.h b/flow.h
index a485c359..675726eb 100644
--- a/flow.h
+++ b/flow.h
@@ -249,6 +249,8 @@ union flow;
 
 void flow_init(void);
 void flow_defer_handler(const struct ctx *c, const struct timespec *now);
+int flow_migrate_source_early(struct ctx *c, const struct migrate_stage *stage,
+			      int fd);
 int flow_migrate_source_pre(struct ctx *c, const struct migrate_stage *stage,
 			    int fd);
 int flow_migrate_source(struct ctx *c, const struct migrate_stage *stage,
diff --git a/migrate.c b/migrate.c
index d035deda..b4e53b45 100644
--- a/migrate.c
+++ b/migrate.c
@@ -98,6 +98,15 @@ static int seen_addrs_target_v1(struct ctx *c,
 
 /* Stages for version 1 */
 static const struct migrate_stage stages_v1[] = {
+	/* FIXME: With this step, close() in tcp_flow_migrate_source_ext()
+	 * *sometimes* closes the connection for real.
+	 */
+/*	{
+		.name = "shrink TCP windows",
+		.source = flow_migrate_source_early,
+		.target = NULL,
+	},
+*/
 	{
 		.name = "observed addresses",
 		.source = seen_addrs_source_v1,
diff --git a/tcp.c b/tcp.c
index c3db1696..94bb059a 100644
--- a/tcp.c
+++ b/tcp.c
@@ -3061,6 +3061,36 @@ static int tcp_flow_repair_wnd(int s, uint32_t *snd_wl1, uint32_t *snd_wnd,
 	return 0;
 }
 
+/**
+ * tcp_flow_migrate_shrink_window() - Dump window data, decrease socket window
+ * @fidx:	Flow index
+ * @conn:	Pointer to the TCP connection structure
+ *
+ * Return: 0 on success, negative error code on failure
+ */
+int tcp_flow_migrate_shrink_window(int fidx, const struct tcp_tap_conn *conn)
+{
+	struct tcp_tap_transfer_ext *t = &migrate_ext[fidx];
+	struct tcp_repair_window wnd;
+	socklen_t sl = sizeof(wnd);
+	int s = conn->sock;
+
+	if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, &((int){ 0 }), sizeof(int)))
+		debug("TCP: failed to set SO_RCVBUF to minimum value");
+
+	/* Dump window data as it is for the target, before touching stuff */
+	tcp_flow_repair_wnd(s, &t->sock_snd_wl1, &t->sock_snd_wnd,
+			    &t->sock_max_window, &t->sock_rcv_wnd,
+			    &t->sock_rcv_wup, &wnd);
+
+	wnd.rcv_wnd = 0;
+
+	if (setsockopt(s, IPPROTO_TCP, TCP_REPAIR_WINDOW, &wnd, sl))
+		debug_perror("Setting window repair data, socket %i", s);
+
+	return 0;
+}
+
 /**
  * tcp_flow_migrate_source() - Send data (flow table part) for a single flow
  * @c:		Execution context
diff --git a/tcp_conn.h b/tcp_conn.h
index 1c920a6e..b64e857a 100644
--- a/tcp_conn.h
+++ b/tcp_conn.h
@@ -227,6 +227,7 @@ bool tcp_flow_defer(const struct tcp_tap_conn *conn);
 int tcp_flow_repair_on(struct ctx *c, const struct tcp_tap_conn *conn);
 int tcp_flow_repair_off(struct ctx *c, const struct tcp_tap_conn *conn);
 
+int tcp_flow_migrate_shrink_window(int fidx, const struct tcp_tap_conn *conn);
 int tcp_flow_migrate_source(int fd, const struct tcp_tap_conn *conn);
 int tcp_flow_migrate_source_ext(int fd, int fidx,
 				const struct tcp_tap_conn *conn);
-- 
@@ -227,6 +227,7 @@ bool tcp_flow_defer(const struct tcp_tap_conn *conn);
 int tcp_flow_repair_on(struct ctx *c, const struct tcp_tap_conn *conn);
 int tcp_flow_repair_off(struct ctx *c, const struct tcp_tap_conn *conn);
 
+int tcp_flow_migrate_shrink_window(int fidx, const struct tcp_tap_conn *conn);
 int tcp_flow_migrate_source(int fd, const struct tcp_tap_conn *conn);
 int tcp_flow_migrate_source_ext(int fd, int fidx,
 				const struct tcp_tap_conn *conn);
-- 
2.48.1


      parent reply	other threads:[~2025-02-10  9:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-10  9:17 [PATCH v14 00/14] State migration David Gibson
2025-02-10  9:17 ` [PATCH v14 01/14] migrate: Skeleton of live migration logic David Gibson
2025-02-10  9:17 ` [PATCH v14 02/14] fixup: Remove unused iov field in struct migrate_stage David Gibson
2025-02-10  9:17 ` [PATCH v14 03/14] migrate: Migrate guest observed addresses David Gibson
2025-02-10  9:17 ` [PATCH v14 04/14] Add interfaces and configuration bits for passt-repair David Gibson
2025-02-10  9:17 ` [PATCH v14 05/14] fixup: Reorder conf options David Gibson
2025-02-10  9:17 ` [PATCH v14 06/14] fixup: Correctly type repair_cmd global David Gibson
2025-02-10  9:17 ` [PATCH v14 07/14] fixup: Sanity check passt-repair reply message David Gibson
2025-02-10  9:17 ` [PATCH v14 08/14] fixup: Don't close repair socket after first migration attempt David Gibson
2025-02-10  9:18 ` [PATCH v14 09/14] vhost_user: Make source quit after reporting migration state David Gibson
2025-02-10  9:18 ` [PATCH v14 10/14] fixup: Adjust conditions under which we quite after completing migration David Gibson
2025-02-10  9:18 ` [PATCH v14 11/14] migrate: Migrate TCP flows David Gibson
2025-02-10  9:18 ` [PATCH v14 12/14] fixup: Check for errors on repair mode rollback David Gibson
2025-02-10  9:18 ` [PATCH v14 13/14] test: Add migration tests David Gibson
2025-02-10  9:18 ` David Gibson [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250210091805.2261228-15-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).