Skip to content

Commit a735a13

Browse files
vlrpligsilya
vlrpl
authored and
igsilya
committed
miniflow_extract: Push ct_tp_{src, dst} for later frags.
Ales reported that ct_tp_{src,dst} matches are working only for the first frag for the userspace datapath, whereas they are always working for later frags in the case of kernel datapath. The ipf propagates the info in packets metadata, but miniflow_extract() has no handling for them. Fix it by pushing the relevant fields in the miniflow. tp_{src,dst} are not set for later frags, so fill them with padding as ct_tp_{src,dst} are not aligned: struct flow { [...] ovs_be16 tp_src; /* 656 2 */ ovs_be16 tp_dst; /* 658 2 */ ovs_be16 ct_tp_src; /* 660 2 */ ovs_be16 ct_tp_dst; /* 662 2 */ [...] } The patch also includes two tests to exercise the behavior. Fixes: 4ea9669 ("Userspace datapath: Add fragmentation handling.") Reported-at: https://issues.redhat.com/browse/FDP-124 Signed-off-by: Paolo Valerio <[email protected]> Signed-off-by: Ilya Maximets <[email protected]>
1 parent dc86b14 commit a735a13

File tree

2 files changed

+189
-3
lines changed

2 files changed

+189
-3
lines changed

‎lib/flow.c

+18-3
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,14 @@ parse_ethertype(const void **datap, size_t *sizep)
402402
return htons(FLOW_DL_TYPE_NONE);
403403
}
404404

405+
static inline bool
406+
icmp6_is_nd(const struct icmp6_data_header *icmp6)
407+
{
408+
return (icmp6->icmp6_base.icmp6_code == 0 &&
409+
(icmp6->icmp6_base.icmp6_type == ND_NEIGHBOR_SOLICIT ||
410+
icmp6->icmp6_base.icmp6_type == ND_NEIGHBOR_ADVERT));
411+
}
412+
405413
/* Returns 'true' if the packet is an ND packet. In that case the '*nd_target'
406414
* and 'arp_buf[]' are filled in. If the packet is not an ND packet, 'false'
407415
* is returned and no values are filled in on '*nd_target' or 'arp_buf[]'. */
@@ -412,9 +420,7 @@ parse_icmpv6(const void **datap, size_t *sizep,
412420
const union ovs_16aligned_in6_addr **nd_target,
413421
struct eth_addr arp_buf[2], uint8_t *opt_type)
414422
{
415-
if (icmp6->icmp6_base.icmp6_code != 0 ||
416-
(icmp6->icmp6_base.icmp6_type != ND_NEIGHBOR_SOLICIT &&
417-
icmp6->icmp6_base.icmp6_type != ND_NEIGHBOR_ADVERT)) {
423+
if (!icmp6_is_nd(icmp6)) {
418424
return false;
419425
}
420426

@@ -1166,6 +1172,15 @@ miniflow_extract(struct dp_packet *packet, struct miniflow *dst)
11661172
}
11671173
}
11681174
}
1175+
} else if (ct_nw_proto_p &&
1176+
(*ct_nw_proto_p == IPPROTO_TCP ||
1177+
*ct_nw_proto_p == IPPROTO_UDP ||
1178+
*ct_nw_proto_p == IPPROTO_SCTP ||
1179+
*ct_nw_proto_p == IPPROTO_ICMP ||
1180+
(*ct_nw_proto_p == IPPROTO_ICMPV6 && !icmp6_is_nd(data)))) {
1181+
miniflow_pad_from_64(mf, ct_tp_src);
1182+
miniflow_push_be16(mf, ct_tp_src, ct_tp_src);
1183+
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
11691184
}
11701185
out:
11711186
dst->map = mf.map;

‎tests/system-traffic.at

+171
Original file line numberDiff line numberDiff line change
@@ -4367,6 +4367,91 @@ OVS_CHECK_FRAG_LARGE()
43674367
OVS_TRAFFIC_VSWITCHD_STOP(["/Unsupported big reassembled v4 packet/d"])
43684368
AT_CLEANUP
43694369

