From nobody Tue Feb 10 01:35:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=bitdefender.com ARC-Seal: i=1; a=rsa-sha256; t=1586913102; cv=none; d=zohomail.com; s=zohoarc; b=U46Vsmu6bXFbYqVKzJXl/oyQJ7s5+FsyYg6eFkBlTFzfKwydpoqit7z+/60gLefDUSH1MFb1S8Yb3IUQ+d9UACw1McwvEPi6c30QadcO1zklfUBHGy1QPzI+bkpJHIxuuTZYOIgUUZhNf8oxscQI4a+Q2SieKNFxQgKxv91+z4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586913102; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nWtJPk3wowdZSO2BUNY83ee6fXVeuV9jcnadxHLi3Hw=; b=Oz79zgMC+/P/gwPu5nlR0Gzr/4Cg5EPz9Bo9lnLLOljPBCTknBI76X86btIGnO9RQ8buiuSWcQsCK5OOnAclO2Ej45DxqnNOynaBkOK0hwyB/OxqQL1rZW1esqcnTMGFR+zShEFr7tE2qulf6UorSCVjgnXpRuRe9olvKpAse98= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586913102845190.84574154619418; Tue, 14 Apr 2020 18:11:42 -0700 (PDT) Received: from localhost ([::1]:40984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOWab-0005c8-LC for importer@patchew.org; Tue, 14 Apr 2020 21:11:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58435) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOWP9-0001Hi-2a for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOWP7-0005Bd-MF for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:50 -0400 Received: from mx01.bbu.dsd.mx.bitdefender.com ([91.199.104.161]:49088) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOWP7-00050x-9E for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:49 -0400 Received: from smtp.bitdefender.com (smtp02.buh.bitdefender.net [10.17.80.76]) by mx01.bbu.dsd.mx.bitdefender.com (Postfix) with ESMTPS id 2809C30747C9 for ; Wed, 15 Apr 2020 03:59:35 +0300 (EEST) Received: from localhost.localdomain (unknown [91.199.104.27]) by smtp.bitdefender.com (Postfix) with ESMTPSA id 148FB305B7A2; Wed, 15 Apr 2020 03:59:35 +0300 (EEST) From: =?UTF-8?q?Adalbert=20Laz=C4=83r?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v1 11/26] kvm: vmi: add 'handshake_timeout' property Date: Wed, 15 Apr 2020 03:59:23 +0300 Message-Id: <20200415005938.23895-12-alazar@bitdefender.com> In-Reply-To: <20200415005938.23895-1-alazar@bitdefender.com> References: <20200415005938.23895-1-alazar@bitdefender.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 91.199.104.161 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Adalbert=20Laz=C4=83r?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" By having a timer during handshake, the blocked connections can be restored. Signed-off-by: Adalbert Laz=C4=83r --- accel/kvm/vmi.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/accel/kvm/vmi.c b/accel/kvm/vmi.c index 57ded2f69c..5659663caa 100644 --- a/accel/kvm/vmi.c +++ b/accel/kvm/vmi.c @@ -19,6 +19,8 @@ =20 #include "sysemu/vmi-handshake.h" =20 +#define HANDSHAKE_TIMEOUT_SEC 10 + typedef struct VMIntrospection { Object parent_obj; =20 @@ -32,6 +34,8 @@ typedef struct VMIntrospection { qemu_vmi_from_introspector hsk_in; uint64_t hsk_in_read_pos; uint64_t hsk_in_read_size; + GSource *hsk_timer; + uint32_t handshake_timeout; =20 int64_t vm_start_time; =20 @@ -105,6 +109,26 @@ static void prop_set_chardev(Object *obj, const char *= value, Error **errp) i->chardevid =3D g_strdup(value); } =20 +static void prop_get_uint32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint32_t *value =3D opaque; + + visit_type_uint32(v, name, value, errp); +} + +static void prop_set_uint32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint32_t *value =3D opaque; + Error *local_err =3D NULL; + + visit_type_uint32(v, name, value, &local_err); + if (local_err) { + error_propagate(errp, local_err); + } +} + static bool chardev_is_connected(VMIntrospection *i, Error **errp) { Object *obj =3D OBJECT(i->chr); @@ -129,6 +153,11 @@ static void instance_init(Object *obj) update_vm_start_time(i); =20 object_property_add_str(obj, "chardev", NULL, prop_set_chardev, NULL); + + i->handshake_timeout =3D HANDSHAKE_TIMEOUT_SEC; + object_property_add(obj, "handshake_timeout", "uint32", + prop_set_uint32, prop_get_uint32, + NULL, &i->handshake_timeout, NULL); } =20 static void disconnect_chardev(VMIntrospection *i) @@ -165,12 +194,28 @@ static void disconnect_and_unhook_kvmi(VMIntrospectio= n *i) unhook_kvmi(i); } =20 +static void cancel_timer(GSource *timer) +{ + if (timer) { + g_source_destroy(timer); + g_source_unref(timer); + } +} + +static void cancel_handshake_timer(VMIntrospection *i) +{ + cancel_timer(i->hsk_timer); + i->hsk_timer =3D NULL; +} + static void instance_finalize(Object *obj) { VMIntrospection *i =3D VM_INTROSPECTION(obj); =20 g_free(i->chardevid); =20 + cancel_handshake_timer(i); + if (i->chr) { shutdown_socket_fd(i); qemu_chr_fe_deinit(&i->sock, true); @@ -303,7 +348,7 @@ static int chr_can_read(void *opaque) { VMIntrospection *i =3D opaque; =20 - if (i->sock_fd =3D=3D -1) { + if (i->hsk_timer =3D=3D NULL || i->sock_fd =3D=3D -1) { return 0; } =20 @@ -356,10 +401,24 @@ static void chr_read(void *opaque, const uint8_t *buf= , int size) } =20 if (enough_bytes_for_handshake(i)) { + cancel_handshake_timer(i); validate_and_connect(i); } } =20 +static gboolean chr_timeout(gpointer opaque) +{ + VMIntrospection *i =3D opaque; + + warn_report("VMI: the handshake takes too long"); + + g_source_unref(i->hsk_timer); + i->hsk_timer =3D NULL; + + disconnect_and_unhook_kvmi(i); + return FALSE; +} + static void chr_event_open(VMIntrospection *i) { Error *local_err =3D NULL; @@ -378,6 +437,9 @@ static void chr_event_open(VMIntrospection *i) memset(&i->hsk_in, 0, sizeof(i->hsk_in)); i->hsk_in_read_pos =3D 0; i->hsk_in_read_size =3D 0; + i->hsk_timer =3D qemu_chr_timeout_add_ms(i->chr, + i->handshake_timeout * 1000, + chr_timeout, i); } =20 static void chr_event_close(VMIntrospection *i) @@ -386,6 +448,8 @@ static void chr_event_close(VMIntrospection *i) warn_report("VMI: introspection tool disconnected"); disconnect_and_unhook_kvmi(i); } + + cancel_handshake_timer(i); } =20 static void chr_event(void *opaque, QEMUChrEvent event)