From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 6C1015A028B for ; Wed, 28 Feb 2024 12:25:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1709119522; bh=vGnyzn+Cu9QwszzO19iV8nPWQ7fxgC6HUTKjfvs7jlc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CdlcKtmnrbgU9y+y8jCRtDF7JqXzlN3U31sT0NkeviwIjc48LdcwdjBvYBxnOCsSK B4T4P+T8db//g91yV7jYNX7ppavn9/8SKdCWZd59tJtkTiyXFL9Q7/T3MXr+ohzxdA 62YNoSdItE0bbLSdBuO6ghVn6Hn7aHX5RC8G+jjRzV2SdQWyIGQ1RnszW9c0Sb3lc6 hgyPYSbW3AxCBOW+R2mRkKCp2ogdD75tKw3bYc4d1tiGWb+hWHAgLLb0ip7Ng2DmFg ctrSDl+VuqdM4MRx/kRKMmYAR6Ksi3Cm7ijn77VE4gHlWvuwPfI3FypgildtLLJw4j MSCGqp3I3+IZQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4TlBq65Rngz4wyf; Wed, 28 Feb 2024 22:25:22 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v3 09/20] tcp_splice: Don't use flow_trace() before setting flow type Date: Wed, 28 Feb 2024 22:25:09 +1100 Message-ID: <20240228112520.2078220-10-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240228112520.2078220-1-david@gibson.dropbear.id.au> References: <20240228112520.2078220-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: QDM65P5HCQKWGJU66U2U72JKNHTE2K4Y X-Message-ID-Hash: QDM65P5HCQKWGJU66U2U72JKNHTE2K4Y 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: In tcp_splice_conn_from_sock() we can call flow_trace() if there's an error setting TCP_QUICKACK. However, we do so before we've set the flow type in the flow entry. That means that flow_trace() will print nonsense when it tries to print the flow type. There's no reason the setsockopt() has to happen before initialising the flow entry, so just move it after. Signed-off-by: David Gibson --- tcp_splice.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tcp_splice.c b/tcp_splice.c index 8187220d..49585f21 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -453,9 +453,6 @@ bool tcp_splice_conn_from_sock(const struct ctx *c, if (!inany_is_loopback(&aany)) return false; - if (setsockopt(s, SOL_TCP, TCP_QUICKACK, &((int){ 1 }), sizeof(int))) - flow_trace(conn, "failed to set TCP_QUICKACK on %i", s); - conn->f.type = FLOW_TCP_SPLICE; conn->flags = inany_v4(&aany) ? 0 : SPLICE_V6; conn->s[0] = s; @@ -463,6 +460,9 @@ bool tcp_splice_conn_from_sock(const struct ctx *c, conn->pipe[0][0] = conn->pipe[0][1] = -1; conn->pipe[1][0] = conn->pipe[1][1] = -1; + if (setsockopt(s, SOL_TCP, TCP_QUICKACK, &((int){ 1 }), sizeof(int))) + flow_trace(conn, "failed to set TCP_QUICKACK on %i", s); + if (tcp_splice_new(c, conn, ref.port, ref.pif)) conn_flag(c, conn, CLOSING); -- 2.43.2