From nobody Wed Nov 19 13:37:49 2025 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=1616037413; cv=none; d=zohomail.com; s=zohoarc; b=KYsBkQaAKw54p0QQIF57Qa1gwoO+O3P8yY3/IXZwAW4kaEgHllQrqs2aHlJxUjk1Vf8QzaC/4kg3CAiU8ndiPoqiiJOqJngfMwMC86ROEa6hyuZktap9LClorEzwPnWFLr4Ovi8T8Qa8FF7gjiZBMDDw7nSnDfxysrGK8GNvdGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616037413; 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=2UPJttM3zNz9wngCequhXrK+sqVZfI/iEqebMTeezfk=; b=SZf0ScrVGkfTk452wfmwE+ZeasY168yznmEyjhhOhIxgu3l05qG6t3hg7vxb2jeOzdP1ujFlVa7+/8bKbzRLdrWeYUfqkVVATIb/a3neBeEFbkIXgWZbo8rbps1/6JfGfzZQV1e2ZydiavyJmuA2PK8cHxUlkjqzj4boHEjrurM= 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 1616037413951518.7297695099579; Wed, 17 Mar 2021 20:16:53 -0700 (PDT) Received: from localhost ([::1]:38828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMj9Z-0003Og-00 for importer@patchew.org; Wed, 17 Mar 2021 23:16:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMj3n-0004Ob-AF for qemu-devel@nongnu.org; Wed, 17 Mar 2021 23:10:55 -0400 Received: from mga09.intel.com ([134.134.136.24]:54706) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMj3k-0005wD-HL for qemu-devel@nongnu.org; Wed, 17 Mar 2021 23:10:55 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 20:10:51 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 20:10:49 -0700 IronPort-SDR: b2jOrDz3uzt0EagMqak6dy7g5XZnZ6Dp9DDSilRp0aoeyHyDLE6j14BN376Y1IWktk02Vu2JQg MudugLa4L6ig== X-IronPort-AV: E=McAfee;i="6000,8403,9926"; a="189681354" X-IronPort-AV: E=Sophos;i="5.81,257,1610438400"; d="scan'208";a="189681354" IronPort-SDR: 6tscJbnu7obPtbHWtrzlEk+HM+I3VNQcJ2bHDuZWuqyIGgR8a08DUbI3+EUAL7o2RAbhRIP48z lFAOtQEh6igA== X-IronPort-AV: E=Sophos;i="5.81,257,1610438400"; d="scan'208";a="412898271" From: Zhang Chen To: Jason Wang , qemu-dev , Eric Blake , "Dr. David Alan Gilbert" , Markus Armbruster , Lukas Straub Subject: [PATCH V3 6/7] net/colo-compare: Add passthrough list to CompareState Date: Thu, 18 Mar 2021 11:04:59 +0800 Message-Id: <20210318030500.55352-7-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210318030500.55352-1-chen.zhang@intel.com> References: <20210318030500.55352-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.24; envelope-from=chen.zhang@intel.com; helo=mga09.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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , 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 | 29 +++++++++++++++++++++++++++++ net/colo-compare.h | 11 +++++++++++ 2 files changed, 40 insertions(+) diff --git a/net/colo-compare.c b/net/colo-compare.c index a803f8b888..40af8cd501 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; + PassthroughEntry *bypass, *next; int ret; =20 if (mode =3D=3D PRIMARY_IN) { @@ -160,6 +161,32 @@ static int packet_enqueue(CompareState *s, int mode, C= onnection **con) } fill_connection_key(pkt, &key); =20 + /* Check COLO passthrough connenction */ + qemu_mutex_lock(&s->passthroughlist_mutex); + if (!QLIST_EMPTY(&s->passthroughlist)) { + QLIST_FOREACH_SAFE(bypass, &s->passthroughlist, node, next) { + if (((key.ip_proto =3D=3D IPPROTO_TCP) && (bypass->l4_protocol= =3D=3D 0)) || + ((key.ip_proto =3D=3D IPPROTO_UDP) && (bypass->l4_protocol= =3D=3D 1))) { + if (bypass->src_port =3D=3D 0 || bypass->src_port =3D=3D k= ey.dst_port) { + if (bypass->src_ip.s_addr =3D=3D 0 || + bypass->src_ip.s_addr =3D=3D key.src.s_addr) { + if (bypass->dst_port =3D=3D 0 || + bypass->dst_port =3D=3D key.src_port) { + if (bypass->dst_ip.s_addr =3D=3D 0 || + bypass->dst_ip.s_addr =3D=3D key.dst.s_add= r) { + 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); @@ -1224,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, @@ -1236,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 2a9dcac0a7..2259abcd63 100644 --- a/net/colo-compare.h +++ b/net/colo-compare.h @@ -54,6 +54,15 @@ typedef struct SendEntry { uint8_t *buf; } SendEntry; =20 +typedef struct PassthroughEntry { + int l4_protocol; + int src_port; + int dst_port; + struct in_addr src_ip; + struct in_addr dst_ip; + QLIST_ENTRY(PassthroughEntry) node; +} PassthroughEntry; + /* * + CompareState ++ * | | @@ -110,6 +119,8 @@ struct CompareState { =20 QEMUBH *event_bh; enum colo_event event; + QLIST_HEAD(, PassthroughEntry) passthroughlist; + QemuMutex passthroughlist_mutex; =20 QTAILQ_ENTRY(CompareState) next; }; --=20 2.25.1