From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 6B9775A0285 for ; Wed, 16 Nov 2022 05:42:25 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4NBr4R3yVRz4xyK; Wed, 16 Nov 2022 15:42:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1668573735; bh=BGyPtaR1z9MHNQXj4eKHNVzaqzZFqMNeIOxzFCm2qXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=daRzfiQDzNuoPvURS7zqhwkuY1IpC53Kuso5ZCHkI7c/UkMEc5l+XW+2h+/ZRLqy/ oFl65WL41eNX6GQQ+MKHCvfTWeWDpRUSLVXYKlcTUQgR/4A3SuPMjUx6/A0m/MsI3p B4j4Ym8MbNPjkEmkpGwHU+zMmwGMYK6Qnb58rVJ8= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 28/32] tcp_splice: Allow splicing of connections from IPv4-mapped loopback Date: Wed, 16 Nov 2022 15:42:08 +1100 Message-Id: <20221116044212.3876516-29-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116044212.3876516-1-david@gibson.dropbear.id.au> References: <20221116044212.3876516-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: ZBVWSS5TTHO5ZQZCEZRKD6JN3PYAQBQZ X-Message-ID-Hash: ZBVWSS5TTHO5ZQZCEZRKD6JN3PYAQBQZ 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.3 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: For non-spliced connections we now treat IPv4-mapped IPv6 addresses the same as the corresponding IPv4 addresses. However currently we won't splice a connection from ::ffff:127.0.0.1 the way we would one from 127.0.0.1. Correct this so that we can splice connections from IPv4 localhost that have been received on an IPv6 dual stack socket. Signed-off-by: David Gibson --- tcp_splice.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tcp_splice.c b/tcp_splice.c index 7c2f667..61c56be 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -514,19 +514,23 @@ bool tcp_splice_conn_from_sock(struct ctx *c, union epoll_ref ref, struct tcp_splice_conn *conn, int s, const struct sockaddr *sa) { + union inany_addr aany; + const struct in_addr *a4; + in_port_t port; + assert(c->mode == MODE_PASTA); - if (sa->sa_family == AF_INET6) { - const struct sockaddr_in6 *sa6 - = (const struct sockaddr_in6 *)sa; - if (!IN6_IS_ADDR_LOOPBACK(&sa6->sin6_addr)) + inany_from_sockaddr(&aany, &port, sa); + a4 = inany_v4(&aany); + + if (a4) { + if (!IN4_IS_ADDR_LOOPBACK(a4)) return false; - conn->flags = SPLICE_V6; + conn->flags = 0; } else { - const struct sockaddr_in *sa4 = (const struct sockaddr_in *)sa; - if (!IN4_IS_ADDR_LOOPBACK(&sa4->sin_addr)) + if (!IN6_IS_ADDR_LOOPBACK(&aany.a6)) return false; - conn->flags = 0; + conn->flags = SPLICE_V6; } if (setsockopt(s, SOL_TCP, TCP_QUICKACK, &((int){ 1 }), -- 2.38.1