From patchwork Wed Dec 6 17:17:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1872886 X-Patchwork-Delegate: dceara@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gHlFmzdV; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Slkc30NdFz1yST for ; Thu, 7 Dec 2023 04:17:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F162A834C7; Wed, 6 Dec 2023 17:17:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org F162A834C7 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gHlFmzdV X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fh7wryUkcUQT; Wed, 6 Dec 2023 17:17:19 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5EA248343F; Wed, 6 Dec 2023 17:17:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5EA248343F Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4404DC0072; Wed, 6 Dec 2023 17:17:18 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6F448C0037 for ; Wed, 6 Dec 2023 17:17:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3DF6A4202B for ; Wed, 6 Dec 2023 17:17:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3DF6A4202B Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gHlFmzdV X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 19iWmBSN4pDB for ; Wed, 6 Dec 2023 17:17:15 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id C89014171C for ; Wed, 6 Dec 2023 17:17:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C89014171C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701883033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ulPsOlkss9CkfajL96i+fJAQFohwc/wrUhs04dYygQc=; b=gHlFmzdV9FHgobwU7ChZSVLjofNhWuOyro915Cfj39yaszgIk6Hvlnyo9YJz/TgyvvJl2J OGcoeE5350VwUlmhRKiEXGLdFtixHOzPDiwga/qeroE12J0p0MqWW7zEhp/cKfIhlkB1U/ DD51puQ/VoGnDtKwJxR4J47MLpp6MpM= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-277-Y5YiRCVCPrK5wWSB05jDnQ-1; Wed, 06 Dec 2023 12:17:12 -0500 X-MC-Unique: Y5YiRCVCPrK5wWSB05jDnQ-1 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-50bf6201648so2854134e87.2 for ; Wed, 06 Dec 2023 09:17:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701883030; x=1702487830; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ulPsOlkss9CkfajL96i+fJAQFohwc/wrUhs04dYygQc=; b=bZt9ZxG7I+hyZQLdv6FcgEFDagHvvtmbUOJk+h9oJEyYnkNnDqzQjMmyak2WF4H4PW O+3iFMyKZ4HvGtve68NV4VAyTw5V8XfQ0yTKnACXZ/NaCFo3own7MfudUYlbm5TVxuaT 94zznzomFSgxEOMdWVtmSvg85H7ndDzbWOlcUeCaepi4l3mU6h6ij+LQ6wrcqwrmbkhy shK1ydEzqkaIAGqWIt2YucnYkGloqHaTB6YM+RCKYZh1eKxXs/DH0UEz181LpudZ0OVe xwGnv6oxXaJT6bYpdLHiQVqWnAzFwKErxOi0V0OopgTUK2SKkw1dckkAJb1woekmI12x CKyw== X-Gm-Message-State: AOJu0Yznc7r6JCaXmH7VlWsBhW8L1FKJyOx42g1wOLa1sqDsyjN0BfgP Q3oSe9B1aH77XHnVkf7H+NF9v63+DuQKbSxtGKSGbLhPETPJYvSt9OopekXglxDPRZNm2AU2eKD ygPzJ+lJrq0SU4tLt2uhGmaDV0pnEzN5jGtK2XuiwuErZSECsGl3eywMCt01sisuvh+qoe8uTmG SagGwH+RG6qaGS X-Received: by 2002:a19:f50c:0:b0:50c:be7:f322 with SMTP id j12-20020a19f50c000000b0050c0be7f322mr671895lfb.14.1701883030125; Wed, 06 Dec 2023 09:17:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IGhQa2ABX1f9YvdG1gfxs5pjy7apA1B2+74uBRKErUNnWbprXj3SR7bQJYxW/TGeg6CM1/Gww== X-Received: by 2002:a19:f50c:0:b0:50c:be7:f322 with SMTP id j12-20020a19f50c000000b0050c0be7f322mr671886lfb.14.1701883029511; Wed, 06 Dec 2023 09:17:09 -0800 (PST) Received: from localhost (net-93-71-3-198.cust.vodafonedsl.it. [93.71.3.198]) by smtp.gmail.com with ESMTPSA id w3-20020adff9c3000000b0033344e2522dsm167433wrr.37.2023.12.06.09.17.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 09:17:09 -0800 (PST) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Date: Wed, 6 Dec 2023 18:17:04 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 22.12] controller: make garp_max_timeout configurable X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" When using VLAN backed networks and OVN routers leveraging the 'ovn-chassis-mac-mappings' option for east-west traffic, the eth.src field is replaced by the chassis mac address in order to not expose the router mac address from different nodes and confuse the TOR switch. However doing so the TOR switch is not able to learn the port/mac bindings for routed E/W traffic and it is force to always flood it. Fix this issue adding the capability to configure a given timeout for garp sent by ovn-controller and not disable it after the exponential backoff in order to keep refreshing the entries in TOR swtich fdb table. More into about the issue can be found here [0]. [0] https://mail.openvswitch.org/pipermail/ovs-discuss/2020-September/050678.html Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2087779 Signed-off-by: Lorenzo Bianconi Acked-by: Ales Musil Signed-off-by: Mark Michelson --- NEWS | 2 + controller/ovn-controller.8.xml | 11 +++++ controller/ovn-controller.c | 4 +- controller/pinctrl.c | 73 +++++++++++++++++++++++++++------ controller/pinctrl.h | 4 +- tests/ovn.at | 16 ++++++++ 6 files changed, 95 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 0abb9f6ed..fd3831bcb 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ OVN v22.12.3 - xx xxx xxxx Existing sessions might get re-hashed to a different ECMP path when OVN detects the algorithm support in the datapath during an upgrade or restart of ovn-controller. + - Add "garp-max-timeout-sec" config option to vswitchd external-ids to + cap the time between when ovn-controller sends gARP packets. OVN v22.12.2 - 15 Sep 2023 -------------------------- diff --git a/controller/ovn-controller.8.xml b/controller/ovn-controller.8.xml index c69eb7f03..582c47b6f 100644 --- a/controller/ovn-controller.8.xml +++ b/controller/ovn-controller.8.xml @@ -350,6 +350,17 @@ heplful to pin source outer IP for the tunnel when multiple interfaces are used on the host for overlay traffic. +
external_ids:garp-max-timeout-sec
+
+ When used, this configuration value specifies the maximum timeout + (in seconds) between two consecutive GARP packets sent by + ovn-controller. + ovn-controller by default sends just 4 GARP packets + with an exponential backoff timeout. + Setting external_ids:garp-max-timeout-sec allows to + cap for the exponential backoff used by ovn-controller + to send GARPs packets. +

diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 8f2aa1c97..5c4bd7a85 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -4819,7 +4819,9 @@ main(int argc, char *argv[]) &runtime_data->local_datapaths, &runtime_data->active_tunnels, &runtime_data->local_active_ports_ipv6_pd, - &runtime_data->local_active_ports_ras); + &runtime_data->local_active_ports_ras, + ovsrec_open_vswitch_table_get( + ovs_idl_loop.idl)); stopwatch_stop(PINCTRL_RUN_STOPWATCH_NAME, time_msec()); mirror_run(ovs_idl_txn, diff --git a/controller/pinctrl.c b/controller/pinctrl.c index 23aa3b441..6dd7ab1db 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -166,6 +166,10 @@ static struct ovs_mutex pinctrl_mutex = OVS_MUTEX_INITIALIZER; static struct seq *pinctrl_handler_seq; static struct seq *pinctrl_main_seq; +#define GARP_RARP_DEF_MAX_TIMEOUT 16000 +static long long int garp_rarp_max_timeout = GARP_RARP_DEF_MAX_TIMEOUT; +static bool garp_rarp_continuous; + static void *pinctrl_handler(void *arg); struct pinctrl { @@ -224,7 +228,8 @@ static void send_garp_rarp_prepare( const struct ovsrec_bridge *, const struct sbrec_chassis *, const struct hmap *local_datapaths, - const struct sset *active_tunnels) + const struct sset *active_tunnels, + const struct ovsrec_open_vswitch_table *ovs_table) OVS_REQUIRES(pinctrl_mutex); static void send_garp_rarp_run(struct rconn *swconn, long long int *send_garp_rarp_time) @@ -3588,7 +3593,8 @@ pinctrl_run(struct ovsdb_idl_txn *ovnsb_idl_txn, const struct hmap *local_datapaths, const struct sset *active_tunnels, const struct shash *local_active_ports_ipv6_pd, - const struct shash *local_active_ports_ras) + const struct shash *local_active_ports_ras, + const struct ovsrec_open_vswitch_table *ovs_table) { ovs_mutex_lock(&pinctrl_mutex); run_put_mac_bindings(ovnsb_idl_txn, sbrec_datapath_binding_by_key, @@ -3599,7 +3605,7 @@ pinctrl_run(struct ovsdb_idl_txn *ovnsb_idl_txn, send_garp_rarp_prepare(ovnsb_idl_txn, sbrec_port_binding_by_datapath, sbrec_port_binding_by_name, sbrec_mac_binding_by_lport_ip, br_int, chassis, - local_datapaths, active_tunnels); + local_datapaths, active_tunnels, ovs_table); prepare_ipv6_ras(local_active_ports_ras, sbrec_port_binding_by_name); prepare_ipv6_prefixd(ovnsb_idl_txn, sbrec_port_binding_by_name, local_active_ports_ipv6_pd, chassis, @@ -4461,7 +4467,8 @@ struct garp_rarp_data { struct eth_addr ea; /* Ethernet address of port. */ ovs_be32 ipv4; /* Ipv4 address of port. */ long long int announce_time; /* Next announcement in ms. */ - int backoff; /* Backoff for the next announcement. */ + int backoff; /* Backoff timeout for the next + * announcement (in msecs). */ uint32_t dp_key; /* Datapath used to output this GARP. */ uint32_t port_key; /* Port to inject the GARP into. */ }; @@ -4490,7 +4497,7 @@ add_garp_rarp(const char *name, const struct eth_addr ea, ovs_be32 ip, garp_rarp->ea = ea; garp_rarp->ipv4 = ip; garp_rarp->announce_time = time_msec() + 1000; - garp_rarp->backoff = 1; + garp_rarp->backoff = 1000; /* msec. */ garp_rarp->dp_key = dp_key; garp_rarp->port_key = port_key; shash_add(&send_garp_rarp_data, name, garp_rarp); @@ -4506,7 +4513,9 @@ send_garp_rarp_update(struct ovsdb_idl_txn *ovnsb_idl_txn, struct ovsdb_idl_index *sbrec_mac_binding_by_lport_ip, const struct hmap *local_datapaths, const struct sbrec_port_binding *binding_rec, - struct shash *nat_addresses) + struct shash *nat_addresses, + long long int garp_max_timeout, + bool garp_continuous) { volatile struct garp_rarp_data *garp_rarp = NULL; @@ -4532,6 +4541,12 @@ send_garp_rarp_update(struct ovsdb_idl_txn *ovnsb_idl_txn, if (garp_rarp) { garp_rarp->dp_key = binding_rec->datapath->tunnel_key; garp_rarp->port_key = binding_rec->tunnel_key; + if (garp_max_timeout != garp_rarp_max_timeout || + garp_continuous != garp_rarp_continuous) { + /* reset backoff */ + garp_rarp->announce_time = time_msec() + 1000; + garp_rarp->backoff = 1000; /* msec. */ + } } else { add_garp_rarp(name, laddrs->ea, laddrs->ipv4_addrs[i].addr, @@ -4556,6 +4571,12 @@ send_garp_rarp_update(struct ovsdb_idl_txn *ovnsb_idl_txn, if (garp_rarp) { garp_rarp->dp_key = binding_rec->datapath->tunnel_key; garp_rarp->port_key = binding_rec->tunnel_key; + if (garp_max_timeout != garp_rarp_max_timeout || + garp_continuous != garp_rarp_continuous) { + /* reset backoff */ + garp_rarp->announce_time = time_msec() + 1000; + garp_rarp->backoff = 1000; /* msec. */ + } } else { add_garp_rarp(name, laddrs->ea, 0, binding_rec->datapath->tunnel_key, @@ -4575,6 +4596,12 @@ send_garp_rarp_update(struct ovsdb_idl_txn *ovnsb_idl_txn, if (garp_rarp) { garp_rarp->dp_key = binding_rec->datapath->tunnel_key; garp_rarp->port_key = binding_rec->tunnel_key; + if (garp_max_timeout != garp_rarp_max_timeout || + garp_continuous != garp_rarp_continuous) { + /* reset backoff */ + garp_rarp->announce_time = time_msec() + 1000; + garp_rarp->backoff = 1000; /* msec. */ + } return; } @@ -4660,13 +4687,15 @@ send_garp_rarp(struct rconn *swconn, struct garp_rarp_data *garp_rarp, ofpbuf_uninit(&ofpacts); /* Set the next announcement. At most 5 announcements are sent for a - * vif. */ - if (garp_rarp->backoff < 16) { - garp_rarp->backoff *= 2; - garp_rarp->announce_time = current_time + garp_rarp->backoff * 1000; + * vif if garp_rarp_max_timeout is not specified otherwise cap the max + * timeout to garp_rarp_max_timeout. */ + if (garp_rarp_continuous || garp_rarp->backoff < garp_rarp_max_timeout) { + garp_rarp->announce_time = current_time + garp_rarp->backoff; } else { garp_rarp->announce_time = LLONG_MAX; } + garp_rarp->backoff = MIN(garp_rarp_max_timeout, garp_rarp->backoff * 2); + return garp_rarp->announce_time; } @@ -5966,13 +5995,26 @@ send_garp_rarp_prepare(struct ovsdb_idl_txn *ovnsb_idl_txn, const struct ovsrec_bridge *br_int, const struct sbrec_chassis *chassis, const struct hmap *local_datapaths, - const struct sset *active_tunnels) + const struct sset *active_tunnels, + const struct ovsrec_open_vswitch_table *ovs_table) OVS_REQUIRES(pinctrl_mutex) { struct sset localnet_vifs = SSET_INITIALIZER(&localnet_vifs); struct sset local_l3gw_ports = SSET_INITIALIZER(&local_l3gw_ports); struct sset nat_ip_keys = SSET_INITIALIZER(&nat_ip_keys); struct shash nat_addresses; + unsigned long long garp_max_timeout = GARP_RARP_DEF_MAX_TIMEOUT; + bool garp_continuous = false; + const struct ovsrec_open_vswitch *cfg = + ovsrec_open_vswitch_table_first(ovs_table); + if (cfg) { + garp_max_timeout = smap_get_ullong( + &cfg->external_ids, "garp-max-timeout-sec", 0) * 1000; + garp_continuous = !!garp_max_timeout; + if (!garp_max_timeout) { + garp_max_timeout = GARP_RARP_DEF_MAX_TIMEOUT; + } + } shash_init(&nat_addresses); @@ -6003,7 +6045,8 @@ send_garp_rarp_prepare(struct ovsdb_idl_txn *ovnsb_idl_txn, if (pb) { send_garp_rarp_update(ovnsb_idl_txn, sbrec_mac_binding_by_lport_ip, - local_datapaths, pb, &nat_addresses); + local_datapaths, pb, &nat_addresses, + garp_max_timeout, garp_continuous); } } @@ -6014,7 +6057,8 @@ send_garp_rarp_prepare(struct ovsdb_idl_txn *ovnsb_idl_txn, = lport_lookup_by_name(sbrec_port_binding_by_name, gw_port); if (pb) { send_garp_rarp_update(ovnsb_idl_txn, sbrec_mac_binding_by_lport_ip, - local_datapaths, pb, &nat_addresses); + local_datapaths, pb, &nat_addresses, + garp_max_timeout, garp_continuous); } } @@ -6032,6 +6076,9 @@ send_garp_rarp_prepare(struct ovsdb_idl_txn *ovnsb_idl_txn, shash_destroy(&nat_addresses); sset_destroy(&nat_ip_keys); + + garp_rarp_max_timeout = garp_max_timeout; + garp_rarp_continuous = garp_continuous; } static bool diff --git a/controller/pinctrl.h b/controller/pinctrl.h index cfece04da..f5621777a 100644 --- a/controller/pinctrl.h +++ b/controller/pinctrl.h @@ -30,6 +30,7 @@ struct ovsdb_idl; struct ovsdb_idl_index; struct ovsdb_idl_txn; struct ovsrec_bridge; +struct ovsrec_open_vswitch_table; struct sbrec_chassis; struct sbrec_dns_table; struct sbrec_controller_event_table; @@ -55,7 +56,8 @@ void pinctrl_run(struct ovsdb_idl_txn *ovnsb_idl_txn, const struct hmap *local_datapaths, const struct sset *active_tunnels, const struct shash *local_active_ports_ipv6_pd, - const struct shash *local_active_ports_ras); + const struct shash *local_active_ports_ras, + const struct ovsrec_open_vswitch_table *ovs_table); void pinctrl_wait(struct ovsdb_idl_txn *ovnsb_idl_txn); void pinctrl_destroy(void); void pinctrl_set_br_int_name(const char *br_int_name); diff --git a/tests/ovn.at b/tests/ovn.at index 3df21ec0d..1cb952031 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -8924,6 +8924,7 @@ AT_CLEANUP OVN_FOR_EACH_NORTHD([ AT_SETUP([send gratuitous arp for l3gateway only on selected chassis]) +AT_SKIP_IF([test $HAVE_TCPDUMP = no]) ovn_start # Create logical switch @@ -9013,6 +9014,21 @@ sleep 2 OVN_CHECK_PACKETS_CONTAIN([hv2/snoopvif-tx.pcap], [arp_expected]) OVN_CHECK_PACKETS([hv1/snoopvif-tx.pcap], [empty_expected]) +# Temporarily remove lr0 chassis +AT_CHECK([ovn-nbctl --wait=hv remove logical_router lr0 options chassis]) + +as hv1 reset_pcap_file snoopvif hv1/snoopvif +as hv2 reset_pcap_file snoopvif hv2/snoopvif + +AT_CHECK([ovn-nbctl --wait=hv set logical_router lr0 options:chassis=hv1]) +# set garp max timeout to 2s +AT_CHECK([as hv1 ovs-vsctl set Open_vSwitch . external-ids:garp-max-timeout-sec=2]) + +OVS_WAIT_UNTIL([ +n_arp=$(tcpdump -c 10 -ner hv1/snoopvif-tx.pcap arp | wc -l) +test "$n_arp" = 10 +]) + OVN_CLEANUP([hv1],[hv2]) AT_CLEANUP