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 12/14] fixup: Check for errors on repair mode rollback
Date: Mon, 10 Feb 2025 20:18:03 +1100	[thread overview]
Message-ID: <20250210091805.2261228-13-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20250210091805.2261228-1-david@gibson.dropbear.id.au>

From: Stefano Brivio <sbrivio@redhat.com>

Check for errors setting REPAIR_OFF in flow_migrate_source_rollback().
In this situation there's not much we can do but die(), but this at least
should avoid hard to debug weirdness from continuing to operate with some
sockets in repair mode.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 flow.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/flow.c b/flow.c
index 3fdc8881..dbe57082 100644
--- a/flow.c
+++ b/flow.c
@@ -912,9 +912,11 @@ static int flow_migrate_source_rollback(struct ctx *c, unsigned max_flow,
 	debug("...roll back migration");
 
 	foreach_tcp_flow(i, flow, max_flow)
-		tcp_flow_repair_off(c, &flow->tcp);
+		if (tcp_flow_repair_off(c, &flow->tcp))
+			die("Failed to roll back TCP_REPAIR mode");
 
-	repair_flush(c);
+	if (repair_flush(c))
+		die("Failed to roll back TCP_REPAIR mode");
 
 	return ret;
 }
-- 
@@ -912,9 +912,11 @@ static int flow_migrate_source_rollback(struct ctx *c, unsigned max_flow,
 	debug("...roll back migration");
 
 	foreach_tcp_flow(i, flow, max_flow)
-		tcp_flow_repair_off(c, &flow->tcp);
+		if (tcp_flow_repair_off(c, &flow->tcp))
+			die("Failed to roll back TCP_REPAIR mode");
 
-	repair_flush(c);
+	if (repair_flush(c))
+		die("Failed to roll back TCP_REPAIR mode");
 
 	return ret;
 }
-- 
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 ` David Gibson [this message]
2025-02-10  9:18 ` [PATCH v14 13/14] test: Add migration tests David Gibson
2025-02-10  9:18 ` [PATCH v14 14/14] WIP: migrate, tcp: Shrink windows before migration 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=20250210091805.2261228-13-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).