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=202602 header.b=OZr/w/rR; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 1243A5A0274 for ; Wed, 20 May 2026 15:09:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202602; t=1779282534; bh=8JtN4P+CL1x+nCB+GnYH/SbLW2aogdSE/TzCRZKI2LM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OZr/w/rRmucTuH/ootNd54bD9ME2F4BILDfSRKPoxAcrNKh7dBuP2b3Q5+cunvnmb sjnNsb4SkMnj7fsYEzrtKUndCUwz0dJ7NYT2EfN/FRrCIoX+SHGYX7SSRUqNoZqNBK XoCsqD5AtWK7yAuO4H5QfJ5bVA5UbLYeD6VVidfE5U2endIGFhfhipPeKakg8wqTxF TmybLNwO3ZM2h5t5gR4SxVj0WGvI5ZdbYZpqBs+yylpY/JmrZxZUncM/uU8VdVZyYh RazFjJBmus5nue8UwxP/X0OeIosPIhDyJqWZFbBrvrH3ysodYYs9MimdNCOiiS10sI fm+Im47ovbcTA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4gLBgp1vbmz59Gf; Wed, 20 May 2026 23:08:54 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 6/6] tcp_splice: Simplify shutdown(2) handling Date: Wed, 20 May 2026 23:08:51 +1000 Message-ID: <20260520130851.436931-7-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520130851.436931-1-david@gibson.dropbear.id.au> References: <20260520130851.436931-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: PD55Y3FCJZT2XZ5FUTBYM3RUWDN7NIYH X-Message-ID-Hash: PD55Y3FCJZT2XZ5FUTBYM3RUWDN7NIYH 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: Paul Holzinger , 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: At the end of tcp_splice_forward(), we check for half-closed connections and propagate the FIN to the other side with a shutdown(2). Currently we check for a half closed connection in either direction. That's unnecessary here, because tcp_splice_forward() will already be called for each direction if there are any relevant events. Signed-off-by: David Gibson --- tcp_splice.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tcp_splice.c b/tcp_splice.c index b45f0060..e5018f2e 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -582,21 +582,15 @@ retry: break; } - if (!conn->pending[fromsidei] && - conn->events & FIN_RCVD(fromsidei)) { - unsigned sidei; - - flow_foreach_sidei(sidei) { - if ((conn->events & FIN_RCVD(sidei)) && - !(conn->events & FIN_SENT(!sidei))) { - if (shutdown(conn->s[!sidei], SHUT_WR) < 0) { - flow_perror(conn, "shutdown() on %s", - pif_name(conn->f.pif[!sidei])); - return -1; - } - conn_event(conn, FIN_SENT(!sidei)); - } + if ((conn->events & FIN_RCVD(fromsidei)) && + !(conn->events & FIN_SENT(!fromsidei)) && + !conn->pending[fromsidei]) { + if (shutdown(conn->s[!fromsidei], SHUT_WR) < 0) { + flow_perror(conn, "shutdown() on %s", + pif_name(conn->f.pif[!fromsidei])); + return -1; } + conn_event(conn, FIN_SENT(!fromsidei)); } return 0; -- 2.54.0