From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FF29C433FE for ; Wed, 15 Sep 2021 16:40:09 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 46C116112E for ; Wed, 15 Sep 2021 16:40:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 46C116112E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:57314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQXxA-0003bu-GU for qemu-devel@archiver.kernel.org; Wed, 15 Sep 2021 12:40:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQXoZ-00043O-5a for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:31:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQXoW-0004uf-Os for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:31:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631723472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=252kVfb3qyFd6mzpp+co0OW3S/qXcMRHawcaccOecCw=; b=irHUzwlzDv3AkWmnCsDIDo2piV6ogORGiiiuXxzO6klxtAUWd1zHwucsLALCv2Af5S2nOt UFcUe/jI2rsd59m+e5KxojarpUkDFVuvXxHpxkxi0fMV4b4WwmwOsrR/54GXKSvkHzcn+m wdLt9OdCqJtH7yq6pOqQACGHD0One74= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-604-qBh0kNSmOGCOxAGo5l2eJg-1; Wed, 15 Sep 2021 12:31:10 -0400 X-MC-Unique: qBh0kNSmOGCOxAGo5l2eJg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12AF9802B9F; Wed, 15 Sep 2021 16:31:10 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.11.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id B68D47771A; Wed, 15 Sep 2021 16:31:08 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v4 10/27] python/aqmp: add configurable read buffer limit Date: Wed, 15 Sep 2021 12:29:38 -0400 Message-Id: <20210915162955.333025-11-jsnow@redhat.com> In-Reply-To: <20210915162955.333025-1-jsnow@redhat.com> References: <20210915162955.333025-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Eric Blake , Stefan Hajnoczi , Markus Armbruster , Wainer dos Santos Moschetta , "Niteesh G . S ." , Willian Rampazzo , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" QMP can transmit some pretty big messages, and the default limit of 64KB isn't sufficient. Make sure that we can configure it. Reported-by: G S Niteesh Babu Signed-off-by: John Snow Reviewed-by: Eric Blake --- python/qemu/aqmp/protocol.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/python/qemu/aqmp/protocol.py b/python/qemu/aqmp/protocol.py index 62c26ede5a..2ef19e9693 100644 --- a/python/qemu/aqmp/protocol.py +++ b/python/qemu/aqmp/protocol.py @@ -189,6 +189,9 @@ class AsyncProtocol(Generic[T]): #: Logger object for debugging messages from this connection. logger = logging.getLogger(__name__) + # Maximum allowable size of read buffer + _limit = (64 * 1024) + # ------------------------- # Section: Public interface # ------------------------- @@ -452,6 +455,7 @@ async def _client_connected_cb(reader: asyncio.StreamReader, port=address[1], ssl=ssl, backlog=1, + limit=self._limit, ) else: coro = asyncio.start_unix_server( @@ -459,6 +463,7 @@ async def _client_connected_cb(reader: asyncio.StreamReader, path=address, ssl=ssl, backlog=1, + limit=self._limit, ) server = await coro # Starts listening @@ -482,9 +487,18 @@ async def _do_connect(self, address: Union[str, Tuple[str, int]], self.logger.debug("Connecting to %s ...", address) if isinstance(address, tuple): - connect = asyncio.open_connection(address[0], address[1], ssl=ssl) + connect = asyncio.open_connection( + address[0], + address[1], + ssl=ssl, + limit=self._limit, + ) else: - connect = asyncio.open_unix_connection(path=address, ssl=ssl) + connect = asyncio.open_unix_connection( + path=address, + ssl=ssl, + limit=self._limit, + ) self._reader, self._writer = await connect self.logger.debug("Connected.") -- 2.31.1