| Message ID | 1473681897-32260-1-git-send-email-jakub.kicinski@netronome.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 09/12/2016 02:04 PM, Jakub Kicinski wrote: > Commit d5709f7ab776 ("flow_dissector: For stripped vlan, get vlan > info from skb->vlan_tci") made flow dissector look at vlan_proto > when vlan is present. Since test_bpf sets skb->vlan_tci to ~0 > (including VLAN_TAG_PRESENT) we have to populate skb->vlan_proto. > > Fixes false negative on test #24: > test_bpf: #24 LD_PAYLOAD_OFF jited:0 175 ret 0 != 42 FAIL (1 times) > > Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> > Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com> Acked-by: Daniel Borkmann <daniel@iogearbox.net>
On Mon, Sep 12, 2016 at 01:04:57PM +0100, Jakub Kicinski wrote: > Commit d5709f7ab776 ("flow_dissector: For stripped vlan, get vlan > info from skb->vlan_tci") made flow dissector look at vlan_proto > when vlan is present. Since test_bpf sets skb->vlan_tci to ~0 > (including VLAN_TAG_PRESENT) we have to populate skb->vlan_proto. > > Fixes false negative on test #24: > test_bpf: #24 LD_PAYLOAD_OFF jited:0 175 ret 0 != 42 FAIL (1 times) > > Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> > Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com> Thanks! This is for net-next. Pls mention that in the subj next time. Acked-by: Alexei Starovoitov <ast@kernel.org>
From: Jakub Kicinski <jakub.kicinski@netronome.com> Date: Mon, 12 Sep 2016 13:04:57 +0100 > Commit d5709f7ab776 ("flow_dissector: For stripped vlan, get vlan > info from skb->vlan_tci") made flow dissector look at vlan_proto > when vlan is present. Since test_bpf sets skb->vlan_tci to ~0 > (including VLAN_TAG_PRESENT) we have to populate skb->vlan_proto. > > Fixes false negative on test #24: > test_bpf: #24 LD_PAYLOAD_OFF jited:0 175 ret 0 != 42 FAIL (1 times) > > Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> > Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com> Applied.
diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 93f45011a59d..94346b4d8984 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -5485,6 +5485,7 @@ static struct sk_buff *populate_skb(char *buf, int size) skb->hash = SKB_HASH; skb->queue_mapping = SKB_QUEUE_MAP; skb->vlan_tci = SKB_VLAN_TCI; + skb->vlan_proto = htons(ETH_P_IP); skb->dev = &dev; skb->dev->ifindex = SKB_DEV_IFINDEX; skb->dev->type = SKB_DEV_TYPE;
Commit d5709f7ab776 ("flow_dissector: For stripped vlan, get vlan info from skb->vlan_tci") made flow dissector look at vlan_proto when vlan is present. Since test_bpf sets skb->vlan_tci to ~0 (including VLAN_TAG_PRESENT) we have to populate skb->vlan_proto. Fixes false negative on test #24: test_bpf: #24 LD_PAYLOAD_OFF jited:0 175 ret 0 != 42 FAIL (1 times) Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com> --- lib/test_bpf.c | 1 + 1 file changed, 1 insertion(+)