public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v11 8/9] fixup: Reset SO_PEEK_OFF value after incoming migration
Date: Fri,  7 Feb 2025 02:07:23 +0100	[thread overview]
Message-ID: <20250207010724.3121569-9-sbrivio@redhat.com> (raw)
In-Reply-To: <20250207010724.3121569-1-sbrivio@redhat.com>

From: David Gibson <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 f0d4a96..0f05011 100644
--- a/tcp.c
+++ b/tcp.c
@@ -3093,6 +3093,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)))
@@ -3121,5 +3122,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;
 }
-- 
@@ -3093,6 +3093,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)))
@@ -3121,5 +3122,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.43.0


  parent reply	other threads:[~2025-02-07  1:07 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-07  1:07 [PATCH v11 0/9] Draft state migration Stefano Brivio
2025-02-07  1:07 ` [PATCH v11 1/9] migrate: Skeleton of live migration logic Stefano Brivio
2025-02-07  1:07 ` [PATCH v11 2/9] fixup: Fix errors in modes that don't support migration Stefano Brivio
2025-02-07  1:07 ` [PATCH v11 3/9] migrate: Migrate guest observed addresses Stefano Brivio
2025-02-07  1:07 ` [PATCH v11 4/9] Add interfaces and configuration bits for passt-repair Stefano Brivio
2025-02-07  1:07 ` [PATCH v11 5/9] vhost_user: Make source quit after reporting migration state Stefano Brivio
2025-02-07  1:07 ` [PATCH v11 6/9] migrate: Hack for late migration fixups Stefano Brivio
2025-02-07  1:07 ` [PATCH v11 7/9] migrate: Migrate TCP flows Stefano Brivio
2025-02-07  1:07 ` Stefano Brivio [this message]
2025-02-07  1:07 ` [PATCH v11 9/9] test: Add migration tests Stefano Brivio

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=20250207010724.3121569-9-sbrivio@redhat.com \
    --to=sbrivio@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    /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).