From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZClsG-0003oo-FY for qemu-devel@nongnu.org; Wed, 08 Jul 2015 05:42:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZClsD-0004Ti-A7 for qemu-devel@nongnu.org; Wed, 08 Jul 2015 05:42:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZClsD-0004T4-5M for qemu-devel@nongnu.org; Wed, 08 Jul 2015 05:42:37 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id C1F13B8BCA for ; Wed, 8 Jul 2015 09:42:36 +0000 (UTC) Message-ID: <559CF088.50502@redhat.com> Date: Wed, 08 Jul 2015 17:42:32 +0800 From: Jason Wang MIME-Version: 1.0 References: <1436266737-3859-1-git-send-email-jasowang@redhat.com> <1436266737-3859-2-git-send-email-jasowang@redhat.com> <20150708032210.GB12842@ad.nay.redhat.com> <559CB139.4030908@redhat.com> <20150708054432.GA22926@ad.nay.redhat.com> In-Reply-To: <20150708054432.GA22926@ad.nay.redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] tests: test rx recovery from cont List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: qemu-devel@nongnu.org, stefanha@redhat.com, mst@redhat.com On 07/08/2015 01:44 PM, Fam Zheng wrote: > On Wed, 07/08 13:12, Jason Wang wrote: >> >> On 07/08/2015 11:22 AM, Fam Zheng wrote: >>> On Tue, 07/07 18:58, Jason Wang wrote: >>>> Rx should be recovered after cont. >>>> >>>> Signed-off-by: Jason Wang >>>> --- >>>> tests/virtio-net-test.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ >>>> 1 file changed, 48 insertions(+) >>>> >>>> diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c >>>> index 97aa442..aeae80c 100644 >>>> --- a/tests/virtio-net-test.c >>>> +++ b/tests/virtio-net-test.c >>>> @@ -138,6 +138,45 @@ static void tx_test(const QVirtioBus *bus, QVirtioDevice *dev, >>>> g_assert_cmpstr(buffer, ==, "TEST"); >>>> } >>>> >>>> +static void rx_stop_cont_test(const QVirtioBus *bus, QVirtioDevice *dev, >>>> + QGuestAllocator *alloc, QVirtQueue *vq, >>>> + int socket) >>>> +{ >>>> + uint64_t req_addr; >>>> + uint32_t free_head; >>>> + char test[] = "TEST"; >>>> + char buffer[64]; >>>> + int len = htonl(sizeof(test)); >>>> + struct iovec iov[] = { >>>> + { >>>> + .iov_base = &len, >>>> + .iov_len = sizeof(len), >>>> + }, { >>>> + .iov_base = test, >>>> + .iov_len = sizeof(test), >>>> + }, >>>> + }; >>>> + int ret; >>>> + >>>> + req_addr = guest_alloc(alloc, 64); >>>> + >>>> + free_head = qvirtqueue_add(vq, req_addr, 64, true, false); >>>> + qvirtqueue_kick(bus, dev, vq, free_head); >>>> + >>>> + qmp("{ 'execute' : 'stop'}"); >>>> + >>>> + ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); >>>> + g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len)); >>> Maybe add a small lag here? The next "cont" could be too early that is noticed >>> earlier than the packet. >> I'm not sure I get the point of this. But at any case, rx should be >> recovered. (Btw, current qemu.git will fail in this case). > If 'cont' and the packet land in main loop in the same qemu_poll_ns(), it's > possible that the packet is processed before 'stop'. > > A trick is using qmp commands as barriers: > > qmp("{ 'execute' : 'stop'}"); > > ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); > g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len)); > > /* We could check the status, but this command is more importantly to > * ensure the packet data gets queued in QEMU, before we do 'cont'. > */ > qmp("{ 'execute' : 'query-status'}"); > qmp("{ 'execute' : 'cont'}"); > > Fam > > Right, this looks fine. Thanks