From patchwork Sat Oct 5 13:05:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 11175647 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D93AD76 for ; Sat, 5 Oct 2019 13:11:39 +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 9DDF1222C8 for ; Sat, 5 Oct 2019 13:11:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=web.de header.i=@web.de header.b="ntFd4+ce" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9DDF1222C8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGjqT-0005BP-Jg for patchwork-qemu-devel@patchwork.kernel.org; Sat, 05 Oct 2019 09:11:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56825) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGjl3-0002pd-F9 for qemu-devel@nongnu.org; Sat, 05 Oct 2019 09:06:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGjl0-0005Zl-MG for qemu-devel@nongnu.org; Sat, 05 Oct 2019 09:06:01 -0400 Received: from mout.web.de ([212.227.17.12]:48885) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iGjku-0005U8-7F; Sat, 05 Oct 2019 09:05:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1570280737; bh=6Uf5G14Now/peaYZfO+y9x/dGzGKbhnBYYKyspPJYcQ=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=ntFd4+ceclW+eSssdfkGcqGFvry5yU5MB6OTNaJrfBLYstwr+VIOj/9uFgJhRO1Xf G0u1WGbLcdRbFcDeYzI5pktMlYyjHMUSL1tDaxscg2vF/c8loqIHTntpzKmICxMPCS iLcRUgSdeJ56yWET3Ov0v1DxF9a/VnU0C0BFGHSU= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from luklap ([87.123.206.231]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MXpdL-1iek9G2SwB-00Wiz3; Sat, 05 Oct 2019 15:05:37 +0200 Date: Sat, 5 Oct 2019 15:05:34 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v6 3/4] net/filter.c: Add Options to insert filters anywhere in the filter list Message-ID: <233911f2d68d72126bf93fd746eadb30ab0307e0.1570280098.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:YjyHhRSr8xij19R2Pt/xEUysFg9bBACSmQ7DFPfUpOANcQ6/8b0 /4lnBzodf/2Bci7LdxGYUlLdXWQF4xUtxqkwPCWmxXAq7VcFARsEYqvFsE584yBYVtr7r/h D5CswyZdgMvAlsIPlZNZWYxU4FNim7CvG97oNW1PdSgx5y3hS6/xXYua5tUWqeTvrtqqkdL iXLoW/DMKRkzNzPTFRbOw== X-UI-Out-Filterresults: notjunk:1;V03:K0:BaRS/0d0LPI=:HBPgMPY3kWYmQrpB7QuhY5 0jY8QOy60NVThUXTxJPRWMttdlXxjO74gj3e/kF7EUEV5QESBHdrc+EBi4sc6mzcduMV8iVlx kPq5GmXbG9n/RHaamVwP5yNMSe65IM0h6JIcV4GqAQgznPYowWCYy3I3GULXkKwh6xDPZTuaQ QeazeF6jR6HRsr8NrHK/znTZjEFpQe3z8WmiTqYTLOh4gTa6sV+72f2L1nTF9ezJLA5RbsTb4 dT4rOgBaaNOMRpuC6FN9qfzvAK7jnTOZNlAEa35ymGcKX5lCry+ngKewk46fuMHiAd1+Qvnbi ngRc7eE39LJlhd6dDM2EqXEvfZ+Jx4tU3w7VtJ7398p6Dkupz7bgF47Y6JiSFH7y3/0RIwdDG TH1LADOf7FZsBO5I84orkGd6PrRR18oT47JyBMALJ8CykCvT906WiVFsPF9VAdIlqSWej8GrX TqnYzZO20oVt9wzhpSttkUHu4uZGa/+p2I18ogNUAEOJJWD8rIpx2fwlmqmdNXF4leGUlrxUw vdLXc2k1Ek4bTUpK0nkyV/dcDc7tozdzf+W2M8eReUlTe9R6PD74jb0zAzOLnsAjAVACjPTWn ORq1UQg4JoerTfbfeFapigCsPNiYcbrdz7a/HrGE0XwLV1Q/P827M3tvMgkWuhNq7zqQpG7Fx kJKaIocos3QjeuS2MagEcUBAbEuFy7j8oyp4huaEmUwU9OigvO+Wx79YIsyMKNLw3GLMS2Nn/ Et9ayRRs5kVDFH/xVQqxwrnFWqwI5/xSLvepoTQBEeeNtA6Wx38MITtuitSTaq8jvzRQh6LrT ubgYVTCXqdhtAHKItrh3eaJFArR+VzqyzrxuLo6YKWz8AQsBDb+1qETEA1MUVqS8tdqFKdmaS +wi27RTibKG0tRlBj84h1V4sEBJ80vQ4vJTCVHj1Dkdxp9UXGyl186QRLoUPhUXRk+n162Syh Tlk9LalHPd+nfKC+2UzFo6VVGEnbjlzhM64/zrHGLhxeFd8dLLnrzM4lED20LviHSfm/HFEyF 6+HsR+tiW9AyBDdeP7yB1EeDzab24Wy2Gdh2LAAkq+CB++KkK2VSvVJWj8pQqJ9a1Ksg9j67z +NhjSlOqwnbUVoq5qOUwdnHzgCkXIzoDr6h3lELjDj7+6UJodBNuPAPnrFla2zAeq31bTMTxj b8IaoRZB5k45ibtwydJTdLV3dDm23vmtcvPwGG+/hA/P6Nm/NdjmAxtTD99KkKTGp77I4bCQP TuqHjVKorVYJAWV374pr7ro2P3DA0W53clU/awtL/SYKfke8w8vU1V07Px+A= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.12 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: Kevin Wolf , qemu-block , Wen Congyang , Jason Wang , Max Reitz , Zhang Chen , Xie Changlong Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" To switch the Secondary to Primary, we need to insert new filters before the filter-rewriter. Add the options insert= and position= to be able to insert filters anywhere in the filter list. position should be "head" or "tail" to insert at the head or tail of the filter list or it should be "id=" to specify the id of another filter. insert should be either "before" or "behind" to specify where to insert the new filter relative to the one specified with position. Signed-off-by: Lukas Straub Reviewed-by: Zhang Chen --- include/net/filter.h | 2 + net/filter.c | 92 +++++++++++++++++++++++++++++++++++++++++++- qemu-options.hx | 31 ++++++++++++--- 3 files changed, 119 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/include/net/filter.h b/include/net/filter.h index 49da666ac0..22a723305b 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -62,6 +62,8 @@ struct NetFilterState { NetClientState *netdev; NetFilterDirection direction; bool on; + char *position; + bool insert_before_flag; QTAILQ_ENTRY(NetFilterState) next; }; diff --git a/net/filter.c b/net/filter.c index 28d1930db7..cd2ef9e979 100644 --- a/net/filter.c +++ b/net/filter.c @@ -171,11 +171,47 @@ static void netfilter_set_status(Object *obj, const char *str, Error **errp) } } +static char *netfilter_get_position(Object *obj, Error **errp) +{ + NetFilterState *nf = NETFILTER(obj); + + return g_strdup(nf->position); +} + +static void netfilter_set_position(Object *obj, const char *str, Error **errp) +{ + NetFilterState *nf = NETFILTER(obj); + + nf->position = g_strdup(str); +} + +static char *netfilter_get_insert(Object *obj, Error **errp) +{ + NetFilterState *nf = NETFILTER(obj); + + return nf->insert_before_flag ? g_strdup("before") : g_strdup("behind"); +} + +static void netfilter_set_insert(Object *obj, const char *str, Error **errp) +{ + NetFilterState *nf = NETFILTER(obj); + + if (strcmp(str, "before") && strcmp(str, "behind")) { + error_setg(errp, "Invalid value for netfilter insert, " + "should be 'before' or 'behind'"); + return; + } + + nf->insert_before_flag = !strcmp(str, "before"); +} + static void netfilter_init(Object *obj) { NetFilterState *nf = NETFILTER(obj); nf->on = true; + nf->insert_before_flag = false; + nf->position = g_strdup("tail"); object_property_add_str(obj, "netdev", netfilter_get_netdev_id, netfilter_set_netdev_id, @@ -187,11 +223,18 @@ static void netfilter_init(Object *obj) object_property_add_str(obj, "status", netfilter_get_status, netfilter_set_status, NULL); + object_property_add_str(obj, "position", + netfilter_get_position, netfilter_set_position, + NULL); + object_property_add_str(obj, "insert", + netfilter_get_insert, netfilter_set_insert, + NULL); } static void netfilter_complete(UserCreatable *uc, Error **errp) { NetFilterState *nf = NETFILTER(uc); + NetFilterState *position = NULL; NetClientState *ncs[MAX_QUEUE_NUM]; NetFilterClass *nfc = NETFILTER_GET_CLASS(uc); int queues; @@ -219,6 +262,41 @@ static void netfilter_complete(UserCreatable *uc, Error **errp) return; } + if (strcmp(nf->position, "head") && strcmp(nf->position, "tail")) { + Object *container; + Object *obj; + char *position_id; + + if (!g_str_has_prefix(nf->position, "id=")) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "position", + "'head', 'tail' or 'id='"); + return; + } + + /* get the id from the string */ + position_id = g_strndup(nf->position + 3, strlen(nf->position) - 3); + + /* Search for the position to insert before/behind */ + container = object_get_objects_root(); + obj = object_resolve_path_component(container, position_id); + if (!obj) { + error_setg(errp, "filter '%s' not found", position_id); + g_free(position_id); + return; + } + + position = NETFILTER(obj); + + if (position->netdev != ncs[0]) { + error_setg(errp, "filter '%s' belongs to a different netdev", + position_id); + g_free(position_id); + return; + } + + g_free(position_id); + } + nf->netdev = ncs[0]; if (nfc->setup) { @@ -228,7 +306,18 @@ static void netfilter_complete(UserCreatable *uc, Error **errp) return; } } - QTAILQ_INSERT_TAIL(&nf->netdev->filters, nf, next); + + if (position) { + if (nf->insert_before_flag) { + QTAILQ_INSERT_BEFORE(position, nf, next); + } else { + QTAILQ_INSERT_AFTER(&nf->netdev->filters, position, nf, next); + } + } else if (!strcmp(nf->position, "head")) { + QTAILQ_INSERT_HEAD(&nf->netdev->filters, nf, next); + } else if (!strcmp(nf->position, "tail")) { + QTAILQ_INSERT_TAIL(&nf->netdev->filters, nf, next); + } } static void netfilter_finalize(Object *obj) @@ -245,6 +334,7 @@ static void netfilter_finalize(Object *obj) QTAILQ_REMOVE(&nf->netdev->filters, nf, next); } g_free(nf->netdev_id); + g_free(nf->position); } static void default_handle_event(NetFilterState *nf, int event, Error **errp) diff --git a/qemu-options.hx b/qemu-options.hx index 08749a3391..d2a6cb7da1 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4368,7 +4368,7 @@ applications, they can do this through this parameter. Its format is a gnutls priority string as described at @url{https://gnutls.org/manual/html_node/Priority-Strings.html}. -@item -object filter-buffer,id=@var{id},netdev=@var{netdevid},interval=@var{t}[,queue=@var{all|rx|tx}][,status=@var{on|off}] +@item -object filter-buffer,id=@var{id},netdev=@var{netdevid},interval=@var{t}[,queue=@var{all|rx|tx}][,status=@var{on|off}][,position=@var{head|tail|id=}][,insert=@var{behind|before}] Interval @var{t} can't be 0, this filter batches the packet delivery: all packets arriving in a given interval on netdev @var{netdevid} are delayed @@ -4387,11 +4387,32 @@ queue @var{all|rx|tx} is an option that can be applied to any netfilter. @option{tx}: the filter is attached to the transmit queue of the netdev, where it will receive packets sent by the netdev. -@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support] +position @var{head|tail|id=} is an option to specify where the +filter should be inserted in the filter list. It can be applied to any +netfilter. + +@option{head}: the filter is inserted at the head of the filter + list, before any existing filters. + +@option{tail}: the filter is inserted at the tail of the filter + list, behind any existing filters (default). + +@option{id=}: the filter is inserted before or behind the filter + specified by , see the insert option below. + +insert @var{behind|before} is an option to specify where to insert the +new filter relative to the one specified with position=id=. It can +be applied to any netfilter. + +@option{before}: insert before the specified filter. + +@option{behind}: insert behind the specified filter (default). + +@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support][,position=@var{head|tail|id=}][,insert=@var{behind|before}] filter-mirror on netdev @var{netdevid},mirror net packet to chardev@var{chardevid}, if it has the vnet_hdr_support flag, filter-mirror will mirror packet with vnet_hdr_len. -@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support] +@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support][,position=@var{head|tail|id=}][,insert=@var{behind|before}] filter-redirector on netdev @var{netdevid},redirect filter's net packet to chardev @var{chardevid},and redirect indev's packet to filter.if it has the vnet_hdr_support flag, @@ -4400,7 +4421,7 @@ 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},[vnet_hdr_support] +@item -object filter-rewriter,id=@var{id},netdev=@var{netdevid},queue=@var{all|rx|tx},[vnet_hdr_support][,position=@var{head|tail|id=}][,insert=@var{behind|before}] Filter-rewriter is a part of COLO project.It will rewrite tcp packet to secondary from primary to keep secondary tcp connection,and rewrite @@ -4413,7 +4434,7 @@ colo secondary: -object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1 -object filter-rewriter,id=rew0,netdev=hn0,queue=all -@item -object filter-dump,id=@var{id},netdev=@var{dev}[,file=@var{filename}][,maxlen=@var{len}] +@item -object filter-dump,id=@var{id},netdev=@var{dev}[,file=@var{filename}][,maxlen=@var{len}][,position=@var{head|tail|id=}][,insert=@var{behind|before}] Dump the network traffic on netdev @var{dev} to the file specified by @var{filename}. At most @var{len} bytes (64k by default) per packet are stored.