Skip to content

Commit

Permalink
bpf: Require only one of cong_avoid() and cong_control() from a TCP CC
Browse files Browse the repository at this point in the history
Remove the check for required and optional functions in a struct
tcp_congestion_ops from bpf_tcp_ca.c. Rely on
tcp_register_congestion_control() to reject a BPF CC that does not
implement all required functions, as it will do for a non-BPF CC.

When a CC implements tcp_congestion_ops.cong_control(), the alternate
cong_avoid() is not in use in the TCP stack. Previously, a BPF CC was
still forced to implement cong_avoid() as a no-op since it was
non-optional in bpf_tcp_ca.c.

Signed-off-by: Jörn-Thorben Hinz <jthinz@mailbox.tu-berlin.de>
  • Loading branch information
jtdor authored and intel-lab-lkp committed Jun 9, 2022
1 parent 08bf2fd commit ac2a3c9
Showing 1 changed file with 0 additions and 32 deletions.
32 changes: 0 additions & 32 deletions net/ipv4/bpf_tcp_ca.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@
/* "extern" is to avoid sparse warning. It is only used in bpf_struct_ops.c. */
extern struct bpf_struct_ops bpf_tcp_congestion_ops;

static u32 optional_ops[] = {
offsetof(struct tcp_congestion_ops, init),
offsetof(struct tcp_congestion_ops, release),
offsetof(struct tcp_congestion_ops, set_state),
offsetof(struct tcp_congestion_ops, cwnd_event),
offsetof(struct tcp_congestion_ops, in_ack_event),
offsetof(struct tcp_congestion_ops, pkts_acked),
offsetof(struct tcp_congestion_ops, min_tso_segs),
offsetof(struct tcp_congestion_ops, sndbuf_expand),
offsetof(struct tcp_congestion_ops, cong_control),
};

static u32 unsupported_ops[] = {
offsetof(struct tcp_congestion_ops, get_info),
};
Expand All @@ -51,18 +39,6 @@ static int bpf_tcp_ca_init(struct btf *btf)
return 0;
}

static bool is_optional(u32 member_offset)
{
unsigned int i;

for (i = 0; i < ARRAY_SIZE(optional_ops); i++) {
if (member_offset == optional_ops[i])
return true;
}

return false;
}

static bool is_unsupported(u32 member_offset)
{
unsigned int i;
Expand Down Expand Up @@ -268,14 +244,6 @@ static int bpf_tcp_ca_init_member(const struct btf_type *t,
return 1;
}

if (!btf_type_resolve_func_ptr(btf_vmlinux, member->type, NULL))
return 0;

/* Ensure bpf_prog is provided for compulsory func ptr */
prog_fd = (int)(*(unsigned long *)(udata + moff));
if (!prog_fd && !is_optional(moff) && !is_unsupported(moff))
return -EINVAL;

return 0;
}

Expand Down

0 comments on commit ac2a3c9

Please sign in to comment.