From: Stanislav Fomichev <sdf@google.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Netdev <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Petar Penkov <ppenkov@google.com>,
Willem de Bruijn <willemb@google.com>,
Song Liu <songliubraving@fb.com>
Subject: Re: [PATCH bpf-next v3 7/7] selftests/bpf: support BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP
Date: Tue, 27 Aug 2019 11:19:53 -0700 [thread overview]
Message-ID: <CAKH8qBsJH80mAYnVP9xgey+_CChgCfSb8uS-RX=rum5gJ+S0_w@mail.gmail.com> (raw)
In-Reply-To: <c1cec8df-e3c5-8d34-c3b3-44eae4f10e9b@gmail.com>
Yeah, I've sent the fix upstream yesterday, will backport.
Feel free to ignore the following patches:
https://screenshot.googleplex.com/DOQKAzGDksV
They are all blocked on this nhoff defined twice :-( I'll backport them
On Tue, Aug 27, 2019 at 11:04 AM Eric Dumazet <eric.dumazet@gmail.com> wrote:
>
>
>
> On 7/26/19 12:52 AM, Stanislav Fomichev wrote:
> > Exit as soon as we found that packet is encapped when
> > BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP is passed.
> > Add appropriate selftest cases.
> >
> > v2:
> > * Subtract sizeof(struct iphdr) from .iph_inner.tot_len (Willem de Bruijn)
> >
> > Acked-by: Petar Penkov <ppenkov@google.com>
> > Acked-by: Willem de Bruijn <willemb@google.com>
> > Acked-by: Song Liu <songliubraving@fb.com>
> > Cc: Song Liu <songliubraving@fb.com>
> > Cc: Willem de Bruijn <willemb@google.com>
> > Cc: Petar Penkov <ppenkov@google.com>
> > Signed-off-by: Stanislav Fomichev <sdf@google.com>
> > ---
> > .../selftests/bpf/prog_tests/flow_dissector.c | 64 +++++++++++++++++++
> > tools/testing/selftests/bpf/progs/bpf_flow.c | 8 +++
> > 2 files changed, 72 insertions(+)
> >
> > diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
> > index ef83f145a6f1..700d73d2f22a 100644
> > --- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
> > +++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
> > @@ -41,6 +41,13 @@ struct ipv4_pkt {
> > struct tcphdr tcp;
> > } __packed;
> >
> > +struct ipip_pkt {
> > + struct ethhdr eth;
> > + struct iphdr iph;
> > + struct iphdr iph_inner;
> > + struct tcphdr tcp;
> > +} __packed;
> > +
> > struct svlan_ipv4_pkt {
> > struct ethhdr eth;
> > __u16 vlan_tci;
> > @@ -82,6 +89,7 @@ struct test {
> > union {
> > struct ipv4_pkt ipv4;
> > struct svlan_ipv4_pkt svlan_ipv4;
> > + struct ipip_pkt ipip;
> > struct ipv6_pkt ipv6;
> > struct ipv6_frag_pkt ipv6_frag;
> > struct dvlan_ipv6_pkt dvlan_ipv6;
> > @@ -303,6 +311,62 @@ struct test tests[] = {
> > },
> > .flags = BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL,
> > },
> > + {
> > + .name = "ipip-encap",
> > + .pkt.ipip = {
> > + .eth.h_proto = __bpf_constant_htons(ETH_P_IP),
> > + .iph.ihl = 5,
> > + .iph.protocol = IPPROTO_IPIP,
> > + .iph.tot_len = __bpf_constant_htons(MAGIC_BYTES),
> > + .iph_inner.ihl = 5,
> > + .iph_inner.protocol = IPPROTO_TCP,
> > + .iph_inner.tot_len =
> > + __bpf_constant_htons(MAGIC_BYTES) -
> > + sizeof(struct iphdr),
> > + .tcp.doff = 5,
> > + .tcp.source = 80,
> > + .tcp.dest = 8080,
> > + },
> > + .keys = {
> > + .nhoff = 0,
> > + .nhoff = ETH_HLEN,
>
> clang emits a warning because nhoff is defined twice.
>
> > + .thoff = ETH_HLEN + sizeof(struct iphdr) +
> > + sizeof(struct iphdr),
> > + .addr_proto = ETH_P_IP,
> > + .ip_proto = IPPROTO_TCP,
> > + .n_proto = __bpf_constant_htons(ETH_P_IP),
> > + .is_encap = true,
> > + .sport = 80,
> > + .dport = 8080,
> > + },
> > + },
> > + {
> > + .name = "ipip-no-encap",
> > + .pkt.ipip = {
> > + .eth.h_proto = __bpf_constant_htons(ETH_P_IP),
> > + .iph.ihl = 5,
> > + .iph.protocol = IPPROTO_IPIP,
> > + .iph.tot_len = __bpf_constant_htons(MAGIC_BYTES),
> > + .iph_inner.ihl = 5,
> > + .iph_inner.protocol = IPPROTO_TCP,
> > + .iph_inner.tot_len =
> > + __bpf_constant_htons(MAGIC_BYTES) -
> > + sizeof(struct iphdr),
> > + .tcp.doff = 5,
> > + .tcp.source = 80,
> > + .tcp.dest = 8080,
> > + },
> > + .keys = {
> > + .flags = BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP,
> > + .nhoff = ETH_HLEN,
> > + .thoff = ETH_HLEN + sizeof(struct iphdr),
> > + .addr_proto = ETH_P_IP,
> > + .ip_proto = IPPROTO_IPIP,
> > + .n_proto = __bpf_constant_htons(ETH_P_IP),
> > + .is_encap = true,
> > + },
> > + .flags = BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP,
> > + },
> > };
> >
> > static int create_tap(const char *ifname)
> > diff --git a/tools/testing/selftests/bpf/progs/bpf_flow.c b/tools/testing/selftests/bpf/progs/bpf_flow.c
> > index 7fbfa22f33df..08bd8b9d58d0 100644
> > --- a/tools/testing/selftests/bpf/progs/bpf_flow.c
> > +++ b/tools/testing/selftests/bpf/progs/bpf_flow.c
> > @@ -167,9 +167,15 @@ static __always_inline int parse_ip_proto(struct __sk_buff *skb, __u8 proto)
> > return export_flow_keys(keys, BPF_OK);
> > case IPPROTO_IPIP:
> > keys->is_encap = true;
> > + if (keys->flags & BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP)
> > + return export_flow_keys(keys, BPF_OK);
> > +
> > return parse_eth_proto(skb, bpf_htons(ETH_P_IP));
> > case IPPROTO_IPV6:
> > keys->is_encap = true;
> > + if (keys->flags & BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP)
> > + return export_flow_keys(keys, BPF_OK);
> > +
> > return parse_eth_proto(skb, bpf_htons(ETH_P_IPV6));
> > case IPPROTO_GRE:
> > gre = bpf_flow_dissect_get_header(skb, sizeof(*gre), &_gre);
> > @@ -189,6 +195,8 @@ static __always_inline int parse_ip_proto(struct __sk_buff *skb, __u8 proto)
> > keys->thoff += 4; /* Step over sequence number */
> >
> > keys->is_encap = true;
> > + if (keys->flags & BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP)
> > + return export_flow_keys(keys, BPF_OK);
> >
> > if (gre->proto == bpf_htons(ETH_P_TEB)) {
> > eth = bpf_flow_dissect_get_header(skb, sizeof(*eth),
> >
next prev parent reply other threads:[~2019-08-27 18:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 22:52 [PATCH bpf-next v3 0/7] bpf/flow_dissector: support input flags Stanislav Fomichev
2019-07-25 22:52 ` [PATCH bpf-next v3 1/7] bpf/flow_dissector: pass input flags to BPF flow dissector program Stanislav Fomichev
2019-07-25 22:52 ` [PATCH bpf-next v3 2/7] bpf/flow_dissector: document flags Stanislav Fomichev
2019-07-25 22:52 ` [PATCH bpf-next v3 3/7] bpf/flow_dissector: support flags in BPF_PROG_TEST_RUN Stanislav Fomichev
2019-07-25 22:52 ` [PATCH bpf-next v3 4/7] tools/bpf: sync bpf_flow_keys flags Stanislav Fomichev
2019-07-25 22:52 ` [PATCH bpf-next v3 5/7] selftests/bpf: support BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG Stanislav Fomichev
2019-07-25 22:52 ` [PATCH bpf-next v3 6/7] bpf/flow_dissector: support ipv6 flow_label and BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL Stanislav Fomichev
2019-07-25 22:52 ` [PATCH bpf-next v3 7/7] selftests/bpf: support BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP Stanislav Fomichev
2019-08-27 18:04 ` Eric Dumazet
2019-08-27 18:19 ` Stanislav Fomichev [this message]
2019-07-26 1:06 ` [PATCH bpf-next v3 0/7] bpf/flow_dissector: support input flags Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKH8qBsJH80mAYnVP9xgey+_CChgCfSb8uS-RX=rum5gJ+S0_w@mail.gmail.com' \
--to=sdf@google.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=ppenkov@google.com \
--cc=songliubraving@fb.com \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.