From: Jason Wang <jasowang@redhat.com> To: aliguori@us.ibm.com, mst@redhat.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, shajnocz@redhat.com Cc: krkumar2@in.ibm.com, kvm@vger.kernel.org, mprivozn@redhat.com, rusty@rustcorp.com.au, jwhan@filewood.snu.ac.kr, gaowanlong@cn.fujitsu.com, Jason Wang <jasowang@redhat.com> Subject: [PATCH V4 RESEND 13/22] tap: support enabling or disabling a queue Date: Fri, 1 Feb 2013 15:39:47 +0800 [thread overview] Message-ID: <1359704396-55327-14-git-send-email-jasowang@redhat.com> (raw) In-Reply-To: <1359704396-55327-1-git-send-email-jasowang@redhat.com> This patch introduce a new bit - enabled in TAPState which tracks whether a specific queue/fd is enabled. The tap/fd is enabled during initialization and could be enabled/disabled by tap_enalbe() and tap_disable() which calls platform specific helpers to do the real work. Polling of a tap fd can only done when the tap was enabled. Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- include/net/tap.h | 2 ++ net/tap-win32.c | 10 ++++++++++ net/tap.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/include/net/tap.h b/include/net/tap.h index 883cebf..a994f20 100644 --- a/include/net/tap.h +++ b/include/net/tap.h @@ -35,6 +35,8 @@ int tap_has_vnet_hdr_len(NetClientState *nc, int len); void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr); void tap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo); void tap_set_vnet_hdr_len(NetClientState *nc, int len); +int tap_enable(NetClientState *nc); +int tap_disable(NetClientState *nc); int tap_get_fd(NetClientState *nc); diff --git a/net/tap-win32.c b/net/tap-win32.c index 601437e..d0b89f6 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -764,3 +764,13 @@ void tap_set_vnet_hdr_len(NetClientState *nc, int len) { abort(); } + +int tap_enable(NetClientState *nc) +{ + return 0; +} + +int tap_disable(NetClientState *nc) +{ + abort(); +} diff --git a/net/tap.c b/net/tap.c index 23fb6e0..8610ba2 100644 --- a/net/tap.c +++ b/net/tap.c @@ -59,6 +59,7 @@ typedef struct TAPState { bool write_poll; bool using_vnet_hdr; bool has_ufo; + bool enabled; VHostNetState *vhost_net; unsigned host_vnet_hdr_len; } TAPState; @@ -72,9 +73,9 @@ static void tap_writable(void *opaque); static void tap_update_fd_handler(TAPState *s) { qemu_set_fd_handler2(s->fd, - s->read_poll ? tap_can_send : NULL, - s->read_poll ? tap_send : NULL, - s->write_poll ? tap_writable : NULL, + 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); } @@ -337,6 +338,7 @@ static TAPState *net_tap_fd_init(NetClientState *peer, s->host_vnet_hdr_len = vnet_hdr ? sizeof(struct virtio_net_hdr) : 0; s->using_vnet_hdr = false; s->has_ufo = tap_probe_has_ufo(s->fd); + s->enabled = true; tap_set_offload(&s->nc, 0, 0, 0, 0, 0); /* * Make sure host header length is set correctly in tap: @@ -735,3 +737,38 @@ VHostNetState *tap_get_vhost_net(NetClientState *nc) assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP); return s->vhost_net; } + +int tap_enable(NetClientState *nc) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + int ret; + + if (s->enabled) { + return 0; + } else { + ret = tap_fd_enable(s->fd); + if (ret == 0) { + s->enabled = true; + tap_update_fd_handler(s); + } + return ret; + } +} + +int tap_disable(NetClientState *nc) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + int ret; + + if (s->enabled == 0) { + return 0; + } else { + ret = tap_fd_disable(s->fd); + if (ret == 0) { + qemu_purge_queued_packets(nc); + s->enabled = false; + tap_update_fd_handler(s); + } + return ret; + } +} -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com> To: aliguori@us.ibm.com, mst@redhat.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, shajnocz@redhat.com Cc: krkumar2@in.ibm.com, kvm@vger.kernel.org, mprivozn@redhat.com, Jason Wang <jasowang@redhat.com>, rusty@rustcorp.com.au, jwhan@filewood.snu.ac.kr, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH V4 RESEND 13/22] tap: support enabling or disabling a queue Date: Fri, 1 Feb 2013 15:39:47 +0800 [thread overview] Message-ID: <1359704396-55327-14-git-send-email-jasowang@redhat.com> (raw) In-Reply-To: <1359704396-55327-1-git-send-email-jasowang@redhat.com> This patch introduce a new bit - enabled in TAPState which tracks whether a specific queue/fd is enabled. The tap/fd is enabled during initialization and could be enabled/disabled by tap_enalbe() and tap_disable() which calls platform specific helpers to do the real work. Polling of a tap fd can only done when the tap was enabled. Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- include/net/tap.h | 2 ++ net/tap-win32.c | 10 ++++++++++ net/tap.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/include/net/tap.h b/include/net/tap.h index 883cebf..a994f20 100644 --- a/include/net/tap.h +++ b/include/net/tap.h @@ -35,6 +35,8 @@ int tap_has_vnet_hdr_len(NetClientState *nc, int len); void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr); void tap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo); void tap_set_vnet_hdr_len(NetClientState *nc, int len); +int tap_enable(NetClientState *nc); +int tap_disable(NetClientState *nc); int tap_get_fd(NetClientState *nc); diff --git a/net/tap-win32.c b/net/tap-win32.c index 601437e..d0b89f6 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -764,3 +764,13 @@ void tap_set_vnet_hdr_len(NetClientState *nc, int len) { abort(); } + +int tap_enable(NetClientState *nc) +{ + return 0; +} + +int tap_disable(NetClientState *nc) +{ + abort(); +} diff --git a/net/tap.c b/net/tap.c index 23fb6e0..8610ba2 100644 --- a/net/tap.c +++ b/net/tap.c @@ -59,6 +59,7 @@ typedef struct TAPState { bool write_poll; bool using_vnet_hdr; bool has_ufo; + bool enabled; VHostNetState *vhost_net; unsigned host_vnet_hdr_len; } TAPState; @@ -72,9 +73,9 @@ static void tap_writable(void *opaque); static void tap_update_fd_handler(TAPState *s) { qemu_set_fd_handler2(s->fd, - s->read_poll ? tap_can_send : NULL, - s->read_poll ? tap_send : NULL, - s->write_poll ? tap_writable : NULL, + 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); } @@ -337,6 +338,7 @@ static TAPState *net_tap_fd_init(NetClientState *peer, s->host_vnet_hdr_len = vnet_hdr ? sizeof(struct virtio_net_hdr) : 0; s->using_vnet_hdr = false; s->has_ufo = tap_probe_has_ufo(s->fd); + s->enabled = true; tap_set_offload(&s->nc, 0, 0, 0, 0, 0); /* * Make sure host header length is set correctly in tap: @@ -735,3 +737,38 @@ VHostNetState *tap_get_vhost_net(NetClientState *nc) assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP); return s->vhost_net; } + +int tap_enable(NetClientState *nc) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + int ret; + + if (s->enabled) { + return 0; + } else { + ret = tap_fd_enable(s->fd); + if (ret == 0) { + s->enabled = true; + tap_update_fd_handler(s); + } + return ret; + } +} + +int tap_disable(NetClientState *nc) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + int ret; + + if (s->enabled == 0) { + return 0; + } else { + ret = tap_fd_disable(s->fd); + if (ret == 0) { + qemu_purge_queued_packets(nc); + s->enabled = false; + tap_update_fd_handler(s); + } + return ret; + } +} -- 1.7.1
next prev parent reply other threads:[~2013-02-01 7:49 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-02-01 7:39 [PATCH V4 RESEND 00/22] Multiqueue virtio-net Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 01/22] net: tap: using bool instead of bitfield Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 02/22] net: tap: use abort() instead of assert(0) Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 03/22] net: introduce qemu_get_queue() Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 04/22] net: introduce qemu_get_nic() Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 05/22] net: intorduce qemu_del_nic() Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 18:00 ` Eric Blake 2013-02-01 18:00 ` [Qemu-devel] " Eric Blake 2013-02-01 7:39 ` [PATCH V4 RESEND 06/22] net: introduce qemu_find_net_clients_except() Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 07/22] net: introduce qemu_net_client_setup() Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 08/22] net: introduce NetClientState destructor Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 09/22] net: multiqueue support Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-12 21:21 ` Alexander Graf 2013-02-19 7:45 ` Jason Wang 2013-02-12 21:24 ` [Qemu-devel] " Andreas Färber 2013-02-01 7:39 ` [PATCH V4 RESEND 10/22] tap: import linux multiqueue constants Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 11/22] tap: factor out common tap initialization Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 12/22] tap: add Linux multiqueue support Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` Jason Wang [this message] 2013-02-01 7:39 ` [Qemu-devel] [PATCH V4 RESEND 13/22] tap: support enabling or disabling a queue Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 14/22] tap: introduce a helper to get the name of an interface Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 15/22] tap: multiqueue support Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 22:43 ` Eric Blake 2013-02-01 22:43 ` Eric Blake 2013-02-11 10:28 ` Markus Armbruster 2013-02-20 9:28 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 17/22] virtio: introduce virtio_del_queue() Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 18/22] virtio: add a queue_index to VirtQueue Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 19/22] virtio-net: separate virtqueue from VirtIONet Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 20/22] virtio-net: multiqueue support Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 21/22] virtio-net: migration support for multiqueue Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 7:39 ` [PATCH V4 RESEND 22/22] virtio-net: compat multiqueue support Jason Wang 2013-02-01 7:39 ` [Qemu-devel] " Jason Wang 2013-02-01 8:22 ` [PATCH V4 RESEND 00/22] Multiqueue virtio-net Jason Wang 2013-02-01 8:22 ` [Qemu-devel] " Jason Wang 2013-02-04 22:53 ` Anthony Liguori
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1359704396-55327-14-git-send-email-jasowang@redhat.com \ --to=jasowang@redhat.com \ --cc=aliguori@us.ibm.com \ --cc=blauwirbel@gmail.com \ --cc=gaowanlong@cn.fujitsu.com \ --cc=jwhan@filewood.snu.ac.kr \ --cc=krkumar2@in.ibm.com \ --cc=kvm@vger.kernel.org \ --cc=mprivozn@redhat.com \ --cc=mst@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rusty@rustcorp.com.au \ --cc=shajnocz@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.