northd: Support /31 router ports (RFC 3021).

A /31 point-to-point link has no broadcast address; both addresses in
the range are usable hosts.  However, ovn-northd computed a traditional
subnet broadcast for the router port and included it in the priority-100
lr_in_ip_input L3 admission control drop flow (ip4.src == {...}).  On a
/31, that "broadcast" address is the peer, so all traffic originating
from the /31 peer was dropped.

Skip the broadcast address in the admission control drop set for /31
networks so that /31 router ports work as expected.

Fixes: 936b640 ("ovn: Implement basic logical L3 routing.")
Assisted-by: Claude Opus 4.8, Cursor
Signed-off-by: Han Zhou <hzhou@ovn.org>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
(cherry picked from commit 1e738aa)

Author: hzhou8

northd/northd.c

@@ -12067,9 +12067,13 @@ op_put_v4_networks(struct ds *ds, const struct ovn_port *op, bool add_bcast)
     }
 
     ds_put_cstr(ds, "{");
-    for (int i = 0; i < op->lrp_networks.n_ipv4_addrs; i++) {
+    for (size_t i = 0; i < op->lrp_networks.n_ipv4_addrs; i++) {
         ds_put_format(ds, "%s, ", op->lrp_networks.ipv4_addrs[i].addr_s);
-        if (add_bcast) {
+        /* A /31 point-to-point link (RFC 3021) has no broadcast address:
+         * both addresses in the range are usable hosts.  Including the
+         * computed "broadcast" here would drop legitimate traffic from the
+         * /31 peer, so skip it for /31 networks. */
+        if (add_bcast && op->lrp_networks.ipv4_addrs[i].plen != 31) {
             ds_put_format(ds, "%s, ", op->lrp_networks.ipv4_addrs[i].bcast_s);
         }
     }

northd/ovn-northd.8.xml

@@ -3279,7 +3279,9 @@ icmp6_error {
           </li>
           <li>
             <code>ip4.src</code> is the broadcast address of any IP network
-            known to the router.
+            known to the router.  Point-to-point (<code>/31</code>, RFC 3021)
+            networks have no broadcast address and are excluded, so that
+            traffic from a <code>/31</code> peer is not dropped.
           </li>
         </ul>
       </li>

tests/ovn-northd.at

@@ -2233,6 +2233,33 @@ OVN_CLEANUP_NORTHD
 AT_CLEANUP
 ])
 
+OVN_FOR_EACH_NORTHD_NO_HV([
+AT_SETUP([router LRP /31 L3 admission control])
+ovn_start
+
+# A /31 point-to-point link (RFC 3021) has no broadcast address; both
+# addresses of the /31 are usable hosts.  The L3 admission control flow must
+# therefore not drop the computed "broadcast" address, otherwise traffic from
+# the /31 peer is dropped.
+check ovn-nbctl lr-add lr
+check ovn-nbctl lrp-add lr lrp31 00:00:00:00:00:01 10.0.0.0/31
+check ovn-nbctl lrp-add lr lrp24 00:00:00:00:00:03 10.0.2.1/24
+
+check ovn-nbctl --wait=sb sync
+ovn-sbctl dump-flows lr > lrflows
+AT_CAPTURE_FILE([lrflows])
+
+# The /31 peer (10.0.0.1) must not appear as a dropped broadcast source;
+# only the wider /24 network keeps its broadcast address.
+AT_CHECK([grep "lr_in_ip_input" lrflows | grep "priority=100" | grep "reg9" | ovn_strip_lflows], [0], [dnl
+  table=??(lr_in_ip_input     ), priority=100  , match=(ip4.src == {10.0.0.0} && reg9[[0]] == 0), action=(drop;)
+  table=??(lr_in_ip_input     ), priority=100  , match=(ip4.src == {10.0.2.1, 10.0.2.255} && reg9[[0]] == 0), action=(drop;)
+])
+
+OVN_CLEANUP_NORTHD
+AT_CLEANUP
+])
+
 # This test case tests that when a logical switch has load balancers associated
 # (with VIPs configured), the below logical flow is added by ovn-northd.
 # table=ls_out_pre_lb, priority=100, match=(ip), action=(reg0[[0]] = 1; next;)

tests/ovn.at

@@ -14180,6 +14180,96 @@ OVN_CLEANUP([hv1],[hv2])
 AT_CLEANUP
 ])
 
