From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202502 header.b=TSgtStvu; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id CC5905A0275 for ; Tue, 04 Feb 2025 06:42:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1738647727; bh=6EP2ng95g+ihlFI740LYxp4SCPDrc7Zhid6AyU+8Jis=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TSgtStvuOwCYGjgRhEfPWT0dLm+nEMVsRxSmkAzPfRFQ52c5T0As17rnssgCt6TOy EidMR/1SCBQ+XYPfMRffVsSe0UHYa3zyqJaFhabIHVWbZnWSFFbvw1pg4UVO8mzQSQ joY03VlwlBZ+V4LNW40+c1RNr1F1ZJXT/JZN13lMa3GcNWJXo6yJSUbyS4YHmTdoHT bEklxPIHMq6cQQfd3WHTIB2NPQPbCCilrZ7GmX/pDoKvR75bKuQg4dShB0TJaoI+zw sSgZ0cjSuzvaqiQ6X2t/zi72/9UFnfBi5fN5BXjlMG57yPgGMiEp2ZJ9TWw1mqFP+4 q+EBoRoX7V2nA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4YnC1C2HgMz4wy9; Tue, 4 Feb 2025 16:42:07 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 2/3] migrate, tcp: Report more error conditions during connection repair Date: Tue, 4 Feb 2025 16:42:14 +1100 Message-ID: <20250204054215.644811-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250204054215.644811-1-david@gibson.dropbear.id.au> References: <20250204054215.644811-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 3DKEYK5TCS7XVZRTSRFI4M6DLG7FK5UU X-Message-ID-Hash: 3DKEYK5TCS7XVZRTSRFI4M6DLG7FK5UU X-MailFrom: dgibson@gandalf.ozlabs.org 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: This should help debugging problems with migration. [This is a candidate to be folded into the earlier patch] Signed-off-by: David Gibson --- tcp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tcp.c b/tcp.c index 3760e67a..7ce0f4cb 100644 --- a/tcp.c +++ b/tcp.c @@ -1011,10 +1011,17 @@ int tcp_flow_repair_connect(struct ctx *c, struct tcp_tap_conn *conn) { struct flowside *tgt = &conn->f.side[TGTSIDE]; struct tcp_repair_opt opts[2]; + int rc; - tcp_flow_repair_seq(c, conn, true); + rc = tcp_flow_repair_seq(c, conn, true); + if (rc) + return rc; - flowside_connect(c, conn->sock, PIF_HOST, tgt); + rc = flowside_connect(c, conn->sock, PIF_HOST, tgt); + if (rc) { + err("Failed to connect repaired socket: %s", strerror_(errno)); + return rc; + } /* FIXME: Fetch those with TCP_REPAIR_OPTIONS and store in migration * data. These hardcoded values just happen to be good enough. -- 2.48.1