northd: Skip UNSNAT for force-SNAT load balancer VIPs.

Northd adds a priority-120 UNSNAT bypass when a load balancer VIP
also appears as a NAT external IP. This prevents packets for the VIP
from repeatedly entering an SNAT zone lookup that never commits the
pre-DNAT tuple. Such packets remain ct.new and cannot be offloaded.

Gateway routers using lb_force_snat_ip=router_ip may use a router
port IP as the VIP while their NAT external IP is a different
masquerade address. Northd then omits the bypass even though it
creates an UNSNAT flow for the router port IP.

Generate the bypass when a port-specific VIP also matches a DNAT or
load balancer force-SNAT address, or a router port address selected
by lb_force_snat_ip=router_ip.

Do not extend the bypass to port-less VIPs in the new force-SNAT
cases. Such a flow would match replies sent to the force-SNAT
address and shadow the flow that reverses SNAT. Keep the existing
NAT external-IP behavior unchanged.

Add coverage using port-specific and port-less VIPs with a different
masquerade SNAT address. A single-stream OVN-Kubernetes DPU test with
the port-specific NodePort VIP improved from 8.8 Gbit/s to 19.8
Gbit/s.

Backport note: lib/ovn-util.c on this branch has no
lport_addresses_contains_ip(); upstream gained it in a feature commit
that is not stable material.  northd.c therefore carries a local static
copy with identical semantics.  The rest of the change is unmodified.

Reported-at: ovn-kubernetes/ovn-kubernetes#6422
Assisted-by: GPT-5, OpenAI Codex
Signed-off-by: Tim Rozet <trozet@nvidia.com>
Signed-off-by: Han Zhou <hzhou@ovn.org>
(cherry picked from commit 45831b7)

Author: trozet

northd/northd.c

@@ -12403,6 +12403,60 @@ build_gw_lrouter_nat_flows_for_lb(struct lrouter_nat_lb_flows_ctx *ctx,
     bitmap_free(dp_non_meter);
 }
 
