From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAX9c-0007v9-3o for qemu-devel@nongnu.org; Wed, 08 Jun 2016 02:39:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAX9W-0004LE-Ok for qemu-devel@nongnu.org; Wed, 08 Jun 2016 02:39:52 -0400 References: <1465304408-16545-1-git-send-email-pl@kamp.de> From: Jason Wang Message-ID: <5757BDA0.8090504@redhat.com> Date: Wed, 8 Jun 2016 14:39:28 +0800 MIME-Version: 1.0 In-Reply-To: <1465304408-16545-1-git-send-email-pl@kamp.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable 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 , qemu-devel@nongnu.org Cc: s.priebe@profihost.ag, qemu-stable@nongnu.org, pbonzini@redhat.com, hongyang.yang@easystack.cn On 2016=E5=B9=B406=E6=9C=8807=E6=97=A5 21:00, 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. [Paol= o] > > 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 *se= nder, > NetClientState *nc =3D opaque; > int ret; > =20 > + /* we currently only support sending raw packets via qemu_send_pac= ket_raw. > + * If we want generic raw iov support we need to implement somethi= ng like > + * .receive_raw_iov in NetClientInfo first. */ > + assert(!(flags & QEMU_NET_PACKET_FLAG_RAW) || iovcnt =3D=3D 1); > + > if (nc->link_down) { > return iov_size(iov, iovcnt); > } > @@ -722,7 +727,10 @@ ssize_t qemu_deliver_packet_iov(NetClientState *se= nder, > return 0; > } > =20 > - if (nc->info->receive_iov) { > + if (flags & QEMU_NET_PACKET_FLAG_RAW && nc->info->receive_raw) { > + /* this is required for qemu_announce_self() */ > + ret =3D nc->info->receive_raw(nc, iov[0].iov_base, iov[0].iov_= len); > + } else if (nc->info->receive_iov) { > ret =3D nc->info->receive_iov(nc, iov, iovcnt); > } else { > ret =3D nc_sendv_compat(nc, iov, iovcnt, flags); We still have raw packet support in nv_sendv_compat, can we use it? (and=20 then there's no need for the assert above). Thanks