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=la+dRlT3; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id CA63E5A0629 for ; Thu, 13 Feb 2025 05:58:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1739422696; bh=p6xFFA1AO3ERtswA2qJzInSAVVjfokedoNvyUqG82oI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=la+dRlT3XqQhvNfcuGQmNA7GAGkoDdFnMmDpcwTOy+AtQG9ZLBHETXelt658k4KGu K0gF5tP2zvfG7577sGDxj5fC2oi+MiBamxSncwpPlWNOFIct8zcV4dy5r9z68klOfj pTCY9CXT4BGQUzKQ8PrmVnZRpusIw7wrJhokHWjFUsxp/32/Q3E6bZnBZw3Y//3wmW i6BFbS28pkWZ0T+x8kld635UPb3ds1xVJ23kQNdbIrz+YEMiXT/1p5V9OxIA/rID46 WxA8pt6agEWMzGV5yvpLQIptoNSUiu+Buyg/lnNOzmOVrpm2JLGX3lFft50pxuYS59 5lro7E0DyQRzg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4YtjcS0bsVz4x3S; Thu, 13 Feb 2025 15:58:16 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v20 3/5] fixup?: loop on EGAIN in repair queue Date: Thu, 13 Feb 2025 15:58:11 +1100 Message-ID: <20250213045813.3767488-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213045813.3767488-1-david@gibson.dropbear.id.au> References: <20250213045813.3767488-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: I3QM55L6HXFFDBLW4ZULZERTSLYAEIDA X-Message-ID-Hash: I3QM55L6HXFFDBLW4ZULZERTSLYAEIDA 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: On at least one occassion, I saw the repair queue fail with an EAGAIN. libsoccr doesn't do this, so I'm not sure whether this is really the right thing. Signed-off-by: David Gibson --- tcp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tcp.c b/tcp.c index f18b2913..39035e14 100644 --- a/tcp.c +++ b/tcp.c @@ -2957,6 +2957,8 @@ static int tcp_flow_repair_queue(int s, size_t len, uint8_t *buf) ssize_t rc = send(s, p, MIN(len, chunk), 0); if (rc < 0) { + if (errno == EAGAIN || errno == EWOULDBLOCK) + continue; if ((errno == ENOBUFS || errno == ENOMEM) && chunk >= TCP_MIGRATE_RESTORE_CHUNK_MIN) { chunk /= 2; -- 2.48.1