Commit 4b39bdce authored by Zhang Chen's avatar Zhang Chen Committed by Jason Wang
Browse files

net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len 



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=rew0,netdev=hn0,queue=all,vnet_hdr_support

We get the vnet_hdr_len from NetClientState that make us
parse net packet correctly.

Signed-off-by: default avatarZhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent d63b366a

net/filter-rewriter.c

+36 −1
Original line number Diff line number Diff line
@@ -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;



static void filter_rewriter_flush(NetFilterState *nf)
@@ -155,10 +157,16 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf, 
    ConnectionKey key;

    Packet *pkt;

    ssize_t size = iov_size(iov, iovcnt);

    ssize_t vnet_hdr_len = 0;

    char *buf = g_malloc0(size);



    iov_to_buf(iov, iovcnt, 0, buf, size);

    pkt = packet_new(buf, size, 0);



    if (s->vnet_hdr) {

        vnet_hdr_len = nf->netdev->vnet_hdr_len;

    }



    pkt = packet_new(buf, size, vnet_hdr_len);

    g_free(buf);



    /*
@@ -237,6 +245,32 @@ static void colo_rewriter_setup(NetFilterState *nf, Error **errp) 
    s->incoming_queue = qemu_new_net_queue(qemu_netfilter_pass_to_next, nf);

}



static bool filter_rewriter_get_vnet_hdr(Object *obj, Error **errp)

{

    RewriterState *s = FILTER_COLO_REWRITER(obj);



    return s->vnet_hdr;

}



static void filter_rewriter_set_vnet_hdr(Object *obj,

                                         bool value,

                                         Error **errp)

{

    RewriterState *s = FILTER_COLO_REWRITER(obj);



    s->vnet_hdr = value;

}



static void filter_rewriter_init(Object *obj)

{

    RewriterState *s = FILTER_COLO_REWRITER(obj);



    s->vnet_hdr = 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 = NETFILTER_CLASS(oc);
@@ -250,6 +284,7 @@ static const TypeInfo colo_rewriter_info = { 
    .name = TYPE_FILTER_REWRITER,

    .parent = TYPE_NETFILTER,

    .class_init = colo_rewriter_class_init,

    .instance_init = filter_rewriter_init,

    .instance_size = sizeof(RewriterState),

};

qemu-options.hx

+2 −2
Original line number Diff line number Diff line
@@ -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.



@item -object filter-rewriter,id=@var{id},netdev=@var{netdevid}[,queue=@var{all|rx|tx}]

@item -object filter-rewriter,id=@var{id},netdev=@var{netdevid},queue=@var{all|rx|tx},[vnet_hdr_support]



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.



usage:

colo secondary: