From nobody Sun Feb 8 14:53:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488471094022966.7031067422014; Thu, 2 Mar 2017 08:11:34 -0800 (PST) Received: from localhost ([::1]:53127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjTKD-00064v-PS for importer@patchew.org; Thu, 02 Mar 2017 11:11:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjTJQ-00063c-TM for qemu-devel@nongnu.org; Thu, 02 Mar 2017 11:10:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjTJQ-0008Ra-3g for qemu-devel@nongnu.org; Thu, 02 Mar 2017 11:10:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52650) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjTJP-0008R8-U8 for qemu-devel@nongnu.org; Thu, 02 Mar 2017 11:10:40 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2A5087FD47; Thu, 2 Mar 2017 16:10:40 +0000 (UTC) Received: from t460.redhat.com (ovpn-116-205.ams2.redhat.com [10.36.116.205]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v22GAaKP016904; Thu, 2 Mar 2017 11:10:38 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 2 Mar 2017 16:10:31 +0000 Message-Id: <20170302161033.4787-2-berrange@redhat.com> In-Reply-To: <20170302161033.4787-1-berrange@redhat.com> References: <20170302161033.4787-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 02 Mar 2017 16:10:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 1/3] io: fix decoding when multiple websockets frames arrive at once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The qio_channel_websock_read_wire() method will read upto 4096 bytes off the socket and then decode the websockets header and payload. The code was only decoding a single websockets frame, even if the buffered data contained multiple frames. This meant that decoding of subsequent frames was delayed until further input arrived on the socket. This backlog of delayed frames gets worse & worse over time. Symptom was that when connecting to the VNC server via the built-in websockets server, mouse/keyboard interaction would start out fine, but slowly get more & more delayed until it was unusable. Signed-off-by: Daniel P. Berrange --- io/channel-websock.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index e47279a..a06a4a8 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -570,21 +570,24 @@ static ssize_t qio_channel_websock_read_wire(QIOChann= elWebsock *ioc, ioc->encinput.offset +=3D ret; } =20 - if (ioc->payload_remain =3D=3D 0) { - ret =3D qio_channel_websock_decode_header(ioc, errp); + while (ioc->encinput.offset !=3D 0) { + if (ioc->payload_remain =3D=3D 0) { + ret =3D qio_channel_websock_decode_header(ioc, errp); + if (ret < 0) { + return ret; + } + if (ret =3D=3D 0) { + ioc->io_eof =3D TRUE; + break; + } + } + + ret =3D qio_channel_websock_decode_payload(ioc, errp); if (ret < 0) { return ret; } - if (ret =3D=3D 0) { - return 0; - } } - - ret =3D qio_channel_websock_decode_payload(ioc, errp); - if (ret < 0) { - return ret; - } - return ret; + return 1; } =20 =20 @@ -642,9 +645,6 @@ static gboolean qio_channel_websock_flush(QIOChannel *i= oc, if (ret < 0) { goto cleanup; } - if (ret =3D=3D 0) { - wioc->io_eof =3D TRUE; - } } =20 cleanup: --=20 2.9.3