From patchwork Mon Mar 3 14:33:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juraj Marcin X-Patchwork-Id: 13998928 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E78C5C282CD for ; Mon, 3 Mar 2025 14:35:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tp6sa-0007he-Me; Mon, 03 Mar 2025 09:34:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tp6rl-00071k-Jf for qemu-devel@nongnu.org; Mon, 03 Mar 2025 09:34:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tp6rh-0003Iv-IT for qemu-devel@nongnu.org; Mon, 03 Mar 2025 09:33:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741012432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lXMzolwNc1Q4Al27OWqc7aD1YS+U1HS0kfuILgDIM3w=; b=YsscSgqWbz9Z0YOjxNgQl44wrcNYguM5QUrXt4le8hYr2HG5o12ceHX9cmNK3VqGR9sdPV mbSWt/biZ4JHL5ZT0OMmuihh0VQs6bFNN42uC74E0dwB/h60y6KUpEg978JdFr9udY9cEW xomG3tN/y+KuPrqlGXMIlZfBCq9CksU= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-uiVaxy7_NHClNJDEM1P1Ww-1; Mon, 03 Mar 2025 09:33:47 -0500 X-MC-Unique: uiVaxy7_NHClNJDEM1P1Ww-1 X-Mimecast-MFC-AGG-ID: uiVaxy7_NHClNJDEM1P1Ww_1741012426 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3F9641944D01; Mon, 3 Mar 2025 14:33:46 +0000 (UTC) Received: from rh-jmarcin.redhat.com (unknown [10.44.34.124]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E26611956094; Mon, 3 Mar 2025 14:33:43 +0000 (UTC) From: Juraj Marcin To: qemu-devel@nongnu.org Cc: Juraj Marcin , vsementsov@virtuozzo.com, =?utf-8?q?D?= =?utf-8?q?aniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 2/2] utils/qemu-sockets: Introduce keep-alive-idle-period inet socket option Date: Mon, 3 Mar 2025 15:33:06 +0100 Message-ID: <20250303143312.640909-3-jmarcin@redhat.com> In-Reply-To: <20250303143312.640909-1-jmarcin@redhat.com> References: <20250303143312.640909-1-jmarcin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass client-ip=170.10.133.124; envelope-from=jmarcin@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 --- io/dns-resolver.c | 4 ++++ meson.build | 2 ++ qapi/sockets.json | 5 +++++ util/qemu-sockets.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 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 0ee79c664d..ca726f317f 100644 --- a/meson.build +++ b/meson.build @@ -2724,6 +2724,8 @@ config_host_data.set('HAVE_OPTRESET', cc.has_header_symbol('getopt.h', 'optreset')) config_host_data.set('HAVE_IPPROTO_MPTCP', cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) +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 c30e4ac2ce..edcda846ef 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -349,6 +349,18 @@ listen_ok: slisten = -1; goto exit; } +#ifdef HAVE_TCP_KEEPIDLE + if (saddr->has_keep_alive_idle_period && saddr->keep_alive_idle_period) { + int keepidle = saddr->has_keep_alive_idle_period; + ret = setsockopt(slisten, IPPROTO_TCP, TCP_KEEPIDLE, &keepidle, sizeof(keepidle)); + if (ret < 0) { + error_setg_errno(errp, errno, "Unable to set TCP_KEEPIDLE"); + close(slisten); + slisten = -1; + goto exit; + } + } +#endif } exit: freeaddrinfo(res); @@ -492,6 +504,17 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp) close(sock); return -1; } +#ifdef HAVE_TCP_KEEPIDLE + if (saddr->has_keep_alive_idle_period && saddr->keep_alive_idle_period) { + int keepidle = saddr->keep_alive_idle_period; + ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &keepidle, sizeof(keepidle)); + if (ret < 0) { + error_setg_errno(errp, errno, "Unsable to set TCP_KEEPIDLE"); + close(sock); + return -1; + } + } +#endif } return sock; @@ -698,6 +721,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) {