[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 04/11] net: delete netfilter object when dele
From: |
Jason Wang |
Subject: |
Re: [Qemu-devel] [PATCH v4 04/11] net: delete netfilter object when delete netdev |
Date: |
Thu, 06 Aug 2015 15:09:51 +0800 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 |
On 08/04/2015 04:30 PM, Yang Hongyang wrote:
> When we delete the netdev, we also delete the netfilter object
> attached to it, because if the netdev is removed, the filters
> which attached to it is useless.
>
> Signed-off-by: Yang Hongyang <address@hidden>
Please squash this into patch 3. (otherwise you're fixing a bug
introduced by patch 3).
> ---
> include/net/filter.h | 1 +
> net/filter.c | 2 +-
> net/net.c | 14 ++++++++++++++
> 3 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/include/net/filter.h b/include/net/filter.h
> index 8eff85a..c146be2 100644
> --- a/include/net/filter.h
> +++ b/include/net/filter.h
> @@ -50,6 +50,7 @@ NetFilterState *qemu_new_net_filter(NetFilterInfo *info,
> const char *model,
> const char *name,
> int chain);
> +void qemu_del_net_filter(NetFilterState *nf);
> void netfilter_add(QemuOpts *opts, Error **errp);
> void qmp_netfilter_add(QDict *qdict, QObject **ret, Error **errp);
>
> diff --git a/net/filter.c b/net/filter.c
> index 54a5c06..24ec4e1 100644
> --- a/net/filter.c
> +++ b/net/filter.c
> @@ -57,7 +57,7 @@ static void qemu_cleanup_net_filter(NetFilterState *nf)
> g_free(nf);
> }
>
> -static void qemu_del_net_filter(NetFilterState *nf)
> +void qemu_del_net_filter(NetFilterState *nf)
> {
> /* handle multi queue? */
> qemu_cleanup_net_filter(nf);
> diff --git a/net/net.c b/net/net.c
> index d9b70cd..03b2296 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -28,6 +28,7 @@
> #include "hub.h"
> #include "net/slirp.h"
> #include "net/eth.h"
> +#include "net/filter.h"
> #include "util.h"
>
> #include "monitor/monitor.h"
> @@ -385,6 +386,8 @@ void qemu_del_net_client(NetClientState *nc)
> {
> NetClientState *ncs[MAX_QUEUE_NUM];
> int queues, i;
> + NetFilterState *nf, *next;
> + QemuOpts *opts;
>
> assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC);
>
> @@ -396,6 +399,17 @@ void qemu_del_net_client(NetClientState *nc)
> MAX_QUEUE_NUM);
> assert(queues != 0);
>
> + /*
> + * we delete/free the netfilter object attached to this netdev
> + * multiqueue netfilter is not supported now, so only delete
> + * nc->filters is enough.
> + */
The comment is not correct since for multiqueue, each NetClientState is
a queue. I think you can just remove above.
> + QTAILQ_FOREACH_SAFE(nf, &nc->filters, next, next) {
> + opts = qemu_opts_find(qemu_find_opts_err("netfilter", NULL),
> nf->name);
> + qemu_del_net_filter(nf);
> + qemu_opts_del(opts);
> + }
> +
> /* If there is a peer NIC, delete and cleanup client, but do not free. */
> if (nc->peer && nc->peer->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
> NICState *nic = qemu_get_nic(nc->peer);
- Re: [Qemu-devel] [PATCH v4 06/11] netfilter: add an API to pass the packet to next filter, (continued)
[Qemu-devel] [PATCH v4 03/11] netfilter: add netfilter_{add|del} commands, Yang Hongyang, 2015/08/04
[Qemu-devel] [PATCH v4 07/11] net/queue: export qemu_net_queue_append_iov, Yang Hongyang, 2015/08/04
[Qemu-devel] [PATCH v4 04/11] net: delete netfilter object when delete netdev, Yang Hongyang, 2015/08/04
- Re: [Qemu-devel] [PATCH v4 04/11] net: delete netfilter object when delete netdev,
Jason Wang <=
[Qemu-devel] [PATCH v4 10/11] filter/buffer: update command description and help, Yang Hongyang, 2015/08/04
[Qemu-devel] [PATCH v4 09/11] netfilter: add a netbuffer filter, Yang Hongyang, 2015/08/04