From nobody Tue Jan 28 14:22:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yj6tz1kSfz5lWs5; Tue, 28 Jan 2025 14:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yj6tz11H0z3XVW; Tue, 28 Jan 2025 14:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738074155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOqvwju38L4L3QwV5qAABbRRvUybBc54w7RlWeodLp8=; b=NOaBIoRXKKch7mMXXPNxy/y7Q8+ieWvIffOvx+rOcIKI7+jHGxD3prQwZ18Vz8yXXCj3Y7 1LJwC5BXKhEoW3x9U59LvwdtSrES88bl+Q47hb+AAZrKCZQwSJ4AcEjkB5PK2eN8tUaHqh uQzokAXhlGvHFc/1GKRElna9uyh2QnmH943hXUYE5u07EJgXc1wBIxn6k9FsW2D90B72gK DeTwChEwaWfSQeiDRBW8215cBJRqzquCoHiIHVcXn4ICU9BkV7itl18wVvLG5KndcEEgik MkApiz/iKPJCMiTlpxALJ1vhqbN70R4wK7pASjrjllYB/3sG4fJLatTJEqREng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738074155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOqvwju38L4L3QwV5qAABbRRvUybBc54w7RlWeodLp8=; b=DfdW3PwNaUXYwO4drWU1EGYbjY1PiHIwrqUQGjVlTt5rf7I3Kpy2aFlFz0pkFADlsTxtkC 7WnAcBsCpE/gFr1C4zzC5gEHXdbuiTvns+wEQM39YdpE8064L02Cu61sLS3Pt1TM0Ckd/G uLQ8sjzF+eoYIhfz+Z8opqUKGvfK5PJdD43YgAIo6OS1PrPRuta/RA1+uwMiNXOOAzAJpg Krvd7O/2SittDPqr89rBQ5uf9qIxJbwx73lyAHUIVaPeJTJ0+kM41UMwQXf6IxIUE9/h7x 9Yv2ErCFxWPFMyy3ykJd52n6ztJTnlUjXbRvc1bFz4tb/+pl/N3sPRU5pm+Igw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738074155; a=rsa-sha256; cv=none; b=ntocDZKOIHUGyj25GFdcgR23eXDksqPjYc+CTyBKcXWuMXZYK6VOoWPViHhHamR4S6yKzF ps2popQ0w7s+9c/w1EEsX/XvUclbjIXc4CwzJzasxQX5nHROBAFmQcLyz0Y/VlASaEKULU fRspOg0c2YjN4PvPkUGHoIMXQ161g9lFZL6O9dBeHzG5rb+GuzbhvX8wyFCNWhnohAHbfP aQ/kxp+aWnh+xtrCTu4DdGqB+ClMeKLoJwvyYP3UgjTZvc4SslcESAzYDoBUbLrcE/i/73 x7SpLLwWeuecKrN42q78MKCAa1n/9HnXW9xLjhDAZwz6h3QeYVVfrX/lgoPZZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yj6tz0YfDz3WB; Tue, 28 Jan 2025 14:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50SEMYYx057641; Tue, 28 Jan 2025 14:22:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SEMY1R057638; Tue, 28 Jan 2025 14:22:34 GMT (envelope-from git) Date: Tue, 28 Jan 2025 14:22:34 GMT Message-Id: <202501281422.50SEMY1R057638@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 63efd7f5ac66 - main - socket tests: Add a test which calls listen() twice on an lb socket List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63efd7f5ac6675b5a780adf52b91ee089d8b2665 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=63efd7f5ac6675b5a780adf52b91ee089d8b2665 commit 63efd7f5ac6675b5a780adf52b91ee089d8b2665 Author: Mark Johnston AuthorDate: 2025-01-27 22:23:08 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 14:22:20 +0000 socket tests: Add a test which calls listen() twice on an lb socket This exercises commit 06bf119f265c ("sockets/tcp: quick fix for regression with SO_REUSEPORT_LB") Reviewed by: glebius MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D48702 --- tests/sys/netinet/so_reuseport_lb_test.c | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index 3ce09fcf5794..09d8e0ce8f83 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -377,11 +377,69 @@ ATF_TC_BODY(concurrent_add, tc) } } +/* + * Try calling listen(2) twice on a socket with SO_REUSEPORT_LB set. + */ +ATF_TC_WITHOUT_HEAD(double_listen_ipv4); +ATF_TC_BODY(double_listen_ipv4, tc) +{ + struct sockaddr_in sin; + int error, s; + + s = lb_listen_socket(PF_INET, 0); + + memset(&sin, 0, sizeof(sin)); + sin.sin_len = sizeof(sin); + sin.sin_family = AF_INET; + sin.sin_port = htons(0); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + error = bind(s, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = listen(s, 1); + ATF_REQUIRE_MSG(error == 0, "listen() failed: %s", strerror(errno)); + error = listen(s, 2); + ATF_REQUIRE_MSG(error == 0, "listen() failed: %s", strerror(errno)); + + error = close(s); + ATF_REQUIRE_MSG(error == 0, "close() failed: %s", strerror(errno)); +} + +/* + * Try calling listen(2) twice on a socket with SO_REUSEPORT_LB set. + */ +ATF_TC_WITHOUT_HEAD(double_listen_ipv6); +ATF_TC_BODY(double_listen_ipv6, tc) +{ + struct sockaddr_in6 sin6; + int error, s; + + s = lb_listen_socket(PF_INET6, 0); + + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_len = sizeof(sin6); + sin6.sin6_family = AF_INET6; + sin6.sin6_port = htons(0); + sin6.sin6_addr = in6addr_loopback; + error = bind(s, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = listen(s, 1); + ATF_REQUIRE_MSG(error == 0, "listen() failed: %s", strerror(errno)); + error = listen(s, 2); + ATF_REQUIRE_MSG(error == 0, "listen() failed: %s", strerror(errno)); + + error = close(s); + ATF_REQUIRE_MSG(error == 0, "close() failed: %s", strerror(errno)); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); ATF_TP_ADD_TC(tp, basic_ipv6); ATF_TP_ADD_TC(tp, concurrent_add); + ATF_TP_ADD_TC(tp, double_listen_ipv4); + ATF_TP_ADD_TC(tp, double_listen_ipv6); return (atf_no_error()); }