From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAJV7-0007l7-7r for qemu-devel@nongnu.org; Tue, 07 Jun 2016 12:05:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAJV3-0008B9-6t for qemu-devel@nongnu.org; Tue, 07 Jun 2016 12:05:09 -0400 MIME-Version: 1.0 In-Reply-To: <1465304408-16545-1-git-send-email-pl@kamp.de> References: <1465304408-16545-1-git-send-email-pl@kamp.de> From: Yang Hongyang Date: Tue, 7 Jun 2016 23:28:04 +0800 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PATCH V2] net: fix qemu_announce_self not emitting packets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Lieven Cc: qemu devel , s.priebe@profihost.ag, Jason Wang , qemu-stable@nongnu.org, Paolo Bonzini , Yang Hongyang On Tue, Jun 7, 2016 at 9:00 PM, Peter Lieven wrote: > commit fefe2a78 accidently dropped the code path for injecting > raw packets. This feature is needed for sending gratuitous ARPs > after an incoming migration has completed. The result is increased > network downtime for vservers where the network card is not virtio-net > with the VIRTIO_NET_F_GUEST_ANNOUNCE feature. > > Fixes: fefe2a78abde932e0f340b21bded2c86def1d242 > Cc: qemu-stable@nongnu.org > Cc: hongyang.yang@easystack.cn > Signed-off-by: Peter Lieven > --- > v1->v2: assert that only raw packets with a plain buffer come in. [Paolo] > > net/net.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/net/net.c b/net/net.c > index 5f3e5a9..5e1b5fa 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -714,6 +714,11 @@ ssize_t qemu_deliver_packet_iov(NetClientState > *sender, > NetClientState *nc = opaque; > int ret; > > + /* we currently only support sending raw packets via > qemu_send_packet_raw. > + * If we want generic raw iov support we need to implement something > like > + * .receive_raw_iov in NetClientInfo first. */ > + assert(!(flags & QEMU_NET_PACKET_FLAG_RAW) || iovcnt == 1); > + > This assert is hard to understand IMO...I think move assert(iovcnt==1) as well as the comment to if condition below as Paolo said previously is better... > if (nc->link_down) { > return iov_size(iov, iovcnt); > } > @@ -722,7 +727,10 @@ ssize_t qemu_deliver_packet_iov(NetClientState > *sender, > return 0; > } > > - if (nc->info->receive_iov) { > + if (flags & QEMU_NET_PACKET_FLAG_RAW && nc->info->receive_raw) { > + /* this is required for qemu_announce_self() */ > + ret = nc->info->receive_raw(nc, iov[0].iov_base, iov[0].iov_len); > + } else if (nc->info->receive_iov) { > ret = nc->info->receive_iov(nc, iov, iovcnt); > } else { > ret = nc_sendv_compat(nc, iov, iovcnt, flags); > -- > 1.9.1 > > > -- Thanks, Yang