Cache the 'conn' context and use it when it is valid. The cached 'conn' context will get reset if it is not expected to be valid; a negative test is added to check this.
Signed-off-by: Darrell Ball <[email protected]> --- v4: Reset 'conn' cache context automatically when tuple changes, rather than needing an explicit 'ct_clear' action. Need to check if all cases are handled. v3: Remove unneeded 'NAT' field added to 'struct conn_lookup_ctx'. lib/conntrack.c | 54 ++++++++++++++++++++++++++++++++++++++++-- lib/netdev.c | 1 + lib/packets.c | 7 ++++++ lib/packets.h | 10 ++++++++ tests/system-traffic.at | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 133 insertions(+), 2 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index 4c63638..ce50e49 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -1077,6 +1077,45 @@ conn_update_state_alg(struct conntrack *ct, struct dp_packet *pkt, return false; } +static inline void +set_cached_conn(const struct nat_action_info_t *nat_action_info, + enum ct_alg_ctl_type ct_alg_ctl, struct conn *conn, + const struct conn_lookup_ctx *ctx, struct dp_packet *pkt) +{ + if (OVS_LIKELY(!nat_action_info && ct_alg_ctl == CT_ALG_CTL_NONE)) { + pkt->md.conn = conn; + pkt->md.reply = ctx->reply; + pkt->md.icmp_related = ctx->icmp_related; + } else { + pkt->md.conn = NULL; + } +} + +static inline void +process_one_fast(struct dp_packet *pkt, uint16_t zone, + const uint32_t *setmark, + const struct ovs_key_ct_labels *setlabel, + const struct nat_action_info_t *nat_action_info, + struct conn *conn) +{ + if (nat_action_info) { + handle_nat(pkt, conn, zone, pkt->md.reply, pkt->md.icmp_related); + pkt->md.conn = NULL; + } + + pkt->md.ct_zone = zone; + pkt->md.ct_mark = conn->mark; + pkt->md.ct_label = conn->label; + + if (setmark) { + set_mark(pkt, conn, setmark[0], setmark[1]); + } + + if (setlabel) { + set_label(pkt, conn, &setlabel[0], &setlabel[1]); + } +} + static void process_one(struct conntrack *ct, struct dp_packet *pkt, struct conn_lookup_ctx *ctx, uint16_t zone, @@ -1173,6 +1212,8 @@ process_one(struct conntrack *ct, struct dp_packet *pkt, } handle_alg_ctl(ct, ctx, pkt, ct_alg_ctl, conn, now, !!nat_action_info); + + set_cached_conn(nat_action_info, ct_alg_ctl, conn, ctx, pkt); } /* Sends the packets in '*pkt_batch' through the connection tracker 'ct'. All @@ -1200,8 +1241,16 @@ conntrack_execute(struct conntrack *ct, struct dp_packet_batch *pkt_batch, struct conn_lookup_ctx ctx; DP_PACKET_BATCH_FOR_EACH (i, packet, pkt_batch) { - if (packet->md.ct_state == CS_INVALID - || !conn_key_extract(ct, packet, dl_type, &ctx, zone)) { + struct conn *conn = packet->md.conn; + if (OVS_UNLIKELY(packet->md.ct_state == CS_INVALID)) { + write_ct_md(packet, zone, NULL, NULL, NULL); + continue; + } else if (conn && !force && !commit && conn->key.zone == zone) { + process_one_fast(packet, zone, setmark, setlabel, nat_action_info, + packet->md.conn); + continue; + } else if (OVS_UNLIKELY(!conn_key_extract(ct, packet, dl_type, &ctx, + zone))) { packet->md.ct_state = CS_INVALID; write_ct_md(packet, zone, NULL, NULL, NULL); continue; @@ -1221,6 +1270,7 @@ conntrack_clear(struct dp_packet *packet) /* According to pkt_metadata_init(), ct_state == 0 is enough to make all of * the conntrack fields invalid. */ packet->md.ct_state = 0; + pkt_metadata_init_conn(&packet->md); } static void diff --git a/lib/netdev.c b/lib/netdev.c index 7d7ecf6..6bf3e77 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -817,6 +817,7 @@ netdev_pop_header(struct netdev *netdev, struct dp_packet_batch *batch) * interpretation in the further packet processing when * recirculated.*/ dp_packet_reset_offload(packet); + pkt_metadata_init_conn(&packet->md); dp_packet_batch_refill(batch, packet, i); } } diff --git a/lib/packets.c b/lib/packets.c index a8fd61f..4f52b15 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -979,6 +979,8 @@ packet_set_ipv4_addr(struct dp_packet *packet, ovs_be32 old_addr = get_16aligned_be32(addr); size_t l4_size = dp_packet_l4_size(packet); + pkt_metadata_init_conn(&packet->md); + if (nh->ip_proto == IPPROTO_TCP && l4_size >= TCP_HEADER_LEN) { struct tcp_header *th = dp_packet_l4(packet); @@ -1118,6 +1120,7 @@ packet_set_ipv6_addr(struct dp_packet *packet, uint8_t proto, packet_update_csum128(packet, proto, addr, new_addr); } memcpy(addr, new_addr, sizeof(ovs_be32[4])); + pkt_metadata_init_conn(&packet->md); } static void @@ -1219,6 +1222,7 @@ packet_set_tcp_port(struct dp_packet *packet, ovs_be16 src, ovs_be16 dst) packet_set_port(&th->tcp_src, src, &th->tcp_csum); packet_set_port(&th->tcp_dst, dst, &th->tcp_csum); + pkt_metadata_init_conn(&packet->md); } /* Sets the UDP source and destination port ('src' and 'dst' respectively) of @@ -1240,6 +1244,7 @@ packet_set_udp_port(struct dp_packet *packet, ovs_be16 src, ovs_be16 dst) uh->udp_src = src; uh->udp_dst = dst; } + pkt_metadata_init_conn(&packet->md); } /* Sets the SCTP source and destination port ('src' and 'dst' respectively) of @@ -1261,6 +1266,7 @@ packet_set_sctp_port(struct dp_packet *packet, ovs_be16 src, ovs_be16 dst) new_csum = crc32c((void *)sh, tp_len); put_16aligned_be32(&sh->sctp_csum, old_csum ^ old_correct_csum ^ new_csum); + pkt_metadata_init_conn(&packet->md); } /* Sets the ICMP type and code of the ICMP header contained in 'packet'. @@ -1279,6 +1285,7 @@ packet_set_icmp(struct dp_packet *packet, uint8_t type, uint8_t code) ih->icmp_csum = recalc_csum16(ih->icmp_csum, orig_tc, new_tc); } + pkt_metadata_init_conn(&packet->md); } void diff --git a/lib/packets.h b/lib/packets.h index d293b35..41a6561 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -108,6 +108,9 @@ PADDED_MEMBERS_CACHELINE_MARKER(CACHE_LINE_SIZE, cacheline0, uint32_t ct_mark; /* Connection mark. */ ovs_u128 ct_label; /* Connection label. */ union flow_in_port in_port; /* Input port. */ + void *conn; /* Cached conntrack connection. */ + bool reply; /* True if reply direction. */ + bool icmp_related; /* True if ICMP related. */ ); PADDED_MEMBERS_CACHELINE_MARKER(CACHE_LINE_SIZE, cacheline1, @@ -140,6 +143,12 @@ pkt_metadata_init_tnl(struct pkt_metadata *md) } static inline void +pkt_metadata_init_conn(struct pkt_metadata *md) +{ + md->conn = NULL; +} + +static inline void pkt_metadata_init(struct pkt_metadata *md, odp_port_t port) { /* This is called for every packet in userspace datapath and affects @@ -157,6 +166,7 @@ pkt_metadata_init(struct pkt_metadata *md, odp_port_t port) md->tunnel.ip_dst = 0; md->tunnel.ipv6_dst = in6addr_any; md->in_port.odp_port = port; + md->conn = NULL; } /* This function prefetches the cachelines touched by pkt_metadata_init() diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 79d12fe..7b5669d 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -5528,6 +5528,69 @@ grep "tcp,orig=(src=10.254.254.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),r OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP +AT_SETUP([conntrack - negative test for recirculation optimization]) +dnl This test will fail if 'conn' caching is being used, because the tuple +dnl has been changed outside of conntrack. +AT_SKIP_IF([test $HAVE_NC = no]) +CHECK_CONNTRACK() +OVS_TRAFFIC_VSWITCHD_START() +OVS_CHECK_CT_CLEAR() + +ADD_NAMESPACES(at_ns0, at_ns1) +ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24", "f0:00:00:01:01:01") dnl FIP 10.254.254.1 +ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24", "f0:00:00:01:01:02") dnl FIP 10.254.254.2 + +dnl Static ARPs +NS_CHECK_EXEC([at_ns0], [ip neigh add 10.1.1.2 lladdr f0:00:00:01:01:02 dev p0]) +NS_CHECK_EXEC([at_ns1], [ip neigh add 10.1.1.1 lladdr f0:00:00:01:01:01 dev p1]) + +dnl Static ARP and route entries for the FIP "gateway" +NS_CHECK_EXEC([at_ns0], [ip neigh add 10.1.1.254 lladdr f0:00:00:01:01:FE dev p0]) +NS_CHECK_EXEC([at_ns1], [ip neigh add 10.1.1.254 lladdr f0:00:00:01:01:FE dev p1]) +NS_CHECK_EXEC([at_ns0], [ip route add default nexthop via 10.1.1.254]) +NS_CHECK_EXEC([at_ns1], [ip route add default nexthop via 10.1.1.254]) + +NETNS_DAEMONIZE([at_ns0], [nc -l -k 1234 > /dev/null], [nc0.pid]) + +AT_DATA([flows.txt], [dnl +table=0,priority=10 ip action=ct(table=1) +dnl dst FIP +table=1,priority=20 ip,ct_state=+trk+est,nw_dst=10.254.254.0/24 action=goto_table:2 +table=1,priority=20 ip,ct_state=+trk+new,nw_dst=10.254.254.0/24 action=ct(commit,exec(set_field:1->ct_mark),table=2) +dnl +dnl FIP translation (dst FIP, src local) --> (dst local, src FIP) +table=2 ip,nw_dst=10.254.254.1 action=set_field:10.1.1.1->nw_dst,goto_table:3 +table=2 ip,nw_dst=10.254.254.2 action=set_field:10.1.1.2->nw_dst,goto_table:3 +table=3 ip,nw_src=10.1.1.1 action=set_field:10.254.254.1->nw_src,goto_table:4 +table=3 ip,nw_src=10.1.1.2 action=set_field:10.254.254.2->nw_src,goto_table:4 +table=4 ip,nw_dst=10.1.1.1 action=set_field:f0:00:00:01:01:01->eth_dst,goto_table:5 +table=4 ip,nw_dst=10.1.1.2 action=set_field:f0:00:00:01:01:02->eth_dst,goto_table:5 +table=5 ip,nw_src=10.254.254.0/24 action=set_field:f0:00:00:01:01:FE->eth_src,goto_table:6 +dnl +dnl Tuple has been changed outside of conntrack +table=6,priority=10 ip action=ct(table=7) +dnl +table=7 ip,ct_state=+trk+est action=goto_table:8 +table=7 ip,ct_mark=0x0,ct_state=+trk+new action=ct(commit,exec(set_field:2->ct_mark),table=8) +dnl +table=8 ip,nw_dst=10.1.1.1 action=output:ovs-p0 +table=8 ip,nw_dst=10.1.1.2 action=output:ovs-p1 +]) + +AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) + +NS_CHECK_EXEC([at_ns1], [echo "foobar" |nc $NC_EOF_OPT 10.254.254.1 1234]) + +AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.254.254)], [0], [dnl +tcp,orig=(src=10.1.1.2,dst=10.254.254.1,sport=<cleared>,dport=<cleared>),reply=(src=10.254.254.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),mark=1,protoinfo=(state=<cleared>) +tcp,orig=(src=10.254.254.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.1,dst=10.254.254.2,sport=<cleared>,dport=<cleared>),mark=2,protoinfo=(state=<cleared>) +]) + +ovs-appctl dpif/dump-flows br0 + +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP + AT_BANNER([802.1ad]) AT_SETUP([802.1ad - vlan_limit]) -- 1.9.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
