* [PATCH bpf-next] selftests/bpf: use reno instead of dctcp
@ 2020-05-01 22:43 Stanislav Fomichev
2020-05-01 22:57 ` Martin KaFai Lau
0 siblings, 1 reply; 3+ messages in thread
From: Stanislav Fomichev @ 2020-05-01 22:43 UTC (permalink / raw)
To: netdev, bpf; +Cc: davem, ast, daniel, Stanislav Fomichev, Andrey Ignatov
Andrey pointed out that we can use reno instead of dctcp for CC
tests and drop CONFIG_TCP_CONG_DCTCP=y requirement.
Fixes: beecf11bc218 ("bpf: Bpf_{g,s}etsockopt for struct bpf_sock_addr")
Suggested-by: Andrey Ignatov <rdna@fb.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
tools/testing/selftests/bpf/config | 1 -
tools/testing/selftests/bpf/progs/connect4_prog.c | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
index 6e5b94c036ca..60e3ae5d4e48 100644
--- a/tools/testing/selftests/bpf/config
+++ b/tools/testing/selftests/bpf/config
@@ -37,4 +37,3 @@ CONFIG_IPV6_SIT=m
CONFIG_BPF_JIT=y
CONFIG_BPF_LSM=y
CONFIG_SECURITY=y
-CONFIG_TCP_CONG_DCTCP=y
diff --git a/tools/testing/selftests/bpf/progs/connect4_prog.c b/tools/testing/selftests/bpf/progs/connect4_prog.c
index 972918cd2d7f..c2c85c31cffd 100644
--- a/tools/testing/selftests/bpf/progs/connect4_prog.c
+++ b/tools/testing/selftests/bpf/progs/connect4_prog.c
@@ -59,12 +59,12 @@ static __inline int verify_cc(struct bpf_sock_addr *ctx,
static __inline int set_cc(struct bpf_sock_addr *ctx)
{
- char dctcp[TCP_CA_NAME_MAX] = "dctcp";
+ char reno[TCP_CA_NAME_MAX] = "reno";
char cubic[TCP_CA_NAME_MAX] = "cubic";
- if (bpf_setsockopt(ctx, SOL_TCP, TCP_CONGESTION, &dctcp, sizeof(dctcp)))
+ if (bpf_setsockopt(ctx, SOL_TCP, TCP_CONGESTION, &reno, sizeof(reno)))
return 1;
- if (verify_cc(ctx, dctcp))
+ if (verify_cc(ctx, reno))
return 1;
if (bpf_setsockopt(ctx, SOL_TCP, TCP_CONGESTION, &cubic, sizeof(cubic)))
--
2.26.2.526.g744177e7f7-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: use reno instead of dctcp
2020-05-01 22:43 [PATCH bpf-next] selftests/bpf: use reno instead of dctcp Stanislav Fomichev
@ 2020-05-01 22:57 ` Martin KaFai Lau
2020-05-01 23:52 ` Alexei Starovoitov
0 siblings, 1 reply; 3+ messages in thread
From: Martin KaFai Lau @ 2020-05-01 22:57 UTC (permalink / raw)
To: Stanislav Fomichev; +Cc: netdev, bpf, davem, ast, daniel, Andrey Ignatov
On Fri, May 01, 2020 at 03:43:20PM -0700, Stanislav Fomichev wrote:
> Andrey pointed out that we can use reno instead of dctcp for CC
> tests and drop CONFIG_TCP_CONG_DCTCP=y requirement.
Acked-by: Martin KaFai Lau <kafai@fb.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: use reno instead of dctcp
2020-05-01 22:57 ` Martin KaFai Lau
@ 2020-05-01 23:52 ` Alexei Starovoitov
0 siblings, 0 replies; 3+ messages in thread
From: Alexei Starovoitov @ 2020-05-01 23:52 UTC (permalink / raw)
To: Martin KaFai Lau
Cc: Stanislav Fomichev, Network Development, bpf, David S. Miller,
Alexei Starovoitov, Daniel Borkmann, Andrey Ignatov
On Fri, May 1, 2020 at 3:57 PM Martin KaFai Lau <kafai@fb.com> wrote:
>
> On Fri, May 01, 2020 at 03:43:20PM -0700, Stanislav Fomichev wrote:
> > Andrey pointed out that we can use reno instead of dctcp for CC
> > tests and drop CONFIG_TCP_CONG_DCTCP=y requirement.
> Acked-by: Martin KaFai Lau <kafai@fb.com>
Applied. Thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-01 23:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-01 22:43 [PATCH bpf-next] selftests/bpf: use reno instead of dctcp Stanislav Fomichev
2020-05-01 22:57 ` Martin KaFai Lau
2020-05-01 23:52 ` Alexei Starovoitov
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).