From patchwork Tue Jun 20 13:58:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1797354 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=fqr/n8Fg; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QlpC75scjz20XS for ; Tue, 20 Jun 2023 23:58:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F14646131B; Tue, 20 Jun 2023 13:58:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F14646131B 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=fqr/n8Fg 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 64RcOPrRfveJ; Tue, 20 Jun 2023 13:58:57 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 1FF0460AFD; Tue, 20 Jun 2023 13:58:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1FF0460AFD Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C3869C008C; Tue, 20 Jun 2023 13:58:55 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 65983C007C for ; Tue, 20 Jun 2023 13:58:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 93333416F8 for ; Tue, 20 Jun 2023 13:58:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 93333416F8 Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fqr/n8Fg X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TroeybSquWoq for ; Tue, 20 Jun 2023 13:58:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 997C0416FF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id 997C0416FF for ; Tue, 20 Jun 2023 13:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687269526; 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=4nCCpbj2dbYIGvXpgLRqLmP/I/HdIol6cqVX+ryUpdE=; b=fqr/n8FgQsdRQLfIflnAeqJTmbiV6OHzcdqoZFV72eqDN1PNmxx7Z/ZU76YiIXnPYjEPuy u7iRdLlTFDtdJNxfF+RDFHXyCw2bfyjeMH8JblKavHqVOJBspe1+/21BA63PqcR0AkegGK +k1oCHYE/7exFruyhtWdJ/a6r14wzQ4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-58-eZYDRng_Prubad1CHcvGSQ-1; Tue, 20 Jun 2023 09:58:44 -0400 X-MC-Unique: eZYDRng_Prubad1CHcvGSQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B8908631DB for ; Tue, 20 Jun 2023 13:58:44 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.ntdv.lab.eng.bos.redhat.com [10.19.188.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B4EB112132C; Tue, 20 Jun 2023 13:58:44 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Tue, 20 Jun 2023 15:58:43 +0200 Message-Id: <20230620135843.2273523-2-xsimonar@redhat.com> In-Reply-To: <20230620135843.2273523-1-xsimonar@redhat.com> References: <20230607172834.3851733-2-xsimonar@redhat.com> <20230620135843.2273523-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 2/2] binding: fixed qos when no iface 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" Before this patch, if iface did not exist when qos I+P was run the first time a qos queue was still created and qos I+P was not applying qos to OVS. qos was potentially applied later, if/when (for any reason) runtime_data had to be recomputed. Fixes: 7d1d111ff213 ("controller: configure qos through ovs qos table and do not run tc directly") Signed-off-by: Xavier Simonart Acked-by: Ales Musil --- v2: - handled Lorenzo's comments - updated test case to also test null network (as referenced by Lorenzo) - rebased on origin/main --- controller/binding.c | 26 ++++++++++++-------------- tests/ovn.at | 8 ++++++++ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/controller/binding.c b/controller/binding.c index 8069a2e0d..355b73070 100644 --- a/controller/binding.c +++ b/controller/binding.c @@ -362,7 +362,7 @@ configure_qos(const struct sbrec_port_binding *pb, struct qos_queue *q = find_qos_queue(b_ctx_out->qos_map, hash, pb->logical_port); if (!q || q->min_rate != min_rate || q->max_rate != max_rate || - q->burst != burst) { + q->burst != burst || (network && strcmp(network, q->network))) { struct shash bridge_mappings = SHASH_INITIALIZER(&bridge_mappings); add_ovs_bridge_mappings(b_ctx_in->ovs_table, b_ctx_in->bridge_table, &bridge_mappings); @@ -378,22 +378,20 @@ configure_qos(const struct sbrec_port_binding *pb, add_ovs_qos_table_entry(b_ctx_in->ovs_idl_txn, port, min_rate, max_rate, burst, queue_id, pb->logical_port); + if (!q) { + q = xzalloc(sizeof *q); + hmap_insert(b_ctx_out->qos_map, &q->node, hash); + q->port = xstrdup(pb->logical_port); + q->queue_id = queue_id; + } + free(q->network); + q->network = network ? xstrdup(network) : NULL; + q->min_rate = min_rate; + q->max_rate = max_rate; + q->burst = burst; } shash_destroy(&bridge_mappings); } - - if (!q) { - q = xzalloc(sizeof *q); - hmap_insert(b_ctx_out->qos_map, &q->node, hash); - q->port = xstrdup(pb->logical_port); - q->queue_id = queue_id; - } - - free(q->network); - q->network = network ? xstrdup(network) : NULL; - q->min_rate = min_rate; - q->max_rate = max_rate; - q->burst = burst; } static const struct ovsrec_queue * diff --git a/tests/ovn.at b/tests/ovn.at index 2c221a05c..8d69c35d9 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -36235,6 +36235,7 @@ check ovn-nbctl ls-add ls1 check ovn-nbctl lsp-add ls1 public1 check ovn-nbctl lsp-set-addresses public1 unknown check ovn-nbctl lsp-set-type public1 localnet +check ovn-nbctl lsp-set-options public1 network_name=phys check ovn-nbctl lsp-add ls1 lsp5 check ovn-nbctl lsp-set-addresses lsp5 f0:00:00:00:00:05 @@ -36244,6 +36245,12 @@ ovs-vsctl add-port br-int vif5 -- \ ofport-request=5 OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp5` = xup]) +# Delete and add back public1 +check ovn-nbctl --wait=hv lsp-del public1 +check ovn-nbctl lsp-add ls1 public1 +check ovn-nbctl lsp-set-addresses public1 unknown +check ovn-nbctl lsp-set-type public1 localnet + check ovn-nbctl set Logical_Switch_Port public1 options:qos_min_rate=6000000000 check ovn-nbctl set Logical_Switch_Port public1 options:qos_max_rate=7000000000 check ovn-nbctl set Logical_Switch_Port public1 options:qos_burst=8000000000 @@ -36509,6 +36516,7 @@ check ovn-nbctl lsp-add ls2 public2 check ovn-nbctl lsp-set-addresses public2 unknown check ovn-nbctl lsp-set-type public2 localnet check ovn-nbctl --wait=sb set Logical_Switch_Port public2 options:qos_min_rate=6000000000 options:qos_max_rate=7000000000 options:qos_burst=8000000000 options:network_name=phys +check ovn-nbctl --wait=sb lsp-set-options public2 qos_min_rate=6000000000 qos_max_rate=7000000000 qos_burst=8000000000 # Let's now send ovn controller to sleep, so it will receive both ofport notification and ls deletion simultaneously sleep_controller hv-1