+static bool
+lport_addresses_contains_ip(const struct lport_addresses *lsp_addrs,
+                            size_t n_lsp_addrs, const char *ip_s)
+{
+    struct in6_addr ip6;
+    ovs_be32 ip4;
+
+    if (ip_parse(ip_s, &ip4)) {
+        for (size_t i = 0; i < n_lsp_addrs; i++) {
+            for (size_t j = 0; j < lsp_addrs[i].n_ipv4_addrs; j++) {
+                if (lsp_addrs[i].ipv4_addrs[j].addr == ip4) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    if (ipv6_parse(ip_s, &ip6)) {
+        for (size_t i = 0; i < n_lsp_addrs; i++) {
+            for (size_t j = 0; j < lsp_addrs[i].n_ipv6_addrs; j++) {
+                if (IN6_ARE_ADDR_EQUAL(&lsp_addrs[i].ipv6_addrs[j].addr,
+                                       &ip6)) {
+                    return true;
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
+static bool
+lrouter_lb_vip_is_unsnat_ip(const struct ovn_datapath *od,
+                            const struct lr_nat_record *lrnat_rec,
+                            const struct ovn_lb_vip *lb_vip)
+{
+    const char *vip = lb_vip->vip_str;
+
+    if (sset_contains(&lrnat_rec->external_ips, vip)) {
+        return true;
+    }
+
+    /* A port-less bypass would also match replies sent to a force-SNAT
+     * address and prevent them from reaching the UNSNAT flow. */
+    return lb_vip->port_str
+           && (lport_addresses_contains_ip(
+                   &lrnat_rec->dnat_force_snat_addrs, 1, vip)
+               || lport_addresses_contains_ip(
+                      &lrnat_rec->lb_force_snat_addrs, 1, vip)
+               || (lrnat_rec->lb_force_snat_router_ip
+                   && sset_contains(&od->router_ips, vip)));
+}
+
 static void
 build_lrouter_nat_flows_for_lb(
     struct ovn_lb_vip *lb_vip,
@@ -12552,16 +12606,15 @@ build_lrouter_nat_flows_for_lb(
             bitmap_set1(aff_dp_bitmap[type], index);
         }
 
-        if (sset_contains(&lrnat_rec->external_ips, lb_vip->vip_str)) {
-            /* The load balancer vip is also present in the NAT entries.
-             * So add a high priority lflow to advance the the packet
-             * destined to the vip (and the vip port if defined)
-             * in the S_ROUTER_IN_UNSNAT stage.
+        if (lrouter_lb_vip_is_unsnat_ip(od, lrnat_rec, lb_vip)) {
+            /* The load balancer VIP is also present in an UNSNAT flow.
+             * Add a high priority lflow to advance packets destined to the
+             * VIP (and the VIP port if defined) in S_ROUTER_IN_UNSNAT.
              * There seems to be an issue with ovs-vswitchd. When the new
-             * connection packet destined for the lb vip is received,
-             * it is dnat'ed in the S_ROUTER_IN_DNAT stage in the dnat
+             * connection packet destined for the LB VIP is received,
+             * it is DNATed in the S_ROUTER_IN_DNAT stage in the DNAT
              * conntrack zone. For the next packet, if it goes through
-             * unsnat stage, the conntrack flags are not set properly, and
+             * UNSNAT stage, the conntrack flags are not set properly, and
              * it doesn't hit the established state flows in
              * S_ROUTER_IN_DNAT stage. */
             ovn_lflow_add_with_hint(lflows, od, S_ROUTER_IN_UNSNAT, 120,

tests/ovn-northd.at

@@ -1733,6 +1733,48 @@ OVN_CLEANUP_NORTHD
 AT_CLEANUP
 ])
 
+OVN_FOR_EACH_NORTHD_NO_HV([
+AT_SETUP([Load balancer VIP in force-SNAT addresses])
+ovn_start
+
+check ovn-nbctl ls-add public
+check ovn-nbctl lr-add lr0
+check ovn-nbctl set logical_router lr0 options:chassis=ch1
+check ovn-nbctl lrp-add lr0 lr0-public 00:00:00:00:00:01 \
+    192.0.2.1/24
+check ovn-nbctl lsp-add-router-port public public-lr0 lr0-public
+
+check ovn-nbctl lb-add lb0 192.0.2.1:30663 198.51.100.10:5201
+check ovn-nbctl lb-add lb1 192.0.2.1 198.51.100.11
+check ovn-nbctl lr-lb-add lr0 lb0
+check ovn-nbctl lr-lb-add lr0 lb1
+check ovn-nbctl lr-nat-add lr0 snat 169.254.0.47 198.51.100.0/24
+check ovn-nbctl --wait=sb sync
+
+ovn-sbctl dump-flows lr0 > sbflows
+AT_CAPTURE_FILE([sbflows])
+AT_CHECK([grep "lr_in_unsnat.*priority=120" sbflows], [1])
+
+check ovn-nbctl --wait=sb set logical_router lr0 \
+    options:lb_force_snat_ip=192.0.2.1
+
+AT_CHECK([ovn-sbctl dump-flows lr0 | \
+    grep "lr_in_unsnat.*priority=120" | ovn_strip_lflows], [0], [dnl
+  table=??(lr_in_unsnat       ), priority=120  , match=(ip4 && ip4.dst == 192.0.2.1 && tcp && tcp.dst == 30663), action=(next;)
+])
+
+check ovn-nbctl --wait=sb set logical_router lr0 \
+    options:lb_force_snat_ip=router_ip
+
+AT_CHECK([ovn-sbctl dump-flows lr0 | \
+    grep "lr_in_unsnat.*priority=120" | ovn_strip_lflows], [0], [dnl
+  table=??(lr_in_unsnat       ), priority=120  , match=(ip4 && ip4.dst == 192.0.2.1 && tcp && tcp.dst == 30663), action=(next;)
+])
+
+OVN_CLEANUP_NORTHD
+AT_CLEANUP
+])
+
 OVN_FOR_EACH_NORTHD_NO_HV([
 AT_SETUP([LRP same IP as VIP or SNAT])
 ovn_start