File c6cbe187-network-delay-global-fw-setup.patch of Package libvirt.11700
commit c6cbe18771c832fba02e8edda250eb67d4afe5a5
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue May 21 12:40:13 2019 +0100
network: delay global firewall setup if no networks are running
Creating firewall rules for the virtual networks causes the kernel to
load the conntrack module. This imposes a significant performance
penalty on Linux network traffic. Thus we want to only take that hit if
we actually have virtual networks running.
We need to create global firewall rules during startup in order to
"upgrade" rules for any running networks created by older libvirt.
If no running networks are present though, we can safely delay setup
until the time we actually start a network.
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Index: libvirt-5.1.0/src/network/bridge_driver.c
===================================================================
--- libvirt-5.1.0.orig/src/network/bridge_driver.c
+++ libvirt-5.1.0/src/network/bridge_driver.c
@@ -2108,7 +2108,7 @@ static void
networkReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup)
{
VIR_INFO("Reloading iptables rules");
- networkPreReloadFirewallRules(startup);
+ networkPreReloadFirewallRules(driver, startup);
virNetworkObjListForEach(driver->networks,
networkReloadFirewallRulesHelper,
NULL);
Index: libvirt-5.1.0/src/network/bridge_driver_linux.c
===================================================================
--- libvirt-5.1.0.orig/src/network/bridge_driver_linux.c
+++ libvirt-5.1.0/src/network/bridge_driver_linux.c
@@ -84,16 +84,57 @@ static void networkSetupPrivateChains(vo
}
}
-void networkPreReloadFirewallRules(bool startup)
+
+static int
+networkHasRunningNetworksHelper(virNetworkObjPtr obj,
+ void *opaque)
+{
+ bool *running = opaque;
+
+ virObjectLock(obj);
+ if (virNetworkObjIsActive(obj))
+ *running = true;
+ virObjectUnlock(obj);
+
+ return 0;
+}
+
+
+static bool
+networkHasRunningNetworks(virNetworkDriverStatePtr driver)
{
- /* We create global rules upfront as we don't want
- * the perf hit of conditionally figuring out whether
- * to create them each time a network is started.
+ bool running = false;
+ virNetworkObjListForEach(driver->networks,
+ networkHasRunningNetworksHelper,
+ &running);
+ return running;
+}
+
+
+void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup)
+{
+ /*
+ * If there are any running networks, we need to
+ * create the global rules upfront. This allows us
+ * convert rules created by old libvirt into the new
+ * format.
+ *
+ * If there are not any running networks, then we
+ * must not create rules, because the rules will
+ * cause the conntrack kernel module to be loaded.
+ * This imposes a significant performance hit on
+ * the networking stack. Thus we will only create
+ * rules if a network is later startup.
*
* Any errors here are saved to be reported at time
* of starting the network though as that makes them
* more likely to be seen by a human
*/
+ if (!networkHasRunningNetworks(driver)) {
+ VIR_DEBUG("Delayed global rule setup as no networks are running");
+ return;
+ }
+
ignore_value(virOnce(&createdOnce, networkSetupPrivateChains));
/*
@@ -726,6 +767,9 @@ int networkAddFirewallRules(virNetworkDe
virFirewallPtr fw = NULL;
int ret = -1;
+ if (virOnce(&createdOnce, networkSetupPrivateChains) < 0)
+ return -1;
+
if (errInitV4 &&
(virNetworkDefGetIPByIndex(def, AF_INET, 0) ||
virNetworkDefGetRouteByIndex(def, AF_INET, 0))) {
Index: libvirt-5.1.0/src/network/bridge_driver_nop.c
===================================================================
--- libvirt-5.1.0.orig/src/network/bridge_driver_nop.c
+++ libvirt-5.1.0/src/network/bridge_driver_nop.c
@@ -19,7 +19,8 @@
#include <config.h>
-void networkPreReloadFirewallRules(bool startup ATTRIBUTE_UNUSED)
+void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver ATTRIBUTE_UNUSED,
+ bool startup ATTRIBUTE_UNUSED)
{
}
Index: libvirt-5.1.0/src/network/bridge_driver_platform.h
===================================================================
--- libvirt-5.1.0.orig/src/network/bridge_driver_platform.h
+++ libvirt-5.1.0/src/network/bridge_driver_platform.h
@@ -58,7 +58,7 @@ struct _virNetworkDriverState {
typedef struct _virNetworkDriverState virNetworkDriverState;
typedef virNetworkDriverState *virNetworkDriverStatePtr;
-void networkPreReloadFirewallRules(bool startup);
+void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup);
void networkPostReloadFirewallRules(bool startup);
int networkCheckRouteCollision(virNetworkDefPtr def);
Index: libvirt-5.1.0/tests/networkxml2firewalldata/base.args
===================================================================
--- /dev/null
+++ libvirt-5.1.0/tests/networkxml2firewalldata/base.args
@@ -0,0 +1,116 @@
+iptables \
+--table filter \
+--list-rules
+iptables \
+--table nat \
+--list-rules
+iptables \
+--table mangle \
+--list-rules
+iptables \
+--table filter \
+--new-chain LIBVIRT_INP
+iptables \
+--table filter \
+--insert INPUT \
+--jump LIBVIRT_INP
+iptables \
+--table filter \
+--new-chain LIBVIRT_OUT
+iptables \
+--table filter \
+--insert OUTPUT \
+--jump LIBVIRT_OUT
+iptables \
+--table filter \
+--new-chain LIBVIRT_FWO
+iptables \
+--table filter \
+--insert FORWARD \
+--jump LIBVIRT_FWO
+iptables \
+--table filter \
+--new-chain LIBVIRT_FWI
+iptables \
+--table filter \
+--insert FORWARD \
+--jump LIBVIRT_FWI
+iptables \
+--table filter \
+--new-chain LIBVIRT_FWX
+iptables \
+--table filter \
+--insert FORWARD \
+--jump LIBVIRT_FWX
+iptables \
+--table nat \
+--new-chain LIBVIRT_PRT
+iptables \
+--table nat \
+--insert POSTROUTING \
+--jump LIBVIRT_PRT
+iptables \
+--table mangle \
+--new-chain LIBVIRT_PRT
+iptables \
+--table mangle \
+--insert POSTROUTING \
+--jump LIBVIRT_PRT
+ip6tables \
+--table filter \
+--list-rules
+ip6tables \
+--table nat \
+--list-rules
+ip6tables \
+--table mangle \
+--list-rules
+ip6tables \
+--table filter \
+--new-chain LIBVIRT_INP
+ip6tables \
+--table filter \
+--insert INPUT \
+--jump LIBVIRT_INP
+ip6tables \
+--table filter \
+--new-chain LIBVIRT_OUT
+ip6tables \
+--table filter \
+--insert OUTPUT \
+--jump LIBVIRT_OUT
+ip6tables \
+--table filter \
+--new-chain LIBVIRT_FWO
+ip6tables \
+--table filter \
+--insert FORWARD \
+--jump LIBVIRT_FWO
+ip6tables \
+--table filter \
+--new-chain LIBVIRT_FWI
+ip6tables \
+--table filter \
+--insert FORWARD \
+--jump LIBVIRT_FWI
+ip6tables \
+--table filter \
+--new-chain LIBVIRT_FWX
+ip6tables \
+--table filter \
+--insert FORWARD \
+--jump LIBVIRT_FWX
+ip6tables \
+--table nat \
+--new-chain LIBVIRT_PRT
+ip6tables \
+--table nat \
+--insert POSTROUTING \
+--jump LIBVIRT_PRT
+ip6tables \
+--table mangle \
+--new-chain LIBVIRT_PRT
+ip6tables \
+--table mangle \
+--insert POSTROUTING \
+--jump LIBVIRT_PRT
Index: libvirt-5.1.0/tests/networkxml2firewalltest.c
===================================================================
--- libvirt-5.1.0.orig/tests/networkxml2firewalltest.c
+++ libvirt-5.1.0/tests/networkxml2firewalltest.c
@@ -22,6 +22,7 @@
#include <config.h>
#include "testutils.h"
+#include "viralloc.h"
#if defined (__linux__)
@@ -59,13 +60,15 @@ testCommandDryRun(const char *const*args
}
static int testCompareXMLToArgvFiles(const char *xml,
- const char *cmdline)
+ const char *cmdline,
+ const char *baseargs)
{
char *expectargv = NULL;
char *actualargv = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER;
virNetworkDefPtr def = NULL;
int ret = -1;
+ char *actual;
virCommandSetDryRun(&buf, testCommandDryRun, NULL);
@@ -78,11 +81,18 @@ static int testCompareXMLToArgvFiles(con
if (virBufferError(&buf))
goto cleanup;
- actualargv = virBufferContentAndReset(&buf);
+ actual = actualargv = virBufferContentAndReset(&buf);
virTestClearCommandPath(actualargv);
virCommandSetDryRun(NULL, NULL, NULL);
- if (virTestCompareToFile(actualargv, cmdline) < 0)
+ /* The first network to be created populates the
+ * libvirt global chains. We must skip args for
+ * that if present
+ */
+ if (STRPREFIX(actual, baseargs))
+ actual += strlen(baseargs);
+
+ if (virTestCompareToFile(actual, cmdline) < 0)
goto cleanup;
ret = 0;
@@ -97,6 +107,7 @@ static int testCompareXMLToArgvFiles(con
struct testInfo {
const char *name;
+ const char *baseargs;
};
@@ -114,7 +125,7 @@ testCompareXMLToIPTablesHelper(const voi
abs_srcdir, info->name, RULESTYPE) < 0)
goto cleanup;
- result = testCompareXMLToArgvFiles(xml, args);
+ result = testCompareXMLToArgvFiles(xml, args, info->baseargs);
cleanup:
VIR_FREE(xml);
@@ -135,6 +146,8 @@ static int
mymain(void)
{
int ret = 0;
+ const char *basefile = NULL;
+ const char *baseargs = NULL;
abs_top_srcdir = getenv("abs_top_srcdir");
if (!abs_top_srcdir)
@@ -142,8 +155,8 @@ mymain(void)
# define DO_TEST(name) \
do { \
- static struct testInfo info = { \
- name, \
+ struct testInfo info = { \
+ name, baseargs, \
}; \
if (virTestRun("Network XML-2-iptables " name, \
testCompareXMLToIPTablesHelper, &info) < 0) \
@@ -162,6 +175,17 @@ mymain(void)
goto cleanup;
}
+ if (virAsprintf(&basefile, "%s/networkxml2firewalldata/base.args",
+ abs_srcdir) < 0) {
+ ret = -1;
+ goto cleanup;
+ }
+
+ if (virTestLoadFile(basefile, &baseargs) < 0) {
+ ret = -1;
+ goto cleanup;
+ }
+
DO_TEST("nat-default");
DO_TEST("nat-tftp");
DO_TEST("nat-many-ips");
@@ -170,6 +194,8 @@ mymain(void)
DO_TEST("route-default");
cleanup:
+ VIR_FREE(basefile);
+ VIR_FREE(baseargs);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