+OVN_FOR_EACH_NORTHD([
+AT_SETUP([/31 router port (RFC 3021)])
+CHECK_SCAPY
+ovn_start
+
+# Logical network:
+# 2 LS 'sw0' and 'sw1' connected via router R1.
+# R1 connects to 'sw0' with a /31 point-to-point network (RFC 3021).  The
+# host 'sw0p1' uses 10.0.0.1, which is the address that OVN previously
+# computed as the /31 "broadcast" and dropped in the L3 admission control.
+# This test verifies that traffic sourced from the /31 peer is forwarded.
+
+check ovn-nbctl lr-add R1
+
+check ovn-nbctl ls-add sw0
+check ovn-nbctl ls-add sw1
+
+# Connect sw0 to R1 with a /31 network.  The router owns 10.0.0.0/31.
+check ovn-nbctl lrp-add R1 sw0 00:00:00:01:02:03 10.0.0.0/31
+check ovn-nbctl lsp-add sw0 rp-sw0 -- set Logical_Switch_Port rp-sw0 \
+          type=router options:router-port=sw0 addresses=\"00:00:00:01:02:03\"
+
+# Connect sw1 to R1.
+check ovn-nbctl lrp-add R1 sw1 00:00:00:01:02:04 20.0.0.1/24
+check ovn-nbctl lsp-add sw1 rp-sw1 -- set Logical_Switch_Port rp-sw1 \
+          type=router options:router-port=sw1 addresses=\"00:00:00:01:02:04\"
+
+# Create logical port sw0p1 in sw0.  Its IP (10.0.0.1) is the /31 peer of
+# the router port and equals the address OVN treated as the broadcast.
+check ovn-nbctl lsp-add sw0 sw0p1 \
+-- lsp-set-addresses sw0p1 "f0:00:00:01:02:03 10.0.0.1"
+
+# Create logical port sw1p1 in sw1.
+check ovn-nbctl lsp-add sw1 sw1p1 \
+-- lsp-set-addresses sw1p1 "f0:00:00:01:02:04 20.0.0.2"
+
+# Create two hypervisors and OVS ports corresponding to logical ports.
+net_add n1
+
+sim_add hv1
+as hv1
+check ovs-vsctl add-br br-phys
+ovn_attach n1 br-phys 192.168.0.1
+check ovs-vsctl -- add-port br-int hv1-vif1 -- \
+    set interface hv1-vif1 external-ids:iface-id=sw0p1 \
+    options:tx_pcap=hv1/vif1-tx.pcap \
+    options:rxq_pcap=hv1/vif1-rx.pcap \
+    ofport-request=1
+
+sim_add hv2
+as hv2
+check ovs-vsctl add-br br-phys
+ovn_attach n1 br-phys 192.168.0.2
+check ovs-vsctl -- add-port br-int hv2-vif1 -- \
+    set interface hv2-vif1 external-ids:iface-id=sw1p1 \
+    options:tx_pcap=hv2/vif1-tx.pcap \
+    options:rxq_pcap=hv2/vif1-rx.pcap \
+    ofport-request=1
+
+# Pre-populate the hypervisors' ARP tables so that we don't lose any
+# packets for ARP resolution (native tunneling doesn't queue packets
+# for ARP resolution).
+OVN_POPULATE_ARP
+
+wait_for_ports_up
+check ovn-nbctl --wait=hv sync
+
+# Send an IP packet from sw0p1 (10.0.0.1, the /31 peer) to sw1p1 (20.0.0.2).
+# Before the /31 fix this packet was dropped by the L3 admission control,
+# which treated 10.0.0.1 as the broadcast address of the 10.0.0.0/31 network.
+packet=$(fmt_pkt "Ether(dst='00:00:00:01:02:03', \
+                        src='f0:00:00:01:02:03') / \
+                  IP(src='10.0.0.1', dst='20.0.0.2', ttl=64) / \
+                  UDP(sport=53, dport=4369)")
+as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet
+
+# Packet to expect at 'sw1p1'.
+packet=$(fmt_pkt "Ether(dst='f0:00:00:01:02:04', \
+                        src='00:00:00:01:02:04') / \
+                  IP(src='10.0.0.1', dst='20.0.0.2', ttl=63) / \
+                  UDP(sport=53, dport=4369)")
+echo $packet > expected
+
+OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected])
+
+OVN_CLEANUP([hv1],[hv2])
+
+AT_CLEANUP
+])
+
 OVN_FOR_EACH_NORTHD([
 AT_SETUP([2 HVs, 1 lport/HV, localport ports])
 ovn_start