From patchwork Wed Dec 6 17:43:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1872931 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=ZI9REysf; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 4SllDT5lLQz1yST for ; Thu, 7 Dec 2023 04:45:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8CE9C61537; Wed, 6 Dec 2023 17:45:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8CE9C61537 Authentication-Results: smtp3.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=ZI9REysf X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7K_xA6cCBfUt; Wed, 6 Dec 2023 17:45:26 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 47597614CC; Wed, 6 Dec 2023 17:45:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 47597614CC Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 038ECC0072; Wed, 6 Dec 2023 17:45:25 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8B9E4C0037 for ; Wed, 6 Dec 2023 17:45:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5A5FF80C11 for ; Wed, 6 Dec 2023 17:45:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5A5FF80C11 Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZI9REysf 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 Sgxcs42o6m29 for ; Wed, 6 Dec 2023 17:45:22 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id C5AD380B37 for ; Wed, 6 Dec 2023 17:45:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C5AD380B37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701884720; 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=sYR41S4/PDDYuB1CjTzYm5fWtGGcj8HoKCmmb6ovN0U=; b=ZI9REysfoTt3Mu6qTemnjJTFIKekRfOWaafaxiyTIhoV64/Zbrdo2dYFN+jU9oCixPHQMW d+b6856DvRlpiGfsFvv09kNx+agRFuRBLu6HXegUOPDqSTmjB/LlbtOdGmfwbsRi4DdY7F YMP3mqU72r7+J2+J/gObRhgLvrQX78U= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-93-PFVMTFUBOmGcq1ha19Jbjg-1; Wed, 06 Dec 2023 12:45:19 -0500 X-MC-Unique: PFVMTFUBOmGcq1ha19Jbjg-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3334549e36cso35280f8f.0 for ; Wed, 06 Dec 2023 09:45:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701884717; x=1702489517; 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=sYR41S4/PDDYuB1CjTzYm5fWtGGcj8HoKCmmb6ovN0U=; b=QAR6qmEIGE4lA6umr8UBqzl5rSUJV/2NgsuUND6RcT2Pq6VnKnE8Mu8hLzQPiqjhok jSxh2737ghfr7GtpsvHOAjDCqg64uP+CKkzgd+Dy5Pt55yF2TMD8jyz6w+9fQSG7TLtQ ANqYFHsETLQFePKW91kKWSm3uqmyAZ0oqHDH4+wERFA9cp1WNktTAXBcQYUYKuEKFPD/ G3UQo4z2MJUNBBnxHN7hs3p4TMWV+1it+npeu3v4wEvWM63Yw/7heDxVDdU0a9bvwSyD 45nxIDB+9arHBKwY0XyS6CCMtEVV0fiiyO6UG7egVVfm4nQ/shqQyoNuqPTMQUKB30rT 5eSA== X-Gm-Message-State: AOJu0YysONa5CbMV2wvHWublTclH1/K4yYmURWXw1H6/fO3ghiu/GOBr 9XXid7uPcv5kvLF4Yq3V0uUlVR8DLQVTHNrWv+XCjbrhp+OQyxrNF+sGjtf9EgtHvs6Myj2e8n1 rdHDcsyMu6eaVYlOW8E0Z1atL3cFOl+OkG5weAMR6haN8Cj5suwcE9Kdiovh1kAJQfS/rb0vv8j MYQskVx0H6ddXv X-Received: by 2002:adf:fe52:0:b0:333:73c:7850 with SMTP id m18-20020adffe52000000b00333073c7850mr611007wrs.34.1701884717536; Wed, 06 Dec 2023 09:45:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IGmUw/qO+5iCotzjaNqS7XjrtMVr4jvxJtjtPpD9uj1JD57yJMjMjX46trxenZWCFBrmt2T8A== X-Received: by 2002:adf:fe52:0:b0:333:73c:7850 with SMTP id m18-20020adffe52000000b00333073c7850mr611000wrs.34.1701884716958; Wed, 06 Dec 2023 09:45:16 -0800 (PST) Received: from localhost (net-93-71-3-198.cust.vodafonedsl.it. [93.71.3.198]) by smtp.gmail.com with ESMTPSA id e11-20020a5d530b000000b003333521a1cesm217645wrv.57.2023.12.06.09.45.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 09:45:16 -0800 (PST) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Date: Wed, 6 Dec 2023 18:43:53 +0100 Message-ID: <34b004347e951638a6c4d55aa5eb371c9e5d3220.1701884492.git.lorenzo.bianconi@redhat.com> 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 21.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 | 76 +++++++++++++++++++++++++++------ controller/pinctrl.h | 4 +- 5 files changed, 81 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index 4c300ebc1..69ae85635 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ OVN v21.12.3 - xx xxx xxxx - A new ACL option, "log-related" has been added that allows for reply and related traffic to be logged for an ACL in addition to the traffic that directly matches the ACL. + - Add "garp-max-timeout-sec" config option to vswitchd external-ids to + cap the time between when ovn-controller sends gARP packets. OVN v21.12.2 - 03 Jun 2022 -------------------------- diff --git a/controller/ovn-controller.8.xml b/controller/ovn-controller.8.xml index 68e7de2d4..cb54862bf 100644 --- a/controller/ovn-controller.8.xml +++ b/controller/ovn-controller.8.xml @@ -338,6 +338,17 @@ of how many entries there are in the cache. By default this is set to 30000 (30 seconds). +
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 797222895..671485a47 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -3888,7 +3888,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()); /* Updating monitor conditions if runtime data or diff --git a/controller/pinctrl.c b/controller/pinctrl.c index 499da59da..829a22aa3 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -164,6 +164,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 { @@ -209,7 +213,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) @@ -3475,7 +3480,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); pinctrl_set_br_int_name_(br_int->name); @@ -3487,7 +3493,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, @@ -4330,7 +4336,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. */ }; @@ -4359,7 +4366,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); @@ -4375,7 +4382,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; @@ -4401,6 +4410,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, @@ -4425,6 +4440,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, @@ -4444,6 +4465,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; } @@ -4529,13 +4556,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; } @@ -5778,13 +5807,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); @@ -5813,8 +5855,10 @@ send_garp_rarp_prepare(struct ovsdb_idl_txn *ovnsb_idl_txn, const struct sbrec_port_binding *pb = lport_lookup_by_name( sbrec_port_binding_by_name, iface_id); if (pb) { - send_garp_rarp_update(ovnsb_idl_txn, sbrec_mac_binding_by_lport_ip, - local_datapaths, pb, &nat_addresses); + send_garp_rarp_update(ovnsb_idl_txn, + sbrec_mac_binding_by_lport_ip, + local_datapaths, pb, &nat_addresses, + garp_max_timeout, garp_continuous); } } @@ -5825,7 +5869,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); } } @@ -5843,6 +5888,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 88f18e983..b76e43626 100644 --- a/controller/pinctrl.h +++ b/controller/pinctrl.h @@ -28,6 +28,7 @@ struct lport_index; 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; @@ -52,7 +53,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(char *br_int_name);