From nobody Sun May 5 02:01:03 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1621998218; cv=none; d=zohomail.com; s=zohoarc; b=T0qayNVl/h+NvUvyvh7Ug0Ecx8BEQXnF92/v8h75msYXcOmDsQhwVp5WcPBn69HMe7e+OQZLLq1XklrO8lXs0/EyiFkXK+fwfJgIiPkjgkOF96WzAvguM3yFWKInPOcF/4Hp0B95KJNEpHn77cYg5k1rHP9wASDtSFpAoBZJQ6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621998218; 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=/i9pobpUUX/KP9Boq0OH6Pdl7F0fUDu6XK3+RD6FnTo=; b=oJu2w1QCOLYZ5WP7bnA9fL71cY5OJK/n313g2Rnh7YzQ9lFc+05S4p/vA9zLYBsvDnNp9ZW3oACi1nO7Acx6nGW60OXeVKM0U+r+AiKoyC/c6EVeh4g+CMMg0QhxOwZBS6VLbNM1KLaRcpAIzJZlQr2hUcACkqL4e7Tz3CsuQaA= 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+importer2=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 1621998218716244.8125737885938; Tue, 25 May 2021 20:03:38 -0700 (PDT) Received: from localhost ([::1]:38024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lljpZ-0000WT-NB for importer2@patchew.org; Tue, 25 May 2021 23:03:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnI-0006GV-4w for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:16 -0400 Received: from mga14.intel.com ([192.55.52.115]:16088) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnD-0002sV-5A for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:15 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:07 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:04 -0700 IronPort-SDR: dpsVsz7XBTgpY7qZTefQUm74vouibxoxWak6nc4QL2v7tdFHKDOgtp5f2ALy/XJrGGbHzZrMZ+ nF1LLE4i2+iw== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202118598" X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="202118598" IronPort-SDR: vR8rDbBqMiEnA3qzDxmcVTGr0K02RQFgydZHuJLbKXWu1P5EkiPKQwg5iLTyk9BHuVHj0CnKc6 9cVDfA0w01nQ== X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="443741244" 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 V7 1/6] qapi/net: Add IPFlowSpec and QMP command for COLO passthrough Date: Wed, 26 May 2021 10:54:19 +0800 Message-Id: <20210526025424.1319994-2-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210526025424.1319994-1-chen.zhang@intel.com> References: <20210526025424.1319994-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.115; envelope-from=chen.zhang@intel.com; helo=mga14.intel.com X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H2=-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 , Lukas Straub , Zhang Chen Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Since the real user scenario does not need COLO to monitor all traffic. Add colo-passthrough-add and colo-passthrough-del to maintain a COLO network passthrough list. Add IPFlowSpec struct for all QMP commands. Except protocol field is necessary, other fields are optional. Signed-off-by: Zhang Chen --- net/net.c | 10 ++++++++ qapi/net.json | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/net/net.c b/net/net.c index 2a472604ec..a4bee86b24 100644 --- a/net/net.c +++ b/net/net.c @@ -1194,6 +1194,16 @@ void qmp_netdev_del(const char *id, Error **errp) } } =20 +void qmp_colo_passthrough_add(IPFlowSpec *spec, Error **errp) +{ + /* TODO implement setup passthrough rule */ +} + +void qmp_colo_passthrough_del(IPFlowSpec *spec, Error **errp) +{ + /* TODO implement delete passthrough rule */ +} + static void netfilter_print_info(Monitor *mon, NetFilterState *nf) { char *str; diff --git a/qapi/net.json b/qapi/net.json index af3f5b0fda..aca3b54278 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -7,6 +7,7 @@ ## =20 { 'include': 'common.json' } +{ 'include': 'sockets.json' } =20 ## # @set_link: @@ -694,3 +695,70 @@ ## { 'event': 'FAILOVER_NEGOTIATED', 'data': {'device-id': 'str'} } + +## +# @IPFlowSpec: +# +# IP flow specification. +# +# @protocol: Transport layer protocol like TCP/UDP... +# +# @object-name: Point out the IPflow spec effective range of object, +# If there is no such part, it means global spec. +# +# @source: Source address and port. +# +# @destination: Destination address and port. +# +# Since: 6.1 +## +{ 'struct': 'IPFlowSpec', + 'data': { '*protocol': 'str', '*object-name': 'str', + '*source': 'InetSocketAddressBase', + '*destination': 'InetSocketAddressBase' } } + +## +# @colo-passthrough-add: +# +# Add passthrough entry according to user's needs in COLO-compare. +# Source IP/port and destination IP/port both optional, If user just +# input parts of infotmation, it will match all. +# +# Returns: Nothing on success +# +# Since: 6.1 +# +# Example: +# +# -> { "execute": "colo-passthrough-add", +# "arguments": { "protocol": "tcp", "object-name": "object0", +# "source": {"host": "192.168.1.1", "port": "1234"}, +# "destination": {"host": "192.168.1.2", "port": "4321"} } } +# <- { "return": {} } +# +## +{ 'command': 'colo-passthrough-add', 'boxed': true, + 'data': 'IPFlowSpec' } + +## +# @colo-passthrough-del: +# +# Delete passthrough entry according to user's needs in COLO-compare. +# Source IP/port and destination IP/port both optional, If user just +# input parts of infotmation, it will match all. +# +# Returns: Nothing on success +# +# Since: 6.1 +# +# Example: +# +# -> { "execute": "colo-passthrough-del", +# "arguments": { "protocol": "tcp", "object-name": "object0", +# "source": {"host": "192.168.1.1", "port": "1234"}, +# "destination": {"host": "192.168.1.2", "port": "4321"} } } +# <- { "return": {} } +# +## +{ 'command': 'colo-passthrough-del', 'boxed': true, + 'data': 'IPFlowSpec' } --=20 2.25.1 From nobody Sun May 5 02:01:03 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1621998318; cv=none; d=zohomail.com; s=zohoarc; b=WzKuMKvXpOMnuIC+CZp9NxD8APaQoCd+J/YaDITQb8HNIdJuKI5J41L3N8hXWohdSRZfNtl1N6KEYnEwTZt+yQx9RW+vrTUYbCEF6tlMgXedK1PghnN1keUw59PwUThajnJCuBJpNsykBSNeLMPAkZsXBUcPdyHwjI9XXVm9BSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621998318; 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=ZfOGa1EwJFtyy0wn8IknWjhmIyP4Xc535+Yw4+9Ksw8=; b=fcb4ywleV2QZwmhpYEItfK7Wrfill4vK+nPk5336e5IhnhTjeUiGr46MO9BbtB6+PwWQrnrepCAuj3Dgb268b9PxUGDE1xXm8Zu9PPC2Irx1NwBsRcosBZ+j7WBVb36BTAnov7mavuiIFupsaC05bOO3T/w0JJuoT828+BQJlSc= 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+importer2=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 1621998318758299.6723821626531; Tue, 25 May 2021 20:05:18 -0700 (PDT) Received: from localhost ([::1]:44504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lljrB-0004ua-Qf for importer2@patchew.org; Tue, 25 May 2021 23:05:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnH-0006GI-Ls for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:15 -0400 Received: from mga14.intel.com ([192.55.52.115]:16092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnE-0002ux-Gh for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:15 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:10 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:07 -0700 IronPort-SDR: nEr69BBC/m6L4yFlELuK4suRnk1++/eGpQM08waDGi6LZLOyMX73387ClXQWukx93aX458xUTF hJfiU2MIUs0A== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202118605" X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="202118605" IronPort-SDR: 6fDjKJtpb39LO5Xv1CX1zKWVogGgdBW4kgQuk8TSENWwKaELnkafo+wGXWe/vRpG/fZJ5aEZHW j4aLmVFXy0cw== X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="443741303" 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 V7 2/6] util/qemu-sockets.c: Add inet_parse_base to handle InetSocketAddressBase Date: Wed, 26 May 2021 10:54:20 +0800 Message-Id: <20210526025424.1319994-3-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210526025424.1319994-1-chen.zhang@intel.com> References: <20210526025424.1319994-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.115; envelope-from=chen.zhang@intel.com; helo=mga14.intel.com X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H2=-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 , Lukas Straub , Zhang Chen Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" No need to carry the flag all the time in many scenarios. Signed-off-by: Zhang Chen --- include/qemu/sockets.h | 1 + util/qemu-sockets.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 7d1f813576..d5abc227eb 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -32,6 +32,7 @@ int socket_set_fast_reuse(int fd); int inet_ai_family_from_address(InetSocketAddress *addr, Error **errp); int inet_parse(InetSocketAddress *addr, const char *str, Error **errp); +int inet_parse_base(InetSocketAddressBase *addr, const char *str, Error **= errp); int inet_connect(const char *str, Error **errp); int inet_connect_saddr(InetSocketAddress *saddr, Error **errp); =20 diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 8af0278f15..c16eba1917 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -690,6 +690,20 @@ int inet_parse(InetSocketAddress *addr, const char *st= r, Error **errp) return 0; } =20 +int inet_parse_base(InetSocketAddressBase *base, const char *str, Error **= errp) +{ + InetSocketAddress *addr; + int ret =3D 0; + + addr =3D g_new0(InetSocketAddress, 1); + ret =3D inet_parse(addr, str, errp); + + base->host =3D addr->host; + base->port =3D addr->port; + + g_free(addr); + return ret; +} =20 /** * Create a blocking socket and connect it to an address. --=20 2.25.1 From nobody Sun May 5 02:01:03 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1621998219; cv=none; d=zohomail.com; s=zohoarc; b=B9P0Kf8ogeypSnkC+40qBwnzsC1kDKRd1HbkU2tr3gFzVOlY4HfAJYMU5//QXCMDmqFh6Se4ouMhKZO8aaQ6Nhmqh9WbYRcDMQB/xAjlDVtkdOZIFAPISBHsdNtxe0qzJdlX3bXfBbVc/JXJFwRLaKpptkhVPaJ95umH5C1LBHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621998219; 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=TuaYPHkDdZqIgLiYLGnNA5CqHj6Sxj/zFsihjpkorig=; b=DWrJ0gbECZrQ/ztPR1imq3uea+MNRJ2JEncFaIadUhBDYM+NRJhFgF2DBKXbOUoqIHOYhbMBXcc7wi4/VJysucKO5yZiMnwxt3JrqIQ+oYTfNLHGGNa4xeZkFGPCe3fbf0pOIlO/R5pZVf3exytJdXKobfHl2rAPXr2hIWqs524= 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+importer2=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 1621998219483470.4442359585196; Tue, 25 May 2021 20:03:39 -0700 (PDT) Received: from localhost ([::1]:37998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lljpa-0000Va-CC for importer2@patchew.org; Tue, 25 May 2021 23:03:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnI-0006Gw-Ae for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:16 -0400 Received: from mga14.intel.com ([192.55.52.115]:16084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnG-0002qb-8r for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:16 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:12 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:10 -0700 IronPort-SDR: +KneaiCLqxaDOgPCWECkr2feq/VipdgFe5sYhT4CkvW55Ie/8rS3bmmA6WFQzSe1046T1ZxRh3 xdQpqIRZcg9w== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202118611" X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="202118611" IronPort-SDR: R5vmjJ43emZH4olqrYXBef/wg0iLeoicVmljB38KprgRv7bTiE2rXzlhBU8QHOYVYla2DzXgTK sv0QjVqtlupg== X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="443741361" 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 V7 3/6] hmp-commands: Add new HMP command for COLO passthrough Date: Wed, 26 May 2021 10:54:21 +0800 Message-Id: <20210526025424.1319994-4-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210526025424.1319994-1-chen.zhang@intel.com> References: <20210526025424.1319994-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.115; envelope-from=chen.zhang@intel.com; helo=mga14.intel.com X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H2=-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 , Lukas Straub , Zhang Chen Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add hmp_colo_passthrough_add and hmp_colo_passthrough_del make user can maintain COLO network passthrough list in human monitor Signed-off-by: Zhang Chen --- hmp-commands.hx | 26 ++++++++++++++ include/monitor/hmp.h | 2 ++ monitor/hmp-cmds.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 435c591a1c..cbb08623c7 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1290,6 +1290,32 @@ SRST Remove host network device. ERST =20 + { + .name =3D "colo_passthrough_add", + .args_type =3D "protocol:s,object-name:s?,src:s?,dst:s?", + .params =3D "protocol [object-name] [src] [dst]", + .help =3D "Add network stream to colo passthrough list", + .cmd =3D hmp_colo_passthrough_add, + }, + +SRST +``colo_passthrough_add`` + Add network stream to colo passthrough list. +ERST + + { + .name =3D "colo_passthrough_del", + .args_type =3D "protocol:s,object-name:s?,src:s?,dst:s?", + .params =3D "protocol [object-name] [src] [dst]", + .help =3D "Delete network stream from colo passthrough list", + .cmd =3D hmp_colo_passthrough_del, + }, + +SRST +``colo_passthrough_del`` + Delete network stream from colo passthrough list. +ERST + { .name =3D "object_add", .args_type =3D "object:S", diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 605d57287a..a784f98531 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -77,6 +77,8 @@ void hmp_device_del(Monitor *mon, const QDict *qdict); void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict); void hmp_netdev_add(Monitor *mon, const QDict *qdict); void hmp_netdev_del(Monitor *mon, const QDict *qdict); +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict); +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict); void hmp_getfd(Monitor *mon, const QDict *qdict); void hmp_closefd(Monitor *mon, const QDict *qdict); void hmp_sendkey(Monitor *mon, const QDict *qdict); diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index d9bef63373..01b467e306 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1634,6 +1634,88 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, err); } =20 +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict) +{ + IPFlowSpec *spec =3D g_new0(IPFlowSpec, 1); + char *src, *dst; + Error *err =3D NULL; + + spec->protocol =3D g_strdup(qdict_get_try_str(qdict, "protocol")); + spec->object_name =3D g_strdup(qdict_get_try_str(qdict, "object-name")= ); + + src =3D g_strdup(qdict_get_try_str(qdict, "src")); + if (src) { + spec->source =3D g_new0(InetSocketAddressBase, 1); + + if (inet_parse_base(spec->source, src, NULL)) { + monitor_printf(mon, "bad colo passthrough src address"); + goto out; + } + } + + dst =3D g_strdup(qdict_get_try_str(qdict, "dst")); + if (dst) { + spec->destination =3D g_new0(InetSocketAddressBase, 1); + + if (inet_parse_base(spec->destination, dst, NULL)) { + monitor_printf(mon, "bad colo passthrough dst address"); + goto out; + } + } + + qmp_colo_passthrough_add(spec, &err); + +out: + g_free(src); + src =3D NULL; + + g_free(dst); + dst =3D NULL; + + hmp_handle_error(mon, err); +} + +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict) +{ + IPFlowSpec *spec =3D g_new0(IPFlowSpec, 1); + char *src, *dst; + Error *err =3D NULL; + + spec->protocol =3D g_strdup(qdict_get_try_str(qdict, "protocol")); + spec->object_name =3D g_strdup(qdict_get_try_str(qdict, "object-name")= ); + + src =3D g_strdup(qdict_get_try_str(qdict, "src")); + if (src) { + spec->source =3D g_new0(InetSocketAddressBase, 1); + + if (inet_parse_base(spec->source, src, NULL)) { + monitor_printf(mon, "bad colo passthrough src address"); + goto out; + } + } + + dst =3D g_strdup(qdict_get_try_str(qdict, "dst")); + if (dst) { + spec->destination =3D g_new0(InetSocketAddressBase, 1); + + if (inet_parse_base(spec->destination, dst, NULL)) { + monitor_printf(mon, "bad colo passthrough dst address"); + goto out; + } + } + + qmp_colo_passthrough_del(spec, &err); + +out: + g_free(src); + src =3D NULL; + + g_free(dst); + dst =3D NULL; + + hmp_handle_error(mon, err); +} + void hmp_object_add(Monitor *mon, const QDict *qdict) { const char *options =3D qdict_get_str(qdict, "object"); --=20 2.25.1 From nobody Sun May 5 02:01:03 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1621998412; cv=none; d=zohomail.com; s=zohoarc; b=PiGcCO1/HPyRa2n6zaNDhkN82DGX/E7eXLhZG3s8xdyZruZQBNtyoX54/PxiWknC4NVlvvnXIJHa7L9uuKGZknIzJZdUoIzftP8+eUrPnCj50FThsHthNKdUVISJixM9+BtfzUDb6V3fKtG3/jrC8j1MsNqDt8/4FXxe7b8IaQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621998412; 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=7RLTpkMnYxcovvCNuV1/ilq6bEBDCjdtY1IXqkUdio4=; b=eTj7y9ThpYgVo3L2szRqQA77ep64xlTK5wsky01zl40DO6CA871Rq/mSbzitrwz5yxCqeNRye00ANdpc5aNj446/u/DRxb+bZ+yk7DvNJcE6Vxjc358kqTAf2/ON9m/ksxjsUREnOc+8tB9UBVUzCDXknkGK6f4LWNJ5NSK71OA= 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+importer2=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 1621998412201866.0476145619551; Tue, 25 May 2021 20:06:52 -0700 (PDT) Received: from localhost ([::1]:48584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lljsf-0007iw-Ve for importer2@patchew.org; Tue, 25 May 2021 23:06:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnM-0006RS-4B for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:20 -0400 Received: from mga14.intel.com ([192.55.52.115]:16092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnI-0002ux-Ci for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:19 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:15 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:12 -0700 IronPort-SDR: G2jHQ9vjJUi8alG/NlQZ6yGHf+oHpmXndP7xhG2+4E/j2eJL9j9V2xZfrNSe6wyBUQPXoJJ+U3 JYJ1T+PJ3WhQ== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202118624" X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="202118624" IronPort-SDR: BYyN6JoSGEV+lCI22Zbn4XrRTzelasTzt9ge56/lIxqKVoUeVhIR3yQ6aZtX9MYepHjqRWUTkB kr0eiIbDbtkQ== X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="443741402" 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 V7 4/6] net/colo-compare: Move data structure and define to .h file. Date: Wed, 26 May 2021 10:54:22 +0800 Message-Id: <20210526025424.1319994-5-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210526025424.1319994-1-chen.zhang@intel.com> References: <20210526025424.1319994-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.115; envelope-from=chen.zhang@intel.com; helo=mga14.intel.com X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H2=-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 , Lukas Straub , Zhang Chen Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Rename structure with COLO index and move it to .h file, It make other modules can reuse COLO code. Signed-off-by: Zhang Chen --- net/colo-compare.c | 132 ++++++++------------------------------------- net/colo-compare.h | 86 +++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 109 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 9d1ad99941..8175612c5f 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -17,29 +17,18 @@ #include "qemu/error-report.h" #include "trace.h" #include "qapi/error.h" -#include "net/net.h" #include "net/eth.h" #include "qom/object_interfaces.h" #include "qemu/iov.h" #include "qom/object.h" #include "net/queue.h" -#include "chardev/char-fe.h" #include "qemu/sockets.h" -#include "colo.h" -#include "sysemu/iothread.h" #include "net/colo-compare.h" -#include "migration/colo.h" -#include "migration/migration.h" #include "util.h" =20 #include "block/aio-wait.h" #include "qemu/coroutine.h" =20 -#define TYPE_COLO_COMPARE "colo-compare" -typedef struct CompareState CompareState; -DECLARE_INSTANCE_CHECKER(CompareState, COLO_COMPARE, - TYPE_COLO_COMPARE) - static QTAILQ_HEAD(, CompareState) net_compares =3D QTAILQ_HEAD_INITIALIZER(net_compares); =20 @@ -47,13 +36,13 @@ static NotifierList colo_compare_notifiers =3D NOTIFIER_LIST_INITIALIZER(colo_compare_notifiers); =20 #define COMPARE_READ_LEN_MAX NET_BUFSIZE -#define MAX_QUEUE_SIZE 1024 +#define MAX_COLO_QUEUE_SIZE 1024 =20 #define COLO_COMPARE_FREE_PRIMARY 0x01 #define COLO_COMPARE_FREE_SECONDARY 0x02 =20 -#define REGULAR_PACKET_CHECK_MS 1000 -#define DEFAULT_TIME_OUT_MS 3000 +#define COLO_REGULAR_PACKET_CHECK_MS 1000 +#define COLO_DEFAULT_TIME_OUT_MS 3000 =20 /* #define DEBUG_COLO_PACKETS */ =20 @@ -64,87 +53,6 @@ static QemuCond event_complete_cond; static int event_unhandled_count; static uint32_t max_queue_size; =20 -/* - * + CompareState ++ - * | | - * +---------------+ +---------------+ +---------------+ - * | conn list + - > conn + ------- > conn + -- > .= ..... - * +---------------+ +---------------+ +---------------+ - * | | | | | | - * +---------------+ +---v----+ +---v----+ +---v----+ +---v----+ - * |primary | |secondary |primary | |secondary - * |packet | |packet + |packet | |packet + - * +--------+ +--------+ +--------+ +--------+ - * | | | | - * +---v----+ +---v----+ +---v----+ +---v----+ - * |primary | |secondary |primary | |secondary - * |packet | |packet + |packet | |packet + - * +--------+ +--------+ +--------+ +--------+ - * | | | | - * +---v----+ +---v----+ +---v----+ +---v----+ - * |primary | |secondary |primary | |secondary - * |packet | |packet + |packet | |packet + - * +--------+ +--------+ +--------+ +--------+ - */ - -typedef struct SendCo { - Coroutine *co; - struct CompareState *s; - CharBackend *chr; - GQueue send_list; - bool notify_remote_frame; - bool done; - int ret; -} SendCo; - -typedef struct SendEntry { - uint32_t size; - uint32_t vnet_hdr_len; - uint8_t *buf; -} SendEntry; - -struct CompareState { - Object parent; - - char *pri_indev; - char *sec_indev; - char *outdev; - char *notify_dev; - CharBackend chr_pri_in; - CharBackend chr_sec_in; - CharBackend chr_out; - CharBackend chr_notify_dev; - SocketReadState pri_rs; - SocketReadState sec_rs; - SocketReadState notify_rs; - SendCo out_sendco; - SendCo notify_sendco; - bool vnet_hdr; - uint64_t compare_timeout; - uint32_t expired_scan_cycle; - - /* - * Record the connection that through the NIC - * Element type: Connection - */ - GQueue conn_list; - /* Record the connection without repetition */ - GHashTable *connection_track_table; - - IOThread *iothread; - GMainContext *worker_context; - QEMUTimer *packet_check_timer; - - QEMUBH *event_bh; - enum colo_event event; - - QTAILQ_ENTRY(CompareState) next; -}; - -typedef struct CompareClass { - ObjectClass parent_class; -} CompareClass; - enum { PRIMARY_IN =3D 0, SECONDARY_IN, @@ -155,6 +63,12 @@ static const char *colo_mode[] =3D { [SECONDARY_IN] =3D "secondary", }; =20 +typedef struct COLOSendEntry { + uint32_t size; + uint32_t vnet_hdr_len; + uint8_t *buf; +} COLOSendEntry; + static int compare_chr_send(CompareState *s, uint8_t *buf, uint32_t size, @@ -737,19 +651,19 @@ static void colo_compare_connection(void *opaque, voi= d *user_data) =20 static void coroutine_fn _compare_chr_send(void *opaque) { - SendCo *sendco =3D opaque; + COLOSendCo *sendco =3D opaque; CompareState *s =3D sendco->s; int ret =3D 0; =20 while (!g_queue_is_empty(&sendco->send_list)) { - SendEntry *entry =3D g_queue_pop_tail(&sendco->send_list); + COLOSendEntry *entry =3D g_queue_pop_tail(&sendco->send_list); uint32_t len =3D htonl(entry->size); =20 ret =3D qemu_chr_fe_write_all(sendco->chr, (uint8_t *)&len, sizeof= (len)); =20 if (ret !=3D sizeof(len)) { g_free(entry->buf); - g_slice_free(SendEntry, entry); + g_slice_free(COLOSendEntry, entry); goto err; } =20 @@ -766,7 +680,7 @@ static void coroutine_fn _compare_chr_send(void *opaque) =20 if (ret !=3D sizeof(len)) { g_free(entry->buf); - g_slice_free(SendEntry, entry); + g_slice_free(COLOSendEntry, entry); goto err; } } @@ -777,12 +691,12 @@ static void coroutine_fn _compare_chr_send(void *opaq= ue) =20 if (ret !=3D entry->size) { g_free(entry->buf); - g_slice_free(SendEntry, entry); + g_slice_free(COLOSendEntry, entry); goto err; } =20 g_free(entry->buf); - g_slice_free(SendEntry, entry); + g_slice_free(COLOSendEntry, entry); } =20 sendco->ret =3D 0; @@ -790,9 +704,9 @@ static void coroutine_fn _compare_chr_send(void *opaque) =20 err: while (!g_queue_is_empty(&sendco->send_list)) { - SendEntry *entry =3D g_queue_pop_tail(&sendco->send_list); + COLOSendEntry *entry =3D g_queue_pop_tail(&sendco->send_list); g_free(entry->buf); - g_slice_free(SendEntry, entry); + g_slice_free(COLOSendEntry, entry); } sendco->ret =3D ret < 0 ? ret : -EIO; out: @@ -808,8 +722,8 @@ static int compare_chr_send(CompareState *s, bool notify_remote_frame, bool zero_copy) { - SendCo *sendco; - SendEntry *entry; + COLOSendCo *sendco; + COLOSendEntry *entry; =20 if (notify_remote_frame) { sendco =3D &s->notify_sendco; @@ -821,7 +735,7 @@ static int compare_chr_send(CompareState *s, return 0; } =20 - entry =3D g_slice_new(SendEntry); + entry =3D g_slice_new(COLOSendEntry); entry->size =3D size; entry->vnet_hdr_len =3D vnet_hdr_len; if (zero_copy) { @@ -1274,17 +1188,17 @@ static void colo_compare_complete(UserCreatable *uc= , Error **errp) =20 if (!s->compare_timeout) { /* Set default value to 3000 MS */ - s->compare_timeout =3D DEFAULT_TIME_OUT_MS; + s->compare_timeout =3D COLO_DEFAULT_TIME_OUT_MS; } =20 if (!s->expired_scan_cycle) { /* Set default value to 3000 MS */ - s->expired_scan_cycle =3D REGULAR_PACKET_CHECK_MS; + s->expired_scan_cycle =3D COLO_REGULAR_PACKET_CHECK_MS; } =20 if (!max_queue_size) { /* Set default queue size to 1024 */ - max_queue_size =3D MAX_QUEUE_SIZE; + max_queue_size =3D MAX_COLO_QUEUE_SIZE; } =20 if (find_and_check_chardev(&chr, s->pri_indev, errp) || diff --git a/net/colo-compare.h b/net/colo-compare.h index 22ddd512e2..a481df8ce6 100644 --- a/net/colo-compare.h +++ b/net/colo-compare.h @@ -17,6 +17,92 @@ #ifndef QEMU_COLO_COMPARE_H #define QEMU_COLO_COMPARE_H =20 +#include "net/net.h" +#include "chardev/char-fe.h" +#include "migration/colo.h" +#include "migration/migration.h" +#include "sysemu/iothread.h" +#include "colo.h" + +#define TYPE_COLO_COMPARE "colo-compare" +typedef struct CompareState CompareState; +DECLARE_INSTANCE_CHECKER(CompareState, COLO_COMPARE, + TYPE_COLO_COMPARE) + +typedef struct COLOSendCo { + Coroutine *co; + struct CompareState *s; + CharBackend *chr; + GQueue send_list; + bool notify_remote_frame; + bool done; + int ret; +} COLOSendCo; + +/* + * + CompareState ++ + * | | + * +---------------+ +---------------+ +---------------+ + * | conn list + - > conn + ------- > conn + -- > .= ..... + * +---------------+ +---------------+ +---------------+ + * | | | | | | + * +---------------+ +---v----+ +---v----+ +---v----+ +---v----+ + * |primary | |secondary |primary | |secondary + * |packet | |packet + |packet | |packet + + * +--------+ +--------+ +--------+ +--------+ + * | | | | + * +---v----+ +---v----+ +---v----+ +---v----+ + * |primary | |secondary |primary | |secondary + * |packet | |packet + |packet | |packet + + * +--------+ +--------+ +--------+ +--------+ + * | | | | + * +---v----+ +---v----+ +---v----+ +---v----+ + * |primary | |secondary |primary | |secondary + * |packet | |packet + |packet | |packet + + * +--------+ +--------+ +--------+ +--------+ + */ +struct CompareState { + Object parent; + + char *pri_indev; + char *sec_indev; + char *outdev; + char *notify_dev; + CharBackend chr_pri_in; + CharBackend chr_sec_in; + CharBackend chr_out; + CharBackend chr_notify_dev; + SocketReadState pri_rs; + SocketReadState sec_rs; + SocketReadState notify_rs; + COLOSendCo out_sendco; + COLOSendCo notify_sendco; + bool vnet_hdr; + uint64_t compare_timeout; + uint32_t expired_scan_cycle; + + /* + * Record the connection that through the NIC + * Element type: Connection + */ + GQueue conn_list; + /* Record the connection without repetition */ + GHashTable *connection_track_table; + + IOThread *iothread; + GMainContext *worker_context; + QEMUTimer *packet_check_timer; + + QEMUBH *event_bh; + enum colo_event event; + + QTAILQ_ENTRY(CompareState) next; +}; + +typedef struct CompareClass { + ObjectClass parent_class; +} CompareClass; + void colo_notify_compares_event(void *opaque, int event, Error **errp); void colo_compare_register_notifier(Notifier *notify); void colo_compare_unregister_notifier(Notifier *notify); --=20 2.25.1 From nobody Sun May 5 02:01:03 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1621998229; cv=none; d=zohomail.com; s=zohoarc; b=VFkN94RJKl+sHCPnSJli97E1/0+NrjrqccCDBr76tflw4espIRVVbTYuNB4mcf32pYY6IoEybXUwh5YXn+CLp7V6TTDi1sfEmKprzobHL1F1VsIe7gaQl94pgxgR8NaKmyGVe9XUZvi56OZsJx6pagWhYeGT+k9YTo5gA3gzMFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621998229; 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=LdqScEWTQ2o4U5zvL+v3jsFdisUJyoyPYDIYs03tQFA=; b=h6PQjTVt5I7Lmdt0EJEaqrluLrLj8NEEM36I5fuMtAboHq//hyK5MZf8KM7JozfA4I2/vfsj9lY6/qdHVKXN83Ronk7ucrIQb1M1DDquEVL+1kTzINA1BlcXqz+dCb9QTrGkysz9PqmStSZ64zJW99lxkNs/N2tInnxI6NoSPj0= 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+importer2=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 1621998229586351.1664122654407; Tue, 25 May 2021 20:03:49 -0700 (PDT) Received: from localhost ([::1]:38700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lljpk-0000yB-Gz for importer2@patchew.org; Tue, 25 May 2021 23:03:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnT-0006fA-Io for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:28 -0400 Received: from mga14.intel.com ([192.55.52.115]:16092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnO-0002ux-Gz for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:26 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:19 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:15 -0700 IronPort-SDR: X0H+YOfGa93403QEsDda/AvBvYhc1KnrPLfLgoS5O80IMHQZZtRhE06d8tuH7u441ZPnPnbu6J 5E0BwwsfIW3A== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202118635" X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="202118635" IronPort-SDR: vGzzl8H6f9zSmBe/C2g6N7vuMoFMY3xxyMNfGfkgcpCLvibGI96J/4+shEf8tiYpa/FnX8jl3c 9Jwdwj2vlbsQ== X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="443741429" 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 V7 5/6] net/colo-compare: Add passthrough list to CompareState Date: Wed, 26 May 2021 10:54:23 +0800 Message-Id: <20210526025424.1319994-6-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210526025424.1319994-1-chen.zhang@intel.com> References: <20210526025424.1319994-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.115; envelope-from=chen.zhang@intel.com; helo=mga14.intel.com X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H2=-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 , Lukas Straub , Zhang Chen Errors-To: qemu-devel-bounces+importer2=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 8175612c5f..2250efd40d 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); =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); @@ -1245,6 +1271,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, @@ -1259,6 +1286,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 a481df8ce6..1980df4487 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 From nobody Sun May 5 02:01:03 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1621998321; cv=none; d=zohomail.com; s=zohoarc; b=JSRsB0mqflKb4NPsM3BLTC1h+olX60RNLrrcaDEL39alCjmE3t9Sl5xgsbvxquO1nkX6bwmtZNFC0l89fk+dWW7Vr2zlgwnPDu95UFLtw7rwCxFEHxiSsJZGHsmZmHU/gPeIC5w9Q6eCV2Jh+CgMp7pXL3mlmmCuEoIvZH6odPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621998321; 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=HafPiJkFRCY4f+OQwkomz/ZTk/cLMjn+UodKEGlyS/c=; b=Zu+PQy2mo6mpAj8kVeJ7OjRdAy5x+ukNu+00otnSIl4xr0zWkQ32KEg+d0aexD80D2VQct6jPBP9ScAefdXVTVxD4V4SdIQt1in7vIOJWizVAWax1TLMv8u/qNdaq1CttGnKf+zpsg2NUMObzbcWSlPn7kaXWL4a5QElquRVqwA= 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+importer2=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 1621998321150734.0823385711267; Tue, 25 May 2021 20:05:21 -0700 (PDT) Received: from localhost ([::1]:44624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lljrE-0004zx-4f for importer2@patchew.org; Tue, 25 May 2021 23:05:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnW-0006fp-N5 for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:38 -0400 Received: from mga14.intel.com ([192.55.52.115]:16106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lljnP-0003AA-D1 for qemu-devel@nongnu.org; Tue, 25 May 2021 23:01:30 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:21 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 20:01:18 -0700 IronPort-SDR: 4e8QnAyi2PkUDUkuAf/0NaUygBhyfKY0rJpZW9nAeKB0F89rMlmFix1pfCLnVSBOFfuYRHtQhN y0jythqsNEKQ== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202118637" X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="202118637" IronPort-SDR: f5kqrOCsQbKO0U3yqYMl6QpRZVDPUmMbPrKmFJaZ7qAx6JZsTQjNL6usNwE30endUGn/WGUFi2 5HuohNAOrI0g== X-IronPort-AV: E=Sophos;i="5.82,330,1613462400"; d="scan'208";a="443741457" 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 V7 6/6] net/net.c: Add handler for COLO passthrough connection Date: Wed, 26 May 2021 10:54:24 +0800 Message-Id: <20210526025424.1319994-7-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210526025424.1319994-1-chen.zhang@intel.com> References: <20210526025424.1319994-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.115; envelope-from=chen.zhang@intel.com; helo=mga14.intel.com X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H2=-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 , Lukas Straub , Zhang Chen Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Use connection protocol,src port,dst port,src ip,dst ip as the key to bypass certain network traffic in COLO compare. Signed-off-by: Zhang Chen --- net/net.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 2 deletions(-) diff --git a/net/net.c b/net/net.c index a4bee86b24..6cb0387199 100644 --- a/net/net.c +++ b/net/net.c @@ -54,6 +54,8 @@ #include "sysemu/runstate.h" #include "net/filter.h" #include "qapi/string-output-visitor.h" +#include "net/colo-compare.h" +#include "qom/object_interfaces.h" =20 /* Net bridge is currently not supported for W32. */ #if !defined(_WIN32) @@ -1194,14 +1196,170 @@ void qmp_netdev_del(const char *id, Error **errp) } } =20 +static CompareState *colo_passthrough_check(IPFlowSpec *spec, Error **errp) +{ + Object *container; + Object *obj; + CompareState *s; + + if (!spec->object_name) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "object-name", + "Need input colo-compare object name"); + return NULL; + } + + container =3D object_get_objects_root(); + obj =3D object_resolve_path_component(container, spec->object_name); + if (!obj) { + error_setg(errp, "colo-compare '%s' not found", spec->object_name); + return NULL; + } + + s =3D COLO_COMPARE(obj); + + if (!getprotobyname(spec->protocol)) { + error_setg(errp, "COLO pass through get wrong protocol"); + return NULL; + } + + if ((spec->source->host && !qemu_isdigit(spec->source->host[0])) || + (spec->destination->host && + !qemu_isdigit(spec->destination->host[0]))) { + error_setg(errp, "COLO pass through get wrong IP"); + return NULL; + } + + if (atoi(spec->source->port) > 65536 || atoi(spec->source->port) < 0 || + atoi(spec->destination->port) > 65536 || + atoi(spec->destination->port) < 0) { + error_setg(errp, "COLO pass through get wrong port"); + return NULL; + } + + return s; +} + +static COLOPassthroughEntry *compare_passthrough_find(CompareState *s, + COLOPassthroughEntry= *ent) +{ + COLOPassthroughEntry *next =3D NULL, *origin =3D NULL; + + if (!QLIST_EMPTY(&s->passthroughlist)) { + QLIST_FOREACH_SAFE(origin, &s->passthroughlist, node, next) { + if ((ent->l4_protocol->p_proto =3D=3D origin->l4_protocol->p_p= roto) && + (ent->src_port =3D=3D origin->src_port) && + (ent->dst_port =3D=3D origin->dst_port) && + (ent->src_ip.s_addr =3D=3D origin->src_ip.s_addr) && + (ent->dst_ip.s_addr =3D=3D origin->dst_ip.s_addr)) { + return origin; + } + } + } + + return NULL; +} + +static void compare_passthrough_add(CompareState *s, + IPFlowSpec *spec, + Error **errp) +{ + COLOPassthroughEntry *pass =3D NULL; + + pass =3D g_new0(COLOPassthroughEntry, 1); + + pass->l4_protocol =3D getprotobyname(spec->protocol); + pass->src_port =3D atoi(spec->source->port); + pass->dst_port =3D atoi(spec->destination->port); + + if (!inet_aton(spec->source->host, &pass->src_ip)) { + pass->src_ip.s_addr =3D 0; + } + + if (!inet_aton(spec->destination->host, &pass->dst_ip)) { + pass->dst_ip.s_addr =3D 0; + } + + qemu_mutex_lock(&s->passthroughlist_mutex); + if (compare_passthrough_find(s, pass)) { + error_setg(errp, "The pass through connection already exists"); + g_free(pass); + qemu_mutex_unlock(&s->passthroughlist_mutex); + return; + } + + QLIST_INSERT_HEAD(&s->passthroughlist, pass, node); + qemu_mutex_unlock(&s->passthroughlist_mutex); +} + +static void compare_passthrough_del(CompareState *s, + IPFlowSpec *spec, + Error **errp) +{ + COLOPassthroughEntry *pass =3D NULL, *result =3D NULL; + + pass =3D g_new0(COLOPassthroughEntry, 1); + + pass->l4_protocol =3D getprotobyname(spec->protocol); + pass->src_port =3D atoi(spec->source->port); + pass->dst_port =3D atoi(spec->destination->port); + + if (!inet_aton(spec->source->host, &pass->src_ip)) { + pass->src_ip.s_addr =3D 0; + } + + if (!inet_aton(spec->destination->host, &pass->dst_ip)) { + pass->dst_ip.s_addr =3D 0; + } + + qemu_mutex_lock(&s->passthroughlist_mutex); + + result =3D compare_passthrough_find(s, pass); + if (result) { + QLIST_REMOVE(result, node); + g_free(result); + } else { + error_setg(errp, "Can't find the IP flow Spec"); + } + + g_free(pass); + qemu_mutex_unlock(&s->passthroughlist_mutex); +} + + void qmp_colo_passthrough_add(IPFlowSpec *spec, Error **errp) { - /* TODO implement setup passthrough rule */ + CompareState *s; + Error *err =3D NULL; + + s =3D colo_passthrough_check(spec, &err); + if (err) { + error_propagate(errp, err); + return; + } + + compare_passthrough_add(s, spec, &err); + if (err) { + error_propagate(errp, err); + return; + } } =20 void qmp_colo_passthrough_del(IPFlowSpec *spec, Error **errp) { - /* TODO implement delete passthrough rule */ + CompareState *s; + Error *err =3D NULL; + + s =3D colo_passthrough_check(spec, &err); + if (err) { + error_propagate(errp, err); + return; + } + + compare_passthrough_del(s, spec, &err); + if (err) { + error_propagate(errp, err); + return; + } } =20 static void netfilter_print_info(Monitor *mon, NetFilterState *nf) --=20 2.25.1