From nobody Thu May 1 06:12:26 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
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=redhat.com
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1642137243323247.34216576805431;
Thu, 13 Jan 2022 21:14:03 -0800 (PST)
Received: from localhost ([::1]:59574 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1n8EuY-0000UR-8s
for importer@patchew.org; Fri, 14 Jan 2022 00:14:02 -0500
Received: from eggs.gnu.org ([209.51.188.92]:38302)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <jasowang@redhat.com>)
id 1n8EqX-00060d-6A
for qemu-devel@nongnu.org; Fri, 14 Jan 2022 00:09:53 -0500
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54877)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <jasowang@redhat.com>)
id 1n8EqU-0001Ov-Hs
for qemu-devel@nongnu.org; Fri, 14 Jan 2022 00:09:51 -0500
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
us-mta-616-rTx6Q3YYME6wslIRx78E3A-1; Fri, 14 Jan 2022 00:09:46 -0500
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
[10.5.11.23])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA7C218957E4;
Fri, 14 Jan 2022 05:09:45 +0000 (UTC)
Received: from localhost.localdomain (ovpn-13-172.pek2.redhat.com
[10.72.13.172])
by smtp.corp.redhat.com (Postfix) with ESMTP id 6B9F4108B3;
Fri, 14 Jan 2022 05:09:43 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1642136989;
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=k1NJAYuxbBU0g4T+irextBwXVyFw4TEr/n6y5h1xTD4=;
b=ONh8mkxoF/wQhEDa9HRub+Mllxz2hozHh2N0phnD0f6rdxJAp9XO6MOMDQUu8qaiuZ3ieI
eLGFhhYDk8Kx2Yz0pDqFADe1kCYCDAucMvAUMIVkyWToeHLhHF6L9maNrg6gUGpm1SIpX5
P+4cc92IBZyiGero6sGkfUes3ecrtLQ=
X-MC-Unique: rTx6Q3YYME6wslIRx78E3A-1
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org
Subject: [PULL V3 06/13] net/filter: Optimize filter_send to coroutine
Date: Fri, 14 Jan 2022 13:09:02 +0800
Message-Id: <20220114050909.27133-7-jasowang@redhat.com>
In-Reply-To: <20220114050909.27133-1-jasowang@redhat.com>
References: <20220114050909.27133-1-jasowang@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
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;
Received-SPF: pass client-ip=170.10.133.124;
envelope-from=jasowang@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -33
X-Spam_score: -3.4
X-Spam_bar: ---
X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.594,
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_H3=0.001, RCVD_IN_MSPIKE_WL=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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Jason Wang <jasowang@redhat.com>, Zhang Chen <chen.zhang@intel.com>,
Rao Lei <lei.rao@intel.com>, qemu-devel@nongnu.org,
Li Zhijian <lizhijian@fujitsu.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1642137245030100001
Content-Type: text/plain; charset="utf-8"
From: Rao Lei <lei.rao@intel.com>
This patch is to improve the logic of QEMU main thread sleep code in
qemu_chr_write_buffer() where it can be blocked and can't run other
coroutines during COLO IO stress test.
Our approach is to put filter_send() in a coroutine. In this way,
filter_send() will call qemu_coroutine_yield() in qemu_co_sleep_ns(),
so that it can be scheduled out and QEMU main thread has opportunity to
run other tasks.
Signed-off-by: Lei Rao <lei.rao@intel.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/filter-mirror.c | 66 ++++++++++++++++++++++++++++++++++++++++++-------=
----
1 file changed, 53 insertions(+), 13 deletions(-)
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index f20240c..34a63b5 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -20,6 +20,7 @@
#include "chardev/char-fe.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
+#include "block/aio-wait.h"
=20
#define TYPE_FILTER_MIRROR "filter-mirror"
typedef struct MirrorState MirrorState;
@@ -42,20 +43,21 @@ struct MirrorState {
bool vnet_hdr;
};
=20
-static int filter_send(MirrorState *s,
- const struct iovec *iov,
- int iovcnt)
+typedef struct FilterSendCo {
+ MirrorState *s;
+ char *buf;
+ ssize_t size;
+ bool done;
+ int ret;
+} FilterSendCo;
+
+static int _filter_send(MirrorState *s,
+ char *buf,
+ ssize_t size)
{
NetFilterState *nf =3D NETFILTER(s);
int ret =3D 0;
- ssize_t size =3D 0;
uint32_t len =3D 0;
- char *buf;
-
- size =3D iov_size(iov, iovcnt);
- if (!size) {
- return 0;
- }
=20
len =3D htonl(size);
ret =3D qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len=
));
@@ -80,10 +82,7 @@ static int filter_send(MirrorState *s,
}
}
=20
- buf =3D g_malloc(size);
- iov_to_buf(iov, iovcnt, 0, buf, size);
ret =3D qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
- g_free(buf);
if (ret !=3D size) {
goto err;
}
@@ -94,6 +93,47 @@ err:
return ret < 0 ? ret : -EIO;
}
=20
+static void coroutine_fn filter_send_co(void *opaque)
+{
+ FilterSendCo *data =3D opaque;
+
+ data->ret =3D _filter_send(data->s, data->buf, data->size);
+ data->done =3D true;
+ g_free(data->buf);
+ aio_wait_kick();
+}
+
+static int filter_send(MirrorState *s,
+ const struct iovec *iov,
+ int iovcnt)
+{
+ ssize_t size =3D iov_size(iov, iovcnt);
+ char *buf =3D NULL;
+
+ if (!size) {
+ return 0;
+ }
+
+ buf =3D g_malloc(size);
+ iov_to_buf(iov, iovcnt, 0, buf, size);
+
+ FilterSendCo data =3D {
+ .s =3D s,
+ .size =3D size,
+ .buf =3D buf,
+ .ret =3D 0,
+ };
+
+ Coroutine *co =3D qemu_coroutine_create(filter_send_co, &data);
+ qemu_coroutine_enter(co);
+
+ while (!data.done) {
+ aio_poll(qemu_get_aio_context(), true);
+ }
+
+ return data.ret;
+}
+
static void redirector_to_filter(NetFilterState *nf,
const uint8_t *buf,
int len)
--=20
2.7.4