From patchwork Wed Jul 29 10:51:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 501659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2470D140157 for ; Wed, 29 Jul 2015 21:09:31 +1000 (AEST) Received: from localhost ([::1]:34600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKPEn-0003M4-8B for incoming@patchwork.ozlabs.org; Wed, 29 Jul 2015 07:09:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKPDF-0000ba-D6 for qemu-devel@nongnu.org; Wed, 29 Jul 2015 07:07:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZKPDA-0006wK-OE for qemu-devel@nongnu.org; Wed, 29 Jul 2015 07:07:53 -0400 Received: from [59.151.112.132] (port=44341 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKPD6-0006iu-Hy for qemu-devel@nongnu.org; Wed, 29 Jul 2015 07:07:48 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="99029567" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 29 Jul 2015 18:55:41 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t6TAoFdT019117; Wed, 29 Jul 2015 18:50:15 +0800 Received: from localhost (10.167.226.223) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 29 Jul 2015 18:52:06 +0800 From: Yang Hongyang To: Date: Wed, 29 Jul 2015 18:51:48 +0800 Message-ID: <1438167116-29270-5-git-send-email-yanghy@cn.fujitsu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438167116-29270-1-git-send-email-yanghy@cn.fujitsu.com> References: <1438167116-29270-1-git-send-email-yanghy@cn.fujitsu.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: thuth@redhat.com, zhang.zhanghailiang@huawei.com, jasowang@redhat.com, mrhines@linux.vnet.ibm.com, stefanha@redhat.com, Yang Hongyang Subject: [Qemu-devel] [PATCH 04/12] net: add/remove filters from network backend X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org add/remove filters from network backend Signed-off-by: Yang Hongyang --- include/net/net.h | 8 ++++++++ net/filter.c | 4 ++-- net/net.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index 6a6cbef..5c5c109 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -40,6 +40,11 @@ typedef struct NICConf { /* Net clients */ +typedef struct Filter Filter; +struct Filter { + NetFilterState *nf; + QTAILQ_ENTRY(Filter) next; +}; typedef void (NetPoll)(NetClientState *, bool enable); typedef int (NetCanReceive)(NetClientState *); @@ -92,6 +97,7 @@ struct NetClientState { NetClientDestructor *destructor; unsigned int queue_index; unsigned rxfilter_notify_enabled:1; + QTAILQ_HEAD(, Filter) filters; }; typedef struct NICState { @@ -109,6 +115,8 @@ NetClientState *qemu_new_net_client(NetClientInfo *info, NetClientState *peer, const char *model, const char *name); +int qemu_netdev_add_filter(NetClientState *nc, NetFilterState *nf); +void qemu_netdev_remove_filter(NetClientState *nc, NetFilterState *nf); NICState *qemu_new_nic(NetClientInfo *info, NICConf *conf, const char *model, diff --git a/net/filter.c b/net/filter.c index 1685fbc..3d3b7bc 100644 --- a/net/filter.c +++ b/net/filter.c @@ -35,14 +35,14 @@ NetFilterState *qemu_new_net_filter(NetFilterInfo *info, nf->name = g_strdup(name); nf->netdev = netdev; QTAILQ_INSERT_TAIL(&net_filters, nf, next); - /* TODO: attach netfilter to netdev */ + qemu_netdev_add_filter(netdev, nf); return nf; } static void qemu_cleanup_net_filter(NetFilterState *nf) { - /* TODO: remove netfilter from netdev */ + qemu_netdev_remove_filter(nf->netdev, nf); QTAILQ_REMOVE(&net_filters, nf, next); diff --git a/net/net.c b/net/net.c index 28a5597..22748e0 100644 --- a/net/net.c +++ b/net/net.c @@ -287,6 +287,7 @@ static void qemu_net_client_setup(NetClientState *nc, nc->incoming_queue = qemu_new_net_queue(nc); nc->destructor = destructor; + QTAILQ_INIT(&nc->filters); } NetClientState *qemu_new_net_client(NetClientInfo *info, @@ -305,6 +306,38 @@ NetClientState *qemu_new_net_client(NetClientInfo *info, return nc; } +int qemu_netdev_add_filter(NetClientState *nc, NetFilterState *nf) +{ + Filter *filter = g_malloc0(sizeof(*filter)); + + filter->nf = nf; + QTAILQ_INSERT_TAIL(&nc->filters, filter, next); + return 0; +} + +static void remove_filter(NetClientState *nc, Filter *filter) +{ + if (!filter) { + return; + } + + QTAILQ_REMOVE(&nc->filters, filter, next); + g_free(filter); +} + +void qemu_netdev_remove_filter(NetClientState *nc, NetFilterState *nf) +{ + Filter *filter = NULL; + + QTAILQ_FOREACH(filter, &nc->filters, next) { + if (filter->nf == nf) { + break; + } + } + + remove_filter(nc, filter); +} + NICState *qemu_new_nic(NetClientInfo *info, NICConf *conf, const char *model, @@ -367,6 +400,8 @@ static void qemu_cleanup_net_client(NetClientState *nc) static void qemu_free_net_client(NetClientState *nc) { + Filter *filter, *next; + if (nc->incoming_queue) { qemu_del_net_queue(nc->incoming_queue); } @@ -375,6 +410,9 @@ static void qemu_free_net_client(NetClientState *nc) } g_free(nc->name); g_free(nc->model); + QTAILQ_FOREACH_SAFE(filter, &nc->filters, next, next) { + remove_filter(nc, filter); + } if (nc->destructor) { nc->destructor(nc); }