[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V2 16/17] net: always walk through filters in reverse
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V2 16/17] net: always walk through filters in reverse if traffic is egress |
Date: |
Thu, 4 Feb 2016 16:31:45 +0800 |
From: Li Zhijian <address@hidden>
Previously, if we attach more than one filters for a single netdev,
both ingress and egress traffic will go through net filters in same
order like:
ingress: netdev ->filter1 ->filter2 ->...filter[n] ->emulated device
egress: emulated device ->filter1 ->filter2 ->...filter[n] ->netdev.
This is against the natural feeling and will complicate filters
configuration since in some scenes, we hope filters handle the egress
traffic in a reverse order. For example, in colo-proxy (will be
implemented later), we have a redirector filter and a colo-rewriter
filter, we need the filter behave like:
ingress(->)/egress(<-): chardev<->redirector<->colo-rewriter<->emulated device
Since both buffer filter and dump do not require strict order of
filters, this patch switches to always let egress traffic walk through
net filters in reverse to simplify the possible filters configuration
in the future.
Signed-off-by: Wen Congyang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Reviewed-by: Yang Hongyang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
include/net/net.h | 2 +-
net/filter.c | 21 +++++++++++++++++++--
net/net.c | 20 +++++++++++++++-----
3 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 7af3e15..73e4c46 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -92,7 +92,7 @@ struct NetClientState {
NetClientDestructor *destructor;
unsigned int queue_index;
unsigned rxfilter_notify_enabled:1;
- QTAILQ_HEAD(, NetFilterState) filters;
+ QTAILQ_HEAD(NetFilterHead, NetFilterState) filters;
};
typedef struct NICState {
diff --git a/net/filter.c b/net/filter.c
index 5d90f83..17a8398 100644
--- a/net/filter.c
+++ b/net/filter.c
@@ -34,6 +34,22 @@ ssize_t qemu_netfilter_receive(NetFilterState *nf,
return 0;
}
+static NetFilterState *netfilter_next(NetFilterState *nf,
+ NetFilterDirection dir)
+{
+ NetFilterState *next;
+
+ if (dir == NET_FILTER_DIRECTION_TX) {
+ /* forward walk through filters */
+ next = QTAILQ_NEXT(nf, next);
+ } else {
+ /* reverse order */
+ next = QTAILQ_PREV(nf, NetFilterHead, next);
+ }
+
+ return next;
+}
+
ssize_t qemu_netfilter_pass_to_next(NetClientState *sender,
unsigned flags,
const struct iovec *iov,
@@ -43,7 +59,7 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender,
int ret = 0;
int direction;
NetFilterState *nf = opaque;
- NetFilterState *next = QTAILQ_NEXT(nf, next);
+ NetFilterState *next = NULL;
if (!sender || !sender->peer) {
/* no receiver, or sender been deleted, no need to pass it further */
@@ -61,6 +77,7 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender,
direction = nf->direction;
}
+ next = netfilter_next(nf, direction);
while (next) {
/*
* if qemu_netfilter_pass_to_next been called, means that
@@ -73,7 +90,7 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender,
if (ret) {
return ret;
}
- next = QTAILQ_NEXT(next, next);
+ next = netfilter_next(next, direction);
}
/*
diff --git a/net/net.c b/net/net.c
index 87dd356..c929c41 100644
--- a/net/net.c
+++ b/net/net.c
@@ -580,11 +580,21 @@ static ssize_t filter_receive_iov(NetClientState *nc,
ssize_t ret = 0;
NetFilterState *nf = NULL;
- QTAILQ_FOREACH(nf, &nc->filters, next) {
- ret = qemu_netfilter_receive(nf, direction, sender, flags, iov,
- iovcnt, sent_cb);
- if (ret) {
- return ret;
+ if (direction == NET_FILTER_DIRECTION_TX) {
+ QTAILQ_FOREACH(nf, &nc->filters, next) {
+ ret = qemu_netfilter_receive(nf, direction, sender, flags, iov,
+ iovcnt, sent_cb);
+ if (ret) {
+ return ret;
+ }
+ }
+ } else {
+ QTAILQ_FOREACH_REVERSE(nf, &nc->filters, NetFilterHead, next) {
+ ret = qemu_netfilter_receive(nf, direction, sender, flags, iov,
+ iovcnt, sent_cb);
+ if (ret) {
+ return ret;
+ }
}
}
--
2.5.0
- [Qemu-devel] [PULL V2 03/17] net: cadence_gem: check packet size in gem_recieve, (continued)
- [Qemu-devel] [PULL V2 03/17] net: cadence_gem: check packet size in gem_recieve, Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 04/17] cadence_gem: fix buffer overflow, Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 08/17] slirp: Make Socket structure IPv6 compatible, Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 09/17] slirp: Factorizing address translation, Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 10/17] slirp: Factorizing and cleaning solookup(), Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 11/17] slirp: Add sockaddr_equal, make solookup family-agnostic, Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 12/17] slirp: Make udp_attach IPv6 compatible, Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 13/17] slirp: Adding family argument to tcp_fconnect(), Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 14/17] e1000: eliminate infinite loops on out-of-bounds transfer start, Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 15/17] net: netmap: use nm_open() to open netmap ports, Jason Wang, 2016/02/04
- [Qemu-devel] [PULL V2 16/17] net: always walk through filters in reverse if traffic is egress,
Jason Wang <=
- [Qemu-devel] [PULL V2 17/17] net/filter: Fix the output information for command 'info network', Jason Wang, 2016/02/04
- Re: [Qemu-devel] [PULL V2 00/17] Net patches, Peter Maydell, 2016/02/04