From: Liu Ping Fan <pingf...@linux.vnet.ibm.com> Signed-off-by: Liu Ping Fan <pingf...@linux.vnet.ibm.com> --- net/tap.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/net/tap.c b/net/tap.c index daab350..35cbb6e 100644 --- a/net/tap.c +++ b/net/tap.c @@ -62,6 +62,7 @@ typedef struct TAPState { bool enabled; VHostNetState *vhost_net; unsigned host_vnet_hdr_len; + EventGSource *nsrc; } TAPState; static int launch_script(const char *setup_script, const char *ifname, int fd); @@ -70,25 +71,48 @@ static int tap_can_send(void *opaque); static void tap_send(void *opaque); static void tap_writable(void *opaque); -static void tap_update_fd_handler(TAPState *s) +static bool readable(void *opaque) { - qemu_set_fd_handler2(s->fd, - s->read_poll && s->enabled ? tap_can_send : NULL, - s->read_poll && s->enabled ? tap_send : NULL, - s->write_poll && s->enabled ? tap_writable : NULL, - s); + TAPState *s = opaque; + + if (s->enabled && s->read_poll && + tap_can_send(s)) { + return true; + } + return false; +} + +static bool writable(void *opaque) +{ + TAPState *s = opaque; + + if (s->enabled && s->write_poll) { + return true; + } + return false; +} + +static gboolean tap_handler(gpointer data) +{ + EventGSource *nsrc = data; + + if (nsrc->gfd.revents & G_IO_IN) { + tap_send(nsrc->opaque); + } + if (nsrc->gfd.revents & G_IO_OUT) { + tap_writable(nsrc->opaque); + } + return true; } static void tap_read_poll(TAPState *s, bool enable) { s->read_poll = enable; - tap_update_fd_handler(s); } static void tap_write_poll(TAPState *s, bool enable) { s->write_poll = enable; - tap_update_fd_handler(s); } static void tap_writable(void *opaque) @@ -291,6 +315,7 @@ static void tap_cleanup(NetClientState *nc) tap_read_poll(s, false); tap_write_poll(s, false); + event_source_release(s->nsrc); close(s->fd); s->fd = -1; } @@ -298,8 +323,10 @@ static void tap_cleanup(NetClientState *nc) static void tap_poll(NetClientState *nc, bool enable) { TAPState *s = DO_UPCAST(TAPState, nc, nc); + /* fixme, when tap backend on another thread, the disable should be sync */ tap_read_poll(s, enable); tap_write_poll(s, enable); + } int tap_get_fd(NetClientState *nc) @@ -309,6 +336,13 @@ int tap_get_fd(NetClientState *nc) return s->fd; } +static void tap_bind_ctx(NetClientState *nc, GMainContext *ctx) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + + g_source_attach(&s->nsrc->source, ctx); +} + /* fd support */ static NetClientInfo net_tap_info = { @@ -319,6 +353,7 @@ static NetClientInfo net_tap_info = { .receive_iov = tap_receive_iov, .poll = tap_poll, .cleanup = tap_cleanup, + .bind_ctx = tap_bind_ctx, }; static TAPState *net_tap_fd_init(NetClientState *peer, @@ -596,6 +631,7 @@ static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, int vnet_hdr, int fd) { TAPState *s; + EventGSource *nsrc; s = net_tap_fd_init(peer, model, name, fd, vnet_hdr); if (!s) { @@ -606,6 +642,12 @@ static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, if (tap_set_sndbuf(s->fd, tap) < 0) { return -1; } + nsrc = event_source_new(s->fd, tap_handler, s); + nsrc->gfd.events = G_IO_IN|G_IO_OUT; + nsrc->readable = readable; + nsrc->writable = writable; + s->nsrc = nsrc; + s->nc.info->bind_ctx(&s->nc, NULL); if (tap->has_fd || tap->has_fds) { snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd); @@ -843,8 +885,8 @@ int tap_enable(NetClientState *nc) } else { ret = tap_fd_enable(s->fd); if (ret == 0) { + /*fixme, will be sync to ensure handler not be called */ s->enabled = true; - tap_update_fd_handler(s); } return ret; } @@ -861,8 +903,8 @@ int tap_disable(NetClientState *nc) ret = tap_fd_disable(s->fd); if (ret == 0) { qemu_purge_queued_packets(nc); + /*fixme, will be sync to ensure handler not be called */ s->enabled = false; - tap_update_fd_handler(s); } return ret; } -- 1.7.4.4