From e429c062cb77a453a436dfa1458fe0a5f3a957c0 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 3 Jan 2022 16:24:58 +0100 Subject: [PATCH] virnetdevopenvswitch: Fix 'burst' value passed to ovs-vsctl As described in the previous commit, the units for 'burst' are kibibytes and not kilobytes, i.e. multiples of 1024 not 1000. Therefore, when constructing ovs-vsctl command the burst value must be multiplied by 1024 and not just 1000. And because ovs expects this size in bits the value has to be multiplied again by 8. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1510237#c26 Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/util/virnetdevopenvswitch.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 5dab545037..ba886dfb7d 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -638,11 +638,13 @@ virNetDevOpenvswitchFindUUID(const char *table, } /* - * Average, peak, floor and burst in virNetDevBandwidth are in kbytes. - * However other_config in ovs qos is in bit. - * ingress_policing_rate in ovs interface is in kbit. + * In virNetDevBandwidthRate, average, peak, floor are in kilobyes and burst in + * kibibytes. However other_config in ovs qos is in bits and + * ingress_policing_rate in ovs interface is in kilobit and + * ingress_policing_burst is in kibibits. */ -#define VIR_NETDEV_TX_TO_OVS 8000 +#define KBYTE_TO_BITS(x) (x * 8000ULL) +#define KIBIBYTE_TO_BITS(x) (x * 8192ULL) #define VIR_NETDEV_RX_TO_OVS 8 /** @@ -717,11 +719,11 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname, g_autofree char *qos_uuid = NULL; g_autofree char *queue_uuid = NULL; - average = g_strdup_printf("%llu", tx->average * VIR_NETDEV_TX_TO_OVS); + average = g_strdup_printf("%llu", KBYTE_TO_BITS(tx->average)); if (tx->burst) - burst = g_strdup_printf("%llu", tx->burst * VIR_NETDEV_TX_TO_OVS); + burst = g_strdup_printf("%llu", KIBIBYTE_TO_BITS(tx->burst)); if (tx->peak) - peak = g_strdup_printf("%llu", tx->peak * VIR_NETDEV_TX_TO_OVS); + peak = g_strdup_printf("%llu", KBYTE_TO_BITS(tx->peak)); virUUIDFormat(vmuuid, vmuuidstr); vmid_ex_id = g_strdup_printf("external-ids:vm-id=\"%s\"", vmuuidstr); -- 2.39.5