qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Fam Zheng <famz@redhat.com>
Cc: jcmvbkbc@gmail.com, Jason Wang <jasowang@redhat.com>,
	qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2] net: Flush queued packets when guest resumes
Date: Tue, 7 Jul 2015 11:13:13 +0300	[thread overview]
Message-ID: <20150707111103-mutt-send-email-mst@redhat.com> (raw)
In-Reply-To: <1436232067-29144-1-git-send-email-famz@redhat.com>

On Tue, Jul 07, 2015 at 09:21:07AM +0800, Fam Zheng wrote:
> Since commit 6e99c63 "net/socket: Drop net_socket_can_send" and friends,
> net queues need to be explicitly flushed after qemu_can_send_packet()
> returns false, because the netdev side will disable the polling of fd.
> 
> This fixes the case of "cont" after "stop" (or migration).
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

Note virtio has its own handler which must be used to
flush packets - this one might run too early or too late.

> ---
> 
> v2: Unify with VM stop handler. (Stefan)
> ---
>  net/net.c | 19 ++++++++++++-------
>  1 file changed, 12 insertions(+), 7 deletions(-)
> 
> diff --git a/net/net.c b/net/net.c
> index 6ff7fec..28a5597 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -1257,14 +1257,19 @@ void qmp_set_link(const char *name, bool up, Error **errp)
>  static void net_vm_change_state_handler(void *opaque, int running,
>                                          RunState state)
>  {
> -    /* Complete all queued packets, to guarantee we don't modify
> -     * state later when VM is not running.
> -     */
> -    if (!running) {
> -        NetClientState *nc;
> -        NetClientState *tmp;
> +    NetClientState *nc;
> +    NetClientState *tmp;
>  
> -        QTAILQ_FOREACH_SAFE(nc, &net_clients, next, tmp) {
> +    QTAILQ_FOREACH_SAFE(nc, &net_clients, next, tmp) {
> +        if (running) {
> +            /* Flush queued packets and wake up backends. */
> +            if (nc->peer && qemu_can_send_packet(nc)) {
> +                qemu_flush_queued_packets(nc->peer);
> +            }
> +        } else {
> +            /* Complete all queued packets, to guarantee we don't modify
> +             * state later when VM is not running.
> +             */
>              qemu_flush_or_purge_queued_packets(nc, true);
>          }
>      }
> -- 
> 2.4.3

  parent reply	other threads:[~2015-07-07  8:13 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-07  1:21 [Qemu-devel] [PATCH v2] net: Flush queued packets when guest resumes Fam Zheng
2015-07-07  7:44 ` Jason Wang
2015-07-07  9:03   ` Fam Zheng
2015-07-08  9:40     ` Jason Wang
2015-07-07  8:13 ` Michael S. Tsirkin [this message]
2015-07-07  8:58   ` Jason Wang
2015-07-07  9:10     ` Michael S. Tsirkin
2015-07-07 10:02       ` Fam Zheng
2015-07-09  9:25       ` Stefan Hajnoczi
2015-07-07  9:09   ` Fam Zheng
2015-07-07  9:19     ` Michael S. Tsirkin
2015-07-10  9:03       ` Fam Zheng
2015-07-14 12:20         ` Stefan Hajnoczi
2015-07-14 12:42           ` Michael S. Tsirkin
2015-07-15  2:50             ` Fam Zheng
2015-07-07  8:51 ` Stefan Hajnoczi
  -- strict thread matches above, loose matches on Subject: below --
2015-07-10  9:24 Fam Zheng
2015-07-13  5:21 ` Jason Wang

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=20150707111103-mutt-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=famz@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=jcmvbkbc@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@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: 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).