From patchwork Mon Sep 21 16:25:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1368499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: 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=L6BmW7vq; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bw8w21WP1z9sVT for ; Tue, 22 Sep 2020 02:26:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C853C85EA5; Mon, 21 Sep 2020 16:26:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M0szHOF48Oxb; Mon, 21 Sep 2020 16:26:40 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id EF1B185E93; Mon, 21 Sep 2020 16:26:39 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CF169C0890; Mon, 21 Sep 2020 16:26:39 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3D9C7C0051 for ; Mon, 21 Sep 2020 16:26:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2618920798 for ; Mon, 21 Sep 2020 16:26:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NYvLN0FdxVDn for ; Mon, 21 Sep 2020 16:26:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by silver.osuosl.org (Postfix) with ESMTPS id 23DBB21519 for ; Mon, 21 Sep 2020 16:26:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600705569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q8Q4mv14SzLnehcjZrnAKyHMIHU5Lm47yToX+gN8WCE=; b=L6BmW7vqUS51fObhSRnpF5vbgEj0Dm5y46KEd9FL2Wco7jrjFOpIy/Ebt3nlzdxqLx9hv0 ghrHcH/LEXnUhFGgcuHBHeKgf6WtiSRzmrfEA4Bib+4zY2KYoSN360FR0KoGcWij+Gd3IO uvvEkYsWrtcM647z3zvoVjKBc9qGkhQ= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-579-c0UJCsQSNLCb8v68laC1hw-1; Mon, 21 Sep 2020 12:25:53 -0400 X-MC-Unique: c0UJCsQSNLCb8v68laC1hw-1 Received: by mail-wr1-f69.google.com with SMTP id a12so6089606wrg.13 for ; Mon, 21 Sep 2020 09:25:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q8Q4mv14SzLnehcjZrnAKyHMIHU5Lm47yToX+gN8WCE=; b=JxS8E5FYBhwQHI8Qa6FCAw5rAghzT4NmRAkLH8sxS6jrwGCAyeBjepdNlCmOk5L2Ou 53k3okD/Z5M6Xb+/R5uJyNhbyPVaX/LCu+im71lH07ReysKYmyOL3F+wFSZpVazh7mqy mgETUpor/6N+9ymVqrot0E+2mkGGxPGhNAWOj3/6R9qbqokuGaqJEWPczC4IwOblFhnX Bdy8qb2uV/dyDToZIwRdg31PNpsNl8YUlGZR4n41hTLqIehIsHTXi9vIieVhQMBIXp6a n39GDeW6eUFgvh7lM5bu89wHO6qfvmAZjpnU4RfvpZX5cE/K8iRPoCt/cmq3FXwfPi6J gXJg== X-Gm-Message-State: AOAM531QKRBDE6dWe6QBPZIyKIBNtVvAIMCeP1UT+/D4f9NUkU+E6GAf KWsbDiul8AhAXfM1VX0/iulrcM8Oe0qyI50HFsGnaT4WyvfPr6fk8lRX5g5CNmyMrhJIjg2JeO+ 2xVSOYCJORedfIksU9A== X-Received: by 2002:a5d:55c8:: with SMTP id i8mr558480wrw.331.1600705551417; Mon, 21 Sep 2020 09:25:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBAjkg7rK0XPEqqjt4ZpOpoPcdohfl6S0WbUsi2xO6UxucY0IzibkKjQ3CeDcVfPdz70CG+Q== X-Received: by 2002:a5d:55c8:: with SMTP id i8mr558459wrw.331.1600705551171; Mon, 21 Sep 2020 09:25:51 -0700 (PDT) Received: from lore-desk.redhat.com ([151.66.80.226]) by smtp.gmail.com with ESMTPSA id s11sm21019205wrt.43.2020.09.21.09.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 09:25:50 -0700 (PDT) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Date: Mon, 21 Sep 2020 18:25:37 +0200 Message-Id: <6554c8f94a5572b52bd7e3267b8602f4f1a8cf85.1600704955.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lorenzo.bianconi@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: hzhou@ovn.org Subject: [ovs-dev] [PATCH v2 ovn 3/3] binding: fix localnet QoS configuration after I-P 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" After the I-P has been introduced in commit 354bdba51a ("ovn-controller: I-P for SB port binding and OVS interface in runtime_data"), the QoS on localnet ports is not properly configured if the ovs interface is marked with "ovn-egress-iface" flag after the related record in the logical_switch_port table is set. The issue can be triggered with the following reproducer: $ovn-nbctl set Logical_Switch_Port ln-public options:qos_burst=1000 $ovs-vsctl set interface eth0 external-ids:ovn-egress-iface=true Fix the issue triggering a recomputation after qos is configured for ovs interface Fixes: 354bdba51abf ("ovn-controller: I-P for SB port binding and OVS interface in runtime_data") Signed-off-by: Lorenzo Bianconi --- controller/binding.c | 26 +++++++++++++++++ controller/binding.h | 1 + tests/ovn-performance.at | 13 +++++++++ tests/system-ovn.at | 60 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+) diff --git a/controller/binding.c b/controller/binding.c index 107bc28a6..26542ae66 100644 --- a/controller/binding.c +++ b/controller/binding.c @@ -1353,6 +1353,13 @@ build_local_bindings(struct binding_ctx_in *b_ctx_in, struct local_iface_node *iface_node = xmalloc(sizeof *iface_node); iface_node->iface_id = xstrdup(iface_id); + struct local_iface_node *old_iface_node = shash_find_data( + b_ctx_out->local_ifaces, + iface_rec->name); + if (old_iface_node) { + iface_node->qos_egress_iface = + old_iface_node->qos_egress_iface; + } iface_node = shash_replace(b_ctx_out->local_ifaces, iface_rec->name, iface_node); if (iface_node) { @@ -1700,6 +1707,12 @@ consider_iface_claim(const struct ovsrec_interface *iface_rec, struct local_iface_node *iface_node = xmalloc(sizeof *iface_node); iface_node->iface_id = xstrdup(iface_id); + struct local_iface_node *old_iface_node = shash_find_data( + b_ctx_out->local_ifaces, + iface_rec->name); + if (old_iface_node) { + iface_node->qos_egress_iface = old_iface_node->qos_egress_iface; + } iface_node = shash_replace(b_ctx_out->local_ifaces, iface_rec->name, iface_node); if (iface_node) { @@ -1928,6 +1941,19 @@ binding_handle_ovs_interface_changes(struct binding_ctx_in *b_ctx_in, continue; } + struct local_iface_node *node = shash_find_data( + b_ctx_out->local_ifaces, iface_rec->name); + bool old_qos_egress = node ? node->qos_egress_iface : false; + bool qos_egress = smap_get_bool(&iface_rec->external_ids, + "ovn-egress-iface", false); + if (qos_egress != old_qos_egress) { + if (node) { + node->qos_egress_iface = qos_egress; + } + handled = false; + break; + } + const char *iface_id = smap_get(&iface_rec->external_ids, "iface-id"); int64_t ofport = iface_rec->n_ofport ? *iface_rec->ofport : 0; if (iface_id && ofport > 0) { diff --git a/controller/binding.h b/controller/binding.h index a1e0f1ccf..9e3e1f512 100644 --- a/controller/binding.h +++ b/controller/binding.h @@ -56,6 +56,7 @@ struct binding_ctx_in { struct local_iface_node { char *iface_id; + bool qos_egress_iface; }; struct binding_ctx_out { diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at index 3010860d5..6cc5b2174 100644 --- a/tests/ovn-performance.at +++ b/tests/ovn-performance.at @@ -247,6 +247,8 @@ for i in 1 2 3; do ovs-vsctl set open . external_ids:ovn-bridge-mappings="public:br-ex" j=$((i + 2)) ovn_attach n1 br-phys 192.168.0.$j + ip link add vgw$i type dummy + ovs-vsctl add-port br-ex vgw$i done # Wait for the tunnel ports to be created and up. @@ -477,6 +479,17 @@ OVN_CONTROLLER_EXPECT_HIT( [ovn-nbctl --wait=hv lrp-set-gateway-chassis lr1-public gw3 10 && ovn-nbctl --wait=hv sync] ) +# create QoS rule +OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2 gw1 gw2 gw3], [lflow_run], + [ovn-nbctl --wait=hv set Logical_Switch_Port ln-public options:qos_burst=1000] +) + +OVN_CONTROLLER_EXPECT_HIT( + [gw1], [lflow_run], + [as gw1 ovs-vsctl set interface vgw1 external-ids:ovn-egress-iface=true] +) + # Make gw2 master. There is remote possibility that full recompute # triggers for gw2 after it becomes master. Most of the time # there will be no recompute. diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 4f72754c6..f779947f4 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -5397,3 +5397,63 @@ as OVS_TRAFFIC_VSWITCHD_STOP(["/.*error receiving.*/d /.*terminating with signal 15.*/d"]) AT_CLEANUP + +AT_SETUP([ovn -- egress qos]) +AT_KEYWORDS([ovn-egress-qos]) + +ovn_start +OVS_TRAFFIC_VSWITCHD_START() + +ADD_BR([br-int]) +ADD_BR([br-ext]) + +ovs-ofctl add-flow br-ext action=normal +# Set external-ids in br-int needed for ovn-controller +ovs-vsctl \ + -- set Open_vSwitch . external-ids:system-id=hv1 \ + -- set Open_vSwitch . external-ids:ovn-remote=unix:$ovs_base/ovn-sb/ovn-sb.sock \ + -- set Open_vSwitch . external-ids:ovn-encap-type=geneve \ + -- set Open_vSwitch . external-ids:ovn-encap-ip=169.0.0.1 \ + -- set bridge br-int fail-mode=secure other-config:disable-in-band=true + +# Start ovn-controller +start_daemon ovn-controller + +ovn-nbctl ls-add sw0 + +ADD_NAMESPACES(sw01) +ADD_VETH(sw01, sw01, br-int, "192.168.1.2/24", "f0:00:00:01:02:03") +ovn-nbctl lsp-add sw0 sw01 \ + -- lsp-set-addresses sw01 "f0:00:00:01:02:03 192.168.1.2" + +ADD_NAMESPACES(public) +ADD_VETH(public, public, br-ext, "192.168.2.2/24", "f0:00:00:01:02:05") + +AT_CHECK([ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings=phynet:br-ext]) +ovn-nbctl lsp-add sw0 public \ + -- lsp-set-addresses public unknown \ + -- lsp-set-type public localnet \ + -- lsp-set-options public network_name=phynet + +AT_CHECK([ovn-nbctl set Logical_Switch_Port public options:qos_burst=1000]) +AT_CHECK([ovs-vsctl set interface ovs-public external-ids:ovn-egress-iface=true]) +AT_CHECK([tc qdisc show | grep -q 'htb 1: dev ovs-public']) + +AT_CHECK([ovn-nbctl remove Logical_Switch_Port public options qos_burst=1000]) +AT_CHECK([tc qdisc show | grep -q 'htb 1: dev ovs-public'],[1]) + +kill $(pidof ovn-controller) + +as ovn-sb +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) + +as ovn-nb +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) + +as northd +OVS_APP_EXIT_AND_WAIT([ovn-northd]) + +as +OVS_TRAFFIC_VSWITCHD_STOP(["/.*error receiving.*/d +/.*terminating with signal 15.*/d"]) +AT_CLEANUP