From nobody Sun Feb 8 14:53:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552999640554864.2876575941726; Tue, 19 Mar 2019 05:47:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A6898C049E20; Tue, 19 Mar 2019 12:47:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F20B060C1D; Tue, 19 Mar 2019 12:47:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9F4F4181A13E; Tue, 19 Mar 2019 12:47:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2JClBBi028743 for ; Tue, 19 Mar 2019 08:47:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC4EA5D717; Tue, 19 Mar 2019 12:47:11 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 115615D707; Tue, 19 Mar 2019 12:47:10 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 19 Mar 2019 12:46:28 +0000 Message-Id: <20190319124700.16722-5-berrange@redhat.com> In-Reply-To: <20190319124700.16722-1-berrange@redhat.com> References: <20190319124700.16722-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 04/36] network: add missing bandwidth limits for bridge forward type X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 19 Mar 2019 12:47:19 +0000 (UTC) In the case of a network with forward=3Dbridge, which has a bridge device listed, we are capable of setting bandwidth limits but fail to call the function to register them. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Cole Robinson --- src/network/bridge_driver.c | 39 ++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 1e6d1be32e..4770dd1e4e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3229,7 +3229,7 @@ networkValidate(virNetworkDriverStatePtr driver, virPortGroupDefPtr defaultPortGroup =3D NULL; virNetworkIPDefPtr ipdef; bool ipv4def =3D false, ipv6def =3D false; - bool bandwidthAllowed =3D true; + bool bandwidthAllowed =3D false; bool usesInterface =3D false, usesAddress =3D false; =20 if (virXMLCheckIllegalChars("name", def->name, "\n") < 0) @@ -3250,9 +3250,15 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; =20 virNetworkSetBridgeMacAddr(def); + bandwidthAllowed =3D true; break; =20 case VIR_NETWORK_FORWARD_BRIDGE: + if (def->bridge !=3D NULL) + bandwidthAllowed =3D true; + + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: case VIR_NETWORK_FORWARD_PASSTHROUGH: @@ -3293,15 +3299,6 @@ networkValidate(virNetworkDriverStatePtr driver, virNetworkForwardTypeToString(def->forward.type= )); return -1; } - if (def->bandwidth) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported network-wide element= " - "in network %s with forward mode=3D'%s'"), - def->name, - virNetworkForwardTypeToString(def->forward.type= )); - return -1; - } - bandwidthAllowed =3D false; break; =20 case VIR_NETWORK_FORWARD_LAST: @@ -3310,6 +3307,16 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; } =20 + if (def->bandwidth && + !bandwidthAllowed) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported network-wide element " + "in network %s with forward mode=3D'%s'"), + def->name, + virNetworkForwardTypeToString(def->forward.type)); + return -1; + } + /* we support configs with a single PF defined: * * or with a list of netdev names: @@ -4578,6 +4585,9 @@ networkAllocateActualDevice(virNetworkPtr net, goto error; } } + + if (networkPlugBandwidth(obj, iface) < 0) + goto error; break; } =20 @@ -5052,6 +5062,11 @@ networkReleaseActualDevice(virNetworkPtr net, break; =20 case VIR_NETWORK_FORWARD_BRIDGE: + if (iface->data.network.actual && + actualType =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE && + networkUnplugBandwidth(obj, iface) < 0) + goto error; + break; case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: case VIR_NETWORK_FORWARD_PASSTHROUGH: @@ -5460,7 +5475,9 @@ networkBandwidthGenericChecks(virDomainNetDefPtr ifac= e, virNetDevBandwidthPtr ifaceBand; unsigned long long old_floor, new_floor; =20 - if (virDomainNetGetActualType(iface) !=3D VIR_DOMAIN_NET_TYPE_NETWORK)= { + if (virDomainNetGetActualType(iface) !=3D VIR_DOMAIN_NET_TYPE_NETWORK = && + (virDomainNetGetActualType(iface) !=3D VIR_DOMAIN_NET_TYPE_BRIDGE = || + iface->data.network.actual->data.bridge.brname =3D=3D NULL)) { /* This is not an interface that's plugged into a network. * We don't care. Thus from our POV bandwidth change is allowed. */ return false; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list