diff --git a/0004-util-use-a-single-flags-arg-for-virNetDevBandwidthSe.patch b/0004-util-use-a-single-flags-arg-for-virNetDevBandwidthSe.patch new file mode 100644 index 0000000..608df53 --- /dev/null +++ b/0004-util-use-a-single-flags-arg-for-virNetDevBandwidthSe.patch @@ -0,0 +1,315 @@ +From 807e2670f2704c41f0a1dca81a5d2f2f9336137c Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Mon, 25 Nov 2024 22:24:44 -0500 +Subject: [PATCH 4/9] util: use a single flags arg for virNetDevBandwidthSet(), + not multiple bools + +Having two bools in the arg list is on the borderline of being +confusing to anyone trying to read the code, but we're about to add a +3rd. This patch replaces the two bools with a single flags argument +which will instead have one or more bits from virNetDevBandwidthFlags +set. + +Signed-off-by: Laine Stump +Signed-off-by: Michal Privoznik +Reviewed-by: Michal Privoznik +--- + src/lxc/lxc_driver.c | 8 ++++++-- + src/lxc/lxc_process.c | 8 ++++++-- + src/network/bridge_driver.c | 10 ++++++++-- + src/qemu/qemu_command.c | 11 ++++++++--- + src/qemu/qemu_driver.c | 29 ++++++++++++++------------- + src/qemu/qemu_hotplug.c | 22 +++++++++++++++------ + src/util/virnetdevbandwidth.c | 36 ++++++++++++++++++++-------------- + src/util/virnetdevbandwidth.h | 9 +++++++-- + tests/virnetdevbandwidthtest.c | 8 +++++++- + 9 files changed, 94 insertions(+), 47 deletions(-) + +diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c +index 534e257f30..b693980dbb 100644 +--- a/src/lxc/lxc_driver.c ++++ b/src/lxc/lxc_driver.c +@@ -3570,8 +3570,12 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, + actualBandwidth = virDomainNetGetActualBandwidth(net); + if (actualBandwidth) { + if (virNetDevSupportsBandwidth(actualType)) { +- if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false, +- !virDomainNetTypeSharesHostView(net)) < 0) ++ unsigned int flags = 0; ++ ++ if (!virDomainNetTypeSharesHostView(net)) ++ flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; ++ ++ if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0) + goto cleanup; + } else { + VIR_WARN("setting bandwidth on interfaces of " +diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c +index f5eb5383ec..0e689fbb70 100644 +--- a/src/lxc/lxc_process.c ++++ b/src/lxc/lxc_process.c +@@ -605,8 +605,12 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver, + actualBandwidth = virDomainNetGetActualBandwidth(net); + if (actualBandwidth) { + if (virNetDevSupportsBandwidth(type)) { +- if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false, +- !virDomainNetTypeSharesHostView(net)) < 0) ++ unsigned int flags = 0; ++ ++ if (!virDomainNetTypeSharesHostView(net)) ++ flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; ++ ++ if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0) + goto cleanup; + } else { + VIR_WARN("setting bandwidth on interfaces of " +diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c +index 32572c755f..1c53636450 100644 +--- a/src/network/bridge_driver.c ++++ b/src/network/bridge_driver.c +@@ -2058,8 +2058,11 @@ networkStartNetworkVirtual(virNetworkDriverState *driver, + } + } + +- if (virNetDevBandwidthSet(def->bridge, def->bandwidth, true, true) < 0) ++ if (virNetDevBandwidthSet(def->bridge, def->bandwidth, ++ VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS ++ | VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED) < 0) { + goto error; ++ } + + return 0; + +@@ -2141,8 +2144,11 @@ networkStartNetworkBridge(virNetworkObj *obj) + * type BRIDGE, is started. On failure, undo anything you've done, + * and return -1. On success return 0. + */ +- if (virNetDevBandwidthSet(def->bridge, def->bandwidth, true, true) < 0) ++ if (virNetDevBandwidthSet(def->bridge, def->bandwidth, ++ VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS ++ | VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED) < 0) { + goto error; ++ } + + if (networkStartHandleMACTableManagerMode(obj) < 0) + goto error; +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index f15e6bda1e..b4815e5e71 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -8840,9 +8840,14 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, + def->uuid, + !virDomainNetTypeSharesHostView(net)) < 0) + goto cleanup; +- } else if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false, +- !virDomainNetTypeSharesHostView(net)) < 0) { +- goto cleanup; ++ } else { ++ unsigned int flags = 0; ++ ++ if (!virDomainNetTypeSharesHostView(net)) ++ flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; ++ ++ if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0) ++ goto cleanup; + } + } else { + VIR_WARN("setting bandwidth on interfaces of " +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 736602333e..14929616e5 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -9941,21 +9941,22 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, + virErrorRestore(&orig_err); + goto endjob; + } +- } else if (virNetDevBandwidthSet(net->ifname, newBandwidth, false, +- !virDomainNetTypeSharesHostView(net)) < 0) { +- virErrorPtr orig_err; +- +- virErrorPreserveLast(&orig_err); +- ignore_value(virNetDevBandwidthSet(net->ifname, +- net->bandwidth, +- false, +- !virDomainNetTypeSharesHostView(net))); +- if (net->bandwidth) { +- ignore_value(virDomainNetBandwidthUpdate(net, +- net->bandwidth)); ++ } else { ++ unsigned int bwflags = 0; ++ ++ if (!virDomainNetTypeSharesHostView(net)) ++ bwflags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; ++ ++ if (virNetDevBandwidthSet(net->ifname, newBandwidth, bwflags) < 0) { ++ virErrorPtr orig_err; ++ ++ virErrorPreserveLast(&orig_err); ++ ignore_value(virNetDevBandwidthSet(net->ifname, net->bandwidth, bwflags)); ++ if (net->bandwidth) ++ ignore_value(virDomainNetBandwidthUpdate(net, net->bandwidth)); ++ virErrorRestore(&orig_err); ++ goto endjob; + } +- virErrorRestore(&orig_err); +- goto endjob; + } + + /* If the old bandwidth was cleared out, restore qdisc. */ +diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c +index 7cb1800504..d5e7e99359 100644 +--- a/src/qemu/qemu_hotplug.c ++++ b/src/qemu/qemu_hotplug.c +@@ -1279,9 +1279,14 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, + vm->def->uuid, + !virDomainNetTypeSharesHostView(net)) < 0) + goto cleanup; +- } else if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false, +- !virDomainNetTypeSharesHostView(net)) < 0) { +- goto cleanup; ++ } else { ++ int flags = 0; ++ ++ if (!virDomainNetTypeSharesHostView(net)) ++ flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; ++ ++ if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0) ++ goto cleanup; + } + } else { + VIR_WARN("setting bandwidth on interfaces of " +@@ -4082,9 +4087,14 @@ qemuDomainChangeNet(virQEMUDriver *driver, + vm->def->uuid, + !virDomainNetTypeSharesHostView(newdev)) < 0) + goto cleanup; +- } else if (virNetDevBandwidthSet(newdev->ifname, newb, false, +- !virDomainNetTypeSharesHostView(newdev)) < 0) { +- goto cleanup; ++ } else { ++ int flags = 0; ++ ++ if (!virDomainNetTypeSharesHostView(newdev)) ++ flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; ++ ++ if (virNetDevBandwidthSet(newdev->ifname, newb, flags) < 0) ++ goto cleanup; + } + } else { + if (virDomainInterfaceClearQoS(vm->def, olddev) < 0) +diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c +index 2b58c58d3e..1baad849c6 100644 +--- a/src/util/virnetdevbandwidth.c ++++ b/src/util/virnetdevbandwidth.c +@@ -173,30 +173,35 @@ virNetDevBandwidthManipulateFilter(const char *ifname, + * virNetDevBandwidthSet: + * @ifname: on which interface + * @bandwidth: rates to set (may be NULL) +- * @hierarchical_class: whether to create hierarchical class +- * @swapped: true if IN/OUT should be set contrariwise ++ * @flags: bits indicating certain optional actions + * ++ + * This function enables QoS on specified interface + * and set given traffic limits for both, incoming +- * and outgoing traffic. Any previous setting get +- * overwritten. If @hierarchical_class is TRUE, create +- * hierarchical class. It is used to guarantee minimal +- * throughput ('floor' attribute in NIC). ++ * and outgoing traffic. ++ * ++ * @flags bits and their meanings: ++ * ++ * VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS ++ * whether to create a hierarchical class ++ * A hiearchical class structure is used to implement a minimal ++ * throughput guarantee ('floor' attribute in NIC). + * +- * If @swapped is set, the IN part of @bandwidth is set on +- * @ifname's TX, and vice versa. If it is not set, IN is set on +- * RX and OUT on TX. This is because for some types of interfaces +- * domain and the host live on the same side of the interface (so +- * domain's RX/TX is host's RX/TX), and for some it's swapped +- * (domain's RX/TX is hosts's TX/RX). ++ * VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED ++ * set if IN/OUT should be set backwards from what's indicated in ++ * the bandwidth, i.e. the IN part of @bandwidth is set on ++ * @ifname's TX, and the OUT part of @bandwidth is set on ++ * @ifname's RX. This is needed because for some types of ++ * interfaces the domain and the host live on the same side of the ++ * interface (so domain's RX/TX is host's RX/TX), and for some ++ * it's swapped (domain's RX/TX is hosts's TX/RX). + * + * Return 0 on success, -1 otherwise. + */ + int + virNetDevBandwidthSet(const char *ifname, + const virNetDevBandwidth *bandwidth, +- bool hierarchical_class, +- bool swapped) ++ unsigned int flags) + { + int ret = -1; + virNetDevBandwidthRate *rx = NULL; /* From domain POV */ +@@ -205,6 +210,7 @@ virNetDevBandwidthSet(const char *ifname, + char *average = NULL; + char *peak = NULL; + char *burst = NULL; ++ bool hierarchical_class = flags & VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS; + + if (!bandwidth) { + /* nothing to be enabled */ +@@ -224,7 +230,7 @@ virNetDevBandwidthSet(const char *ifname, + return -1; + } + +- if (swapped) { ++ if (flags & VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED) { + rx = bandwidth->out; + tx = bandwidth->in; + } else { +diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h +index 6d268fb119..80dc654486 100644 +--- a/src/util/virnetdevbandwidth.h ++++ b/src/util/virnetdevbandwidth.h +@@ -39,11 +39,16 @@ void virNetDevBandwidthFree(virNetDevBandwidth *def); + + G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevBandwidth, virNetDevBandwidthFree); + ++typedef enum { ++ VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS = (1 << 0), ++ VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED = (1 << 1), ++} virNetDevBandwidthSetFlags; ++ + int virNetDevBandwidthSet(const char *ifname, + const virNetDevBandwidth *bandwidth, +- bool hierarchical_class, +- bool swapped) ++ unsigned int flags) + G_GNUC_WARN_UNUSED_RESULT; ++ + int virNetDevBandwidthClear(const char *ifname); + int virNetDevBandwidthCopy(virNetDevBandwidth **dest, + const virNetDevBandwidth *src) +diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c +index f7c38faa2e..6529ff4026 100644 +--- a/tests/virnetdevbandwidthtest.c ++++ b/tests/virnetdevbandwidthtest.c +@@ -82,8 +82,14 @@ testVirNetDevBandwidthSet(const void *data) + if (virNetDevOpenvswitchInterfaceSetQos(iface, band, info->uuid, true) < 0) + return -1; + } else { ++ unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; ++ ++ if (info->hierarchical_class) ++ flags |= VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS; ++ + exp_cmd = info->exp_cmd_tc; +- if (virNetDevBandwidthSet(iface, band, info->hierarchical_class, true) < 0) ++ ++ if (virNetDevBandwidthSet(iface, band, flags) < 0) + return -1; + } + +-- +2.47.1 + diff --git a/0005-util-make-it-optional-to-clear-existing-tc-qdiscs-fi.patch b/0005-util-make-it-optional-to-clear-existing-tc-qdiscs-fi.patch new file mode 100644 index 0000000..0768150 --- /dev/null +++ b/0005-util-make-it-optional-to-clear-existing-tc-qdiscs-fi.patch @@ -0,0 +1,185 @@ +From 490f58382dca2a415a5f16b6133f298d853bb379 Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Mon, 25 Nov 2024 22:24:45 -0500 +Subject: [PATCH 5/9] util: make it optional to clear existing tc + qdiscs/filters in virNetDevBandwidthSet() + +virNetDevBandwidthSet() always clears all existing qdiscs and their +subordinate filters before adding all the new qdiscs/filters. This is +normally exactly what we want, but there is one case (the network +driver) where the Qdisc added by virNetDevBandwidthSet() may already +be in use by the nftables backend (which will add a rule to fix the +checksum of dhcp packets); in that case, we *don't* want +virNetDevBandwidthSet() to clear out the qdisc that was already added +for nftables, and none of the bandwidth filters have been added yet, +so there already aren't any "old" filters that need to be removed +either - it is safe to just skip virNetDevBandwidthClear() in this +case. + +To allow the network driver to set bandwidth without first clearing +it, this patch adds the flag VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL to the +virNetDevBandwidthSetFlags enum, and recognizes it in +virNetDevBandwidthSet() - if the flag is set, then +virNetDevBandwidth() will call virNetDevBandwidthClear() just as it +always has. But if the flag isn't set it *won't* call +virNetDevBandwidthClear(). + +As suggested above, VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL is set for all +calls to virNetdevBandwidthSet() except for two places in the network +driver. + +Signed-off-by: Laine Stump +Reviewed-by: Michal Privoznik +--- + src/lxc/lxc_driver.c | 2 +- + src/lxc/lxc_process.c | 2 +- + src/qemu/qemu_command.c | 2 +- + src/qemu/qemu_driver.c | 2 +- + src/qemu/qemu_hotplug.c | 4 ++-- + src/util/virnetdevbandwidth.c | 21 ++++++++++++++++++++- + src/util/virnetdevbandwidth.h | 1 + + tests/virnetdevbandwidthtest.c | 3 ++- + 8 files changed, 29 insertions(+), 8 deletions(-) + +diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c +index b693980dbb..81581c74df 100644 +--- a/src/lxc/lxc_driver.c ++++ b/src/lxc/lxc_driver.c +@@ -3570,7 +3570,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, + actualBandwidth = virDomainNetGetActualBandwidth(net); + if (actualBandwidth) { + if (virNetDevSupportsBandwidth(actualType)) { +- unsigned int flags = 0; ++ unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL; + + if (!virDomainNetTypeSharesHostView(net)) + flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; +diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c +index 0e689fbb70..081ce03a57 100644 +--- a/src/lxc/lxc_process.c ++++ b/src/lxc/lxc_process.c +@@ -605,7 +605,7 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver, + actualBandwidth = virDomainNetGetActualBandwidth(net); + if (actualBandwidth) { + if (virNetDevSupportsBandwidth(type)) { +- unsigned int flags = 0; ++ unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL; + + if (!virDomainNetTypeSharesHostView(net)) + flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index b4815e5e71..ed54fd4c5b 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -8841,7 +8841,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, + !virDomainNetTypeSharesHostView(net)) < 0) + goto cleanup; + } else { +- unsigned int flags = 0; ++ unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL; + + if (!virDomainNetTypeSharesHostView(net)) + flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 14929616e5..9549065b1f 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -9942,7 +9942,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, + goto endjob; + } + } else { +- unsigned int bwflags = 0; ++ unsigned int bwflags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL; + + if (!virDomainNetTypeSharesHostView(net)) + bwflags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; +diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c +index d5e7e99359..ceda4119cd 100644 +--- a/src/qemu/qemu_hotplug.c ++++ b/src/qemu/qemu_hotplug.c +@@ -1280,7 +1280,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, + !virDomainNetTypeSharesHostView(net)) < 0) + goto cleanup; + } else { +- int flags = 0; ++ int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL; + + if (!virDomainNetTypeSharesHostView(net)) + flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; +@@ -4088,7 +4088,7 @@ qemuDomainChangeNet(virQEMUDriver *driver, + !virDomainNetTypeSharesHostView(newdev)) < 0) + goto cleanup; + } else { +- int flags = 0; ++ int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL; + + if (!virDomainNetTypeSharesHostView(newdev)) + flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; +diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c +index 1baad849c6..9c48844c5d 100644 +--- a/src/util/virnetdevbandwidth.c ++++ b/src/util/virnetdevbandwidth.c +@@ -196,6 +196,21 @@ virNetDevBandwidthManipulateFilter(const char *ifname, + * interface (so domain's RX/TX is host's RX/TX), and for some + * it's swapped (domain's RX/TX is hosts's TX/RX). + * ++ * VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL ++ * If VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL is set, then the root ++ * qdisc is deleted before adding any new qdisc/class/filter, ++ * which causes any pre-existing filters to also be deleted. If ++ * not set, then it's assumed that there are no existing rules (or ++ * that those already there need to be kept). The caller should ++ * set this flag for an existing interface that is having its ++ * bandwidth settings modified, but can leave it unset if the ++ * interface was newly created and this is the first time ++ * bandwidth has been set, but someone else might have already ++ * added the qdisc (e.g. this is the case when the network driver ++ * is setting bandwidth for a virtual network bridge device - the ++ * nftables backend may have already added qdisc handle 1:0 and a ++ * filter, and we don't want to delete them) ++ * + * Return 0 on success, -1 otherwise. + */ + int +@@ -238,7 +253,11 @@ virNetDevBandwidthSet(const char *ifname, + tx = bandwidth->out; + } + +- virNetDevBandwidthClear(ifname); ++ /* Only if the caller requests, clear everything including root ++ * qdisc and all filters before adding everything. ++ */ ++ if (flags & VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL) ++ virNetDevBandwidthClear(ifname); + + if (tx && tx->average) { + average = g_strdup_printf("%llukbps", tx->average); +diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h +index 80dc654486..744aa4c826 100644 +--- a/src/util/virnetdevbandwidth.h ++++ b/src/util/virnetdevbandwidth.h +@@ -42,6 +42,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevBandwidth, virNetDevBandwidthFree); + typedef enum { + VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS = (1 << 0), + VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED = (1 << 1), ++ VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL = (1 << 2), + } virNetDevBandwidthSetFlags; + + int virNetDevBandwidthSet(const char *ifname, +diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c +index 6529ff4026..6d5c847ad7 100644 +--- a/tests/virnetdevbandwidthtest.c ++++ b/tests/virnetdevbandwidthtest.c +@@ -82,7 +82,8 @@ testVirNetDevBandwidthSet(const void *data) + if (virNetDevOpenvswitchInterfaceSetQos(iface, band, info->uuid, true) < 0) + return -1; + } else { +- unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED; ++ unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED | ++ VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL; + + if (info->hierarchical_class) + flags |= VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS; +-- +2.47.1 + diff --git a/0006-util-put-the-command-that-adds-a-tx-filter-qdisc-int.patch b/0006-util-put-the-command-that-adds-a-tx-filter-qdisc-int.patch new file mode 100644 index 0000000..19e32fe --- /dev/null +++ b/0006-util-put-the-command-that-adds-a-tx-filter-qdisc-int.patch @@ -0,0 +1,98 @@ +From faebbbbfa3b1bd4120852b3f416c8073ab82d5c5 Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Mon, 25 Nov 2024 22:24:46 -0500 +Subject: [PATCH 6/9] util: put the command that adds a tx filter qdisc into a + separate function + +virNetDevBandwidthSet() adds a queue discipline (qdisc) for each +interface that it will need to add tc transmit filters to, and the +filters are then attached to the qdisc. + +There are other circumstances where some other function will need to +add tc transmit filters to an interface (in particular an upcoming +patch to the network driver nftables backend that will use a tc tx +filter to fix the checksum of dhcp packets), so that function will +also need a qdisc for the tx filter. To assure both always use exactly +the same qdisc, this patch puts the command that adds the tx filter +qdisc into a separate helper function that can (and will) be called +from either place + +Signed-off-by: Laine Stump +Reviewed-by: Michal Privoznik +--- + src/libvirt_private.syms | 1 + + src/util/virnetdevbandwidth.c | 30 +++++++++++++++++++++++++----- + src/util/virnetdevbandwidth.h | 3 +++ + 3 files changed, 29 insertions(+), 5 deletions(-) + +diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms +index d15d6a6a9d..0211cee967 100644 +--- a/src/libvirt_private.syms ++++ b/src/libvirt_private.syms +@@ -2859,6 +2859,7 @@ virNetDevVFInterfaceStats; + + + # util/virnetdevbandwidth.h ++virNetDevBandWidthAddTxFilterParentQdisc; + virNetDevBandwidthClear; + virNetDevBandwidthCopy; + virNetDevBandwidthEqual; +diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c +index 9c48844c5d..90eebe6576 100644 +--- a/src/util/virnetdevbandwidth.c ++++ b/src/util/virnetdevbandwidth.c +@@ -266,11 +266,7 @@ virNetDevBandwidthSet(const char *ifname, + if (tx->burst) + burst = g_strdup_printf("%llukb", tx->burst); + +- cmd = virCommandNew(TC); +- virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root", +- "handle", "1:", "htb", "default", +- hierarchical_class ? "2" : "1", NULL); +- if (virCommandRun(cmd, NULL) < 0) ++ if (virNetDevBandWidthAddTxFilterParentQdisc(ifname, hierarchical_class) < 0) + goto cleanup; + + /* If we are creating a hierarchical class, all non guaranteed traffic +@@ -794,3 +790,27 @@ virNetDevBandwidthSetRootQDisc(const char *ifname, + + return 0; + } ++ ++/** ++ * virNetDevBandwidthAddTxFilterParentQdisc: ++ * @ifname: name of interface that needs a qdisc to attach tx filters to ++ * @hierarchical_class: true if hierarchical classes will be used on this interface ++ * ++ * Add a root Qdisc (Queueing Discipline) for attaching Tx filters to ++ * @ifname. ++ * ++ * returns 0 on success, -1 on failure ++ */ ++int ++virNetDevBandWidthAddTxFilterParentQdisc(const char *ifname, ++ bool hierarchical_class) ++{ ++ g_autoptr(virCommand) cmd = NULL; ++ ++ cmd = virCommandNew(TC); ++ virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root", ++ "handle", "1:", "htb", "default", ++ hierarchical_class ? "2" : "1", NULL); ++ ++ return virCommandRun(cmd, NULL); ++} +diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h +index 744aa4c826..65c1500637 100644 +--- a/src/util/virnetdevbandwidth.h ++++ b/src/util/virnetdevbandwidth.h +@@ -84,3 +84,6 @@ int virNetDevBandwidthUpdateFilter(const char *ifname, + int virNetDevBandwidthSetRootQDisc(const char *ifname, + const char *qdisc) + G_NO_INLINE; ++ ++int virNetDevBandWidthAddTxFilterParentQdisc(const char *ifname, ++ bool hierarchical_class); +-- +2.47.1 + diff --git a/0007-util-don-t-re-add-the-qdisc-used-for-tx-filters-if-i.patch b/0007-util-don-t-re-add-the-qdisc-used-for-tx-filters-if-i.patch new file mode 100644 index 0000000..b968409 --- /dev/null +++ b/0007-util-don-t-re-add-the-qdisc-used-for-tx-filters-if-i.patch @@ -0,0 +1,107 @@ +From 73c0fb19ce5b816ee81ede691252855c75391c9a Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Mon, 25 Nov 2024 22:24:47 -0500 +Subject: [PATCH 7/9] util: don't re-add the qdisc used for tx filters if it + already exists + +There will soon be two separate users of tc on virtual networks, and +both will use the "qdisc root handle 1: htb" to add tx filters. One or the +other could get the first chance to add the qdisc, and then if at a +later time the other decides to use it, we need to prevent the 2nd +user from attempting to re-add the qdisc (because that just generates +an error). + +We do this by running "tc qdisc show dev $bridge handle 1:" then +checking if the output of that command contains both "qdisc" and " 1: +".[*] If it does then the qdisc has already been added. If not then we +need to add it now. + +[*]As of this writing, the output more exactly starts with "qdisc +htb 1: root", but our comparison is made purposefully generous to +increase the chances that it will continue to work properly if tc +modifies the format of its output. + +Signed-off-by: Laine Stump +Reviewed-by: Michal Privoznik +--- + src/util/virnetdevbandwidth.c | 35 ++++++++++++++++++++++++++++------ + tests/virnetdevbandwidthtest.c | 3 +++ + 2 files changed, 32 insertions(+), 6 deletions(-) + +diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c +index 90eebe6576..5c6a65528c 100644 +--- a/src/util/virnetdevbandwidth.c ++++ b/src/util/virnetdevbandwidth.c +@@ -805,12 +805,35 @@ int + virNetDevBandWidthAddTxFilterParentQdisc(const char *ifname, + bool hierarchical_class) + { +- g_autoptr(virCommand) cmd = NULL; ++ g_autoptr(virCommand) testCmd = NULL; ++ g_autofree char *testResult = NULL; + +- cmd = virCommandNew(TC); +- virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root", +- "handle", "1:", "htb", "default", +- hierarchical_class ? "2" : "1", NULL); ++ /* first check it the qdisc with handle 1: was already added for ++ * this interface by someone else ++ */ ++ testCmd = virCommandNew(TC); ++ virCommandAddArgList(testCmd, "qdisc", "show", "dev", ifname, ++ "handle", "1:", NULL); ++ virCommandSetOutputBuffer(testCmd, &testResult); + +- return virCommandRun(cmd, NULL); ++ if (virCommandRun(testCmd, NULL) < 0) ++ return -1; ++ ++ /* output will be something like: "qdisc htb 1: root refcnt ..." ++ * if the qdisc was already added. We just search for "qdisc" and ++ * " 1: " anywhere in the output to allow for tc changing its ++ * output format. ++ */ ++ if (!(testResult && strstr(testResult, "qdisc") && strstr(testResult, " 1: "))) { ++ /* didn't find qdisc in output, so we need to add one */ ++ g_autoptr(virCommand) addCmd = virCommandNew(TC); ++ ++ virCommandAddArgList(addCmd, "qdisc", "add", "dev", ifname, "root", ++ "handle", "1:", "htb", "default", ++ hierarchical_class ? "2" : "1", NULL); ++ ++ return virCommandRun(addCmd, NULL); ++ } ++ ++ return 0; + } +diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c +index 6d5c847ad7..31aa7f469d 100644 +--- a/tests/virnetdevbandwidthtest.c ++++ b/tests/virnetdevbandwidthtest.c +@@ -147,6 +147,7 @@ mymain(void) + "", + TC " qdisc del dev eth0 root\n" + TC " qdisc del dev eth0 ingress\n" ++ TC " qdisc show dev eth0 handle 1:\n" + TC " qdisc add dev eth0 root handle 1: htb default 1\n" + TC " class add dev eth0 parent 1: classid 1:1 htb rate 1024kbps quantum 87\n" + TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n" +@@ -177,6 +178,7 @@ mymain(void) + "", + TC " qdisc del dev eth0 root\n" + TC " qdisc del dev eth0 ingress\n" ++ TC " qdisc show dev eth0 handle 1:\n" + TC " qdisc add dev eth0 root handle 1: htb default 1\n" + TC " class add dev eth0 parent 1: classid 1:1 htb rate 1kbps ceil 2kbps burst 4kb quantum 1\n" + TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n" +@@ -199,6 +201,7 @@ mymain(void) + "", + TC " qdisc del dev eth0 root\n" + TC " qdisc del dev eth0 ingress\n" ++ TC " qdisc show dev eth0 handle 1:\n" + TC " qdisc add dev eth0 root handle 1: htb default 1\n" + TC " class add dev eth0 parent 1: classid 1:1 htb rate 4294967295kbps quantum 366503875\n" + TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n" +-- +2.47.1 + diff --git a/0008-util-add-new-tc-layer-for-virFirewallCmd-objects.patch b/0008-util-add-new-tc-layer-for-virFirewallCmd-objects.patch new file mode 100644 index 0000000..aa2ceaf --- /dev/null +++ b/0008-util-add-new-tc-layer-for-virFirewallCmd-objects.patch @@ -0,0 +1,171 @@ +From dac9cb9030ac03d18f59884864a0a253e3c9f8f1 Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Mon, 25 Nov 2024 22:24:48 -0500 +Subject: [PATCH 8/9] util: add new "tc" layer for virFirewallCmd objects + +If the layer of a virFirewallCmd is "tc", then the "tc" utility will +be executed using the arguments that had been added to the +virFirewallCmd + +tc layer doesn't support auto-rollback command creation (any rollback +needs to be added manually with virFirewallAddRollbackCmd()), and also +tc layer isn't supported by the iptables backend (it would have been +straightforward to add, but the iptables backend doesn't need it, and +I didn't want to take the chance of causing a regression in that +code for no good reason). + +Signed-off-by: Laine Stump +Signed-off-by: Michal Privoznik +Reviewed-by: Michal Privoznik +--- + src/network/network_nftables.c | 1 + + src/util/virfirewall.c | 66 +++++++++++++++++++++------------- + src/util/virfirewall.h | 1 + + src/util/virfirewalld.c | 1 + + 4 files changed, 44 insertions(+), 25 deletions(-) + +diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c +index 268d1f12ca..cc184105c3 100644 +--- a/src/network/network_nftables.c ++++ b/src/network/network_nftables.c +@@ -73,6 +73,7 @@ VIR_ENUM_IMPL(nftablesLayer, + "", + "ip", + "ip6", ++ "", + ); + + +diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c +index 811b787ecc..9389bcf541 100644 +--- a/src/util/virfirewall.c ++++ b/src/util/virfirewall.c +@@ -47,6 +47,7 @@ VIR_ENUM_IMPL(virFirewallLayer, + "ethernet", + "ipv4", + "ipv6", ++ "tc", + ); + + typedef struct _virFirewallGroup virFirewallGroup; +@@ -57,6 +58,7 @@ VIR_ENUM_IMPL(virFirewallLayerCommand, + EBTABLES, + IPTABLES, + IP6TABLES, ++ TC, + ); + + struct _virFirewallCmd { +@@ -591,6 +593,7 @@ virFirewallCmdIptablesApply(virFirewall *firewall, + case VIR_FIREWALL_LAYER_IPV6: + virCommandAddArg(cmd, "-w"); + break; ++ case VIR_FIREWALL_LAYER_TC: + case VIR_FIREWALL_LAYER_LAST: + break; + } +@@ -672,39 +675,52 @@ virFirewallCmdNftablesApply(virFirewall *firewall G_GNUC_UNUSED, + size_t i; + int status; + +- cmd = virCommandNew(NFT); ++ if (fwCmd->layer == VIR_FIREWALL_LAYER_TC) { + +- if ((virFirewallTransactionGetFlags(firewall) & VIR_FIREWALL_TRANSACTION_AUTO_ROLLBACK) && +- fwCmd->argsLen > 1) { +- /* skip any leading options to get to command verb */ +- for (i = 0; i < fwCmd->argsLen - 1; i++) { +- if (fwCmd->args[i][0] != '-') +- break; +- } ++ /* for VIR_FIREWALL_LAYER_TC, we run the 'tc' (traffic control) command with ++ * the supplied args. ++ */ ++ cmd = virCommandNew(TC); + +- if (i + 1 < fwCmd->argsLen && +- VIR_NFTABLES_ARG_IS_CREATE(fwCmd->args[i])) { ++ /* NB: RAW commands don't support auto-rollback command creation */ + +- cmdIdx = i; +- objectType = fwCmd->args[i + 1]; ++ } else { + +- /* we currently only handle auto-rollback for rules, +- * chains, and tables, and those all can be "rolled +- * back" by a delete command using the handle that is +- * returned when "-ae" is added to the add/insert +- * command. +- */ +- if (STREQ_NULLABLE(objectType, "rule") || +- STREQ_NULLABLE(objectType, "chain") || +- STREQ_NULLABLE(objectType, "table")) { ++ cmd = virCommandNew(NFT); + +- needRollback = true; +- /* this option to nft instructs it to add the +- * "handle" of the created object to stdout ++ if ((virFirewallTransactionGetFlags(firewall) & VIR_FIREWALL_TRANSACTION_AUTO_ROLLBACK) && ++ fwCmd->argsLen > 1) { ++ /* skip any leading options to get to command verb */ ++ for (i = 0; i < fwCmd->argsLen - 1; i++) { ++ if (fwCmd->args[i][0] != '-') ++ break; ++ } ++ ++ if (i + 1 < fwCmd->argsLen && ++ VIR_NFTABLES_ARG_IS_CREATE(fwCmd->args[i])) { ++ ++ cmdIdx = i; ++ objectType = fwCmd->args[i + 1]; ++ ++ /* we currently only handle auto-rollback for rules, ++ * chains, and tables, and those all can be "rolled ++ * back" by a delete command using the handle that is ++ * returned when "-ae" is added to the add/insert ++ * command. + */ +- virCommandAddArg(cmd, "-ae"); ++ if (STREQ_NULLABLE(objectType, "rule") || ++ STREQ_NULLABLE(objectType, "chain") || ++ STREQ_NULLABLE(objectType, "table")) { ++ ++ needRollback = true; ++ /* this option to nft instructs it to add the ++ * "handle" of the created object to stdout ++ */ ++ virCommandAddArg(cmd, "-ae"); ++ } + } + } ++ + } + + for (i = 0; i < fwCmd->argsLen; i++) +diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h +index bce51259d2..d42e60884b 100644 +--- a/src/util/virfirewall.h ++++ b/src/util/virfirewall.h +@@ -39,6 +39,7 @@ typedef enum { + VIR_FIREWALL_LAYER_ETHERNET, + VIR_FIREWALL_LAYER_IPV4, + VIR_FIREWALL_LAYER_IPV6, ++ VIR_FIREWALL_LAYER_TC, + + VIR_FIREWALL_LAYER_LAST, + } virFirewallLayer; +diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c +index 827e201dbb..124523c420 100644 +--- a/src/util/virfirewalld.c ++++ b/src/util/virfirewalld.c +@@ -43,6 +43,7 @@ VIR_LOG_INIT("util.firewalld"); + VIR_ENUM_DECL(virFirewallLayerFirewallD); + VIR_ENUM_IMPL(virFirewallLayerFirewallD, + VIR_FIREWALL_LAYER_LAST, ++ "", + "eb", + "ipv4", + "ipv6", +-- +2.47.1 + diff --git a/0009-network-add-tc-filter-rule-to-nftables-backend-to-fi.patch b/0009-network-add-tc-filter-rule-to-nftables-backend-to-fi.patch new file mode 100644 index 0000000..603110d --- /dev/null +++ b/0009-network-add-tc-filter-rule-to-nftables-backend-to-fi.patch @@ -0,0 +1,687 @@ +From b1e2318a0d609fcdff04fcf88953ea87cdd02b95 Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Mon, 25 Nov 2024 22:24:49 -0500 +Subject: [PATCH 9/9] network: add tc filter rule to nftables backend to fix + checksum of DHCP responses + +Please see the commit log for commit v10.9.0-rc1-1-g42ab0148dd for the +history and explanation of the problem that this patch is fixing. + +A shorter explanation is that when a guest is connected to a libvirt +virtual network using a virtio-net adapter with in-kernel "vhost-net" +packet processing enabled, it will fail to acquire an IP address from +a DHCP seever running on the host. + +In commit v10.9.0-rc1-1-g42ab0148dd we tried fixing this by *zeroing +out* the checksums of these packets with an nftables rule (nftables +can't recompute the checksum, but it can set it to 0) . This +*appeared* to work initially, but it turned out that zeroing the +checksum ends up breaking dhcp packets on *non* virtio/vhost-net guest +interfaces. That attempt was reverted in commit v10.9.0-rc2. + +Fortunately, there is an existing way to recompute the checksum of a +packet as it leaves an interface - the "tc" (traffic control) utility +that libvirt already uses for bandwidth management. This patch uses a +tc filter rule to match dhcp response packets on the bridge and +recompute their checksum. + +The filter rule must be attached to a tc qdisc, which may also have a +filter attached for bandwidth management (in the element +of the network config). Not only must we add the qdisc only once +(which was already handled by the patch two prior to this one), but +also the filter rule for checksum fixing and the filter rule for +bandwidth management must be different priorities so they don't clash; +this is solved by adding the checksum-fix filter with "priority 2", +while the bandwidth management filter remains "priority 1" (both will +always be evaluated anyway, it's just a matter of which is evaluated +first). + +So far this method has worked with every different guest we could +throw at it, including several that failed with the previous method. + +Fixes: b89c4991daa0ee9371f10937fab3b03c5ffdabc6 +Reported-by: Rich Jones +Reported-by: Andrea Bolognani +Fix-Suggested-by: Eric Garver +Fix-Suggested-by: Phil Sutter +Signed-off-by: Laine Stump +Reviewed-by: Michal Privoznik +--- + src/network/network_nftables.c | 68 +++++++++++++++++++ + .../forward-dev-linux.nftables | 40 +++++++++++ + .../isolated-linux.nftables | 40 +++++++++++ + .../nat-default-linux.nftables | 40 +++++++++++ + .../nat-ipv6-linux.nftables | 40 +++++++++++ + .../nat-ipv6-masquerade-linux.nftables | 40 +++++++++++ + .../nat-many-ips-linux.nftables | 40 +++++++++++ + .../nat-no-dhcp-linux.nftables | 40 +++++++++++ + .../nat-port-range-ipv6-linux.nftables | 40 +++++++++++ + .../nat-port-range-linux.nftables | 40 +++++++++++ + .../nat-tftp-linux.nftables | 40 +++++++++++ + .../route-default-linux.nftables | 40 +++++++++++ + 12 files changed, 508 insertions(+) + +diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c +index cc184105c3..748edb0273 100644 +--- a/src/network/network_nftables.c ++++ b/src/network/network_nftables.c +@@ -29,6 +29,7 @@ + + #include "internal.h" + #include "virfirewalld.h" ++#include "vircommand.h" + #include "virerror.h" + #include "virlog.h" + #include "virhash.h" +@@ -924,6 +925,67 @@ nftablesAddIPSpecificFirewallRules(virFirewall *fw, + } + + ++/** ++ * nftablesAddUdpChecksumFixWithTC: ++ * ++ * Add a tc filter rule to @ifname (the bridge device of this network) ++ * that will recompute the checksum of udp packets output from @iface with ++ * destination port @port. ++ * ++ * Normally the checksum should be filled by some part of the basic ++ * network stack, but there are cases (e.g. DHCP response packets sent ++ * from virtualization host to a QEMU guest when the guest NIC uses ++ * vhost-net packet processing) when the host (sender) thinks that ++ * packet checksums will be computed elsewhere (and so leaves a ++ * partially computed checksum in the packet header) while the guest ++ * (receiver) thinks that the checksum has already been fully ++ * computed; in the meantime none of the code in between has actually ++ * finished computing the checksum. ++ * ++ * An example of this is DHCP response packets from host to guest. If ++ * the checksum of each of these packets isn't properly computed, then ++ * many guests (e.g. FreeBSD) will drop them with reason BAD CHECKSUM; ++ * this tc filter rule will fix the ip and udp checksums, and the ++ * FreeBSD dhcp client will happily accept the packet. ++ * ++ * (NB: if you're wondering how the tc qdisc and filter are removed ++ * when the network is destroyed, the answer is that the kernel ++ * automatically (and properly) removes them for us, so we don't need ++ * to worry about keeping track/deleting as we do with nftables rules) ++ */ ++static int ++nftablesAddUdpChecksumFixWithTC(virFirewall *fw, ++ const char *iface, ++ int port) ++{ ++ g_autofree char *portstr = g_strdup_printf("%d", port); ++ ++ /* this will add the qdisc (that the filter below is attached to) ++ * unless it already exists ++ */ ++ if (virNetDevBandWidthAddTxFilterParentQdisc(iface, true) < 0) ++ return -1; ++ ++ /* add a filter to catch all udp packets with dst "port" and ++ * recompute their checksum ++ */ ++ virFirewallAddCmd(fw, VIR_FIREWALL_LAYER_TC, ++ "filter", "add", "dev", iface, ++ "prio", "2", "protocol", "ip", "parent", "1:", ++ "u32", "match", "ip", "dport", portstr, "ffff", ++ "action", "csum", "ip", "and", "udp", ++ NULL); ++ ++ virFirewallAddRollbackCmd(fw, VIR_FIREWALL_LAYER_TC, ++ "filter", "del", "dev", iface, ++ "prio", "2", "protocol", "ip", "parent", "1:", ++ "u32", "match", "ip", "dport", portstr, "ffff", ++ "action", "csum", "ip", "and", "udp", ++ NULL); ++ return 0; ++} ++ ++ + /* nftablesAddFirewallrules: + * + * @def - the network that needs an nftables firewall added +@@ -944,6 +1006,12 @@ nftablesAddFirewallRules(virNetworkDef *def, virFirewall **fwRemoval) + + virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_AUTO_ROLLBACK); + ++ /* add the tc filter rule needed to fixup the checksum of dhcp ++ * response packets going from host to guest. ++ */ ++ if (nftablesAddUdpChecksumFixWithTC(fw, def->bridge, 68) < 0) ++ return -1; ++ + nftablesAddGeneralFirewallRules(fw, def); + + for (i = 0; +diff --git a/tests/networkxml2firewalldata/forward-dev-linux.nftables b/tests/networkxml2firewalldata/forward-dev-linux.nftables +index 8badb74beb..6772383b37 100644 +--- a/tests/networkxml2firewalldata/forward-dev-linux.nftables ++++ b/tests/networkxml2firewalldata/forward-dev-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/isolated-linux.nftables b/tests/networkxml2firewalldata/isolated-linux.nftables +index d1b4dac178..546a18b75a 100644 +--- a/tests/networkxml2firewalldata/isolated-linux.nftables ++++ b/tests/networkxml2firewalldata/isolated-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/nat-default-linux.nftables b/tests/networkxml2firewalldata/nat-default-linux.nftables +index 28508292f9..08623c1381 100644 +--- a/tests/networkxml2firewalldata/nat-default-linux.nftables ++++ b/tests/networkxml2firewalldata/nat-default-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables +index d8a9ba706d..3fd6b94eef 100644 +--- a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables ++++ b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables +index a7f09cda59..2811e098d1 100644 +--- a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables ++++ b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables +index b826fe6134..5409d5b552 100644 +--- a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables ++++ b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/nat-no-dhcp-linux.nftables b/tests/networkxml2firewalldata/nat-no-dhcp-linux.nftables +index d8a9ba706d..3fd6b94eef 100644 +--- a/tests/networkxml2firewalldata/nat-no-dhcp-linux.nftables ++++ b/tests/networkxml2firewalldata/nat-no-dhcp-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables +index ceaed6fa40..d74417cdb3 100644 +--- a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables ++++ b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/nat-port-range-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-linux.nftables +index 1dc37a26ec..b55bb287a9 100644 +--- a/tests/networkxml2firewalldata/nat-port-range-linux.nftables ++++ b/tests/networkxml2firewalldata/nat-port-range-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/nat-tftp-linux.nftables b/tests/networkxml2firewalldata/nat-tftp-linux.nftables +index 28508292f9..08623c1381 100644 +--- a/tests/networkxml2firewalldata/nat-tftp-linux.nftables ++++ b/tests/networkxml2firewalldata/nat-tftp-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +diff --git a/tests/networkxml2firewalldata/route-default-linux.nftables b/tests/networkxml2firewalldata/route-default-linux.nftables +index 282c9542a5..76d6902517 100644 +--- a/tests/networkxml2firewalldata/route-default-linux.nftables ++++ b/tests/networkxml2firewalldata/route-default-linux.nftables +@@ -1,3 +1,43 @@ ++tc \ ++qdisc \ ++show \ ++dev \ ++virbr0 \ ++handle \ ++1: ++tc \ ++qdisc \ ++add \ ++dev \ ++virbr0 \ ++root \ ++handle \ ++1: \ ++htb \ ++default \ ++2 ++tc \ ++filter \ ++add \ ++dev \ ++virbr0 \ ++prio \ ++2 \ ++protocol \ ++ip \ ++parent \ ++1: \ ++u32 \ ++match \ ++ip \ ++dport \ ++68 \ ++ffff \ ++action \ ++csum \ ++ip \ ++and \ ++udp + nft \ + -ae insert \ + rule \ +-- +2.47.1 + diff --git a/libvirt.spec b/libvirt.spec index ecdead3..a4ee1eb 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -302,6 +302,12 @@ Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz Patch0001: 0001-virarptable-Properly-calculate-rtattr-length.patch Patch0002: 0002-virarptable-Fix-check-for-message-length.patch Patch0003: 0003-virarptable-End-parsing-earlier-in-case-of-NLMSG_DON.patch +Patch0004: 0004-util-use-a-single-flags-arg-for-virNetDevBandwidthSe.patch +Patch0005: 0005-util-make-it-optional-to-clear-existing-tc-qdiscs-fi.patch +Patch0006: 0006-util-put-the-command-that-adds-a-tx-filter-qdisc-int.patch +Patch0007: 0007-util-don-t-re-add-the-qdisc-used-for-tx-filters-if-i.patch +Patch0008: 0008-util-add-new-tc-layer-for-virFirewallCmd-objects.patch +Patch0009: 0009-network-add-tc-filter-rule-to-nftables-backend-to-fi.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release}