From nobody Sat Feb 7 04:47:25 2026 Delivered-To: importer@patchew.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=1618932391; cv=none; d=zohomail.com; s=zohoarc; b=BmyjiE6hOJVC9TNXTMXGyOz+ri4+y9jgXBhrxkuBf/k9ElFF302Ve/zCPfB9dvwHUzbT6Bxqj0fQTMQx6pm559hrkXlC2o1hfjYD14teOF86hhhqsupaCpmXuj/JfnB2os94tm56afgdYbgoPwAHMrA1cy1Rwijnmbz5IBfHeq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618932391; h=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=cOrTymbNVyOXtCAmb+fy6JDiB35fUNQqS4d++xWNMvk=; b=DFNEuw9WVRlJ0uKIdspbNbYX1ZKXZ/wbDT3MEMxWrj17h9TSnG3WB6QItDjbAz0GS2Ne83N3aLH/krYL6/zw8MN/d4h57bK9yth5epWAbNP5YP27dJHt1Uf1yBq2654tzv2ut09mky76KS5Mx8QxgVUct4UnAu6grV+RpZc0tao= 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 1618932391762346.32644772761023; Tue, 20 Apr 2021 08:26:31 -0700 (PDT) Received: from localhost ([::1]:45820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYsGk-0001sT-96 for importer@patchew.org; Tue, 20 Apr 2021 11:26:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYsCZ-0005kM-5k for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:22:14 -0400 Received: from mga05.intel.com ([192.55.52.43]:37566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYsCX-0004ah-6T for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:22:10 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2021 08:22:08 -0700 Received: from unknown (HELO tkid-nvme.lan) ([10.239.13.19]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2021 08:22:05 -0700 IronPort-SDR: Q9/qXqiEO5bSz1HXfwB6qHjGId6iDqkGNUBDSRABQB4hhwNHorZoEOAff8I55I/Bt0PllTfDC4 G/d81cLAJL/A== X-IronPort-AV: E=McAfee;i="6200,9189,9960"; a="280854241" X-IronPort-AV: E=Sophos;i="5.82,237,1613462400"; d="scan'208";a="280854241" IronPort-SDR: Oiw3tQdxDlr0zUGX0gSi30LXKXZj0+sOfEZ5Ox21bxfnbKgoMQcwtHT99k+eWcNh5f5sb9wX2r Hlx3q85b3hQA== X-IronPort-AV: E=Sophos;i="5.82,237,1613462400"; d="scan'208";a="523846751" From: Zhang Chen To: Jason Wang , qemu-dev , Eric Blake , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Li Zhijian Subject: [PATCH V6 5/6] net/colo-compare: Add passthrough list to CompareState Date: Tue, 20 Apr 2021 23:15:36 +0800 Message-Id: <20210420151537.64360-6-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420151537.64360-1-chen.zhang@intel.com> References: <20210420151537.64360-1-chen.zhang@intel.com> MIME-Version: 1.0 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=192.55.52.43; envelope-from=chen.zhang@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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: Zhang Chen , Lukas Straub , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add passthrough list for each CompareState. Signed-off-by: Zhang Chen --- net/colo-compare.c | 28 ++++++++++++++++++++++++++++ net/colo-compare.h | 12 ++++++++++++ 2 files changed, 40 insertions(+) diff --git a/net/colo-compare.c b/net/colo-compare.c index b51b1437ef..7109e2ed30 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -141,6 +141,7 @@ static int packet_enqueue(CompareState *s, int mode, Co= nnection **con) ConnectionKey key; Packet *pkt =3D NULL; Connection *conn; + COLOPassthroughEntry *pass, *next; int ret; =20 if (mode =3D=3D PRIMARY_IN) { @@ -160,6 +161,31 @@ static int packet_enqueue(CompareState *s, int mode, C= onnection **con) } fill_connection_key(pkt, &key); =20 + /* Check COLO passthrough specifications */ + qemu_mutex_lock(&s->passthroughlist_mutex); + if (!QLIST_EMPTY(&s->passthroughlist)) { + QLIST_FOREACH_SAFE(pass, &s->passthroughlist, node, next) { + if (key.ip_proto =3D=3D pass->l4_protocol->p_proto) { + if (pass->src_port =3D=3D 0 || pass->src_port =3D=3D key.d= st_port) { + if (pass->src_ip.s_addr =3D=3D 0 || + pass->src_ip.s_addr =3D=3D key.src.s_addr) { + if (pass->dst_port =3D=3D 0 || + pass->dst_port =3D=3D key.src_port) { + if (pass->dst_ip.s_addr =3D=3D 0 || + pass->dst_ip.s_addr =3D=3D key.dst.s_addr)= { + packet_destroy(pkt, NULL); + pkt =3D NULL; + qemu_mutex_unlock(&s->passthroughlist_mute= x); + return -1; + } + } + } + } + } + } + } + qemu_mutex_unlock(&s->passthroughlist_mutex); + conn =3D connection_get(s->connection_track_table, &key, &s->conn_list); @@ -1225,6 +1251,7 @@ static void colo_compare_complete(UserCreatable *uc, = Error **errp) } =20 g_queue_init(&s->conn_list); + QLIST_INIT(&s->passthroughlist); =20 s->connection_track_table =3D g_hash_table_new_full(connection_key_has= h, connection_key_equal, @@ -1237,6 +1264,7 @@ static void colo_compare_complete(UserCreatable *uc, = Error **errp) if (!colo_compare_active) { qemu_mutex_init(&event_mtx); qemu_cond_init(&event_complete_cond); + qemu_mutex_init(&s->passthroughlist_mutex); colo_compare_active =3D true; } QTAILQ_INSERT_TAIL(&net_compares, s, next); diff --git a/net/colo-compare.h b/net/colo-compare.h index ab649c9dbe..7ca74de840 100644 --- a/net/colo-compare.h +++ b/net/colo-compare.h @@ -23,6 +23,7 @@ #include "migration/migration.h" #include "sysemu/iothread.h" #include "colo.h" +#include =20 #define TYPE_COLO_COMPARE "colo-compare" typedef struct CompareState CompareState; @@ -54,6 +55,15 @@ typedef struct COLOSendEntry { uint8_t *buf; } COLOSendEntry; =20 +typedef struct COLOPassthroughEntry { + struct protoent *l4_protocol; + int src_port; + int dst_port; + struct in_addr src_ip; + struct in_addr dst_ip; + QLIST_ENTRY(COLOPassthroughEntry) node; +} COLOPassthroughEntry; + /* * + CompareState ++ * | | @@ -110,6 +120,8 @@ struct CompareState { =20 QEMUBH *event_bh; enum colo_event event; + QLIST_HEAD(, COLOPassthroughEntry) passthroughlist; + QemuMutex passthroughlist_mutex; =20 QTAILQ_ENTRY(CompareState) next; }; --=20 2.25.1