8:01 p.m.
This patchs allow to set the buffer size for netlink socket in
the libvirtd configuration file. The default buffer size remain
as before at 128k.
Signed-off-by: Zhipeng Lu <lu.zhipeng(a)zte.com.cn>
---
daemon/libvirtd-config.c | 6 ++++++
daemon/libvirtd-config.h | 2 ++
daemon/libvirtd.aug | 1 +
daemon/libvirtd.c | 12 ++++++++++++
daemon/libvirtd.conf | 3 +++
daemon/test_libvirtd.aug.in | 1 +
src/libvirt_private.syms | 1 +
src/util/virnetlink.c | 19 ++++++++++++++++++-
src/util/virnetlink.h | 7 ++++++-
9 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index 6c0f00e..b2bda28 100644
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -33,6 +33,7 @@
#include "remote/remote_protocol.h"
#include "remote/remote_driver.h"
#include "util/virnetdevopenvswitch.h"
+#include "util/virnetlink.h"
#include "virstring.h"
#include "virutil.h"
@@ -172,6 +173,8 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
data->admin_keepalive_count = 5;
data->ovs_timeout = VIR_NETDEV_OVS_DEFAULT_TIMEOUT;
+
+ data->netlink_sock_buffer_size = VIRT_NETLINK_SOCK_BUFFER_SIZE;
localhost = virGetHostname();
if (localhost == NULL) {
@@ -394,6 +397,9 @@ daemonConfigLoadOptions(struct daemonConfig *data,
if (virConfGetValueUInt(conf, "ovs_timeout", &data->ovs_timeout)
< 0)
goto error;
+ if (virConfGetValueUInt(conf, "netlink_sock_buffer_size",
&data->netlink_sock_buffer_size) < 0)
+ goto error;
+
return 0;
error:
diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h
index 1edf5fa..22befd1 100644
--- a/daemon/libvirtd-config.h
+++ b/daemon/libvirtd-config.h
@@ -94,6 +94,8 @@ struct daemonConfig {
unsigned int admin_keepalive_count;
unsigned int ovs_timeout;
+
+ unsigned int netlink_sock_buffer_size;
};
diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug
index 24fdf44..84ea00a 100644
--- a/daemon/libvirtd.aug
+++ b/daemon/libvirtd.aug
@@ -89,6 +89,7 @@ module Libvirtd =
let misc_entry = str_entry "host_uuid"
| str_entry "host_uuid_source"
| int_entry "ovs_timeout"
+ | int_entry "netlink_sock_buffer_size"
(* Each enty in the config is one of the following three ... *)
let entry = network_entry
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index a558458..34db23a 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -648,6 +648,16 @@ daemonSetupNetDevOpenvswitch(struct daemonConfig *config)
/*
+ * Set up the netlink socket buffer size
+ */
+static void
+daemonSetupNetLink(struct daemonConfig *config)
+{
+ virNetLinkSetBufferSize(config->netlink_sock_buffer_size);
+}
+
+
+/*
* Set up the logging environment
* By default if daemonized all errors go to the logfile libvirtd.log,
* but if verbose or error debugging is asked for then also output
@@ -1257,6 +1267,8 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE);
}
+ daemonSetupNetLink(config);
+
daemonSetupNetDevOpenvswitch(config);
if (daemonSetupAccessManager(config) < 0) {
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
index e83e9a1..b174767 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -476,3 +476,6 @@
# potential infinite waits blocking libvirt.
#
#ovs_timeout = 5
+
+# This allow to specify buffer size for netlink socket.
+#netlink_sock_buffer_size = 131072
diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in
index 1200952..0a1207f 100644
--- a/daemon/test_libvirtd.aug.in
+++ b/daemon/test_libvirtd.aug.in
@@ -64,3 +64,4 @@ module Test_libvirtd =
{ "admin_keepalive_interval" = "5" }
{ "admin_keepalive_count" = "5" }
{ "ovs_timeout" = "5" }
+ { "netlink_sock_buffer_size" = "131072" }
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 888412a..83be39d 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2248,6 +2248,7 @@ virNetlinkEventServiceStart;
virNetlinkEventServiceStop;
virNetlinkEventServiceStopAll;
virNetlinkGetErrorCode;
+virNetLinkSetBufferSize;
virNetlinkShutdown;
virNetlinkStartup;
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index d732fe8..0a549b7 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -49,6 +49,7 @@ VIR_LOG_INIT("util.netlink");
#define NETLINK_ACK_TIMEOUT_S (2*1000)
+
#if defined(__linux__) && defined(HAVE_LIBNL)
/* State for a single netlink event handle */
struct virNetlinkEventHandle {
@@ -104,6 +105,22 @@ static int nextWatch = 1;
static virNetlinkEventSrvPrivatePtr server[MAX_LINKS] = {NULL};
static virNetlinkHandle *placeholder_nlhandle;
+/*
+ * Set netlink default buffer size
+ */
+static unsigned int virNetLinkBufferSize = VIRT_NETLINK_SOCK_BUFFER_SIZE;
+
+/**
+ * virNetLinkSetBufferSize:
+ * @size: the buffer size
+ *
+ * Set netlink socket buffer size
+ */
+void
+virNetLinkSetBufferSize(unsigned int size)
+{
+ virNetLinkBufferSize = size;
+}
/* Function definitions */
/**
@@ -189,7 +206,7 @@ virNetlinkCreateSocket(int protocol)
goto error;
}
- if (virNetlinkSetBufferSize(nlhandle, 131702, 0) < 0) {
+ if (virNetlinkSetBufferSize(nlhandle, virNetLinkBufferSize, 0) < 0) {
virReportSystemError(errno, "%s",
_("cannot set netlink socket buffer "
"size to 128k"));
diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
index 088b013..2d6e762 100644
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -22,7 +22,6 @@
# include "internal.h"
# include "virmacaddr.h"
-
# if defined(__linux__) && defined(HAVE_LIBNL)
/* Work around a bug where older libnl-1 headers expected older gcc
@@ -44,6 +43,8 @@ struct nlmsghdr;
# endif /* __linux__ */
+#define VIRT_NETLINK_SOCK_BUFFER_SIZE (131072)
+
int virNetlinkStartup(void);
void virNetlinkShutdown(void);
@@ -120,5 +121,9 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB,
*/
int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr,
unsigned int protocol);
+/**
+ *virNetLinkSetBufferSize: set netlink socket buffer size
+ */
+void virNetLinkSetBufferSize(unsigned int size);
#endif /* __VIR_NETLINK_H__ */
--
1.8.3.1
4:04 p.m.
On 07/11/2017 09:01 PM, ZhiPeng Lu wrote:
This patchs allow to set the buffer size for netlink socket in
the libvirtd configuration file. The default buffer size remain
as before at 128k.
See my more detailed response to your earlier patch here:
https://www.redhat.com/archives/libvir-list/2017-July/msg00566.html
There should be no need to configure the initial libnl buffer size,
because we enable MSG_PEEK on the libnl sockets (and recent versions of
libnl have it turned on by default anyway). If that's not permitting the
buffer to auto-grow as necessary, then there is a different bug somewhere.
Signed-off-by: Zhipeng Lu <lu.zhipeng(a)zte.com.cn>
---
daemon/libvirtd-config.c | 6 ++++++
daemon/libvirtd-config.h | 2 ++
daemon/libvirtd.aug | 1 +
daemon/libvirtd.c | 12 ++++++++++++
daemon/libvirtd.conf | 3 +++
daemon/test_libvirtd.aug.in | 1 +
src/libvirt_private.syms | 1 +
src/util/virnetlink.c | 19 ++++++++++++++++++-
src/util/virnetlink.h | 7 ++++++-
9 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index 6c0f00e..b2bda28 100644
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -33,6 +33,7 @@
#include "remote/remote_protocol.h"
#include "remote/remote_driver.h"
#include "util/virnetdevopenvswitch.h"
+#include "util/virnetlink.h"
#include "virstring.h"
#include "virutil.h"
@@ -172,6 +173,8 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
data->admin_keepalive_count = 5;
data->ovs_timeout = VIR_NETDEV_OVS_DEFAULT_TIMEOUT;
+
+ data->netlink_sock_buffer_size = VIRT_NETLINK_SOCK_BUFFER_SIZE;
localhost = virGetHostname();
if (localhost == NULL) {
@@ -394,6 +397,9 @@ daemonConfigLoadOptions(struct daemonConfig *data,
if (virConfGetValueUInt(conf, "ovs_timeout", &data->ovs_timeout)
< 0)
goto error;
+ if (virConfGetValueUInt(conf, "netlink_sock_buffer_size",
&data->netlink_sock_buffer_size) < 0)
+ goto error;
+
return 0;
error:
diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h
index 1edf5fa..22befd1 100644
--- a/daemon/libvirtd-config.h
+++ b/daemon/libvirtd-config.h
@@ -94,6 +94,8 @@ struct daemonConfig {
unsigned int admin_keepalive_count;
unsigned int ovs_timeout;
+
+ unsigned int netlink_sock_buffer_size;
};
diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug
index 24fdf44..84ea00a 100644
--- a/daemon/libvirtd.aug
+++ b/daemon/libvirtd.aug
@@ -89,6 +89,7 @@ module Libvirtd =
let misc_entry = str_entry "host_uuid"
| str_entry "host_uuid_source"
| int_entry "ovs_timeout"
+ | int_entry "netlink_sock_buffer_size"
(* Each enty in the config is one of the following three ... *)
let entry = network_entry
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index a558458..34db23a 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -648,6 +648,16 @@ daemonSetupNetDevOpenvswitch(struct daemonConfig *config)
/*
+ * Set up the netlink socket buffer size
+ */
+static void
+daemonSetupNetLink(struct daemonConfig *config)
+{
+ virNetLinkSetBufferSize(config->netlink_sock_buffer_size);
+}
+
+
+/*
* Set up the logging environment
* By default if daemonized all errors go to the logfile libvirtd.log,
* but if verbose or error debugging is asked for then also output
@@ -1257,6 +1267,8 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE);
}
+ daemonSetupNetLink(config);
+
daemonSetupNetDevOpenvswitch(config);
if (daemonSetupAccessManager(config) < 0) {
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
index e83e9a1..b174767 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -476,3 +476,6 @@
# potential infinite waits blocking libvirt.
#
#ovs_timeout = 5
+
+# This allow to specify buffer size for netlink socket.
+#netlink_sock_buffer_size = 131072
diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in
index 1200952..0a1207f 100644
--- a/daemon/test_libvirtd.aug.in
+++ b/daemon/test_libvirtd.aug.in
@@ -64,3 +64,4 @@ module Test_libvirtd =
{ "admin_keepalive_interval" = "5" }
{ "admin_keepalive_count" = "5" }
{ "ovs_timeout" = "5" }
+ { "netlink_sock_buffer_size" = "131072" }
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 888412a..83be39d 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2248,6 +2248,7 @@ virNetlinkEventServiceStart;
virNetlinkEventServiceStop;
virNetlinkEventServiceStopAll;
virNetlinkGetErrorCode;
+virNetLinkSetBufferSize;
virNetlinkShutdown;
virNetlinkStartup;
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index d732fe8..0a549b7 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -49,6 +49,7 @@ VIR_LOG_INIT("util.netlink");
#define NETLINK_ACK_TIMEOUT_S (2*1000)
+
#if defined(__linux__) && defined(HAVE_LIBNL)
/* State for a single netlink event handle */
struct virNetlinkEventHandle {
@@ -104,6 +105,22 @@ static int nextWatch = 1;
static virNetlinkEventSrvPrivatePtr server[MAX_LINKS] = {NULL};
static virNetlinkHandle *placeholder_nlhandle;
+/*
+ * Set netlink default buffer size
+ */
+static unsigned int virNetLinkBufferSize = VIRT_NETLINK_SOCK_BUFFER_SIZE;
+
+/**
+ * virNetLinkSetBufferSize:
+ * @size: the buffer size
+ *
+ * Set netlink socket buffer size
+ */
+void
+virNetLinkSetBufferSize(unsigned int size)
+{
+ virNetLinkBufferSize = size;
+}
/* Function definitions */
/**
@@ -189,7 +206,7 @@ virNetlinkCreateSocket(int protocol)
goto error;
}
- if (virNetlinkSetBufferSize(nlhandle, 131702, 0) < 0) {
+ if (virNetlinkSetBufferSize(nlhandle, virNetLinkBufferSize, 0) < 0) {
virReportSystemError(errno, "%s",
_("cannot set netlink socket buffer "
"size to 128k"));
diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
index 088b013..2d6e762 100644
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -22,7 +22,6 @@
# include "internal.h"
# include "virmacaddr.h"
-
# if defined(__linux__) && defined(HAVE_LIBNL)
/* Work around a bug where older libnl-1 headers expected older gcc
@@ -44,6 +43,8 @@ struct nlmsghdr;
# endif /* __linux__ */
+#define VIRT_NETLINK_SOCK_BUFFER_SIZE (131072)
+
int virNetlinkStartup(void);
void virNetlinkShutdown(void);
@@ -120,5 +121,9 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB,
*/
int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr,
unsigned int protocol);
+/**
+ *virNetLinkSetBufferSize: set netlink socket buffer size
+ */
+void virNetLinkSetBufferSize(unsigned int size);
#endif /* __VIR_NETLINK_H__ */
7 a.m.
On 07/16/2017 05:04 PM, Laine Stump wrote:
On 07/11/2017 09:01 PM, ZhiPeng Lu wrote:
> This patchs allow to set the buffer size for netlink socket in
> the libvirtd configuration file. The default buffer size remain
> as before at 128k.
See my more detailed response to your earlier patch here:
https://www.redhat.com/archives/libvir-list/2017-July/msg00566.html
There should be no need to configure the initial libnl buffer size,
because we enable MSG_PEEK on the libnl sockets (and recent versions of
libnl have it turned on by default anyway). If that's not permitting the
buffer to auto-grow as necessary, then there is a different bug somewhere.
If an old version of libnl is the problem, then perhaps a patch which
just adds a comment in virNetlinkCreateSocket to "summarize" what gets
discovered w/r/t MSG_PEEK and the "correct" minimum version of libnl so
that the "next" person to come this way will have a chance at
understanding what needs to be done without going through the submit a
patch changing the size again!
All that said, having it be configurable could be useful for someone who
has a system that doesn't have that version, while still working as
expected for the right version.
John
>
> Signed-off-by: Zhipeng Lu <lu.zhipeng(a)zte.com.cn>
> ---
> daemon/libvirtd-config.c | 6 ++++++
> daemon/libvirtd-config.h | 2 ++
> daemon/libvirtd.aug | 1 +
> daemon/libvirtd.c | 12 ++++++++++++
> daemon/libvirtd.conf | 3 +++
> daemon/test_libvirtd.aug.in | 1 +
> src/libvirt_private.syms | 1 +
> src/util/virnetlink.c | 19 ++++++++++++++++++-
> src/util/virnetlink.h | 7 ++++++-
> 9 files changed, 50 insertions(+), 2 deletions(-)
>
> diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
> index 6c0f00e..b2bda28 100644
> --- a/daemon/libvirtd-config.c
> +++ b/daemon/libvirtd-config.c
> @@ -33,6 +33,7 @@
> #include "remote/remote_protocol.h"
> #include "remote/remote_driver.h"
> #include "util/virnetdevopenvswitch.h"
> +#include "util/virnetlink.h"
> #include "virstring.h"
> #include "virutil.h"
>
> @@ -172,6 +173,8 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
> data->admin_keepalive_count = 5;
>
> data->ovs_timeout = VIR_NETDEV_OVS_DEFAULT_TIMEOUT;
> +
> + data->netlink_sock_buffer_size = VIRT_NETLINK_SOCK_BUFFER_SIZE;
>
> localhost = virGetHostname();
> if (localhost == NULL) {
> @@ -394,6 +397,9 @@ daemonConfigLoadOptions(struct daemonConfig *data,
> if (virConfGetValueUInt(conf, "ovs_timeout",
&data->ovs_timeout) < 0)
> goto error;
>
> + if (virConfGetValueUInt(conf, "netlink_sock_buffer_size",
&data->netlink_sock_buffer_size) < 0)
> + goto error;
> +
> return 0;
>
> error:
> diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h
> index 1edf5fa..22befd1 100644
> --- a/daemon/libvirtd-config.h
> +++ b/daemon/libvirtd-config.h
> @@ -94,6 +94,8 @@ struct daemonConfig {
> unsigned int admin_keepalive_count;
>
> unsigned int ovs_timeout;
> +
> + unsigned int netlink_sock_buffer_size;
> };
>
>
> diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug
> index 24fdf44..84ea00a 100644
> --- a/daemon/libvirtd.aug
> +++ b/daemon/libvirtd.aug
> @@ -89,6 +89,7 @@ module Libvirtd =
> let misc_entry = str_entry "host_uuid"
> | str_entry "host_uuid_source"
> | int_entry "ovs_timeout"
> + | int_entry "netlink_sock_buffer_size"
>
> (* Each enty in the config is one of the following three ... *)
> let entry = network_entry
> diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
> index a558458..34db23a 100644
> --- a/daemon/libvirtd.c
> +++ b/daemon/libvirtd.c
> @@ -648,6 +648,16 @@ daemonSetupNetDevOpenvswitch(struct daemonConfig *config)
>
>
> /*
> + * Set up the netlink socket buffer size
> + */
> +static void
> +daemonSetupNetLink(struct daemonConfig *config)
> +{
> + virNetLinkSetBufferSize(config->netlink_sock_buffer_size);
> +}
> +
> +
> +/*
> * Set up the logging environment
> * By default if daemonized all errors go to the logfile libvirtd.log,
> * but if verbose or error debugging is asked for then also output
> @@ -1257,6 +1267,8 @@ int main(int argc, char **argv) {
> exit(EXIT_FAILURE);
> }
>
> + daemonSetupNetLink(config);
> +
> daemonSetupNetDevOpenvswitch(config);
>
> if (daemonSetupAccessManager(config) < 0) {
> diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
> index e83e9a1..b174767 100644
> --- a/daemon/libvirtd.conf
> +++ b/daemon/libvirtd.conf
> @@ -476,3 +476,6 @@
> # potential infinite waits blocking libvirt.
> #
> #ovs_timeout = 5
> +
> +# This allow to specify buffer size for netlink socket.
> +#netlink_sock_buffer_size = 131072
> diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in
> index 1200952..0a1207f 100644
> --- a/daemon/test_libvirtd.aug.in
> +++ b/daemon/test_libvirtd.aug.in
> @@ -64,3 +64,4 @@ module Test_libvirtd =
> { "admin_keepalive_interval" = "5" }
> { "admin_keepalive_count" = "5" }
> { "ovs_timeout" = "5" }
> + { "netlink_sock_buffer_size" = "131072" }
> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
> index 888412a..83be39d 100644
> --- a/src/libvirt_private.syms
> +++ b/src/libvirt_private.syms
> @@ -2248,6 +2248,7 @@ virNetlinkEventServiceStart;
> virNetlinkEventServiceStop;
> virNetlinkEventServiceStopAll;
> virNetlinkGetErrorCode;
> +virNetLinkSetBufferSize;
> virNetlinkShutdown;
> virNetlinkStartup;
>
> diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
> index d732fe8..0a549b7 100644
> --- a/src/util/virnetlink.c
> +++ b/src/util/virnetlink.c
> @@ -49,6 +49,7 @@ VIR_LOG_INIT("util.netlink");
>
> #define NETLINK_ACK_TIMEOUT_S (2*1000)
>
> +
> #if defined(__linux__) && defined(HAVE_LIBNL)
> /* State for a single netlink event handle */
> struct virNetlinkEventHandle {
> @@ -104,6 +105,22 @@ static int nextWatch = 1;
> static virNetlinkEventSrvPrivatePtr server[MAX_LINKS] = {NULL};
> static virNetlinkHandle *placeholder_nlhandle;
>
> +/*
> + * Set netlink default buffer size
> + */
> +static unsigned int virNetLinkBufferSize = VIRT_NETLINK_SOCK_BUFFER_SIZE;
> +
> +/**
> + * virNetLinkSetBufferSize:
> + * @size: the buffer size
> + *
> + * Set netlink socket buffer size
> + */
> +void
> +virNetLinkSetBufferSize(unsigned int size)
> +{
> + virNetLinkBufferSize = size;
> +}
> /* Function definitions */
>
> /**
> @@ -189,7 +206,7 @@ virNetlinkCreateSocket(int protocol)
> goto error;
> }
>
> - if (virNetlinkSetBufferSize(nlhandle, 131702, 0) < 0) {
> + if (virNetlinkSetBufferSize(nlhandle, virNetLinkBufferSize, 0) < 0) {
> virReportSystemError(errno, "%s",
> _("cannot set netlink socket buffer "
> "size to 128k"));
> diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
> index 088b013..2d6e762 100644
> --- a/src/util/virnetlink.h
> +++ b/src/util/virnetlink.h
> @@ -22,7 +22,6 @@
>
> # include "internal.h"
> # include "virmacaddr.h"
> -
> # if defined(__linux__) && defined(HAVE_LIBNL)
>
> /* Work around a bug where older libnl-1 headers expected older gcc
> @@ -44,6 +43,8 @@ struct nlmsghdr;
>
> # endif /* __linux__ */
>
> +#define VIRT_NETLINK_SOCK_BUFFER_SIZE (131072)
> +
> int virNetlinkStartup(void);
> void virNetlinkShutdown(void);
>
> @@ -120,5 +121,9 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback
handleCB,
> */
> int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr,
> unsigned int protocol);
> +/**
> + *virNetLinkSetBufferSize: set netlink socket buffer size
> + */
> +void virNetLinkSetBufferSize(unsigned int size);
>
> #endif /* __VIR_NETLINK_H__ */
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
9:01 p.m.
On 07/17/2017 08:00 AM, John Ferlan wrote:
On 07/16/2017 05:04 PM, Laine Stump wrote:
> On 07/11/2017 09:01 PM, ZhiPeng Lu wrote:
>> This patchs allow to set the buffer size for netlink socket in
>> the libvirtd configuration file. The default buffer size remain
>> as before at 128k.
> See my more detailed response to your earlier patch here:
>
>
> https://www.redhat.com/archives/libvir-list/2017-July/msg00566.html
>
> There should be no need to configure the initial libnl buffer size,
> because we enable MSG_PEEK on the libnl sockets (and recent versions of
> libnl have it turned on by default anyway). If that's not permitting the
> buffer to auto-grow as necessary, then there is a different bug somewhere.
>
If an old version of libnl is the problem, then perhaps a patch which
just adds a comment in virNetlinkCreateSocket to "summarize" what gets
discovered w/r/t MSG_PEEK and the "correct" minimum version of libnl so
that the "next" person to come this way will have a chance at
understanding what needs to be done without going through the submit a
patch changing the size again!
All that said, having it be configurable could be useful for someone who
has a system that doesn't have that version, while still working as
expected for the right version.
I think it may need to be a fairly unusual combination of kernel,
libvirt, and libnl versions, combined with pretty "big" hardware in
order for that to happen. More information from ZhiPeng about the
versions of those packages might allow us to make a better informed
decision.
Workarounds are okay when necessary. But adding a config parameter is
something that would need to be left in forever, leaving more code to
maintain, and all for a bug that shouldn't even be there today, much
less 6 months or a year from now - turning on message peek was supposed
to "eliminate this problem totally and permanently". If it didn't, I'd
like to know why.
ZhipPeng - can you tell us more about your setup? package versions,
hardware, example XML, gdb backtrace at the instant the error message is
logged?
11:08 a.m.
New subject: [libvirt] 答复: Re: [PATCH v2] network: allow to specify buffer size fornetlink socket
Pk9uIDA3LzE3LzIwMTcgMDg6MDAgQU0sIEpvaG4gRmVybGFuIHdyb3RlOj4+PiBPbiAwNy8xNi8y
MDE3IDA1OjA0IFBNLCBMYWluZSBTdHVtcCB3cm90ZTo+PiBPbiAwNy8xMS8yMDE3IDA5OjAxIFBN
LCBaaGlQZW5nIEx1IHdyb3RlOj4+PiBUaGlzIHBhdGNocyBhbGxvdyB0byBzZXQgdGhlIGJ1ZmZl
ciBzaXplIGZvciBuZXRsaW5rIHNvY2tldCBpbj4+PiB0aGUgbGlidmlydGQgY29uZmlndXJhdGlv
biBmaWxlLiBUaGUgZGVmYXVsdCBidWZmZXIgc2l6ZSByZW1haW4+Pj4gYXMgYmVmb3JlIGF0IDEy
OGsuPj4gU2VlIG15IG1vcmUgZGV0YWlsZWQgcmVzcG9uc2UgdG8geW91ciBlYXJsaWVyIHBhdGNo
IGhlcmU6Pj4+Pj4+ICAgaHR0cHM6Ly93d3cucmVkaGF0LmNvbS9hcmNoaXZlcy9saWJ2aXItbGlz
dC8yMDE3LUp1bHkvbXNnMDA1NjYuaHRtbD4+Pj4gVGhlcmUgc2hvdWxkIGJlIG5vIG5lZWQgdG8g
Y29uZmlndXJlIHRoZSBpbml0aWFsIGxpYm5sIGJ1ZmZlciBzaXplLD4+IGJlY2F1c2Ugd2UgZW5h
YmxlIE1TR19QRUVLIG9uIHRoZSBsaWJubCBzb2NrZXRzIChhbmQgcmVjZW50IHZlcnNpb25zIG9m
Pj4gbGlibmwgaGF2ZSBpdCB0dXJuZWQgb24gYnkgZGVmYXVsdCBhbnl3YXkpLiBJZiB0aGF0J3Mg
bm90IHBlcm1pdHRpbmcgdGhlPj4gYnVmZmVyIHRvIGF1dG8tZ3JvdyBhcyBuZWNlc3NhcnksIHRo
ZW4gdGhlcmUgaXMgYSBkaWZmZXJlbnQgYnVnIHNvbWV3aGVyZS4+Pj4+IElmIGFuIG9sZCB2ZXJz
aW9uIG9mIGxpYm5sIGlzIHRoZSBwcm9ibGVtLCB0aGVuIHBlcmhhcHMgYSBwYXRjaCB3aGljaD4+
IGp1c3QgYWRkcyBhIGNvbW1lbnQgaW4gdmlyTmV0bGlua0NyZWF0ZVNvY2tldCB0byAic3VtbWFy
aXplIiB3aGF0IGdldHM+PiBkaXNjb3ZlcmVkIHcvci90IE1TR19QRUVLIGFuZCB0aGUgImNvcnJl
Y3QiIG1pbmltdW0gdmVyc2lvbiBvZiBsaWJubCBzbz4gdGhhdCB0aGUgIm5leHQiIHBlcnNvbiB0
byBjb21lIHRoaXMgd2F5IHdpbGwgaGF2ZSBhIGNoYW5jZSBhdD4+IHVuZGVyc3RhbmRpbmcgd2hh
dCBuZWVkcyB0byBiZSBkb25lIHdpdGhvdXQgZ29pbmcgdGhyb3VnaCB0aGUgc3VibWl0IGE+PiBw
YXRjaCBjaGFuZ2luZyB0aGUgc2l6ZSBhZ2FpbiE+Pj4gPkFsbCB0aGF0IHNhaWQsIGhhdmluZyBp
dCBiZSBjb25maWd1cmFibGUgY291bGQgYmUgdXNlZnVsIGZvciBzb21lb25lIHdobz4gPmhhcyBh
IHN5c3RlbSB0aGF0IGRvZXNuJ3QgaGF2ZSB0aGF0IHZlcnNpb24sIHdoaWxlIHN0aWxsIHdvcmtp
bmcgYXMNCg0KPiA+ZXhwZWN0ZWQgZm9yIHRoZSByaWdodCB2ZXJzaW9uLj5JIHRoaW5rIGl0IG1h
eSBuZWVkIHRvIGJlIGEgZmFpcmx5IHVudXN1YWwgY29tYmluYXRpb24gb2Yga2VybmVsLD5saWJ2
aXJ0LCBhbmQgbGlibmwgdmVyc2lvbnMsIGNvbWJpbmVkIHdpdGggcHJldHR5ICJiaWciIGhhcmR3
YXJlIGluPm9yZGVyIGZvciB0aGF0IHRvIGhhcHBlbi4gTW9yZSBpbmZvcm1hdGlvbiBmcm9tIFpo
aVBlbmcgYWJvdXQgdGhlPnZlcnNpb25zIG9mIHRob3NlIHBhY2thZ2VzIG1pZ2h0IGFsbG93IHVz
IHRvIG1ha2UgYSBiZXR0ZXIgaW5mb3JtZWQ+ZGVjaXNpb24uPldvcmthcm91bmRzIGFyZSBva2F5
IHdoZW4gbmVjZXNzYXJ5LiBCdXQgYWRkaW5nIGEgY29uZmlnIHBhcmFtZXRlciBpcz5zb21ldGhp
bmcgdGhhdCB3b3VsZCBuZWVkIHRvIGJlIGxlZnQgaW4gZm9yZXZlciwgbGVhdmluZyBtb3JlIGNv
ZGUgdG8+bWFpbnRhaW4sIGFuZCBhbGwgZm9yIGEgYnVnIHRoYXQgc2hvdWxkbid0IGV2ZW4gYmUg
dGhlcmUgdG9kYXksIG11Y2g+bGVzcyA2IG1vbnRocyBvciBhIHllYXIgZnJvbSBub3cgLSB0dXJu
aW5nIG9uIG1lc3NhZ2UgcGVlayB3YXMgc3VwcG9zZWQ+dG8gImVsaW1pbmF0ZSB0aGlzIHByb2Js
ZW0gdG90YWxseSBhbmQgcGVybWFuZW50bHkiLiBJZiBpdCBkaWRuJ3QsIEknZD5saWtlIHRvIGtu
b3cgd2h5Lj5aaGlwUGVuZyAtIGNhbiB5b3UgdGVsbCB1cyBtb3JlIGFib3V0IHlvdXIgc2V0dXA/
IHBhY2thZ2UgdmVyc2lvbnMsPmhhcmR3YXJlLCBleGFtcGxlIFhNTCwgZ2RiIGJhY2t0cmFjZSBh
dCB0aGUgaW5zdGFudCB0aGUgZXJyb3IgbWVzc2FnZSBpcz5sb2dnZWQ/DQoNCg0KDQoNCi0tLS0t
IFRoYW5rcy4NCg0KaSAgd2lsbCB0cnkgdG8gdXBkYXRlIGxpYm5sMyB0byAzLjIuMjkgICxub3cg
IGxpYm5sMyBpcyAzLjIuOCBpbiBteSBob3N0DQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0K
DQoNCg0KDQoNCuiKpuW/l+aciyBsdXpoaXBlbmcNCg0KDQoNCg0KDQoNCklU5byA5Y+R5bel56iL
5biIIElUIERldmVsb3BtZW50CkVuZ2luZWVyDQrmk43kvZzns7vnu5/kuqflk4Hpg6gv5Lit5b+D
56CU56m26ZmiL+ezu+e7n+S6p+WTgSBPUyBQcm9kdWN0IERlcHQuL0NlbnRyYWwgUu+8hkQgSW5z
dGl0dXRlL1N5c3RlbSBQcm9kdWN0DQoNCg0KDQoNCg0KDQoNCg0KDQrmt7HlnLPluILljZflsbHl
jLrnp5HmioDljZfot681NeWPt+S4reWFtOmAmuiur+eglOWPkeWkp+alvDMz5qW8IA0KMzMvRiwg
UiZEIEJ1aWxkaW5nLCBaVEUKQ29ycG9yYXRpb24gSGktdGVjaCBSb2FkIFNvdXRoLCANCkhpLXRl
Y2gKSW5kdXN0cmlhbCBQYXJrIE5hbnNoYW4gRGlzdHJpY3QsIFNoZW56aGVuLCBQLlIuQ2hpbmEs
IDUxODA1NyANClQ6ICs4NiA3NTUgeHh4eHh4eHggRjorODYgNzU1IHh4eHh4eHh4IA0KTTogKzg2
IHh4eHh4eHh4eHh4IA0KRTogbHUuemhpcGVuZ0B6dGUuY29tLmNuIA0Kd3d3Lnp0ZS5jb20uY24N
Cg0KDQoNCg0KDQoNCuWOn+Wni+mCruS7tg0KDQoNCg0K5Y+R5Lu25Lq677yaIDxsYWluZUBsYWlu
ZS5vcmc+DQrmlLbku7bkurrvvJogPGxpYnZpci1saXN0QHJlZGhhdC5jb20+DQrmioTpgIHkurrv
vJogPGpmZXJsYW5AcmVkaGF0LmNvbT7oiqblv5fmnIsxMDEwODI3Mg0K5pelIOacnyDvvJoyMDE3
5bm0MDfmnIgyMeaXpSAxMDowMQ0K5Li7IOmimCDvvJpSZTogW2xpYnZpcnRdIFtQQVRDSCB2Ml0g
bmV0d29yazogYWxsb3cgdG8gc3BlY2lmeSBidWZmZXIgc2l6ZSBmb3JuZXRsaW5rIHNvY2tldA0K
DQoNCg0KDQoNCk9uIDA3LzE3LzIwMTcgMDg6MDAgQU0sIEpvaG4gRmVybGFuIHdyb3RlOg0KPg0K
PiBPbiAwNy8xNi8yMDE3IDA1OjA0IFBNLCBMYWluZSBTdHVtcCB3cm90ZToNCj4+IE9uIDA3LzEx
LzIwMTcgMDk6MDEgUE0sIFpoaVBlbmcgTHUgd3JvdGU6DQo+Pj4gVGhpcyBwYXRjaHMgYWxsb3cg
dG8gc2V0IHRoZSBidWZmZXIgc2l6ZSBmb3IgbmV0bGluayBzb2NrZXQgaW4NCj4+PiB0aGUgbGli
dmlydGQgY29uZmlndXJhdGlvbiBmaWxlLiBUaGUgZGVmYXVsdCBidWZmZXIgc2l6ZSByZW1haW4N
Cj4+PiBhcyBiZWZvcmUgYXQgMTI4ay4NCj4+IFNlZSBteSBtb3JlIGRldGFpbGVkIHJlc3BvbnNl
IHRvIHlvdXIgZWFybGllciBwYXRjaCBoZXJlOg0KPj4NCj4+DQo+PiAgIGh0dHBzOi8vd3d3LnJl
ZGhhdC5jb20vYXJjaGl2ZXMvbGlidmlyLWxpc3QvMjAxNy1KdWx5L21zZzAwNTY2Lmh0bWwNCj4+
DQo+PiBUaGVyZSBzaG91bGQgYmUgbm8gbmVlZCB0byBjb25maWd1cmUgdGhlIGluaXRpYWwgbGli
bmwgYnVmZmVyIHNpemUsDQo+PiBiZWNhdXNlIHdlIGVuYWJsZSBNU0dfUEVFSyBvbiB0aGUgbGli
bmwgc29ja2V0cyAoYW5kIHJlY2VudCB2ZXJzaW9ucyBvZg0KPj4gbGlibmwgaGF2ZSBpdCB0dXJu
ZWQgb24gYnkgZGVmYXVsdCBhbnl3YXkpLiBJZiB0aGF0J3Mgbm90IHBlcm1pdHRpbmcgdGhlDQo+
PiBidWZmZXIgdG8gYXV0by1ncm93IGFzIG5lY2Vzc2FyeSwgdGhlbiB0aGVyZSBpcyBhIGRpZmZl
cmVudCBidWcgc29tZXdoZXJlLg0KPj4NCj4gSWYgYW4gb2xkIHZlcnNpb24gb2YgbGlibmwgaXMg
dGhlIHByb2JsZW0sIHRoZW4gcGVyaGFwcyBhIHBhdGNoIHdoaWNoDQo+IGp1c3QgYWRkcyBhIGNv
bW1lbnQgaW4gdmlyTmV0bGlua0NyZWF0ZVNvY2tldCB0byAic3VtbWFyaXplIiB3aGF0IGdldHMN
Cj4gZGlzY292ZXJlZCB3L3IvdCBNU0dfUEVFSyBhbmQgdGhlICJjb3JyZWN0IiBtaW5pbXVtIHZl
cnNpb24gb2YgbGlibmwgc28NCj4gdGhhdCB0aGUgIm5leHQiIHBlcnNvbiB0byBjb21lIHRoaXMg
d2F5IHdpbGwgaGF2ZSBhIGNoYW5jZSBhdA0KPiB1bmRlcnN0YW5kaW5nIHdoYXQgbmVlZHMgdG8g
YmUgZG9uZSB3aXRob3V0IGdvaW5nIHRocm91Z2ggdGhlIHN1Ym1pdCBhDQo+IHBhdGNoIGNoYW5n
aW5nIHRoZSBzaXplIGFnYWluIQ0KPg0KPiBBbGwgdGhhdCBzYWlkLCBoYXZpbmcgaXQgYmUgY29u
ZmlndXJhYmxlIGNvdWxkIGJlIHVzZWZ1bCBmb3Igc29tZW9uZSB3aG8NCj4gaGFzIGEgc3lzdGVt
IHRoYXQgZG9lc24ndCBoYXZlIHRoYXQgdmVyc2lvbiwgd2hpbGUgc3RpbGwgd29ya2luZyBhcw0K
PiBleHBlY3RlZCBmb3IgdGhlIHJpZ2h0IHZlcnNpb24uDQoNCg0KSSB0aGluayBpdCBtYXkgbmVl
ZCB0byBiZSBhIGZhaXJseSB1bnVzdWFsIGNvbWJpbmF0aW9uIG9mIGtlcm5lbCwNCmxpYnZpcnQs
IGFuZCBsaWJubCB2ZXJzaW9ucywgY29tYmluZWQgd2l0aCBwcmV0dHkgImJpZyIgaGFyZHdhcmUg
aW4NCm9yZGVyIGZvciB0aGF0IHRvIGhhcHBlbi4gTW9yZSBpbmZvcm1hdGlvbiBmcm9tIFpoaVBl
bmcgYWJvdXQgdGhlDQp2ZXJzaW9ucyBvZiB0aG9zZSBwYWNrYWdlcyBtaWdodCBhbGxvdyB1cyB0
byBtYWtlIGEgYmV0dGVyIGluZm9ybWVkDQpkZWNpc2lvbi4NCg0KV29ya2Fyb3VuZHMgYXJlIG9r
YXkgd2hlbiBuZWNlc3NhcnkuIEJ1dCBhZGRpbmcgYSBjb25maWcgcGFyYW1ldGVyIGlzDQpzb21l
dGhpbmcgdGhhdCB3b3VsZCBuZWVkIHRvIGJlIGxlZnQgaW4gZm9yZXZlciwgbGVhdmluZyBtb3Jl
IGNvZGUgdG8NCm1haW50YWluLCBhbmQgYWxsIGZvciBhIGJ1ZyB0aGF0IHNob3VsZG4ndCBldmVu
IGJlIHRoZXJlIHRvZGF5LCBtdWNoDQpsZXNzIDYgbW9udGhzIG9yIGEgeWVhciBmcm9tIG5vdyAt
IHR1cm5pbmcgb24gbWVzc2FnZSBwZWVrIHdhcyBzdXBwb3NlZA0KdG8gImVsaW1pbmF0ZSB0aGlz
IHByb2JsZW0gdG90YWxseSBhbmQgcGVybWFuZW50bHkiLiBJZiBpdCBkaWRuJ3QsIEknZA0KbGlr
ZSB0byBrbm93IHdoeS4NCg0KWmhpcFBlbmcgLSBjYW4geW91IHRlbGwgdXMgbW9yZSBhYm91dCB5
b3VyIHNldHVwPyBwYWNrYWdlIHZlcnNpb25zLA0KaGFyZHdhcmUsIGV4YW1wbGUgWE1MLCBnZGIg
YmFja3RyYWNlIGF0IHRoZSBpbnN0YW50IHRoZSBlcnJvciBtZXNzYWdlIGlzDQpsb2dnZWQ/
12:39 p.m.
New subject: [libvirt] 答复: Re: [PATCH v2] network: allow to specify buffer size fornetlink socket
On 07/20/2017 11:08 PM, lu.zhipeng(a)zte.com.cn wrote:
i will try to update libnl3 to 3.2.29 ,now libnl3 is 3.2.8 in my
host
Do you really mean 3.2.8 and not 3.2.28? 3.2.8 was released in April
2012, so a lot has changed since then; 3.2.28 was released in July 2016,
so much more recent.
2681
days inactive
2690
days old
5 comments
4 participants
participants (4)
-
John Ferlan -
Laine Stump -
lu.zhipeng＠zte.com.cn -
ZhiPeng Lu