From nobody Thu Nov 13 20:40:02 2025 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1582492082; cv=none; d=zohomail.com; s=zohoarc; b=fbnC3tVuE1Qi+qeymsq83yq4hmV78P1g0rv76zIr0JEaGMIKr82/ydMJ3MMNVsibg2o1S7mJxCbPD74NSc4SNTyp+UNxqH2urHg5n3hd9daYbRyHPORLwwlvozxGNkSpC5qVXz+Pr9bhqiF0sF3F1NV0i+Wd6omkh73rscPLsxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582492082; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=1GDcuF+nccXVpM2OpfWaU3G5AD7V4Cx+MfC6IeLa5dc=; b=WupsBrOhfsy9xVsgzTvXodSKVF5JYOx4Dtc6eiOyb2/P7lEpAK2xo4Ojw2xAkdEeqzcQiWKvywSUbSiKuXDiwmc+C3jNbMv/BQ+/PK0fQ5sHmhJr1UymZCTPwJMnKYsaqwAR691KIT0pJNzZxlCYyoRbgNuygC0pBeu3cvDGq00= 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 1582492082692379.18351107766046; Sun, 23 Feb 2020 13:08:02 -0800 (PST) Received: from localhost ([::1]:56842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5yTp-00055e-JG for importer@patchew.org; Sun, 23 Feb 2020 16:08:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56605) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5ySv-0004Eg-JF for qemu-devel@nongnu.org; Sun, 23 Feb 2020 16:07:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5ySu-0001gD-9M for qemu-devel@nongnu.org; Sun, 23 Feb 2020 16:07:05 -0500 Received: from mga05.intel.com ([192.55.52.43]:59521) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j5ySt-0001fh-WF for qemu-devel@nongnu.org; Sun, 23 Feb 2020 16:07:04 -0500 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Feb 2020 13:07:00 -0800 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by fmsmga008.fm.intel.com with ESMTP; 23 Feb 2020 13:06:59 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,477,1574150400"; d="scan'208";a="230945808" From: Zhang Chen To: Jason Wang , qemu-dev Subject: [PATCH 1/2] net/colo-compare.c: Expose "compare_timeout" to user Date: Mon, 24 Feb 2020 04:58:04 +0800 Message-Id: <20200223205805.26412-2-chen.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200223205805.26412-1-chen.zhang@intel.com> References: <20200223205805.26412-1-chen.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 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: Daniel Cho , Zhang Chen , "Dr . David Alan Gilbert" , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Zhang Chen The "compare_timeout" determines the max time to hold the primary net packe= t. This patch expose the "compare_timeout", make user can adjest this value according to the specific application scenario. QMP command demo: { "execute": "qom-get", "arguments": { "path": "/objects/comp0", "property": "compare_timeout" } } { "execute": "qom-set", "arguments": { "path": "/objects/comp0", "property": "compare_timeout", "value": 5000} } Signed-off-by: Zhang Chen --- net/colo-compare.c | 47 ++++++++++++++++++++++++++++++++++++++++++++-- qemu-options.hx | 5 +++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 7ee17f2cf8..ec09b2a524 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -50,6 +50,7 @@ static NotifierList colo_compare_notifiers =3D =20 /* TODO: Should be configurable */ #define REGULAR_PACKET_CHECK_MS 3000 +#define DEFAULT_TIME_OUT_MS 3000 =20 static QemuMutex event_mtx; static QemuCond event_complete_cond; @@ -92,6 +93,7 @@ typedef struct CompareState { SocketReadState sec_rs; SocketReadState notify_rs; bool vnet_hdr; + uint32_t compare_timeout; =20 /* * Record the connection that through the NIC @@ -607,10 +609,9 @@ static int colo_old_packet_check_one_conn(Connection *= conn, CompareState *s) { GList *result =3D NULL; - int64_t check_time =3D REGULAR_PACKET_CHECK_MS; =20 result =3D g_queue_find_custom(&conn->primary_list, - &check_time, + &s->compare_timeout, (GCompareFunc)colo_old_packet_check_one); =20 if (result) { @@ -984,6 +985,39 @@ static void compare_set_notify_dev(Object *obj, const = char *value, Error **errp) s->notify_dev =3D g_strdup(value); } =20 +static void compare_get_timeout(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + CompareState *s =3D COLO_COMPARE(obj); + uint32_t value =3D s->compare_timeout; + + visit_type_uint32(v, name, &value, errp); +} + +static void compare_set_timeout(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + CompareState *s =3D COLO_COMPARE(obj); + Error *local_err =3D NULL; + uint32_t value; + + visit_type_uint32(v, name, &value, &local_err); + if (local_err) { + goto out; + } + if (!value) { + error_setg(&local_err, "Property '%s.%s' requires a positive value= ", + object_get_typename(obj), name); + goto out; + } + s->compare_timeout =3D value; + +out: + error_propagate(errp, local_err); +} + static void compare_pri_rs_finalize(SocketReadState *pri_rs) { CompareState *s =3D container_of(pri_rs, CompareState, pri_rs); @@ -1090,6 +1124,11 @@ static void colo_compare_complete(UserCreatable *uc,= Error **errp) return; } =20 + if (!s->compare_timeout) { + /* Set default value to 3000 MS */ + s->compare_timeout =3D DEFAULT_TIME_OUT_MS; + } + if (find_and_check_chardev(&chr, s->pri_indev, errp) || !qemu_chr_fe_init(&s->chr_pri_in, chr, errp)) { return; @@ -1185,6 +1224,10 @@ static void colo_compare_init(Object *obj) compare_get_notify_dev, compare_set_notify_dev, NULL); =20 + object_property_add(obj, "compare_timeout", "uint32", + compare_get_timeout, + compare_set_timeout, NULL, NULL, NULL); + s->vnet_hdr =3D false; object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr, compare_set_vnet_hdr, NULL); diff --git a/qemu-options.hx b/qemu-options.hx index ac315c1ac4..3832d0ae8a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4598,7 +4598,7 @@ Dump the network traffic on netdev @var{dev} to the f= ile specified by The file format is libpcap, so it can be analyzed with tools such as tcpdu= mp or Wireshark. =20 -@item -object colo-compare,id=3D@var{id},primary_in=3D@var{chardevid},seco= ndary_in=3D@var{chardevid},outdev=3D@var{chardevid},iothread=3D@var{id}[,vn= et_hdr_support][,notify_dev=3D@var{id}] +@item -object colo-compare,id=3D@var{id},primary_in=3D@var{chardevid},seco= ndary_in=3D@var{chardevid},outdev=3D@var{chardevid},iothread=3D@var{id}[,vn= et_hdr_support][,notify_dev=3D@var{id}][,compare_timeout=3D@var{ms}] =20 Colo-compare gets packet from primary_in@var{chardevid} and secondary_in@v= ar{chardevid}, than compare primary packet with secondary packet. If the packets are same, we will output primary @@ -4606,7 +4606,8 @@ packet to outdev@var{chardevid}, else we will notify = colo-frame do checkpoint and send primary packet to outdev@var{chardevid}. In order to improve efficiency, we need to put the task of comparison in another thread. If it has the vnet_hdr_support flag, colo compare -will send/recv packet with vnet_hdr_len. +will send/recv packet with vnet_hdr_len. The compare_timeout=3D@var{ms} +determines the maximum time colo-compare wait for primary packet. If you want to use Xen COLO, will need the notify_dev to notify Xen colo-frame to do checkpoint. =20 --=20 2.17.1