From: "Michael S. Tsirkin" <mst@redhat.com>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: jasowang@redhat.com, qemu-stable@nongnu.org,
qemu-devel@nongnu.org, zhang.zhanghailiang@huawei.com
Subject: Re: [Qemu-devel] [PATCH] net: prevent sending packets while guest is stopped
Date: Tue, 2 Sep 2014 17:25:53 +0300 [thread overview]
Message-ID: <20140902142553.GA16821@redhat.com> (raw)
In-Reply-To: <1409667790-18015-1-git-send-email-stefanha@redhat.com>
On Tue, Sep 02, 2014 at 03:23:10PM +0100, Stefan Hajnoczi wrote:
> Do not modify guest memory or devices when the guest is stopped.
> Currently the netdevs still send packets while the guest is stopped if
> their file descriptor was being monitored for write (e.g. the socket
> write buffer filled before the guest was stopped).
>
> Netdevs call qemu_flush_queued_packets() when the file descriptor
> becomes writable again. Don't resume packet processing when this
> happens.
>
> Instead we flush queues when the guest resumes.
>
> Cc: qemu-stable@nongnu.org
> Reported-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> Note this fixes the transmit side. The receive side was recently fixed in
> "net: Forbid dealing with packets when VM is not running".
>
> net/net.c | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
> diff --git a/net/net.c b/net/net.c
> index 6d930ea..74ec07a 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -47,6 +47,7 @@
> # define CONFIG_NET_BRIDGE
> #endif
>
> +static VMChangeStateEntry *net_change_state_entry;
> static QTAILQ_HEAD(, NetClientState) net_clients;
>
> const char *host_net_devices[] = {
> @@ -506,6 +507,11 @@ void qemu_purge_queued_packets(NetClientState *nc)
>
> void qemu_flush_queued_packets(NetClientState *nc)
> {
> + /* Guest memory and devices must not be modified while stopped */
> + if (!runstate_is_running()) {
> + return;
> + }
> +
> nc->receive_disabled = 0;
>
> if (nc->peer && nc->peer->info->type == NET_CLIENT_OPTIONS_KIND_HUBPORT) {
> @@ -1168,6 +1174,25 @@ void qmp_set_link(const char *name, bool up, Error **errp)
> }
> }
>
> +/* Kick net clients when guest resumes. If a file descriptor was monitored for
> + * writing before the guest was stopped, there will be nothing monitoring it
> + * right now so a kick is required to get packets flowing again.
> + */
> +static void net_vm_change_state_handler(void *opaque, int running,
> + RunState state)
> +{
> + NetClientState *nc;
> + NetClientState *tmp;
> +
> + if (!running) {
> + return;
> + }
> +
> + QTAILQ_FOREACH_SAFE(nc, &net_clients, next, tmp) {
> + qemu_flush_queued_packets(nc);
> + }
> +}
> +
> void net_cleanup(void)
> {
> NetClientState *nc;
> @@ -1183,6 +1208,8 @@ void net_cleanup(void)
> qemu_del_net_client(nc);
> }
> }
> +
> + qemu_del_vm_change_state_handler(net_change_state_entry);
> }
>
> void net_check_clients(void)
> @@ -1268,6 +1295,9 @@ int net_init_clients(void)
> #endif
> }
>
> + net_change_state_entry =
> + qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL);
> +
> QTAILQ_INIT(&net_clients);
>
> if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, 1) == -1)
> --
> 1.9.3
next prev parent reply other threads:[~2014-09-02 14:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-02 14:23 [Qemu-devel] [PATCH] net: prevent sending packets while guest is stopped Stefan Hajnoczi
2014-09-02 14:25 ` Michael S. Tsirkin [this message]
2014-09-04 6:28 ` Michael S. Tsirkin
2014-09-04 4:55 ` Jason Wang
2014-09-04 6:48 ` Michael S. Tsirkin
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=20140902142553.GA16821@redhat.com \
--to=mst@redhat.com \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=stefanha@redhat.com \
--cc=zhang.zhanghailiang@huawei.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).