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=202512 header.b=WgotRi+k; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id A2F215A0627 for ; Wed, 10 Dec 2025 08:03:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202512; t=1765350179; bh=HUusGS/5mHA5pPnJGj/5c35Q3hTmhQBQj0zG6XZO8ME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WgotRi+kJcylcDENRqfPOI/gTXN/bzUNKBnTnLyzVP6SvrhY7uiu0prq33WIQV11W 7E11slkXVHZ9PHWJzXoLeSbEu030iJTFdcd/WhZEEbctBG2stpwKrob6ZT+/F2hRvJ kWU/CCkNEwgUkXyGwmPPLkPaL3vX4OhOVHDlHH9zhSC4K5By+nVzikB+Mk5gEk6Lx+ QUwTViGoEAISG68bQ6C6YezQhQaOk6QZWUSr/4f2FHx65M7X+sISmwsnRJePPvofu6 NRgUS50gpaJgq1awmeIv9t0yYFg0k+t72GMSFk4Utq+O1+Y8HecmZtnfTF2QaFLqj1 K71s6SzH46/fA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4dR69v0CbHz4wQm; Wed, 10 Dec 2025 18:02:59 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH 1/2] tcp: Correct timer expiry value in trace message Date: Wed, 10 Dec 2025 18:02:56 +1100 Message-ID: <20251210070257.1775739-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251210070257.1775739-1-david@gibson.dropbear.id.au> References: <20251210070257.1775739-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: VIKE3QNWRRUG535PLGNHYVDHJQTVYXTA X-Message-ID-Hash: VIKE3QNWRRUG535PLGNHYVDHJQTVYXTA 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: 000601ba8 ("tcp: Adaptive interval based on RTT for socket-side acknowledgement checks") added (amongst other things) a new trace message showing the expiry time for the TCP timer in ms rather than s. Unfortunately there were some arithmetic errors in the message, meaning it will print incorrect numbers. Correct them Fixes: 000601ba86da ("tcp: Adaptive interval based on RTT for socket-side acknowledgement checks") Link: https://bugs.passt.top/show_bug.cgi?id=182 Signed-off-by: David Gibson --- tcp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tcp.c b/tcp.c index 8dabfd30..ce36bbd3 100644 --- a/tcp.c +++ b/tcp.c @@ -626,11 +626,11 @@ static void tcp_timer_ctl(const struct ctx *c, struct tcp_tap_conn *conn) } if (conn->flags & ACK_TO_TAP_DUE) { - flow_trace(conn, "timer expires in %llu.%03llums", - (unsigned long)it.it_value.tv_sec * 1000 + - (unsigned long long)it.it_value.tv_nsec % - ((long)1000 * 1000), - (unsigned long long)it.it_value.tv_nsec / 1000); + flow_trace(conn, "timer expires in %llu.%02llums", + (unsigned long long)it.it_value.tv_sec * 1000 + + it.it_value.tv_nsec / 1000 / 1000, + (unsigned long long)it.it_value.tv_nsec + / 1000 / 10 % 100); } else { flow_dbg(conn, "timer expires in %llu.%03llus", (unsigned long long)it.it_value.tv_sec, -- 2.52.0