4370+
AT_SETUP([conntrack - IPv4 fragmentation with ct orig match])
4371+
CHECK_CONNTRACK()
4372+
OVS_TRAFFIC_VSWITCHD_START()
4373+
4374+
ADD_NAMESPACES(at_ns0, at_ns1)
4375+
4376+
ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
4377+
ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
4378+
4379+
AT_DATA([flows.txt], [dnl
4380+
priority=1,action=drop
4381+
priority=10,arp,action=normal
4382+
priority=100,ip,ct_state=-trk,action=ct(table=0)
4383+
priority=100,in_port=2,icmp,ct_state=+rpl,action=1
4384+
priority=100,in_port=1,ip,ct_nw_proto=17,ct_tp_src=1,ct_tp_dst=2,ct_state=+new+trk,action=ct(commit)
4385+
priority=100,in_port=1,ip,ct_nw_proto=1,ct_tp_src=8,ct_tp_dst=0,ct_state=+new+trk,action=ct(commit),2
4386+
])
4387+
4388+
AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
4389+
4390+
dnl Packet content:
4391+
dnl Ethernet II, Src: 50:54:00:00:00:0a, Dst: 50:54:00:00:00:09
4392+
dnl Type: IPv4 (0x0800)
4393+
dnl Internet Protocol Version 4, Src: 10.1.1.1, Dst: 10.1.1.2
4394+
dnl Total Length: 1420
4395+
dnl Identification: 0x0001 (1)
4396+
dnl 001. .... = Flags: 0x1, More fragments
4397+
dnl 0... .... = Reserved bit: Not set
4398+
dnl .0.. .... = Don't fragment: Not set
4399+
dnl ..1. .... = More fragments: Set
4400+
dnl ...0 0000 0000 0000 = Fragment Offset: 0
4401+
dnl Time to Live: 64
4402+
dnl Protocol: UDP (17)
4403+
dnl User Datagram Protocol, Src Port: 1, Dst Port: 2
4404+
dnl Source Port: 1
4405+
dnl Destination Port: 2
4406+
dnl Length: 1608
4407+
dnl UDP payload (1392 bytes)
4408+
dnl Data (1392 bytes)
4409+
eth="50 54 00 00 00 09 50 54 00 00 00 0a 08 00"
4410+
ip="45 00 05 8c 00 01 20 00 40 11 3f 5c 0a 01 01 01 0a 01 01 02"
4411+
udp="00 01 00 02 06 48 dd 56"
4412+
data_len=$(seq 1392)
4413+
data=$(printf '00 %.0s' ${data_len})
4414+
packet="${eth} ${ip} ${udp} ${data}"
4415+
NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 ${packet} > /dev/null])
4416+
4417+
dnl Packet content:
4418+
dnl Ethernet II, Src: 50:54:00:00:00:0a, Dst: 50:54:00:00:00:09
4419+
dnl Type: IPv4 (0x0800)
4420+
dnl Internet Protocol Version 4, Src: 10.1.1.1, Dst: 10.1.1.2
4421+
dnl 0100 .... = Version: 4
4422+
dnl .... 0101 = Header Length: 20 bytes (5)
4423+
dnl Differentiated Services Field: 0x00 (DSCP: CS0, ECN: Not-ECT)
4424+
dnl 0000 00.. = Differentiated Services Codepoint: Default (0)
4425+
dnl .... ..00 = Explicit Congestion Notification: Not ECN-Capable Transport (0)
4426+
dnl Total Length: 228
4427+
dnl Identification: 0x0001 (1)
4428+
dnl 000. .... = Flags: 0x0
4429+
dnl 0... .... = Reserved bit: Not set
4430+
dnl .0.. .... = Don't fragment: Not set
4431+
dnl ..0. .... = More fragments: Not set
4432+
dnl ...0 0000 1010 1111 = Fragment Offset: 1400
4433+
dnl Time to Live: 64
4434+
dnl Protocol: UDP (17)
4435+
dnl Data (208 bytes)
4436+
eth="50 54 00 00 00 09 50 54 00 00 00 0a 08 00"
4437+
ip="45 00 00 e4 00 01 00 af 40 11 63 55 0a 01 01 01 0a 01 01 02"
4438+
data_len=$(seq 208)
4439+
data=$(printf '00 %.0s' ${data_len})
4440+
packet="${eth} ${ip} ${data}"
4441+
NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 ${packet} > /dev/null])
4442+
4443+
NS_CHECK_EXEC([at_ns0], [ping -s 1600 -q -c 1 -W 1 10.1.1.2 | FORMAT_PING], [0], [dnl
4444+
1 packets transmitted, 1 received, 0% packet loss, time 0ms
4445+
])
4446+
4447+
AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sort], [0], [dnl
4448+
icmp,orig=(src=10.1.1.1,dst=10.1.1.2,id=<cleared>,type=8,code=0),reply=(src=10.1.1.2,dst=10.1.1.1,id=<cleared>,type=0,code=0)
4449+
udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>)
4450+
])
4451+
4452+
OVS_TRAFFIC_VSWITCHD_STOP
4453+
AT_CLEANUP
4454+
43704455
AT_SETUP([conntrack - IPv4 fragmentation expiry])
43714456
CHECK_CONNTRACK()
43724457
OVS_TRAFFIC_VSWITCHD_START()
@@ -4665,6 +4750,92 @@ OVS_CHECK_FRAG_LARGE()
46654750
OVS_TRAFFIC_VSWITCHD_STOP(["/Unsupported big reassembled v6 packet/d"])
46664751
AT_CLEANUP
46674752

