From nobody Tue Feb 10 23:58:47 2026 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.zoho.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: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495549536707160.90899352408667; Tue, 23 May 2017 07:25:36 -0700 (PDT) Received: from localhost ([::1]:49295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDAkd-0006CL-Ay for importer@patchew.org; Tue, 23 May 2017 10:25:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDAgN-0002i7-M5 for qemu-devel@nongnu.org; Tue, 23 May 2017 10:21:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDAgM-00032u-0U for qemu-devel@nongnu.org; Tue, 23 May 2017 10:21:07 -0400 Received: from [59.151.112.132] (port=60669 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDAgK-00031S-Oj for qemu-devel@nongnu.org; Tue, 23 May 2017 10:21:05 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 23 May 2017 22:21:03 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id D64AE47CA8CC; Tue, 23 May 2017 22:21:00 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 23 May 2017 22:21:00 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="19208537" From: Zhang Chen To: qemu devel , Jason Wang Date: Tue, 23 May 2017 22:20:41 +0800 Message-ID: <1495549241-23380-10-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495549241-23380-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1495549241-23380-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: D64AE47CA8CC.A13C6 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH V5 9/9] 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhanghailiang , Li Zhijian , weifuqiang , "eddie . dong" , Zhang Chen , bian naimeng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We add the vnet_hdr option for filter-rewriter, default is disable. If you use virtio-net-pci net driver, please enable it. You can use it for example: -object filter-rewriter,id=3Drew0,netdev=3Dhn0,queue=3Dall,vnet_hdr=3Don We get the vnet_hdr_len from NetClientState that make us parse net packet correctly. Signed-off-by: Zhang Chen --- net/filter-rewriter.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++= +++- qemu-options.hx | 4 ++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 63256c7..be129c7 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,24 @@ 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) { + if (nf->netdev->using_vnet_hdr) { + vnet_hdr_len =3D nf->netdev->vnet_hdr_len; + } else if (nf->netdev->peer->using_vnet_hdr) { + vnet_hdr_len =3D nf->netdev->peer->vnet_hdr_len; + } else { + error_report("filter-rewriter get vnet_hdr_len failed"); + /* When error occurred we drop the packet */ + return 1; + } + } + + pkt =3D packet_new(buf, size, vnet_hdr_len); g_free(buf); =20 /* @@ -237,6 +253,42 @@ 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 char *filter_rewriter_get_vnet_hdr(Object *obj, Error **errp) +{ + RewriterState *s =3D FILTER_COLO_REWRITER(obj); + + return s->vnet_hdr ? g_strdup("on") : g_strdup("off"); +} + +static void filter_rewriter_set_vnet_hdr(Object *obj, + const char *value, + Error **errp) +{ + RewriterState *s =3D FILTER_COLO_REWRITER(obj); + + if (strcmp(value, "on") && strcmp(value, "off")) { + error_setg(errp, "Invalid value for filter-rewriter vnet_hdr, " + "should be 'on' or 'off'"); + return; + } + + s->vnet_hdr =3D !strcmp(value, "on"); +} + +static void filter_rewriter_init(Object *obj) +{ + RewriterState *s =3D FILTER_COLO_REWRITER(obj); + + /* + * The vnet_hdr is disabled by default, if you want to enable + * this option, you must enable all the option on related modules + * (like other filter or colo-compare). + */ + s->vnet_hdr =3D false; + object_property_add_str(obj, "vnet_hdr", 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 +302,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 bb3f400..59cbdd9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4037,12 +4037,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},rewrit= er-mode=3D@var{mode}[,queue=3D@var{all|rx|tx}] +@item -object filter-rewriter,id=3D@var{id},netdev=3D@var{netdevid},rewrit= er-mode=3D@var{mode},vnet_hdr=3D@var{on|off}[,queue=3D@var{all|rx|tx}] =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 vnet_hdr =3D on, we can parse packet with vnet header. =20 usage: colo secondary: --=20 2.7.4