projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 23729ff)
bpf: split shared bpf_tcp_sock and bpf_sock_ops implementation
authorStanislav Fomichev <sdf@google.com>
Tue, 2 Jul 2019 16:13:57 +0000 (09:13 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 3 Jul 2019 14:52:01 +0000 (16:52 +0200)
We've added bpf_tcp_sock member to bpf_sock_ops and don't expect
any new tcp_sock fields in bpf_sock_ops. Let's remove
CONVERT_COMMON_TCP_SOCK_FIELDS so bpf_tcp_sock can be independently
extended.

Cc: Eric Dumazet <edumazet@google.com>
Cc: Priyaranjan Jha <priyarjha@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Cc: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
net/core/filter.c patch | blob | history

diff --git a/net/core/filter.c b/net/core/filter.c
index 4836264f82eec9c6e580dfd0dfe6fa504f58ffb5..ad908526545d0eb0100ee1dd62ee2d94dd2bf1e8 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -5194,54 +5194,6 @@ static const struct bpf_func_proto bpf_lwt_seg6_adjust_srh_proto = {
 };
 #endif /* CONFIG_IPV6_SEG6_BPF */
 
-#define CONVERT_COMMON_TCP_SOCK_FIELDS(md_type, CONVERT)               \
-do {                                                                   \
-       switch (si->off) {                                              \
-       case offsetof(md_type, snd_cwnd):                               \
-               CONVERT(snd_cwnd); break;                               \
-       case offsetof(md_type, srtt_us):                                \
-               CONVERT(srtt_us); break;                                \
-       case offsetof(md_type, snd_ssthresh):                           \
-               CONVERT(snd_ssthresh); break;                           \
-       case offsetof(md_type, rcv_nxt):                                \
-               CONVERT(rcv_nxt); break;                                \
-       case offsetof(md_type, snd_nxt):                                \
-               CONVERT(snd_nxt); break;                                \
-       case offsetof(md_type, snd_una):                                \
-               CONVERT(snd_una); break;                                \
-       case offsetof(md_type, mss_cache):                              \
-               CONVERT(mss_cache); break;                              \
-       case offsetof(md_type, ecn_flags):                              \
-               CONVERT(ecn_flags); break;                              \
-       case offsetof(md_type, rate_delivered):                         \
-               CONVERT(rate_delivered); break;                         \
-       case offsetof(md_type, rate_interval_us):                       \
-               CONVERT(rate_interval_us); break;                       \
-       case offsetof(md_type, packets_out):                            \
-               CONVERT(packets_out); break;                            \
-       case offsetof(md_type, retrans_out):                            \
-               CONVERT(retrans_out); break;                            \
-       case offsetof(md_type, total_retrans):                          \
-               CONVERT(total_retrans); break;                          \
-       case offsetof(md_type, segs_in):                                \
-               CONVERT(segs_in); break;                                \
-       case offsetof(md_type, data_segs_in):                           \
-               CONVERT(data_segs_in); break;                           \
-       case offsetof(md_type, segs_out):                               \
-               CONVERT(segs_out); break;                               \
-       case offsetof(md_type, data_segs_out):                          \
-               CONVERT(data_segs_out); break;                          \
-       case offsetof(md_type, lost_out):                               \
-               CONVERT(lost_out); break;                               \
-       case offsetof(md_type, sacked_out):                             \
-               CONVERT(sacked_out); break;                             \
-       case offsetof(md_type, bytes_received):                         \
-               CONVERT(bytes_received); break;                         \
-       case offsetof(md_type, bytes_acked):                            \
-               CONVERT(bytes_acked); break;                            \
-       }                                                               \
-} while (0)
-
 #ifdef CONFIG_INET
 static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple,
                              int dif, int sdif, u8 family, u8 proto)
@@ -5623,9 +5575,6 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type,
                                      offsetof(struct tcp_sock, FIELD)); \
        } while (0)
 
-       CONVERT_COMMON_TCP_SOCK_FIELDS(struct bpf_tcp_sock,
-                                      BPF_TCP_SOCK_GET_COMMON);
-
        if (insn > insn_buf)
                return insn - insn_buf;
 
@@ -5640,6 +5589,69 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type,
                                      offsetof(struct tcp_sock, rtt_min) +
                                      offsetof(struct minmax_sample, v));
                break;