4753+
AT_SETUP([conntrack - IPv6 fragmentation with ct orig match])
4754+
CHECK_CONNTRACK()
4755+
OVS_TRAFFIC_VSWITCHD_START()
4756+
4757+
ADD_NAMESPACES(at_ns0, at_ns1)
4758+
4759+
ADD_VETH(p0, at_ns0, br0, "fc00::1/96", "50:54:00:00:00:09", [], "nodad")
4760+
ADD_VETH(p1, at_ns1, br0, "fc00::2/96", "50:54:00:00:00:0a", [], "nodad")
4761+
4762+
AT_DATA([flows.txt], [dnl
4763+
priority=1,action=drop
4764+
priority=10,ipv6,ct_state=-trk,action=ct(table=0)
4765+
priority=10,in_port=2,ipv6,ct_tp_src=128,ct_state=+trk+est+rpl,action=1
4766+
priority=10,in_port=1,ipv6,ct_nw_proto=17,ct_tp_src=1,ct_tp_dst=2,ct_state=+new+trk,action=ct(commit)
4767+
priority=10,in_port=1,ipv6,ct_nw_proto=58,ct_tp_src=128,ct_tp_dst=0,ct_state=+new+trk,action=ct(commit),2
4768+
priority=100,icmp6,icmp_type=135,action=normal
4769+
priority=100,icmp6,icmp_type=136,action=normal
4770+
])
4771+
4772+
AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
4773+
4774+
dnl Packet content:
4775+
dnl Ethernet II, Src: 50:54:00:00:00:0a, Dst: 50:54:00:00:00:09
4776+
dnl Type: IPv6 (0x86dd)
4777+
dnl Internet Protocol Version 6, Src: fc00::1, Dst: fc00::2
4778+
dnl Payload Length: 1344
4779+
dnl Next Header: Fragment Header for IPv6 (44)
4780+
dnl Hop Limit: 64
4781+
dnl Fragment Header for IPv6
4782+
dnl Next header: UDP (17)
4783+
dnl Reserved octet: 0x00
4784+
dnl 0000 0000 0000 0... = Offset: 0 (0 bytes)
4785+
dnl .... .... .... .00. = Reserved bits: 0
4786+
dnl .... .... .... ...1 = More Fragments: Yes
4787+
dnl Identification: 0x9bdb1fa7
4788+
dnl User Datagram Protocol, Src Port: 1, Dst Port: 2
4789+
dnl Source Port: 1
4790+
dnl Destination Port: 2
4791+
dnl Length: 1608
4792+
dnl UDP payload (1328 bytes)
4793+
dnl Data (1328 bytes)
4794+
eth="50 54 00 00 00 09 50 54 00 00 00 0a 86 dd"
4795+
ipv6="60 00 00 00 05 40 2c 40 fc 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 \
4796+
fc 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 11 00 00 01 9b db 1f a7"
4797+
udp="00 01 00 02 06 48 fb 56"
4798+
data_len=$(seq 1328)
4799+
data=$(printf '00 %.0s' ${data_len})
4800+
packet="${eth} ${ipv6} ${udp} ${data}"
4801+
NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 ${packet} > /dev/null])
4802+
4803+
dnl IPv6 Packet content
4804+
dnl Ethernet II, Src: 50:54:00:00:00:0a, Dst: 50:54:00:00:00:09
4805+
dnl Type: IPv6 (0x86dd)
4806+
dnl Internet Protocol Version 6, Src: fc00::1, Dst: fc00::2
4807+
dnl Payload Length: 280
4808+
dnl Next Header: Fragment Header for IPv6 (44)
4809+
dnl Hop Limit: 64
4810+
dnl Fragment Header for IPv6
4811+
dnl Next header: UDP (17)
4812+
dnl Reserved octet: 0x00
4813+
dnl 0000 0101 0011 1... = Offset: 167 (1336 bytes)
4814+
dnl .... .... .... .00. = Reserved bits: 0
4815+
dnl .... .... .... ...0 = More Fragments: No
4816+
dnl Identification: 0x9bdb1fa7
4817+
dnl Data (272 bytes)
4818+
eth="50 54 00 00 00 09 50 54 00 00 00 0a 86 dd"
4819+
ipv6="60 00 00 00 01 18 2c 40 fc 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 \
4820+
fc 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 11 00 05 38 9b db 1f a7"
4821+
data_len=$(seq 272)
4822+
data=$(printf '00 %.0s' ${data_len})
4823+
packet="${eth} ${ipv6} ${data}"
4824+
NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 ${packet} > /dev/null])
4825+
4826+
dnl Send also fragmented ICMPv6.
4827+
NS_CHECK_EXEC([at_ns0], [ping6 -s 1600 -q -c 1 -W 1 fc00::2 | FORMAT_PING], [0], [dnl
4828+
1 packets transmitted, 1 received, 0% packet loss, time 0ms
4829+
])
4830+
4831+
AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2) | sort], [0], [dnl
4832+
icmpv6,orig=(src=fc00::1,dst=fc00::2,id=<cleared>,type=128,code=0),reply=(src=fc00::2,dst=fc00::1,id=<cleared>,type=129,code=0)
4833+
udp,orig=(src=fc00::1,dst=fc00::2,sport=<cleared>,dport=<cleared>),reply=(src=fc00::2,dst=fc00::1,sport=<cleared>,dport=<cleared>)
4834+
])
4835+
4836+
OVS_TRAFFIC_VSWITCHD_STOP
4837+
AT_CLEANUP
4838+
46684839
AT_SETUP([conntrack - IPv6 fragmentation expiry])
46694840
CHECK_CONNTRACK()
46704841
OVS_TRAFFIC_VSWITCHD_START()

0 commit comments

Comments
 (0)