Commit 39cd9e0f authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov

bpf: selftests: Rename bictcp to bpf_cubic

As a similar chanage in the kernel, this patch gives the proper
name to the bpf cubic.
Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210325015240.1550074-1-kafai@fb.com
parent 5bd022ec
...@@ -174,8 +174,8 @@ static __always_inline void bictcp_hystart_reset(struct sock *sk) ...@@ -174,8 +174,8 @@ static __always_inline void bictcp_hystart_reset(struct sock *sk)
* as long as it is used in one of the func ptr * as long as it is used in one of the func ptr
* under SEC(".struct_ops"). * under SEC(".struct_ops").
*/ */
SEC("struct_ops/bictcp_init") SEC("struct_ops/bpf_cubic_init")
void BPF_PROG(bictcp_init, struct sock *sk) void BPF_PROG(bpf_cubic_init, struct sock *sk)
{ {
struct bictcp *ca = inet_csk_ca(sk); struct bictcp *ca = inet_csk_ca(sk);
...@@ -192,7 +192,7 @@ void BPF_PROG(bictcp_init, struct sock *sk) ...@@ -192,7 +192,7 @@ void BPF_PROG(bictcp_init, struct sock *sk)
* The remaining tcp-cubic functions have an easier way. * The remaining tcp-cubic functions have an easier way.
*/ */
SEC("no-sec-prefix-bictcp_cwnd_event") SEC("no-sec-prefix-bictcp_cwnd_event")
void BPF_PROG(bictcp_cwnd_event, struct sock *sk, enum tcp_ca_event event) void BPF_PROG(bpf_cubic_cwnd_event, struct sock *sk, enum tcp_ca_event event)
{ {
if (event == CA_EVENT_TX_START) { if (event == CA_EVENT_TX_START) {
struct bictcp *ca = inet_csk_ca(sk); struct bictcp *ca = inet_csk_ca(sk);
...@@ -384,7 +384,7 @@ static __always_inline void bictcp_update(struct bictcp *ca, __u32 cwnd, ...@@ -384,7 +384,7 @@ static __always_inline void bictcp_update(struct bictcp *ca, __u32 cwnd,
} }
/* Or simply use the BPF_STRUCT_OPS to avoid the SEC boiler plate. */ /* Or simply use the BPF_STRUCT_OPS to avoid the SEC boiler plate. */
void BPF_STRUCT_OPS(bictcp_cong_avoid, struct sock *sk, __u32 ack, __u32 acked) void BPF_STRUCT_OPS(bpf_cubic_cong_avoid, struct sock *sk, __u32 ack, __u32 acked)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
struct bictcp *ca = inet_csk_ca(sk); struct bictcp *ca = inet_csk_ca(sk);
...@@ -403,7 +403,7 @@ void BPF_STRUCT_OPS(bictcp_cong_avoid, struct sock *sk, __u32 ack, __u32 acked) ...@@ -403,7 +403,7 @@ void BPF_STRUCT_OPS(bictcp_cong_avoid, struct sock *sk, __u32 ack, __u32 acked)
tcp_cong_avoid_ai(tp, ca->cnt, acked); tcp_cong_avoid_ai(tp, ca->cnt, acked);
} }
__u32 BPF_STRUCT_OPS(bictcp_recalc_ssthresh, struct sock *sk) __u32 BPF_STRUCT_OPS(bpf_cubic_recalc_ssthresh, struct sock *sk)
{ {
const struct tcp_sock *tp = tcp_sk(sk); const struct tcp_sock *tp = tcp_sk(sk);
struct bictcp *ca = inet_csk_ca(sk); struct bictcp *ca = inet_csk_ca(sk);
...@@ -420,7 +420,7 @@ __u32 BPF_STRUCT_OPS(bictcp_recalc_ssthresh, struct sock *sk) ...@@ -420,7 +420,7 @@ __u32 BPF_STRUCT_OPS(bictcp_recalc_ssthresh, struct sock *sk)
return max((tp->snd_cwnd * beta) / BICTCP_BETA_SCALE, 2U); return max((tp->snd_cwnd * beta) / BICTCP_BETA_SCALE, 2U);
} }
void BPF_STRUCT_OPS(bictcp_state, struct sock *sk, __u8 new_state) void BPF_STRUCT_OPS(bpf_cubic_state, struct sock *sk, __u8 new_state)
{ {
if (new_state == TCP_CA_Loss) { if (new_state == TCP_CA_Loss) {
bictcp_reset(inet_csk_ca(sk)); bictcp_reset(inet_csk_ca(sk));
...@@ -496,7 +496,7 @@ static __always_inline void hystart_update(struct sock *sk, __u32 delay) ...@@ -496,7 +496,7 @@ static __always_inline void hystart_update(struct sock *sk, __u32 delay)
} }
} }
void BPF_STRUCT_OPS(bictcp_acked, struct sock *sk, void BPF_STRUCT_OPS(bpf_cubic_acked, struct sock *sk,
const struct ack_sample *sample) const struct ack_sample *sample)
{ {
const struct tcp_sock *tp = tcp_sk(sk); const struct tcp_sock *tp = tcp_sk(sk);
...@@ -525,7 +525,7 @@ void BPF_STRUCT_OPS(bictcp_acked, struct sock *sk, ...@@ -525,7 +525,7 @@ void BPF_STRUCT_OPS(bictcp_acked, struct sock *sk,
hystart_update(sk, delay); hystart_update(sk, delay);
} }
__u32 BPF_STRUCT_OPS(tcp_reno_undo_cwnd, struct sock *sk) __u32 BPF_STRUCT_OPS(bpf_cubic_undo_cwnd, struct sock *sk)
{ {
const struct tcp_sock *tp = tcp_sk(sk); const struct tcp_sock *tp = tcp_sk(sk);
...@@ -534,12 +534,12 @@ __u32 BPF_STRUCT_OPS(tcp_reno_undo_cwnd, struct sock *sk) ...@@ -534,12 +534,12 @@ __u32 BPF_STRUCT_OPS(tcp_reno_undo_cwnd, struct sock *sk)
SEC(".struct_ops") SEC(".struct_ops")
struct tcp_congestion_ops cubic = { struct tcp_congestion_ops cubic = {
.init = (void *)bictcp_init, .init = (void *)bpf_cubic_init,
.ssthresh = (void *)bictcp_recalc_ssthresh, .ssthresh = (void *)bpf_cubic_recalc_ssthresh,
.cong_avoid = (void *)bictcp_cong_avoid, .cong_avoid = (void *)bpf_cubic_cong_avoid,
.set_state = (void *)bictcp_state, .set_state = (void *)bpf_cubic_state,
.undo_cwnd = (void *)tcp_reno_undo_cwnd, .undo_cwnd = (void *)bpf_cubic_undo_cwnd,
.cwnd_event = (void *)bictcp_cwnd_event, .cwnd_event = (void *)bpf_cubic_cwnd_event,
.pkts_acked = (void *)bictcp_acked, .pkts_acked = (void *)bpf_cubic_acked,
.name = "bpf_cubic", .name = "bpf_cubic",
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment