Commit 267cf9fa authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov
Browse files

tcp: bpf: Optionally store mac header in TCP_SAVE_SYN 

This patch is adapted from Eric's patch in an earlier discussion [1].

The TCP_SAVE_SYN currently only stores the network header and
tcp header.  This patch allows it to optionally store
the mac header also if the setsockopt's optval is 2.

It requires one more bit for the "save_syn" bit field in tcp_sock.
This patch achieves this by moving the syn_smc bit next to the is_mptcp.
The syn_smc is currently used with the TCP experimental option.  Since
syn_smc is only used when CONFIG_SMC is enabled, this patch also puts
the "IS_ENABLED(CONFIG_SMC)" around it like the is_mptcp did
with "IS_ENABLED(CONFIG_MPTCP)".

The mac_hdrlen is also stored in the "struct saved_syn"
to allow a quick offset from the bpf prog if it chooses to start
getting from the network header or the tcp header.

[1]: https://lore.kernel.org/netdev/CANn89iLJNWh6bkH7DNhy_kmcAexuUCccqERqe7z2QsvPhGrYPQ@mail.gmail.com/



Suggested-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/bpf/20200820190123.2886935-1-kafai@fb.com
parent ad2f8eb0

include/linux/tcp.h

+8 −5
Original line number Diff line number Diff line
@@ -239,14 +239,13 @@ struct tcp_sock { 
		repair      : 1,

		frto        : 1;/* F-RTO (RFC5682) activated in CA_Loss */

	u8	repair_queue;

	u8	syn_data:1,	/* SYN includes data */

	u8	save_syn:2,	/* Save headers of SYN packet */

		syn_data:1,	/* SYN includes data */

		syn_fastopen:1,	/* SYN includes Fast Open option */

		syn_fastopen_exp:1,/* SYN includes Fast Open exp. option */

		syn_fastopen_ch:1, /* Active TFO re-enabling probe */

		syn_data_acked:1,/* data in SYN is acked by SYN-ACK */

		save_syn:1,	/* Save headers of SYN packet */

		is_cwnd_limited:1,/* forward progress limited by snd_cwnd? */

		syn_smc:1;	/* SYN includes SMC */

		is_cwnd_limited:1;/* forward progress limited by snd_cwnd? */

	u32	tlp_high_seq;	/* snd_nxt at the time of TLP */



	u32	tcp_tx_delay;	/* delay (in usec) added to TX packets */
@@ -393,6 +392,9 @@ struct tcp_sock { 
#if IS_ENABLED(CONFIG_MPTCP)

	bool	is_mptcp;

#endif

#if IS_ENABLED(CONFIG_SMC)

	bool	syn_smc;	/* SYN includes SMC */

#endif



#ifdef CONFIG_TCP_MD5SIG

/* TCP AF-Specific parts; only used by MD5 Signature support so far */
@@ -488,7 +490,8 @@ static inline void tcp_saved_syn_free(struct tcp_sock *tp) 


static inline u32 tcp_saved_syn_len(const struct saved_syn *saved_syn)

{

	return saved_syn->network_hdrlen + saved_syn->tcp_hdrlen;

	return saved_syn->mac_hdrlen + saved_syn->network_hdrlen +

		saved_syn->tcp_hdrlen;

}



struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk,

include/net/request_sock.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct request_sock_ops { 
int inet_rtx_syn_ack(const struct sock *parent, struct request_sock *req);



struct saved_syn {

	u32 mac_hdrlen;

	u32 network_hdrlen;

	u32 tcp_hdrlen;

	u8 data[];

include/uapi/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -4540,6 +4540,7 @@ enum { 
	 */

	TCP_BPF_SYN		= 1005, /* Copy the TCP header */

	TCP_BPF_SYN_IP		= 1006, /* Copy the IP[46] and TCP header */

	TCP_BPF_SYN_MAC         = 1007, /* Copy the MAC, IP[46], and TCP header */

};



enum {

net/core/filter.c

+22 −5
Original line number Diff line number Diff line
@@ -4682,11 +4682,16 @@ static int bpf_sock_ops_get_syn(struct bpf_sock_ops_kern *bpf_sock, 
		if (optname == TCP_BPF_SYN) {

			hdr_start = syn_skb->data;

			ret = tcp_hdrlen(syn_skb);

		} else {

			/* optname == TCP_BPF_SYN_IP */

		} else if (optname == TCP_BPF_SYN_IP) {

			hdr_start = skb_network_header(syn_skb);

			ret = skb_network_header_len(syn_skb) +

				tcp_hdrlen(syn_skb);

		} else {

			/* optname == TCP_BPF_SYN_MAC */

			hdr_start = skb_mac_header(syn_skb);

			ret = skb_mac_header_len(syn_skb) +

				skb_network_header_len(syn_skb) +

				tcp_hdrlen(syn_skb);

		}

	} else {

		struct sock *sk = bpf_sock->sk;
@@ -4706,12 +4711,24 @@ static int bpf_sock_ops_get_syn(struct bpf_sock_ops_kern *bpf_sock, 


		if (optname == TCP_BPF_SYN) {

			hdr_start = saved_syn->data +

				saved_syn->mac_hdrlen +

				saved_syn->network_hdrlen;

			ret = saved_syn->tcp_hdrlen;

		} else if (optname == TCP_BPF_SYN_IP) {

			hdr_start = saved_syn->data +

				saved_syn->mac_hdrlen;

			ret = saved_syn->network_hdrlen +

				saved_syn->tcp_hdrlen;

		} else {

			/* optname == TCP_BPF_SYN_IP */

			/* optname == TCP_BPF_SYN_MAC */



			/* TCP_SAVE_SYN may not have saved the mac hdr */

			if (!saved_syn->mac_hdrlen)

				return -ENOENT;



			hdr_start = saved_syn->data;

			ret = saved_syn->network_hdrlen +

			ret = saved_syn->mac_hdrlen +

				saved_syn->network_hdrlen +

				saved_syn->tcp_hdrlen;

		}

	}
@@ -4724,7 +4741,7 @@ BPF_CALL_5(bpf_sock_ops_getsockopt, struct bpf_sock_ops_kern *, bpf_sock, 
	   int, level, int, optname, char *, optval, int, optlen)

{

	if (IS_ENABLED(CONFIG_INET) && level == SOL_TCP &&

	    optname >= TCP_BPF_SYN && optname <= TCP_BPF_SYN_IP) {

	    optname >= TCP_BPF_SYN && optname <= TCP_BPF_SYN_MAC) {

		int ret, copy_len = 0;

		const u8 *start;

net/ipv4/tcp.c

+2 −1
Original line number Diff line number Diff line
@@ -3211,7 +3211,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, 
		break;



	case TCP_SAVE_SYN:

		if (val < 0 || val > 1)

		/* 0: disable, 1: enable, 2: start from ether_header */

		if (val < 0 || val > 2)

			err = -EINVAL;

		else

			tp->save_syn = val;

CRA Git | Maintained and supported by SUSTech CRA and CCSE