From nobody Fri Nov 29 12:39:46 2024 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE748184533 for ; Fri, 20 Sep 2024 17:02:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726851769; cv=none; b=DPZmGXMaWMw5URHN3N0cdNH+8mOALkt3NSRrqZtI3BQToe0vZ3/rsKKzK3tifkEHJSCEZdZNyxoy4jh4gYbUC75X7eXEJU0Cw25FtUJKj+rfUSkdbl071pdBBlEtT1nIMbnWBj+0Rd/DfQ8DoINeWf2gut5q6tP4WjzA2tzN5C8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726851769; c=relaxed/simple; bh=6jsLEb0C8rdq7VDmohj4Ns2SNUA7feYh+nsP+pP6g2s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IBLsXZ0KsNiNTVxhZ1l1bygPIxCfjKCXkdgf/1uezCbmqmNksd9IQkhN6lEYvzx4iihbBue6qu2vcZBSoIiwmwjayqJiPuTFWiPAFWqRtkk+x/PosrBnFgY+Bt4lmYDQEtzTflCcfAgbIL9zH0BU7OtlL2805/9xTRgJti94cu0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=bwW7vOG5; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="bwW7vOG5" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-42cb57f8b41so27543715e9.0 for ; Fri, 20 Sep 2024 10:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1726851766; x=1727456566; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5SJJEI41L6DAw5qSjBYrpeTyLVVZdoMRJaxTx6iDMqc=; b=bwW7vOG5za4XECZQ5gxpZ0GwfAKnv3yuBfN2e1EOMMvJzqxGUX+RxWsZt4fElOZYdf aeiCRXi/DQReBe5ehwKfueEPenONov2eNozWF5jT4XvqUXxi6u9/bcxhTjJUXysBbnhU ncrS2oMoGgUA2sa6EFKr7KWWvkmULBQDATkBmAvXS/JwMAhFRABAZ+3Aa3id8LIUUMhW ow2XYjQLDJh76/+BbcwvKbM3QYMRv+jX/1eers3aaQuJWE2eT2CurPFmVKeZOK2B02oj CRWq18bZy9nBVJ0Rm9CQeOoRSTCk+zfBGZ1NTZFntrSjESSRHr6GZht4Idk819ZEFgFi OJzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726851766; x=1727456566; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5SJJEI41L6DAw5qSjBYrpeTyLVVZdoMRJaxTx6iDMqc=; b=s9XwevH6b8iueU2WCfYVocSEubv4WEevJy3znnN23yQTVYFeJg34MrKD7J/m9+2WGH n5Sjp1u7nsYfPbOGn+TlS0LnulUlGNp5ScKvljEzIVOkOX9Uwy3JMIt91+NW9AKKnKta I554OG7Ix4CpIJmVVApBRTahsQEsAmBIBpMkjm6DHwZVlR/cUb+Jmw7cl5aVrlyE9dPd cpnB6U6+gYrFrqhSOKNzYWNke3+7alEb3DcCM6JYsGtT6PgtXGoYxLZzDdO1g7RjpEtt Ou6bXOz9GmNPBOl9oDvP/cJw06EO5shGcM0Luqt6d+1HTa/KVEa23Y1rKsvMYeUuxqaT EoLA== X-Forwarded-Encrypted: i=1; AJvYcCX/H7uHMMypmVSr70DizDFi7WNbjcHgNzL9EbsnWkQTLlWDCOYU3XyCdPfzBxy3fZ6id+4w+cKt486OsKg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxy8jRLiylLldy1mQyHc//znU5Bt6eOP4OBbgO5N8bhG1pp9xMq eO/KwcT7QGbl1+rsCqceSAQFbsQwSOnIw3X9qQPCf/VqZwwP0pUlGL4uWNALR7Y= X-Google-Smtp-Source: AGHT+IH/xVCKh+VVWbY69gd2wFgfenC/+h+2qOLYdNz5m9L1N+IiLpwVhUgpa5NRi45ntZBxsNIhpw== X-Received: by 2002:a05:600c:4f0f:b0:42c:b62c:9f0d with SMTP id 5b1f17b1804b1-42e7ac4b1d4mr40135785e9.17.1726851766097; Fri, 20 Sep 2024 10:02:46 -0700 (PDT) Received: from [127.0.1.1] ([2a09:bac5:50ca:432::6b:72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e75450ac2sm54237785e9.24.2024.09.20.10.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2024 10:02:45 -0700 (PDT) From: Tiago Lam Date: Fri, 20 Sep 2024 18:02:14 +0100 Subject: [RFC PATCH v2 3/3] bpf: Add sk_lookup test to use ORIGDSTADDR cmsg. Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240920-reverse-sk-lookup-v2-3-916a48c47d56@cloudflare.com> References: <20240920-reverse-sk-lookup-v2-0-916a48c47d56@cloudflare.com> In-Reply-To: <20240920-reverse-sk-lookup-v2-0-916a48c47d56@cloudflare.com> To: "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Jakub Sitnicki , Tiago Lam , kernel-team@cloudflare.com X-Mailer: b4 0.14.1 This patch reuses the framework already in place for sk_lookup, allowing it now to send a reply from the server fd directly, instead of having to create a socket bound to the original destination address and reply from there. It does this by passing the source address and port from where to reply from in a IP_ORIGDSTADDR ancillary message passed in sendmsg. Signed-off-by: Tiago Lam --- tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 67 +++++++++++++++---= ---- 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c b/tools/tes= ting/selftests/bpf/prog_tests/sk_lookup.c index ae87c00867ba..df780624c16c 100644 --- a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c +++ b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c @@ -75,6 +75,7 @@ struct test { struct inet_addr listen_at; enum server accept_on; bool reuseport_has_conns; /* Add a connected socket to reuseport group */ + bool dont_bind_reply; /* Don't bind, send direct from server fd. */ }; =20 struct cb_opts { @@ -363,7 +364,7 @@ static void v4_to_v6(struct sockaddr_storage *ss) memset(&v6->sin6_addr.s6_addr[0], 0, 10); } =20 -static int udp_recv_send(int server_fd) +static int udp_recv_send(int server_fd, bool dont_bind_reply) { char cmsg_buf[CMSG_SPACE(sizeof(struct sockaddr_storage))]; struct sockaddr_storage _src_addr =3D { 0 }; @@ -373,7 +374,7 @@ static int udp_recv_send(int server_fd) struct iovec iov =3D { 0 }; struct cmsghdr *cm; char buf[1]; - int ret, fd; + int fd; ssize_t n; =20 iov.iov_base =3D buf; @@ -415,26 +416,37 @@ static int udp_recv_send(int server_fd) v4_to_v6(dst_addr); } =20 - /* Reply from original destination address. */ - fd =3D start_server_addr(SOCK_DGRAM, dst_addr, sizeof(*dst_addr), NULL); - if (!ASSERT_OK_FD(fd, "start_server_addr")) { - log_err("failed to create tx socket"); - return -1; - } + if (dont_bind_reply) { + /* Reply directly from server fd, specifying the source address + * and/or port in struct msghdr. + */ + n =3D sendmsg(server_fd, &msg, 0); + if (CHECK(n <=3D 0, "sendmsg", "failed\n")) { + log_err("failed to send echo reply"); + return -1; + } + } else { + /* Reply from original destination address. */ + fd =3D start_server_addr(SOCK_DGRAM, dst_addr, sizeof(*dst_addr), + NULL); + if (!ASSERT_OK_FD(fd, "start_server_addr")) { + log_err("failed to create tx socket"); + return -1; + } =20 - msg.msg_control =3D NULL; - msg.msg_controllen =3D 0; - n =3D sendmsg(fd, &msg, 0); - if (CHECK(n <=3D 0, "sendmsg", "failed\n")) { - log_err("failed to send echo reply"); - ret =3D -1; - goto out; + msg.msg_control =3D NULL; + msg.msg_controllen =3D 0; + n =3D sendmsg(fd, &msg, 0); + if (CHECK(n <=3D 0, "sendmsg", "failed\n")) { + log_err("failed to send echo reply"); + close(fd); + return -1; + } + + close(fd); } =20 - ret =3D 0; -out: - close(fd); - return ret; + return 0; } =20 static int tcp_echo_test(int client_fd, int server_fd) @@ -454,14 +466,14 @@ static int tcp_echo_test(int client_fd, int server_fd) return 0; } =20 -static int udp_echo_test(int client_fd, int server_fd) +static int udp_echo_test(int client_fd, int server_fd, bool dont_bind_repl= y) { int err; =20 err =3D send_byte(client_fd); if (err) return -1; - err =3D udp_recv_send(server_fd); + err =3D udp_recv_send(server_fd, dont_bind_reply); if (err) return -1; err =3D recv_byte(client_fd); @@ -653,7 +665,8 @@ static void run_lookup_prog(const struct test *t) if (t->sotype =3D=3D SOCK_STREAM) tcp_echo_test(client_fd, server_fds[t->accept_on]); else - udp_echo_test(client_fd, server_fds[t->accept_on]); + udp_echo_test(client_fd, server_fds[t->accept_on], + t->dont_bind_reply); =20 close(client_fd); close: @@ -775,6 +788,16 @@ static void test_redirect_lookup(struct test_sk_lookup= *skel) .listen_at =3D { INT_IP4, INT_PORT }, .accept_on =3D SERVER_B, }, + { + .desc =3D "UDP IPv4 redir different ports", + .lookup_prog =3D skel->progs.select_sock_a_no_reuseport, + .sock_map =3D skel->maps.redir_map, + .sotype =3D SOCK_DGRAM, + .connect_to =3D { EXT_IP4, EXT_PORT }, + .listen_at =3D { INT_IP4, INT_PORT }, + .accept_on =3D SERVER_A, + .dont_bind_reply =3D true, + }, { .desc =3D "UDP IPv4 redir and reuseport with conns", .lookup_prog =3D skel->progs.select_sock_a, --=20 2.34.1