From nobody Mon Feb 9 02:14:34 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1636687543959255.68481039315418; Thu, 11 Nov 2021 19:25:43 -0800 (PST) Received: from localhost ([::1]:57996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlNC9-0007CM-Mi for importer@patchew.org; Thu, 11 Nov 2021 22:25:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlN8B-0006A1-4L for qemu-devel@nongnu.org; Thu, 11 Nov 2021 22:21:35 -0500 Received: from mga03.intel.com ([134.134.136.65]:4409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlN89-0005U8-1T for qemu-devel@nongnu.org; Thu, 11 Nov 2021 22:21:34 -0500 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2021 19:21:32 -0800 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2021 19:21:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10165"; a="233009110" X-IronPort-AV: E=Sophos;i="5.87,227,1631602800"; d="scan'208";a="233009110" X-IronPort-AV: E=Sophos;i="5.87,227,1631602800"; d="scan'208";a="504711489" From: Zhang Chen To: Jason Wang , Markus Armbruster , "Dr. David Alan Gilbert" , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eric Blake Subject: [PATCH for 7.0 V10 5/6] net/colo-compare: Add passthrough list to CompareState Date: Fri, 12 Nov 2021 11:11:11 +0800 Message-Id: <20211112031112.9303-6-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112031112.9303-1-chen.zhang@intel.com> References: <20211112031112.9303-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=134.134.136.65; envelope-from=chen.zhang@intel.com; helo=mga03.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , qemu-dev , Li Zhijian Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1636687545095100001 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 9114b687de..df8bc5acce 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -161,6 +161,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) { @@ -180,6 +181,31 @@ static int packet_enqueue(CompareState *s, int mode, C= onnection **con) } fill_connection_key(pkt, &key, false); =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); @@ -1232,6 +1258,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, @@ -1246,6 +1273,7 @@ static void colo_compare_complete(UserCreatable *uc, = Error **errp) qemu_cond_init(&event_complete_cond); colo_compare_active =3D true; } + qemu_mutex_init(&s->passthroughlist_mutex); QTAILQ_INSERT_TAIL(&net_compares, s, next); qemu_mutex_unlock(&colo_compare_mutex); =20 diff --git a/net/colo-compare.h b/net/colo-compare.h index 031b627a2f..995f28b833 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; @@ -39,6 +40,15 @@ typedef struct COLOSendCo { int ret; } COLOSendCo; =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 ++ * | | @@ -95,6 +105,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