From nobody Thu May 1 12:41:55 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
permitted sender) client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1500294586320412.7999227235673;
Mon, 17 Jul 2017 05:29:46 -0700 (PDT)
Received: from localhost ([::1]:50073 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1dX59j-0007RD-S7
for importer@patchew.org; Mon, 17 Jul 2017 08:29:43 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48383)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <jasowang@redhat.com>) id 1dX52e-0000tw-O9
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:22:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <jasowang@redhat.com>) id 1dX52d-0008G4-BG
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:22:24 -0400
Received: from mx1.redhat.com ([209.132.183.28]:42514)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <jasowang@redhat.com>) id 1dX52d-0008Fo-24
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:22:23 -0400
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
[10.5.11.11])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id E5E323DE3D;
Mon, 17 Jul 2017 12:22:21 +0000 (UTC)
Received: from jason-ThinkPad-T450s.redhat.com (ovpn-12-128.pek2.redhat.com
[10.72.12.128])
by smtp.corp.redhat.com (Postfix) with ESMTP id 25C78600C2;
Mon, 17 Jul 2017 12:22:19 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E5E323DE3D
Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com;
dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com;
spf=pass smtp.mailfrom=jasowang@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E5E323DE3D
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org,
qemu-devel@nongnu.org
Date: Mon, 17 Jul 2017 20:21:42 +0800
Message-Id: <1500294105-13713-12-git-send-email-jasowang@redhat.com>
In-Reply-To: <1500294105-13713-1-git-send-email-jasowang@redhat.com>
References: <1500294105-13713-1-git-send-email-jasowang@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.29]);
Mon, 17 Jul 2017 12:22:22 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
[fuzzy]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL 11/14] net/filter-rewriter.c: Make
filter-rewriter support vnet_hdr_len
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Jason Wang <jasowang@redhat.com>,
Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_0 Z_629925259 SPT_0
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
We add the vnet_hdr_support option for filter-rewriter, default is disabled.
If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
You can use it for example:
-object filter-rewriter,id=3Drew0,netdev=3Dhn0,queue=3Dall,vnet_hdr_support
We get the vnet_hdr_len from NetClientState that make us
parse net packet correctly.
Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/filter-rewriter.c | 37 ++++++++++++++++++++++++++++++++++++-
qemu-options.hx | 4 ++--
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index 63256c7..55a6cf5 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -17,6 +17,7 @@
#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
+#include "qemu/error-report.h"
#include "qapi-visit.h"
#include "qom/object.h"
#include "qemu/main-loop.h"
@@ -33,6 +34,7 @@ typedef struct RewriterState {
NetQueue *incoming_queue;
/* hashtable to save connection */
GHashTable *connection_track_table;
+ bool vnet_hdr;
} RewriterState;
=20
static void filter_rewriter_flush(NetFilterState *nf)
@@ -155,10 +157,16 @@ static ssize_t colo_rewriter_receive_iov(NetFilterSta=
te *nf,
ConnectionKey key;
Packet *pkt;
ssize_t size =3D iov_size(iov, iovcnt);
+ ssize_t vnet_hdr_len =3D 0;
char *buf =3D g_malloc0(size);
=20
iov_to_buf(iov, iovcnt, 0, buf, size);
- pkt =3D packet_new(buf, size, 0);
+
+ if (s->vnet_hdr) {
+ vnet_hdr_len =3D nf->netdev->vnet_hdr_len;
+ }
+
+ pkt =3D packet_new(buf, size, vnet_hdr_len);
g_free(buf);
=20
/*
@@ -237,6 +245,32 @@ static void colo_rewriter_setup(NetFilterState *nf, Er=
ror **errp)
s->incoming_queue =3D qemu_new_net_queue(qemu_netfilter_pass_to_next, =
nf);
}
=20
+static bool filter_rewriter_get_vnet_hdr(Object *obj, Error **errp)
+{
+ RewriterState *s =3D FILTER_COLO_REWRITER(obj);
+
+ return s->vnet_hdr;
+}
+
+static void filter_rewriter_set_vnet_hdr(Object *obj,
+ bool value,
+ Error **errp)
+{
+ RewriterState *s =3D FILTER_COLO_REWRITER(obj);
+
+ s->vnet_hdr =3D value;
+}
+
+static void filter_rewriter_init(Object *obj)
+{
+ RewriterState *s =3D FILTER_COLO_REWRITER(obj);
+
+ s->vnet_hdr =3D false;
+ object_property_add_bool(obj, "vnet_hdr_support",
+ filter_rewriter_get_vnet_hdr,
+ filter_rewriter_set_vnet_hdr, NULL);
+}
+
static void colo_rewriter_class_init(ObjectClass *oc, void *data)
{
NetFilterClass *nfc =3D NETFILTER_CLASS(oc);
@@ -250,6 +284,7 @@ static const TypeInfo colo_rewriter_info =3D {
.name =3D TYPE_FILTER_REWRITER,
.parent =3D TYPE_NETFILTER,
.class_init =3D colo_rewriter_class_init,
+ .instance_init =3D filter_rewriter_init,
.instance_size =3D sizeof(RewriterState),
};
=20
diff --git a/qemu-options.hx b/qemu-options.hx
index 91a25ee..e0e04c8 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4262,12 +4262,12 @@ 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.
=20
-@item -object filter-rewriter,id=3D@var{id},netdev=3D@var{netdevid}[,queue=
=3D@var{all|rx|tx}]
+@item -object filter-rewriter,id=3D@var{id},netdev=3D@var{netdevid},queue=
=3D@var{all|rx|tx},[vnet_hdr_support]
=20
Filter-rewriter is a part of COLO project.It will rewrite tcp 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.
+client.if it has the vnet_hdr_support flag, we can parse packet with vnet =
header.
=20
usage:
colo secondary:
--=20
2.7.4