From: Joanne Koong <joannelkoong@gmail.com>
To: Kuniyuki Iwashima <kuniyu@amazon.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Jiri Slaby <jirislaby@kernel.org>,
Kuniyuki Iwashima <kuni1840@gmail.com>,
netdev@vger.kernel.org
Subject: Re: [PATCH v1 net 2/2] tcp: Add selftest for bind() and TIME_WAIT.
Date: Tue, 27 Dec 2022 10:08:22 -0800 [thread overview]
Message-ID: <CAJnrk1aWLfvgit5CgoctMK03LtOMc-SuGu5J=jB1LwCPCYNfiA@mail.gmail.com> (raw)
In-Reply-To: <20221226132753.44175-3-kuniyu@amazon.com>
On Mon, Dec 26, 2022 at 5:29 AM Kuniyuki Iwashima <kuniyu@amazon.com> wrote:
>
> bhash2 split the bind() validation logic into wildcard and non-wildcard
> cases. Let's add a test to catch future regression.
>
> Before the previous patch:
>
> # ./bind_timewait
> TAP version 13
> 1..2
> # Starting 2 tests from 3 test cases.
> # RUN bind_timewait.localhost.1 ...
> # bind_timewait.c:87:1:Expected ret (0) == -1 (-1)
> # 1: Test terminated by assertion
> # FAIL bind_timewait.localhost.1
> not ok 1 bind_timewait.localhost.1
> # RUN bind_timewait.addrany.1 ...
> # OK bind_timewait.addrany.1
> ok 2 bind_timewait.addrany.1
> # FAILED: 1 / 2 tests passed.
> # Totals: pass:1 fail:1 xfail:0 xpass:0 skip:0 error:0
>
> After:
>
> # ./bind_timewait
> TAP version 13
> 1..2
> # Starting 2 tests from 3 test cases.
> # RUN bind_timewait.localhost.1 ...
> # OK bind_timewait.localhost.1
> ok 1 bind_timewait.localhost.1
> # RUN bind_timewait.addrany.1 ...
> # OK bind_timewait.addrany.1
> ok 2 bind_timewait.addrany.1
> # PASSED: 2 / 2 tests passed.
> # Totals: pass:2 fail:0 xfail:0 xpass:0 skip:0 error:0
>
> Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Acked-by: Joanne Koong <joannelkoong@gmail.com>
> ---
> tools/testing/selftests/net/.gitignore | 1 +
> tools/testing/selftests/net/bind_timewait.c | 92 +++++++++++++++++++++
> 2 files changed, 93 insertions(+)
> create mode 100644 tools/testing/selftests/net/bind_timewait.c
>
> diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore
> index 9cc84114741d..a6911cae368c 100644
> --- a/tools/testing/selftests/net/.gitignore
> +++ b/tools/testing/selftests/net/.gitignore
> @@ -1,5 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0-only
> bind_bhash
> +bind_timewait
> csum
> cmsg_sender
> diag_uid
> diff --git a/tools/testing/selftests/net/bind_timewait.c b/tools/testing/selftests/net/bind_timewait.c
> new file mode 100644
> index 000000000000..cb9fdf51ea59
> --- /dev/null
> +++ b/tools/testing/selftests/net/bind_timewait.c
> @@ -0,0 +1,92 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright Amazon.com Inc. or its affiliates. */
> +
> +#include <sys/socket.h>
> +#include <netinet/in.h>
> +
> +#include "../kselftest_harness.h"
> +
> +FIXTURE(bind_timewait)
> +{
> + struct sockaddr_in addr;
> + socklen_t addrlen;
> +};
> +
> +FIXTURE_VARIANT(bind_timewait)
> +{
> + __u32 addr_const;
> +};
> +
> +FIXTURE_VARIANT_ADD(bind_timewait, localhost)
> +{
> + .addr_const = INADDR_LOOPBACK
> +};
> +
> +FIXTURE_VARIANT_ADD(bind_timewait, addrany)
> +{
> + .addr_const = INADDR_ANY
> +};
> +
> +FIXTURE_SETUP(bind_timewait)
> +{
> + self->addr.sin_family = AF_INET;
> + self->addr.sin_port = 0;
> + self->addr.sin_addr.s_addr = htonl(variant->addr_const);
> + self->addrlen = sizeof(self->addr);
> +}
> +
> +FIXTURE_TEARDOWN(bind_timewait)
> +{
> +}
> +
> +void create_timewait_socket(struct __test_metadata *_metadata,
> + FIXTURE_DATA(bind_timewait) *self)
> +{
> + int server_fd, client_fd, child_fd, ret;
> + struct sockaddr_in addr;
> + socklen_t addrlen;
> +
> + server_fd = socket(AF_INET, SOCK_STREAM, 0);
> + ASSERT_GT(server_fd, 0);
> +
> + ret = bind(server_fd, (struct sockaddr *)&self->addr, self->addrlen);
> + ASSERT_EQ(ret, 0);
> +
> + ret = listen(server_fd, 1);
> + ASSERT_EQ(ret, 0);
> +
> + ret = getsockname(server_fd, (struct sockaddr *)&self->addr, &self->addrlen);
> + ASSERT_EQ(ret, 0);
> +
> + client_fd = socket(AF_INET, SOCK_STREAM, 0);
> + ASSERT_GT(client_fd, 0);
> +
> + ret = connect(client_fd, (struct sockaddr *)&self->addr, self->addrlen);
> + ASSERT_EQ(ret, 0);
> +
> + addrlen = sizeof(addr);
> + child_fd = accept(server_fd, (struct sockaddr *)&addr, &addrlen);
> + ASSERT_GT(child_fd, 0);
> +
> + close(child_fd);
> + close(client_fd);
> + close(server_fd);
> +}
> +
> +TEST_F(bind_timewait, 1)
> +{
> + int fd, ret;
> +
> + create_timewait_socket(_metadata, self);
> +
> + fd = socket(AF_INET, SOCK_STREAM, 0);
> + ASSERT_GT(fd, 0);
> +
> + ret = bind(fd, (struct sockaddr *)&self->addr, self->addrlen);
> + ASSERT_EQ(ret, -1);
> + ASSERT_EQ(errno, EADDRINUSE);
> +
> + close(fd);
> +}
> +
> +TEST_HARNESS_MAIN
> --
> 2.30.2
>
next prev parent reply other threads:[~2022-12-27 18:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-26 13:27 [PATCH v1 net 0/2] tcp: Fix bhash2 and TIME_WAIT regression Kuniyuki Iwashima
2022-12-26 13:27 ` [PATCH v1 net 1/2] tcp: Add TIME_WAIT sockets in bhash2 Kuniyuki Iwashima
2022-12-27 18:26 ` Joanne Koong
2022-12-26 13:27 ` [PATCH v1 net 2/2] tcp: Add selftest for bind() and TIME_WAIT Kuniyuki Iwashima
2022-12-27 18:08 ` Joanne Koong [this message]
2022-12-30 7:40 ` [PATCH v1 net 0/2] tcp: Fix bhash2 and TIME_WAIT regression patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJnrk1aWLfvgit5CgoctMK03LtOMc-SuGu5J=jB1LwCPCYNfiA@mail.gmail.com' \
--to=joannelkoong@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jirislaby@kernel.org \
--cc=kuba@kernel.org \
--cc=kuni1840@gmail.com \
--cc=kuniyu@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).