From patchwork Fri Nov 19 05:35:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 12628201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC964C433EF for ; Fri, 19 Nov 2021 05:46:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 701A66121D for ; Fri, 19 Nov 2021 05:46:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 701A66121D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:59636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnwjJ-0003Gg-95 for qemu-devel@archiver.kernel.org; Fri, 19 Nov 2021 00:46:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnwiI-0002XC-1i for qemu-devel@nongnu.org; Fri, 19 Nov 2021 00:45:30 -0500 Received: from mga11.intel.com ([192.55.52.93]:52686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnwiF-0007GY-RD for qemu-devel@nongnu.org; Fri, 19 Nov 2021 00:45:29 -0500 X-IronPort-AV: E=McAfee;i="6200,9189,10172"; a="231843122" X-IronPort-AV: E=Sophos;i="5.87,246,1631602800"; d="scan'208";a="231843122" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2021 21:45:24 -0800 X-IronPort-AV: E=Sophos;i="5.87,246,1631602800"; d="scan'208";a="507767148" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2021 21:45:21 -0800 From: Zhang Chen To: Jason Wang , Li Zhijian Subject: [PATCH V3 1/2] net/filter: Enable the vnet_hdr_support by default Date: Fri, 19 Nov 2021 13:35:05 +0800 Message-Id: <20211119053506.290459-1-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Received-SPF: pass client-ip=192.55.52.93; envelope-from=chen.zhang@intel.com; helo=mga11.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, 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 Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This patch make filters and colo-compare module support vnet_hdr by default. And also support -device non-virtio-net(like e1000.). Because when enabled the support will make the vnet_hdr_len field become must-delivery part of filter transfer protocol(even 0 in use -device e1000). It fully guarantees the compatibility for management layer like libvirt. But it still can't avoid user manual configuration error between different filters connected when enable/disable vnet_hdr_support. Signed-off-by: Zhang Chen --- net/colo-compare.c | 2 +- net/filter-mirror.c | 4 ++-- net/filter-rewriter.c | 2 +- qemu-options.hx | 9 +++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index b966e7e514..0232249311 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -1399,7 +1399,7 @@ static void colo_compare_init(Object *obj) get_max_queue_size, set_max_queue_size, NULL, NULL); - s->vnet_hdr = false; + s->vnet_hdr = true; object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr, compare_set_vnet_hdr); } diff --git a/net/filter-mirror.c b/net/filter-mirror.c index f20240cc9f..adb0c6d89a 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -406,14 +406,14 @@ static void filter_mirror_init(Object *obj) { MirrorState *s = FILTER_MIRROR(obj); - s->vnet_hdr = false; + s->vnet_hdr = true; } static void filter_redirector_init(Object *obj) { MirrorState *s = FILTER_REDIRECTOR(obj); - s->vnet_hdr = false; + s->vnet_hdr = true; } static void filter_mirror_fini(Object *obj) diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index bf05023dc3..5698cd39d1 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -407,7 +407,7 @@ static void filter_rewriter_init(Object *obj) { RewriterState *s = FILTER_REWRITER(obj); - s->vnet_hdr = false; + s->vnet_hdr = true; s->failover_mode = FAILOVER_MODE_OFF; } diff --git a/qemu-options.hx b/qemu-options.hx index 7749f59300..c40e385ede 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4967,13 +4967,13 @@ SRST ``-object filter-mirror,id=id,netdev=netdevid,outdev=chardevid,queue=all|rx|tx[,vnet_hdr_support][,position=head|tail|id=][,insert=behind|before]`` filter-mirror on netdev netdevid,mirror net packet to chardevchardevid, if it has the vnet\_hdr\_support flag, - filter-mirror will mirror packet with vnet\_hdr\_len. + filter-mirror will mirror packet with vnet\_hdr\_len(default: on). ``-object filter-redirector,id=id,netdev=netdevid,indev=chardevid,outdev=chardevid,queue=all|rx|tx[,vnet_hdr_support][,position=head|tail|id=][,insert=behind|before]`` filter-redirector on netdev netdevid,redirect filter's net packet to chardev chardevid,and redirect indev's packet to filter.if it has the vnet\_hdr\_support flag, filter-redirector - will redirect packet with vnet\_hdr\_len. Create a + will redirect packet with vnet\_hdr\_len(default: on). Create a filter-redirector we need to differ outdev id from indev id, id can not be the same. we can just use indev or outdev, but at least one of indev or outdev need to be specified. @@ -4983,7 +4983,8 @@ SRST packet to secondary from primary to keep secondary tcp connection,and rewrite tcp packet to primary from secondary make tcp packet can be handled by client.if it has the - vnet\_hdr\_support flag, we can parse packet with vnet header. + vnet\_hdr\_support flag, we can parse packet with vnet + header(default: on). usage: colo secondary: -object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0 -object @@ -5004,7 +5005,7 @@ SRST checkpoint and send primary packet to out\_dev. In order to improve efficiency, we need to put the task of comparison in another iothread. If it has the vnet\_hdr\_support flag, - colo compare will send/recv packet with vnet\_hdr\_len. + colo compare will send/recv packet with vnet\_hdr\_len(default: on). The compare\_timeout=@var{ms} determines the maximum time of the colo-compare hold the packet. The expired\_scan\_cycle=@var{ms} is to set the period of scanning expired primary node network packets. From patchwork Fri Nov 19 05:35:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 12628203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03C35C433F5 for ; Fri, 19 Nov 2021 05:47:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 85B5E6121D for ; Fri, 19 Nov 2021 05:47:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 85B5E6121D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:33540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnwkE-0004iE-La for qemu-devel@archiver.kernel.org; Fri, 19 Nov 2021 00:47:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnwiJ-0002Zn-V1 for qemu-devel@nongnu.org; Fri, 19 Nov 2021 00:45:32 -0500 Received: from mga11.intel.com ([192.55.52.93]:52686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnwiI-0007GY-HS for qemu-devel@nongnu.org; Fri, 19 Nov 2021 00:45:31 -0500 X-IronPort-AV: E=McAfee;i="6200,9189,10172"; a="231843123" X-IronPort-AV: E=Sophos;i="5.87,246,1631602800"; d="scan'208";a="231843123" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2021 21:45:25 -0800 X-IronPort-AV: E=Sophos;i="5.87,246,1631602800"; d="scan'208";a="507767157" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2021 21:45:23 -0800 From: Zhang Chen To: Jason Wang , Li Zhijian Subject: [PATCH V3 2/2] test/qtest/test-filter-mirror.c: Change the default vnet_hdr_support Date: Fri, 19 Nov 2021 13:35:06 +0800 Message-Id: <20211119053506.290459-2-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211119053506.290459-1-chen.zhang@intel.com> References: <20211119053506.290459-1-chen.zhang@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.55.52.93; envelope-from=chen.zhang@intel.com; helo=mga11.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, 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 Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As net filters changed default vnet_hdr_support=on. For this e1000 test case need to add vnet_hdr_support=off. Signed-off-by: Zhang Chen --- tests/qtest/test-filter-mirror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/test-filter-mirror.c b/tests/qtest/test-filter-mirror.c index bc0dee64dd..7756f8cfc1 100644 --- a/tests/qtest/test-filter-mirror.c +++ b/tests/qtest/test-filter-mirror.c @@ -45,7 +45,7 @@ static void test_mirror(void) "-netdev socket,id=qtest-bn0,fd=%d " "-device %s,netdev=qtest-bn0,id=qtest-e0 " "-chardev socket,id=mirror0,fd=%d " - "-object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0 " + "-object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0,vnet_hdr_support=off " , send_sock[1], devstr, recv_sock[1]); struct iovec iov[] = {