+       case offsetof(struct bpf_tcp_sock, snd_cwnd):
+               BPF_TCP_SOCK_GET_COMMON(snd_cwnd);
+               break;
+       case offsetof(struct bpf_tcp_sock, srtt_us):
+               BPF_TCP_SOCK_GET_COMMON(srtt_us);
+               break;
+       case offsetof(struct bpf_tcp_sock, snd_ssthresh):
+               BPF_TCP_SOCK_GET_COMMON(snd_ssthresh);
+               break;
+       case offsetof(struct bpf_tcp_sock, rcv_nxt):
+               BPF_TCP_SOCK_GET_COMMON(rcv_nxt);
+               break;
+       case offsetof(struct bpf_tcp_sock, snd_nxt):
+               BPF_TCP_SOCK_GET_COMMON(snd_nxt);
+               break;
+       case offsetof(struct bpf_tcp_sock, snd_una):
+               BPF_TCP_SOCK_GET_COMMON(snd_una);
+               break;
+       case offsetof(struct bpf_tcp_sock, mss_cache):
+               BPF_TCP_SOCK_GET_COMMON(mss_cache);
+               break;
+       case offsetof(struct bpf_tcp_sock, ecn_flags):
+               BPF_TCP_SOCK_GET_COMMON(ecn_flags);
+               break;
+       case offsetof(struct bpf_tcp_sock, rate_delivered):
+               BPF_TCP_SOCK_GET_COMMON(rate_delivered);
+               break;
+       case offsetof(struct bpf_tcp_sock, rate_interval_us):
+               BPF_TCP_SOCK_GET_COMMON(rate_interval_us);
+               break;
+       case offsetof(struct bpf_tcp_sock, packets_out):
+               BPF_TCP_SOCK_GET_COMMON(packets_out);
+               break;
+       case offsetof(struct bpf_tcp_sock, retrans_out):
+               BPF_TCP_SOCK_GET_COMMON(retrans_out);
+               break;
+       case offsetof(struct bpf_tcp_sock, total_retrans):
+               BPF_TCP_SOCK_GET_COMMON(total_retrans);
+               break;
+       case offsetof(struct bpf_tcp_sock, segs_in):
+               BPF_TCP_SOCK_GET_COMMON(segs_in);
+               break;
+       case offsetof(struct bpf_tcp_sock, data_segs_in):
+               BPF_TCP_SOCK_GET_COMMON(data_segs_in);
+               break;
+       case offsetof(struct bpf_tcp_sock, segs_out):
+               BPF_TCP_SOCK_GET_COMMON(segs_out);
+               break;
+       case offsetof(struct bpf_tcp_sock, data_segs_out):
+               BPF_TCP_SOCK_GET_COMMON(data_segs_out);
+               break;
+       case offsetof(struct bpf_tcp_sock, lost_out):
+               BPF_TCP_SOCK_GET_COMMON(lost_out);
+               break;
+       case offsetof(struct bpf_tcp_sock, sacked_out):
+               BPF_TCP_SOCK_GET_COMMON(sacked_out);
+               break;
+       case offsetof(struct bpf_tcp_sock, bytes_received):
+               BPF_TCP_SOCK_GET_COMMON(bytes_received);
+               break;
+       case offsetof(struct bpf_tcp_sock, bytes_acked):
+               BPF_TCP_SOCK_GET_COMMON(bytes_acked);
+               break;
        }
 
        return insn - insn_buf;
@@ -7913,9 +7925,6 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,
                        SOCK_OPS_GET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ);        \
        } while (0)
 
-       CONVERT_COMMON_TCP_SOCK_FIELDS(struct bpf_sock_ops,
-                                      SOCK_OPS_GET_TCP_SOCK_FIELD);
-
        if (insn > insn_buf)
                return insn - insn_buf;
 
@@ -8085,6 +8094,69 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,
                SOCK_OPS_GET_OR_SET_FIELD(sk_txhash, sk_txhash,
                                          struct sock, type);
                break;
+       case offsetof(struct bpf_sock_ops, snd_cwnd):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(snd_cwnd);
+               break;
+       case offsetof(struct bpf_sock_ops, srtt_us):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(srtt_us);
+               break;
+       case offsetof(struct bpf_sock_ops, snd_ssthresh):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(snd_ssthresh);
+               break;
+       case offsetof(struct bpf_sock_ops, rcv_nxt):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(rcv_nxt);
+               break;
+       case offsetof(struct bpf_sock_ops, snd_nxt):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(snd_nxt);
+               break;
+       case offsetof(struct bpf_sock_ops, snd_una):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(snd_una);
+               break;
+       case offsetof(struct bpf_sock_ops, mss_cache):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(mss_cache);
+               break;
+       case offsetof(struct bpf_sock_ops, ecn_flags):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(ecn_flags);
+               break;
+       case offsetof(struct bpf_sock_ops, rate_delivered):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(rate_delivered);
+               break;
+       case offsetof(struct bpf_sock_ops, rate_interval_us):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(rate_interval_us);
+               break;
+       case offsetof(struct bpf_sock_ops, packets_out):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(packets_out);
+               break;
+       case offsetof(struct bpf_sock_ops, retrans_out):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(retrans_out);
+               break;
+       case offsetof(struct bpf_sock_ops, total_retrans):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(total_retrans);
+               break;
+       case offsetof(struct bpf_sock_ops, segs_in):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(segs_in);
+               break;
+       case offsetof(struct bpf_sock_ops, data_segs_in):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(data_segs_in);
+               break;
+       case offsetof(struct bpf_sock_ops, segs_out):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(segs_out);
+               break;
+       case offsetof(struct bpf_sock_ops, data_segs_out):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(data_segs_out);
+               break;
+       case offsetof(struct bpf_sock_ops, lost_out):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(lost_out);
+               break;
+       case offsetof(struct bpf_sock_ops, sacked_out):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(sacked_out);
+               break;
+       case offsetof(struct bpf_sock_ops, bytes_received):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(bytes_received);
+               break;
+       case offsetof(struct bpf_sock_ops, bytes_acked):
+               SOCK_OPS_GET_TCP_SOCK_FIELD(bytes_acked);
+               break;
        case offsetof(struct bpf_sock_ops, sk):
                *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(
                                                struct bpf_sock_ops_kern,
John Crispins staging tree