Skip to content

Commit

Permalink
bpf: expose is_mptcp flag to bpf_tcp_sock
Browse files Browse the repository at this point in the history
is_mptcp is a field from struct tcp_sock used to indicate that the
current tcp_sock is part of the MPTCP protocol.

In this protocol, a first socket (mptcp_sock) is created with
sk_protocol set to IPPROTO_MPTCP (=262) for control purpose but it
isn't directly on the wire. This is the role of the subflow (kernel)
sockets which are classical tcp_sock with sk_protocol set to
IPPROTO_TCP. The only way to differentiate such sockets from plain TCP
sockets is the is_mptcp field from tcp_sock.

Such an exposure in BPF is thus required to be able to differentiate
plain TCP sockets from MPTCP subflow sockets in BPF_PROG_TYPE_SOCK_OPS
programs.

The choice has been made to silently pass the case when CONFIG_MPTCP is
unset by defaulting is_mptcp to 0 in order to make BPF independent of
the MPTCP configuration. Another solution is to make the verifier fail
in 'bpf_tcp_sock_is_valid_ctx_access' but this will add an additional
'#ifdef CONFIG_MPTCP' in the BPF code and a same injected BPF program
will not run if MPTCP is not set.

An example use-case is provided in
https://github.com/multipath-tcp/mptcp_net-next/tree/scripts/bpf/examples

Suggested-by: Matthieu Baerts <[email protected]>
Acked-by: Matthieu Baerts <[email protected]>
Acked-by: Mat Martineau <[email protected]>
Signed-off-by: Nicolas Rybowski <[email protected]>
  • Loading branch information
nrybowski authored and jenkins-tessares committed Dec 9, 2020
1 parent d188dfe commit 58a4d0c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions include/uapi/linux/bpf.h
Original file line number Diff line number Diff line change
Expand Up @@ -4321,6 +4321,7 @@ struct bpf_tcp_sock {
__u32 delivered; /* Total data packets delivered incl. rexmits */
__u32 delivered_ce; /* Like the above but only ECE marked packets */
__u32 icsk_retransmits; /* Number of unrecovered [RTO] timeouts */
__u32 is_mptcp; /* Is MPTCP subflow? */
};

struct bpf_sock_tuple {
Expand Down
9 changes: 8 additions & 1 deletion net/core/filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -6228,7 +6228,7 @@ bool bpf_tcp_sock_is_valid_access(int off, int size, enum bpf_access_type type,
struct bpf_insn_access_aux *info)
{
if (off < 0 || off >= offsetofend(struct bpf_tcp_sock,
icsk_retransmits))
is_mptcp))
return false;

if (off % size != 0)
Expand Down Expand Up @@ -6362,6 +6362,13 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type,
case offsetof(struct bpf_tcp_sock, icsk_retransmits):
BPF_INET_SOCK_GET_COMMON(icsk_retransmits);
break;
case offsetof(struct bpf_tcp_sock, is_mptcp):
#ifdef CONFIG_MPTCP
BPF_TCP_SOCK_GET_COMMON(is_mptcp);
#else
*insn++ = BPF_MOV32_IMM(si->dst_reg, 0);
#endif
break;
}

return insn - insn_buf;
Expand Down
1 change: 1 addition & 0 deletions tools/include/uapi/linux/bpf.h
Original file line number Diff line number Diff line change
Expand Up @@ -4321,6 +4321,7 @@ struct bpf_tcp_sock {
__u32 delivered; /* Total data packets delivered incl. rexmits */
__u32 delivered_ce; /* Like the above but only ECE marked packets */
__u32 icsk_retransmits; /* Number of unrecovered [RTO] timeouts */
__u32 is_mptcp; /* Is MPTCP subflow? */
};

struct bpf_sock_tuple {
Expand Down

0 comments on commit 58a4d0c

Please sign in to comment.