On 1/14/25 2:26 PM, MJ Ponsonby wrote:
> Modifies the rule responsible for dropping the MLF_LOCAL_ONLY packets
> to only drop them if the MLF_OVERRIDE_LOCAL_ONLY bit flag is not there.
>
> This does also include the addition of MLF_OVERRIDE_LOCAL_ONLY bitflag applied
> if a router announcement is being sent from either a gateway
> or distributed router.
>
> This is part of an ongoing unnumbered BGP effort.
>
> Signed-off-by: MJ Ponsonby <[email protected]>
> ---
Hi MJ,
AFAICT Mark's comments from v4 have been addressed.
> controller/physical.c | 3 +-
> controller/pinctrl.c | 11 +++-
> include/ovn/logical-fields.h | 3 +
> ovn-architecture.7.xml | 6 +-
> tests/ovn.at | 104 +++++++++++++++++++++++++++++++++++
> 5 files changed, 122 insertions(+), 5 deletions(-)
>
> diff --git a/controller/physical.c b/controller/physical.c
> index c56c73c20..40e39ac12 100644
> --- a/controller/physical.c
> +++ b/controller/physical.c
> @@ -1869,7 +1869,8 @@ consider_port_binding(struct ovsdb_idl_index
> *sbrec_port_binding_by_name,
> put_drop(debug, OFTABLE_CHECK_LOOPBACK, ofpacts_p);
> match_outport_dp_and_port_keys(&match, dp_key, port_key);
> match_set_reg_masked(&match, MFF_LOG_FLAGS - MFF_REG0,
> - MLF_LOCAL_ONLY, MLF_LOCAL_ONLY);
> + MLF_LOCAL_ONLY,
> + MLF_LOCAL_ONLY | MLF_OVERRIDE_LOCAL_ONLY);
> ofctrl_add_flow(flow_table, OFTABLE_CHECK_LOOPBACK, 160,
> binding->header_.uuid.parts[0], &match,
> ofpacts_p, &binding->header_.uuid);
> diff --git a/controller/pinctrl.c b/controller/pinctrl.c
> index 032aca118..d71d9f86f 100644
> --- a/controller/pinctrl.c
> +++ b/controller/pinctrl.c
> @@ -4107,6 +4107,7 @@ struct ipv6_ra_state {
> struct ipv6_ra_config *config;
> int64_t port_key;
> int64_t metadata;
> + bool preserved;
> bool delete_me;
> };
>
> @@ -4432,6 +4433,9 @@ ipv6_ra_send(struct rconn *swconn, struct ipv6_ra_state
> *ra)
> put_load(dp_key, MFF_LOG_DATAPATH, 0, 64, &ofpacts);
> put_load(port_key, MFF_LOG_INPORT, 0, 32, &ofpacts);
> put_load(1, MFF_LOG_FLAGS, MLF_LOCAL_ONLY_BIT, 1, &ofpacts);
> + if (ra->preserved) {
> + put_load(1, MFF_LOG_FLAGS, MLF_OVERRIDE_LOCAL_ONLY_BIT, 1, &ofpacts);
> + }
> struct ofpact_resubmit *resubmit = ofpact_put_RESUBMIT(&ofpacts);
> resubmit->in_port = OFPP_CONTROLLER;
> resubmit->table_id = OFTABLE_LOG_INGRESS_PIPELINE;
> @@ -4542,8 +4546,11 @@ prepare_ipv6_ras(const struct shash
> *local_active_ports_ras,
> * router port is connected to. The RA is injected
> * into that logical switch port.
> */
> - ra->port_key = peer->tunnel_key;
> - ra->metadata = peer->datapath->tunnel_key;
> + ra->port_key = peer->tunnel_key;
> + ra->metadata = peer->datapath->tunnel_key;
> + ra->preserved = (!strcmp(pb->type,"l2gateway") ||
> + !strcmp(pb->type,"l3gateway") ||
> + !strcmp(pb->type,"chassisredirect"));
> ra->delete_me = false;
>
> /* pinctrl_handler thread will send the IPv6 RAs. */
> diff --git a/include/ovn/logical-fields.h b/include/ovn/logical-fields.h
> index 70c6b93c4..da7f9a2ca 100644
> --- a/include/ovn/logical-fields.h
> +++ b/include/ovn/logical-fields.h
> @@ -87,6 +87,7 @@ enum mff_log_flags_bits {
> MLF_LOCALNET_BIT = 15,
> MLF_RX_FROM_TUNNEL_BIT = 16,
> MLF_ICMP_SNAT_BIT = 17,
> + MLF_OVERRIDE_LOCAL_ONLY_BIT = 18,
> };
>
> /* MFF_LOG_FLAGS_REG flag assignments */
> @@ -142,6 +143,8 @@ enum mff_log_flags {
> MLF_RX_FROM_TUNNEL = (1 << MLF_RX_FROM_TUNNEL_BIT),
>
> MLF_ICMP_SNAT = (1 << MLF_ICMP_SNAT_BIT),
> +
> + MLF_OVERRIDE_LOCAL_ONLY = (1 << MLF_OVERRIDE_LOCAL_ONLY_BIT),
> };
>
> /* OVN logical fields
> diff --git a/ovn-architecture.7.xml b/ovn-architecture.7.xml
> index 364ccdd6d..9ea7669fd 100644
> --- a/ovn-architecture.7.xml
> +++ b/ovn-architecture.7.xml
> @@ -1546,8 +1546,10 @@
> <p>
> Table 41 matches and drops packets for which the logical input and
> output ports are the same and the MLF_ALLOW_LOOPBACK flag is not
> - set. It also drops MLF_LOCAL_ONLY packets directed to a localnet
> port.
> - It resubmits other packets to table 42.
> + set. It also drops MLF_LOCAL_ONLY packets directed to a localnet
> port,
> + provided they aren't RAs sent from a gateway or distributed router
> + which is checked via the presence of the bitflag
> + MLF_OVERRIDE_LOCAL_ONLY. It resubmits other packets to table 42.
> </p>
> </li>
>
> diff --git a/tests/ovn.at b/tests/ovn.at
> index de01a649f..a515fc696 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -16935,6 +16935,110 @@ OVN_CLEANUP([hv1],[hv2])
> AT_CLEANUP
> ])
>
> +
> +OVN_FOR_EACH_NORTHD([
> +AT_SETUP([IPv6 periodic gateway RA enabled for localnet adjacent switch
> ports])
> +ovn_start
> +
> +net_add n1
> +sim_add hv1
> +sim_add hv2
> +as hv1
> +check ovs-vsctl add-br br-phys
> +check ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
> +ovn_attach n1 br-phys 192.168.0.2
> +as hv2
> +check ovs-vsctl add-br br-phys
> +check ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
> +ovn_attach n1 br-phys 192.168.0.3
> +
> +check ovn-nbctl lr-add ro -- set Logical_Router ro options:chassis="hv1"
> +check ovn-nbctl lrp-add ro ro-sw 00:00:00:00:00:01
> +
> +check ovn-nbctl ls-add sw
> +check ovn-nbctl lsp-add sw ln
> +check ovn-nbctl lsp-set-addresses ln unknown
> +check ovn-nbctl lsp-set-type ln localnet
> +check ovn-nbctl lsp-set-options ln network_name=phys
> +
> +check ovn-nbctl lsp-add sw sw-ro
> +check ovn-nbctl lsp-set-type sw-ro router
> +check ovn-nbctl lsp-set-options sw-ro router-port=ro-sw
> +check ovn-nbctl lsp-set-addresses sw-ro 00:00:00:00:00:01
> +check ovn-nbctl lsp-add sw sw-p1
> +check ovn-nbctl lsp-set-addresses sw-p1 "00:00:00:00:00:02
> aef0::200:ff:fe00:2"
> +check ovn-nbctl lsp-add sw sw-p2
> +check ovn-nbctl lsp-set-addresses sw-p2 "00:00:00:00:00:03
> aef0::200:ff:fe00:3"
> +
> +AT_CHECK([ovn-sbctl get Port_Binding ro-sw type | tr -d
> '\n'],[0],[l3gateway])
> +
> +check ovn-nbctl set Logical_Router_Port ro-sw
> ipv6_ra_configs:send_periodic=true
> +check ovn-nbctl set Logical_Router_Port ro-sw
> ipv6_ra_configs:address_mode=slaac
> +check ovn-nbctl set Logical_Router_Port ro-sw ipv6_ra_configs:max_interval=1
> +check ovn-nbctl set Logical_Router_Port ro-sw ipv6_ra_configs:min_interval=1
> +
> +for i in 1 2 ; do
> + as hv$i
> + check ovs-vsctl -- add-port br-int hv$i-vif1 -- \
> + set interface hv$i-vif1 external-ids:iface-id=sw-p$i \
> + options:tx_pcap=hv$i/vif1-tx.pcap \
> + options:rxq_pcap=hv$i/vif1-rx.pcap \
> + ofport-request=1
> +done
> +
> +wait_for_ports_up
Just to be sure everything is properly installed in OVS, I added:
check ovn-nbctl --wait=hv sync
Then I applied the patch to main.
I wanted to backport this to 24.09 and 24.03 but for some reason the new
test was failing because the payload length of the RAs was unexpected.
MJ, do you have some time by any chance to investigate this and post a
backport patch for 24.03/24.09? Otherwise I'll try to find some time
next week.
Regards,
Dumitru
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
