* [PATCH bpf-next] selftests/bpf: adding delay in socketmap_listen to reduce flakyness
@ 2021-08-19 16:36 Yucong Sun
2021-08-19 18:44 ` Andrii Nakryiko
2021-08-19 19:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 5+ messages in thread
From: Yucong Sun @ 2021-08-19 16:36 UTC (permalink / raw)
To: andrii; +Cc: sunyucong, bpf, Yucong Sun
This patch adds a 1ms delay to reduce flakyness of the test.
Signed-off-by: Yucong Sun <fallentree@fb.com>
---
.../selftests/bpf/prog_tests/sockmap_listen.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
index afa14fb66f08..6a5df28f9a3d 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
@@ -1603,8 +1603,10 @@ static void unix_redir_to_connected(int sotype, int sock_mapfd,
again:
n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
if (n < 0) {
- if (errno == EAGAIN && retries--)
+ if (errno == EAGAIN && retries--) {
+ usleep(1000);
goto again;
+ }
FAIL_ERRNO("%s: read", log_prefix);
}
if (n == 0)
@@ -1776,8 +1778,10 @@ static void udp_redir_to_connected(int family, int sock_mapfd, int verd_mapfd,
again:
n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
if (n < 0) {
- if (errno == EAGAIN && retries--)
+ if (errno == EAGAIN && retries--) {
+ usleep(1000);
goto again;
+ }
FAIL_ERRNO("%s: read", log_prefix);
}
if (n == 0)
@@ -1869,8 +1873,10 @@ static void inet_unix_redir_to_connected(int family, int type, int sock_mapfd,
again:
n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
if (n < 0) {
- if (errno == EAGAIN && retries--)
+ if (errno == EAGAIN && retries--) {
+ usleep(1000);
goto again;
+ }
FAIL_ERRNO("%s: read", log_prefix);
}
if (n == 0)
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: adding delay in socketmap_listen to reduce flakyness
2021-08-19 16:36 [PATCH bpf-next] selftests/bpf: adding delay in socketmap_listen to reduce flakyness Yucong Sun
@ 2021-08-19 18:44 ` Andrii Nakryiko
2021-08-19 19:15 ` sunyucong
2021-08-19 19:30 ` patchwork-bot+netdevbpf
1 sibling, 1 reply; 5+ messages in thread
From: Andrii Nakryiko @ 2021-08-19 18:44 UTC (permalink / raw)
To: Yucong Sun; +Cc: Andrii Nakryiko, sunyucong, bpf
On Thu, Aug 19, 2021 at 9:36 AM Yucong Sun <fallentree@fb.com> wrote:
>
> This patch adds a 1ms delay to reduce flakyness of the test.
>
> Signed-off-by: Yucong Sun <fallentree@fb.com>
> ---
Any reasons to not implement exponential back-off, like we did for test_maps?
> .../selftests/bpf/prog_tests/sockmap_listen.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> index afa14fb66f08..6a5df28f9a3d 100644
> --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> @@ -1603,8 +1603,10 @@ static void unix_redir_to_connected(int sotype, int sock_mapfd,
> again:
> n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
> if (n < 0) {
> - if (errno == EAGAIN && retries--)
> + if (errno == EAGAIN && retries--) {
> + usleep(1000);
> goto again;
> + }
> FAIL_ERRNO("%s: read", log_prefix);
> }
> if (n == 0)
> @@ -1776,8 +1778,10 @@ static void udp_redir_to_connected(int family, int sock_mapfd, int verd_mapfd,
> again:
> n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
> if (n < 0) {
> - if (errno == EAGAIN && retries--)
> + if (errno == EAGAIN && retries--) {
> + usleep(1000);
> goto again;
> + }
> FAIL_ERRNO("%s: read", log_prefix);
> }
> if (n == 0)
> @@ -1869,8 +1873,10 @@ static void inet_unix_redir_to_connected(int family, int type, int sock_mapfd,
> again:
> n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
> if (n < 0) {
> - if (errno == EAGAIN && retries--)
> + if (errno == EAGAIN && retries--) {
> + usleep(1000);
> goto again;
> + }
> FAIL_ERRNO("%s: read", log_prefix);
> }
> if (n == 0)
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: adding delay in socketmap_listen to reduce flakyness
2021-08-19 18:44 ` Andrii Nakryiko
@ 2021-08-19 19:15 ` sunyucong
2021-08-19 19:29 ` Andrii Nakryiko
0 siblings, 1 reply; 5+ messages in thread
From: sunyucong @ 2021-08-19 19:15 UTC (permalink / raw)
To: Andrii Nakryiko; +Cc: Yucong Sun, Andrii Nakryiko, bpf
On Thu, Aug 19, 2021 at 11:45 AM Andrii Nakryiko
<andrii.nakryiko@gmail.com> wrote:
>
> On Thu, Aug 19, 2021 at 9:36 AM Yucong Sun <fallentree@fb.com> wrote:
> >
> > This patch adds a 1ms delay to reduce flakyness of the test.
> >
> > Signed-off-by: Yucong Sun <fallentree@fb.com>
> > ---
>
> Any reasons to not implement exponential back-off, like we did for test_maps?
for simplicity, since there are no contention involved here I figured
we don’t need random delay and back-offs.
(sorry for resending, I was fooled by the mobile gmail client that it
doesn't do plain text).
>
> > .../selftests/bpf/prog_tests/sockmap_listen.c | 12 +++++++++---
> > 1 file changed, 9 insertions(+), 3 deletions(-)
> >
> > diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> > index afa14fb66f08..6a5df28f9a3d 100644
> > --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> > +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> > @@ -1603,8 +1603,10 @@ static void unix_redir_to_connected(int sotype, int sock_mapfd,
> > again:
> > n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
> > if (n < 0) {
> > - if (errno == EAGAIN && retries--)
> > + if (errno == EAGAIN && retries--) {
> > + usleep(1000);
> > goto again;
> > + }
> > FAIL_ERRNO("%s: read", log_prefix);
> > }
> > if (n == 0)
> > @@ -1776,8 +1778,10 @@ static void udp_redir_to_connected(int family, int sock_mapfd, int verd_mapfd,
> > again:
> > n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
> > if (n < 0) {
> > - if (errno == EAGAIN && retries--)
> > + if (errno == EAGAIN && retries--) {
> > + usleep(1000);
> > goto again;
> > + }
> > FAIL_ERRNO("%s: read", log_prefix);
> > }
> > if (n == 0)
> > @@ -1869,8 +1873,10 @@ static void inet_unix_redir_to_connected(int family, int type, int sock_mapfd,
> > again:
> > n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
> > if (n < 0) {
> > - if (errno == EAGAIN && retries--)
> > + if (errno == EAGAIN && retries--) {
> > + usleep(1000);
> > goto again;
> > + }
> > FAIL_ERRNO("%s: read", log_prefix);
> > }
> > if (n == 0)
> > --
> > 2.30.2
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: adding delay in socketmap_listen to reduce flakyness
2021-08-19 19:15 ` sunyucong
@ 2021-08-19 19:29 ` Andrii Nakryiko
0 siblings, 0 replies; 5+ messages in thread
From: Andrii Nakryiko @ 2021-08-19 19:29 UTC (permalink / raw)
To: sunyucong; +Cc: Yucong Sun, Andrii Nakryiko, bpf
On Thu, Aug 19, 2021 at 12:16 PM sunyucong@gmail.com
<sunyucong@gmail.com> wrote:
>
> On Thu, Aug 19, 2021 at 11:45 AM Andrii Nakryiko
> <andrii.nakryiko@gmail.com> wrote:
> >
> > On Thu, Aug 19, 2021 at 9:36 AM Yucong Sun <fallentree@fb.com> wrote:
> > >
> > > This patch adds a 1ms delay to reduce flakyness of the test.
> > >
> > > Signed-off-by: Yucong Sun <fallentree@fb.com>
> > > ---
> >
> > Any reasons to not implement exponential back-off, like we did for test_maps?
>
> for simplicity, since there are no contention involved here I figured
> we don’t need random delay and back-offs.
Alright, it's an improvement anyways. Let's see if it still causes
problem. Applied to bpf-next, thanks!
>
> (sorry for resending, I was fooled by the mobile gmail client that it
> doesn't do plain text).
>
AFAIK, mobile client doesn't support plain text
>
> >
> > > .../selftests/bpf/prog_tests/sockmap_listen.c | 12 +++++++++---
> > > 1 file changed, 9 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> > > index afa14fb66f08..6a5df28f9a3d 100644
> > > --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> > > +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> > > @@ -1603,8 +1603,10 @@ static void unix_redir_to_connected(int sotype, int sock_mapfd,
> > > again:
> > > n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
> > > if (n < 0) {
> > > - if (errno == EAGAIN && retries--)
> > > + if (errno == EAGAIN && retries--) {
> > > + usleep(1000);
> > > goto again;
> > > + }
> > > FAIL_ERRNO("%s: read", log_prefix);
> > > }
> > > if (n == 0)
> > > @@ -1776,8 +1778,10 @@ static void udp_redir_to_connected(int family, int sock_mapfd, int verd_mapfd,
> > > again:
> > > n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
> > > if (n < 0) {
> > > - if (errno == EAGAIN && retries--)
> > > + if (errno == EAGAIN && retries--) {
> > > + usleep(1000);
> > > goto again;
> > > + }
> > > FAIL_ERRNO("%s: read", log_prefix);
> > > }
> > > if (n == 0)
> > > @@ -1869,8 +1873,10 @@ static void inet_unix_redir_to_connected(int family, int type, int sock_mapfd,
> > > again:
> > > n = read(mode == REDIR_INGRESS ? p0 : c0, &b, 1);
> > > if (n < 0) {
> > > - if (errno == EAGAIN && retries--)
> > > + if (errno == EAGAIN && retries--) {
> > > + usleep(1000);
> > > goto again;
> > > + }
> > > FAIL_ERRNO("%s: read", log_prefix);
> > > }
> > > if (n == 0)
> > > --
> > > 2.30.2
> > >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: adding delay in socketmap_listen to reduce flakyness
2021-08-19 16:36 [PATCH bpf-next] selftests/bpf: adding delay in socketmap_listen to reduce flakyness Yucong Sun
2021-08-19 18:44 ` Andrii Nakryiko
@ 2021-08-19 19:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-08-19 19:30 UTC (permalink / raw)
To: Yucong Sun; +Cc: andrii, sunyucong, bpf
Hello:
This patch was applied to bpf/bpf-next.git (refs/heads/master):
On Thu, 19 Aug 2021 09:36:09 -0700 you wrote:
> This patch adds a 1ms delay to reduce flakyness of the test.
>
> Signed-off-by: Yucong Sun <fallentree@fb.com>
> ---
> .../selftests/bpf/prog_tests/sockmap_listen.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
Here is the summary with links:
- [bpf-next] selftests/bpf: adding delay in socketmap_listen to reduce flakyness
https://git.kernel.org/bpf/bpf-next/c/3666b167ea68
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-19 19:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-19 16:36 [PATCH bpf-next] selftests/bpf: adding delay in socketmap_listen to reduce flakyness Yucong Sun
2021-08-19 18:44 ` Andrii Nakryiko
2021-08-19 19:15 ` sunyucong
2021-08-19 19:29 ` Andrii Nakryiko
2021-08-19 19:30 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.