@@ -417,6 +417,9 @@ struct ovnact_encode_params {
/* 'true' if the flow is for a switch. */
bool is_switch;
+ /* 'true' if the flow is for a gateway router. */
+ bool is_gateway_router;
+
/* A map from a port name to its connection tracking zone. */
const struct simap *ct_zones;
@@ -125,6 +125,15 @@ is_switch(const struct sbrec_datapath_binding *ldp)
}
+static bool
+is_gateway_router(const struct sbrec_datapath_binding *ldp,
+ const struct hmap *local_datapaths)
+{
+ struct local_datapath *ld =
+ get_local_datapath(local_datapaths, ldp->tunnel_key);
+ return ld ? ld->has_local_l3gateway : false;
+}
+
/* Adds the logical flows from the Logical_Flow table to flow tables. */
static void
add_logical_flows(struct controller_ctx *ctx, const struct lport_index *lports,
@@ -238,6 +247,7 @@ consider_logical_flow(const struct lport_index *lports,
.lookup_port = lookup_port_cb,
.aux = &aux,
.is_switch = is_switch(ldp),
+ .is_gateway_router = is_gateway_router(ldp, local_datapaths),
.ct_zones = ct_zones,
.group_table = group_table,
@@ -788,12 +788,15 @@ encode_ct_nat(const struct ovnact_ct_nat *cn,
ct = ofpacts->header;
if (cn->ip) {
ct->flags |= NX_CT_F_COMMIT;
- } else if (snat) {
- /* XXX: For performance reasons, we try to prevent additional
- * recirculations. So far, ct_snat which is used in a gateway router
- * does not need a recirculation. ct_snat(IP) does need a
- * recirculation. Should we consider a method to let the actions
- * specify whether an action needs recirculation if there more use
+ } else if (snat && ep->is_gateway_router) {
+ /* For performance reasons, we try to prevent additional
+ * recirculations. ct_snat which is used in a gateway router
+ * does not need a recirculation. ct_snat(IP) does need a
+ * recirculation. ct_snat in a distributed router needs
+ * recirculation regardless of whether an IP address is
+ * specified.
+ * XXX Should we consider a method to let the actions specify
+ * whether an action needs recirculation if there are more use
* cases?. */
ct->recirc_table = NX_CT_RECIRC_NONE;
}
@@ -852,7 +852,7 @@ ct_dnat();
# ct_snat
ct_snat;
- encodes as ct(zone=NXM_NX_REG12[0..15],nat)
+ encodes as ct(table=27,zone=NXM_NX_REG12[0..15],nat)
has prereqs ip
ct_snat(192.168.1.2);
encodes as ct(commit,table=27,zone=NXM_NX_REG12[0..15],nat(src=192.168.1.2))
Currently, for performance reasons on gateway routers, ct_snat that does not specify an IP address does not immediately trigger recirculation. On gateway routers, ct_snat that does not specify an IP address happens in the UNSNAT pipeline stage, which is followed by the DNAT pipeline stage that triggers recirculation for all packets. This DNAT pipeline stage recirculation takes care of the recirculation needs of UNSNAT as well as other cases such as UNDNAT. On distributed routers, UNDNAT is handled in the egress pipeline stage, separately from DNAT in the ingress pipeline stages. The DNAT pipeline stage only triggers recirculation for some packets. Due to this difference in design, UNSNAT needs to trigger its own recirculation. This patch restricts the logic that avoids recirculation for ct_snat, so that it only applies to datapaths representing gateway routers. Signed-off-by: Mickey Spiegel <mickeys.dev@gmail.com> --- include/ovn/actions.h | 3 +++ ovn/controller/lflow.c | 10 ++++++++++ ovn/lib/actions.c | 15 +++++++++------ tests/ovn.at | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-)