public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>, passt-dev@passt.top
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v10 09/10] fixup: Reset SO_PEEK_OFF value after incoming migration
Date: Thu,  6 Feb 2025 16:49:50 +1100	[thread overview]
Message-ID: <20250206054951.1041610-10-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20250206054951.1041610-1-david@gibson.dropbear.id.au>

TCP code needs to do different things depending on whether SO_PEEK_OFF
is enabled on the socket, and it assumes it is already set if it is
supported.  However, we didn't re-enable it on sockets created for an
incoming migration.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 tcp.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tcp.c b/tcp.c
index 885ba3af..5b389ef8 100644
--- a/tcp.c
+++ b/tcp.c
@@ -3076,6 +3076,7 @@ int tcp_flow_migrate_target_ext(struct ctx *c, union flow *flow, int fd)
 {
 	struct tcp_tap_conn *conn = &flow->tcp;
 	struct tcp_tap_transfer_ext t;
+	uint32_t peek_offset;
 	int s = conn->sock;
 
 	if (read_all_buf(fd, &t, sizeof(t)))
@@ -3104,5 +3105,9 @@ int tcp_flow_migrate_target_ext(struct ctx *c, union flow *flow, int fd)
 
 	tcp_flow_repair_off(c, conn);
 
+	peek_offset = conn->seq_to_tap - conn->seq_ack_from_tap;
+	if (tcp_set_peek_offset(conn->sock, peek_offset))
+		tcp_rst(c, conn);
+
 	return 0;
 }
-- 
@@ -3076,6 +3076,7 @@ int tcp_flow_migrate_target_ext(struct ctx *c, union flow *flow, int fd)
 {
 	struct tcp_tap_conn *conn = &flow->tcp;
 	struct tcp_tap_transfer_ext t;
+	uint32_t peek_offset;
 	int s = conn->sock;
 
 	if (read_all_buf(fd, &t, sizeof(t)))
@@ -3104,5 +3105,9 @@ int tcp_flow_migrate_target_ext(struct ctx *c, union flow *flow, int fd)
 
 	tcp_flow_repair_off(c, conn);
 
+	peek_offset = conn->seq_to_tap - conn->seq_ack_from_tap;
+	if (tcp_set_peek_offset(conn->sock, peek_offset))
+		tcp_rst(c, conn);
+
 	return 0;
 }
-- 
2.48.1


  parent reply	other threads:[~2025-02-06  5:50 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-06  5:49 [PATCH v10 00/10] Draft state migration David Gibson
2025-02-06  5:49 ` [PATCH v10 01/10] debug: Add tcpdump to mbuto.img David Gibson
2025-02-06  9:14   ` Stefano Brivio
2025-02-06  5:49 ` [PATCH v10 02/10] migrate: Skeleton of live migration logic David Gibson
2025-02-06  5:49 ` [PATCH v10 03/10] fixup: Fix errors in modes that don't support migration David Gibson
2025-02-06  5:49 ` [PATCH v10 04/10] migrate: Migrate guest observed addresses David Gibson
2025-02-06  5:49 ` [PATCH v10 05/10] Add interfaces and configuration bits for passt-repair David Gibson
2025-02-06  5:49 ` [PATCH v10 06/10] vhost_user: Make source quit after reporting migration state David Gibson
2025-02-06  5:49 ` [PATCH v10 07/10] migrate: Hack for late migration fixups David Gibson
2025-02-06  5:49 ` [PATCH v10 08/10] migrate: Migrate TCP flows David Gibson
2025-02-06  5:49 ` David Gibson [this message]
2025-02-06  5:49 ` [PATCH v10 10/10] test: Add migrate/basic tests David Gibson

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=20250206054951.1041610-10-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).