Skip to content

Commit 487c1bb

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 898ef68 commit 487c1bb

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

@@ -1172,6 +1178,15 @@ miniflow_extract(struct dp_packet *packet, struct miniflow *dst)
11721178
}
11731179
}
11741180
}
1181+
} else if (ct_nw_proto_p &&
1182+
(*ct_nw_proto_p == IPPROTO_TCP ||
1183+
*ct_nw_proto_p == IPPROTO_UDP ||
1184+
*ct_nw_proto_p == IPPROTO_SCTP ||
1185+
*ct_nw_proto_p == IPPROTO_ICMP ||
1186+
(*ct_nw_proto_p == IPPROTO_ICMPV6 && !icmp6_is_nd(data)))) {
1187+
miniflow_pad_from_64(mf, ct_tp_src);
1188+
miniflow_push_be16(mf, ct_tp_src, ct_tp_src);
1189+
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
11751190
}
11761191
out:
11771192
dst->map = mf.map;

‎tests/system-traffic.at

+171
Original file line numberDiff line numberDiff line change
@@ -4129,6 +4129,91 @@ OVS_CHECK_FRAG_LARGE()
41294129
OVS_TRAFFIC_VSWITCHD_STOP(["/Unsupported big reassembled v4 packet/d"])
41304130
AT_CLEANUP
41314131

4132+
AT_SETUP([conntrack - IPv4 fragmentation with ct orig match])
4133+
CHECK_CONNTRACK()
4134+
OVS_TRAFFIC_VSWITCHD_START()
4135+
4136+
ADD_NAMESPACES(at_ns0, at_ns1)
4137+
4138+
ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
4139+
ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
4140+
4141+
AT_DATA([flows.txt], [dnl
4142+
priority=1,action=drop
4143+
priority=10,arp,action=normal
4144+
priority=100,ip,ct_state=-trk,action=ct(table=0)
4145+
priority=100,in_port=2,icmp,ct_state=+rpl,action=1
4146+
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)
4147+
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
4148+
])
4149+
4150+
AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
4151+
4152+
dnl Packet content:
4153+
dnl Ethernet II, Src: 50:54:00:00:00:0a, Dst: 50:54:00:00:00:09
4154+
dnl Type: IPv4 (0x0800)
4155+
dnl Internet Protocol Version 4, Src: 10.1.1.1, Dst: 10.1.1.2
4156+
dnl Total Length: 1420
4157+
dnl Identification: 0x0001 (1)
4158+
dnl 001. .... = Flags: 0x1, More fragments
4159+
dnl 0... .... = Reserved bit: Not set
4160+
dnl .0.. .... = Don't fragment: Not set
4161+
dnl ..1. .... = More fragments: Set
4162+
dnl ...0 0000 0000 0000 = Fragment Offset: 0
4163+
dnl Time to Live: 64
4164+
dnl Protocol: UDP (17)
4165+
dnl User Datagram Protocol, Src Port: 1, Dst Port: 2
4166+
dnl Source Port: 1
4167+
dnl Destination Port: 2
4168+
dnl Length: 1608
4169+
dnl UDP payload (1392 bytes)
4170+
dnl Data (1392 bytes)
4171+
eth="50 54 00 00 00 09 50 54 00 00 00 0a 08 00"
4172+
ip="45 00 05 8c 00 01 20 00 40 11 3f 5c 0a 01 01 01 0a 01 01 02"
4173+
udp="00 01 00 02 06 48 dd 56"
4174+
data_len=$(seq 1392)
4175+
data=$(printf '00 %.0s' ${data_len})
4176+
packet="${eth} ${ip} ${udp} ${data}"
4177+
NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 ${packet} > /dev/null])
4178+
4179+
dnl Packet content:
4180+
dnl Ethernet II, Src: 50:54:00:00:00:0a, Dst: 50:54:00:00:00:09
4181+
dnl Type: IPv4 (0x0800)
4182+
dnl Internet Protocol Version 4, Src: 10.1.1.1, Dst: 10.1.1.2
4183+
dnl 0100 .... = Version: 4
4184+
dnl .... 0101 = Header Length: 20 bytes (5)
4185+
dnl Differentiated Services Field: 0x00 (DSCP: CS0, ECN: Not-ECT)
4186+
dnl 0000 00.. = Differentiated Services Codepoint: Default (0)
4187+
dnl .... ..00 = Explicit Congestion Notification: Not ECN-Capable Transport (0)
4188+
dnl Total Length: 228
4189+
dnl Identification: 0x0001 (1)
4190+
dnl 000. .... = Flags: 0x0
4191+
dnl 0... .... = Reserved bit: Not set
4192+
dnl .0.. .... = Don't fragment: Not set
4193+
dnl ..0. .... = More fragments: Not set
4194+
dnl ...0 0000 1010 1111 = Fragment Offset: 1400
4195+
dnl Time to Live: 64
4196+
dnl Protocol: UDP (17)
4197+
dnl Data (208 bytes)
4198+
eth="50 54 00 00 00 09 50 54 00 00 00 0a 08 00"
4199+
ip="45 00 00 e4 00 01 00 af 40 11 63 55 0a 01 01 01 0a 01 01 02"
4200+
data_len=$(seq 208)
4201+
data=$(printf '00 %.0s' ${data_len})
4202+
packet="${eth} ${ip} ${data}"
4203+
NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 ${packet} > /dev/null])
4204+
4205+
NS_CHECK_EXEC([at_ns0], [ping -s 1600 -q -c 1 -W 1 10.1.1.2 | FORMAT_PING], [0], [dnl
4206+
1 packets transmitted, 1 received, 0% packet loss, time 0ms
4207+
])
4208+
4209+
AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sort], [0], [dnl
4210+
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)
4211+
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>)
4212+
])
4213+
4214+
OVS_TRAFFIC_VSWITCHD_STOP
4215+
AT_CLEANUP
4216+
41324217
AT_SETUP([conntrack - IPv4 fragmentation expiry])
41334218
CHECK_CONNTRACK()
41344219
OVS_TRAFFIC_VSWITCHD_START()
@@ -4427,6 +4512,92 @@ OVS_CHECK_FRAG_LARGE()
44274512
OVS_TRAFFIC_VSWITCHD_STOP(["/Unsupported big reassembled v6 packet/d"])
44284513
AT_CLEANUP
44294514

