From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEZTt-0003DR-Gu for qemu-devel@nongnu.org; Mon, 13 Jul 2015 04:52:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEZTs-0007lX-Ca for qemu-devel@nongnu.org; Mon, 13 Jul 2015 04:52:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEZTs-0007lQ-4S for qemu-devel@nongnu.org; Mon, 13 Jul 2015 04:52:56 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 94259B0CE3 for ; Mon, 13 Jul 2015 08:52:55 +0000 (UTC) Date: Mon, 13 Jul 2015 16:52:52 +0800 From: Fam Zheng Message-ID: <20150713085252.GC15471@ad.nay.redhat.com> References: <1436767460-2679-1-git-send-email-jasowang@redhat.com> <1436767460-2679-2-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1436767460-2679-2-git-send-email-jasowang@redhat.com> Subject: Re: [Qemu-devel] [PATCH V2 2/2] tests: test rx recovery from cont List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang Cc: qemu-devel@nongnu.org, stefanha@redhat.com, mst@redhat.com On Mon, 07/13 14:04, Jason Wang wrote: > Rx should be recovered after cont. > > Signed-off-by: Jason Wang > --- > Changes from V1: > - query status before sending cont, this makes sure that the packet > were queued. > --- > tests/virtio-net-test.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 52 insertions(+) > > diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c > index b7d6f0b..3c412e2 100644 > --- a/tests/virtio-net-test.c > +++ b/tests/virtio-net-test.c > @@ -140,6 +140,49 @@ 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); > + > + /* 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' : 'stop'}"); > + > + ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); > + g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len)); I meant QMP 'query-status' should be here, between the iov_send and 'cont'. Fam > + > + qmp("{ 'execute' : 'cont'}"); > + > + qvirtio_wait_queue_isr(bus, dev, vq, QVIRTIO_NET_TIMEOUT_US); > + memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test)); > + g_assert_cmpstr(buffer, ==, "TEST"); > + > + guest_free(alloc, req_addr); > +} > + > static void send_recv_test(const QVirtioBus *bus, QVirtioDevice *dev, > QGuestAllocator *alloc, QVirtQueue *rvq, > QVirtQueue *tvq, int socket) > @@ -148,6 +191,13 @@ static void send_recv_test(const QVirtioBus *bus, QVirtioDevice *dev, > tx_test(bus, dev, alloc, tvq, socket); > } > > +static void stop_cont_test(const QVirtioBus *bus, QVirtioDevice *dev, > + QGuestAllocator *alloc, QVirtQueue *rvq, > + QVirtQueue *tvq, int socket) > +{ > + rx_stop_cont_test(bus, dev, alloc, rvq, socket); > +} > + > static void pci_basic(gconstpointer data) > { > QVirtioPCIDevice *dev; > @@ -206,6 +256,8 @@ int main(int argc, char **argv) > g_test_init(&argc, &argv, NULL); > #ifndef _WIN32 > qtest_add_data_func("/virtio/net/pci/basic", send_recv_test, pci_basic); > + qtest_add_data_func("/virtio/net/pci/rx_stop_cont", > + stop_cont_test, pci_basic); > #endif > qtest_add_func("/virtio/net/pci/hotplug", hotplug); > > -- > 2.1.4 >