From: Juraj Marcin <jmar...@redhat.com>
The default idle period for TCP connection could be even 2 hours.
However, in some cases, the application needs to be aware of a
connection issue much sooner.
This is the case, for example, for postcopy live migration. If there is
no traffic from the migration destination guest (server-side) to the
migration source guest (client-side), the destination keeps waiting for
pages indefinitely and does not switch to the postcopy-paused state.
This can happen, for example, if the destination QEMU instance is
started with '-S' command line option and the machine is not started yet
or if the machine is idle and produces no new page faults for
not-yet-migrated pages.
This patch introduces a new inet socket parameter on platforms where
TCP_KEEPIDLE is defined and passes the configured value to the
TCP_KEEPIDLE socket option when a client-side or server-side socket is
created.
The default value is 0, which means system configuration is used, and no
custom value is set.
Signed-off-by: Juraj Marcin <jmar...@redhat.com>
---
io/dns-resolver.c | 4 ++++
meson.build | 2 ++
qapi/sockets.json | 5 +++++
util/qemu-sockets.c | 29 +++++++++++++++++++++++++++++
4 files changed, 40 insertions(+)
diff --git a/io/dns-resolver.c b/io/dns-resolver.c
index ee7403b65b..03c59673f0 100644
--- a/io/dns-resolver.c
+++ b/io/dns-resolver.c
@@ -128,6 +128,10 @@ static int
qio_dns_resolver_lookup_sync_inet(QIODNSResolver *resolver,
#endif
.has_keep_alive = iaddr->has_keep_alive,
.keep_alive = iaddr->keep_alive,
+#ifdef HAVE_TCP_KEEPIDLE
+ .has_keep_alive_idle_period = iaddr->has_keep_alive_idle_period,
+ .keep_alive_idle_period = iaddr->keep_alive_idle_period,
+#endif
};
(*addrs)[i] = newaddr;
diff --git a/meson.build b/meson.build
index 41f68d3806..e3440b09c8 100644
--- a/meson.build
+++ b/meson.build
@@ -2734,6 +2734,8 @@ if linux_io_uring.found()
config_host_data.set('HAVE_IO_URING_PREP_WRITEV2',
cc.has_header_symbol('liburing.h',
'io_uring_prep_writev2'))
endif
+config_host_data.set('HAVE_TCP_KEEPIDLE',
+ cc.has_header_symbol('netinet/tcp.h', 'TCP_KEEPIDLE'))
# has_member
config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
diff --git a/qapi/sockets.json b/qapi/sockets.json
index eb50f64e3a..ddd82b1e66 100644
--- a/qapi/sockets.json
+++ b/qapi/sockets.json
@@ -59,6 +59,10 @@
# @keep-alive: enable keep-alive when connecting to/listening on this socket.
# (Since 4.2, not supported for listening sockets until 10.0)
#
+# @keep-alive-idle-period: time in seconds the connection needs to be idle
+# before sending a keepalive packet. Only supported for TCP sockets on
+# systems where TCP_KEEPIDLE socket option is defined. (Since 10.0)
+#
# @mptcp: enable multi-path TCP. (Since 6.1)
#
# Since: 1.3
@@ -71,6 +75,7 @@
'*ipv4': 'bool',
'*ipv6': 'bool',
'*keep-alive': 'bool',
+ '*keep-alive-idle-period': { 'type': 'uint32', 'if': 'HAVE_TCP_KEEPIDLE' },
'*mptcp': { 'type': 'bool', 'if': 'HAVE_IPPROTO_MPTCP' } } }
##
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 99357a4435..23c8a6cc2b 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -217,6 +217,19 @@ static int inet_set_sockopts(int sock, InetSocketAddress
*saddr, Error **errp)
"Unable to set keep-alive option on socket");
return -1;
}
+#ifdef HAVE_TCP_KEEPIDLE
+ if (saddr->has_keep_alive_idle_period &&
+ saddr->keep_alive_idle_period) {
+ int keep_idle = saddr->has_keep_alive_idle_period;
+ ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &keep_idle,
+ sizeof(keep_idle));
+ if (ret < 0) {
+ error_setg_errno(errp, errno,
+ "Unable to set TCP keep-alive idle option on
socket");
+ return -1;
+ }
+ }
+#endif
}
return 0;
}
@@ -697,6 +710,22 @@ int inet_parse(InetSocketAddress *addr, const char *str,
Error **errp)
}
addr->has_keep_alive = true;
}
+#ifdef HAVE_TCP_KEEPIDLE
+ begin = strstr(optstr, ",keep-alive-idle-period=");
+ if (begin) {
+ begin += strlen(",keep-alive-idle-period=");
+ if (sscanf(begin, "%" PRIu32 "%n", &addr->keep_alive_idle_period,
&pos) != 1 ||
+ (begin[pos] != '\0' && begin[pos] != ',')) {
+ error_setg(errp, "error parsing keep-alive-idle-period argument");
+ return -1;
+ }
+ if (addr->keep_alive_idle_period > INT_MAX) {
+ error_setg(errp, "keep-alive-idle-period value is too large");
+ return -1;
+ }
+ addr->has_keep_alive_idle_period = true;
+ }
+#endif
#ifdef HAVE_IPPROTO_MPTCP
begin = strstr(optstr, ",mptcp");
if (begin) {
--
2.48.1