4515+
AT_SETUP([conntrack - IPv6 fragmentation with ct orig match])
4516+
CHECK_CONNTRACK()
4517+
OVS_TRAFFIC_VSWITCHD_START()
4518+
4519+
ADD_NAMESPACES(at_ns0, at_ns1)
4520+
4521+
ADD_VETH(p0, at_ns0, br0, "fc00::1/96", "50:54:00:00:00:09", [], "nodad")
4522+
ADD_VETH(p1, at_ns1, br0, "fc00::2/96", "50:54:00:00:00:0a", [], "nodad")
4523+
4524+
AT_DATA([flows.txt], [dnl
4525+
priority=1,action=drop
4526+
priority=10,ipv6,ct_state=-trk,action=ct(table=0)
4527+
priority=10,in_port=2,ipv6,ct_tp_src=128,ct_state=+trk+est+rpl,action=1
4528+
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)
4529+
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
4530+
priority=100,icmp6,icmp_type=135,action=normal
4531+
priority=100,icmp6,icmp_type=136,action=normal
4532+
])
4533+
4534+
AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
4535+
4536+
dnl Packet content:
4537+
dnl Ethernet II, Src: 50:54:00:00:00:0a, Dst: 50:54:00:00:00:09
4538+
dnl Type: IPv6 (0x86dd)
4539+
dnl Internet Protocol Version 6, Src: fc00::1, Dst: fc00::2
4540+
dnl Payload Length: 1344
4541+
dnl Next Header: Fragment Header for IPv6 (44)
4542+
dnl Hop Limit: 64
4543+
dnl Fragment Header for IPv6
4544+
dnl Next header: UDP (17)
4545+
dnl Reserved octet: 0x00
4546+
dnl 0000 0000 0000 0... = Offset: 0 (0 bytes)
4547+
dnl .... .... .... .00. = Reserved bits: 0
4548+
dnl .... .... .... ...1 = More Fragments: Yes
4549+
dnl Identification: 0x9bdb1fa7
4550+
dnl User Datagram Protocol, Src Port: 1, Dst Port: 2
4551+
dnl Source Port: 1
4552+
dnl Destination Port: 2
4553+
dnl Length: 1608
4554+
dnl UDP payload (1328 bytes)
4555+
dnl Data (1328 bytes)
4556+
eth="50 54 00 00 00 09 50 54 00 00 00 0a 86 dd"
4557+
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 \
4558+
fc 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 11 00 00 01 9b db 1f a7"
4559+
udp="00 01 00 02 06 48 fb 56"
4560+
data_len=$(seq 1328)
4561+
data=$(printf '00 %.0s' ${data_len})
4562+
packet="${eth} ${ipv6} ${udp} ${data}"
4563+
NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 ${packet} > /dev/null])
4564+
4565+
dnl IPv6 Packet content
4566+
dnl Ethernet II, Src: 50:54:00:00:00:0a, Dst: 50:54:00:00:00:09
4567+
dnl Type: IPv6 (0x86dd)
4568+
dnl Internet Protocol Version 6, Src: fc00::1, Dst: fc00::2
4569+
dnl Payload Length: 280
4570+
dnl Next Header: Fragment Header for IPv6 (44)
4571+
dnl Hop Limit: 64
4572+
dnl Fragment Header for IPv6
4573+
dnl Next header: UDP (17)
4574+
dnl Reserved octet: 0x00
4575+
dnl 0000 0101 0011 1... = Offset: 167 (1336 bytes)
4576+
dnl .... .... .... .00. = Reserved bits: 0
4577+
dnl .... .... .... ...0 = More Fragments: No
4578+
dnl Identification: 0x9bdb1fa7
4579+
dnl Data (272 bytes)
4580+
eth="50 54 00 00 00 09 50 54 00 00 00 0a 86 dd"
4581+
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 \
4582+
fc 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 11 00 05 38 9b db 1f a7"
4583+
data_len=$(seq 272)
4584+
data=$(printf '00 %.0s' ${data_len})
4585+
packet="${eth} ${ipv6} ${data}"
4586+
NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 ${packet} > /dev/null])
4587+
4588+
dnl Send also fragmented ICMPv6.
4589+
NS_CHECK_EXEC([at_ns0], [ping6 -s 1600 -q -c 1 -W 1 fc00::2 | FORMAT_PING], [0], [dnl
4590+
1 packets transmitted, 1 received, 0% packet loss, time 0ms
4591+
])
4592+
4593+
AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2) | sort], [0], [dnl
4594+
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)
4595+
udp,orig=(src=fc00::1,dst=fc00::2,sport=<cleared>,dport=<cleared>),reply=(src=fc00::2,dst=fc00::1,sport=<cleared>,dport=<cleared>)
4596+
])
4597+
4598+
OVS_TRAFFIC_VSWITCHD_STOP
4599+
AT_CLEANUP
4600+
44304601
AT_SETUP([conntrack - IPv6 fragmentation expiry])
44314602
CHECK_CONNTRACK()
44324603
OVS_TRAFFIC_VSWITCHD_START()

0 commit comments

Comments
 (0)