From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acrHY-000339-Jk for qemu-devel@nongnu.org; Mon, 07 Mar 2016 04:16:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acrHT-0007Oq-Tn for qemu-devel@nongnu.org; Mon, 07 Mar 2016 04:16:52 -0500 Received: from [59.151.112.132] (port=15035 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acrHR-0007Oj-Gk for qemu-devel@nongnu.org; Mon, 07 Mar 2016 04:16:47 -0500 References: <1457092906-19828-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> <1457092906-19828-4-git-send-email-zhangchen.fnst@cn.fujitsu.com> <56DD377A.8010101@redhat.com> From: Zhang Chen Message-ID: <56DD473D.2020807@cn.fujitsu.com> Date: Mon, 7 Mar 2016 17:17:49 +0800 MIME-Version: 1.0 In-Reply-To: <56DD377A.8010101@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH V3 3/3] tests/test-filter-redirector: Add unit test for filter-redirector List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang , qemu devel Cc: Li Zhijian , Gui jianfeng , "eddie.dong" , zhanghailiang , "Dr. David Alan Gilbert" , Yang Hongyang On 03/07/2016 04:10 PM, Jason Wang wrote: > > On 03/04/2016 08:01 PM, Zhang Chen wrote: >> In this unit test,we will test the filter redirector function. >> >> Case 1, tx traffic flow: >> >> qemu side | test side >> | >> +---------+ | +-------+ >> | backend <---------------+ sock0 | >> +----+----+ | +-------+ >> | | >> +----v----+ +-------+ | >> | rd0 +->+chardev| | >> +---------+ +---+---+ | >> | | >> +---------+ | | >> | rd1 <------+ | >> +----+----+ | >> | | >> +----v----+ | +-------+ >> | rd2 +--------------->sock1 | >> +---------+ | +-------+ >> + >> >> Start qemu with: >> >> "-netdev socket,id=qtest-bn0,fd=%d" >> "-device rtl8139,netdev=qtest-bn0,id=qtest-e0" >> "-chardev socket,id=redirector0,path=%s,server,nowait" >> "-chardev socket,id=redirector1,path=%s,server,nowait" >> "-chardev socket,id=redirector2,path=%s,nowait" >> "-object filter-redirector,id=qtest-f0,netdev=qtest-bn0," >> "queue=tx,outdev=redirector0" >> "-object filter-redirector,id=qtest-f1,netdev=qtest-bn0," >> "queue=tx,indev=redirector2" >> "-object filter-redirector,id=qtest-f2,netdev=qtest-bn0," >> "queue=tx,outdev=redirector1" > Both the patch and the above figure looks good. But it would be still > better to use several sentences to explain the test. OK, I will fix it in next version. Thanks zhangchen > Thanks > >> -------------------------------------- >> Case 2, rx traffic flow >> qemu side | test side >> | >> +---------+ | +-------+ >> | backend +---------------> sock1 | >> +----^----+ | +-------+ >> | | >> +----+----+ +-------+ | >> | rd0 +<-+chardev| | >> +---------+ +---+---+ | >> ^ | >> +---------+ | | >> | rd1 +------+ | >> +----^----+ | >> | | >> +----+----+ | +-------+ >> | rd2 <---------------+sock0 | >> +---------+ | +-------+ >> >> Start qemu with: >> >> "-netdev socket,id=qtest-bn0,fd=%d" >> "-device rtl8139,netdev=qtest-bn0,id=qtest-e0" >> "-chardev socket,id=redirector0,path=%s,server,nowait" >> "-chardev socket,id=redirector1,path=%s,server,nowait" >> "-chardev socket,id=redirector2,path=%s,nowait" >> "-object filter-redirector,id=qtest-f0,netdev=qtest-bn0," >> "queue=rx,outdev=redirector0" >> "-object filter-redirector,id=qtest-f1,netdev=qtest-bn0," >> "queue=rx,indev=redirector2" >> "-object filter-redirector,id=qtest-f2,netdev=qtest-bn0," >> "queue=rx,outdev=redirector1" >> >> Signed-off-by: Zhang Chen >> Signed-off-by: Wen Congyang >> --- >> tests/.gitignore | 1 + >> tests/Makefile | 2 + >> tests/test-filter-redirector.c | 214 +++++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 217 insertions(+) >> create mode 100644 tests/test-filter-redirector.c >> >> diff --git a/tests/.gitignore b/tests/.gitignore >> index 10df017..5069d5d 100644 >> --- a/tests/.gitignore >> +++ b/tests/.gitignore >> @@ -64,5 +64,6 @@ test-x86-cpuid >> test-xbzrle >> test-netfilter >> test-filter-mirror >> +test-filter-redirector >> *-test >> qapi-schema/*.test.* >> diff --git a/tests/Makefile b/tests/Makefile >> index e56c514..275c4cc 100644 >> --- a/tests/Makefile >> +++ b/tests/Makefile >> @@ -213,6 +213,7 @@ check-qtest-x86_64-$(CONFIG_VHOST_NET_TEST_x86_64) += tests/vhost-user-test$(EXE >> endif >> check-qtest-i386-y += tests/test-netfilter$(EXESUF) >> check-qtest-i386-y += tests/test-filter-mirror$(EXESUF) >> +check-qtest-i386-y += tests/test-filter-redirector$(EXESUF) >> check-qtest-x86_64-y = $(check-qtest-i386-y) >> gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c >> gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y)) >> @@ -565,6 +566,7 @@ tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) >> tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y) >> tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y) >> tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y) >> +tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y) >> tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) >> tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o >> >> diff --git a/tests/test-filter-redirector.c b/tests/test-filter-redirector.c >> new file mode 100644 >> index 0000000..6074cd7 >> --- /dev/null >> +++ b/tests/test-filter-redirector.c >> @@ -0,0 +1,214 @@ >> +/* >> + * QTest testcase for filter-redirector >> + * >> + * Copyright (c) 2016 FUJITSU LIMITED >> + * Author: Zhang Chen >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2 or >> + * later. See the COPYING file in the top-level directory. >> + * >> + * Case 1, tx traffic flow: >> + * >> + * qemu side | test side >> + * | >> + * +---------+ | +-------+ >> + * | backend <---------------+ sock0 | >> + * +----+----+ | +-------+ >> + * | | >> + * +----v----+ +-------+ | >> + * | rd0 +->+chardev| | >> + * +---------+ +---+---+ | >> + * | | >> + * +---------+ | | >> + * | rd1 <------+ | >> + * +----+----+ | >> + * | | >> + * +----v----+ | +-------+ >> + * | rd2 +--------------->sock1 | >> + * +---------+ | +-------+ >> + * + >> + * >> + * -------------------------------------- >> + * Case 2, rx traffic flow >> + * qemu side | test side >> + * | >> + * +---------+ | +-------+ >> + * | backend +---------------> sock1 | >> + * +----^----+ | +-------+ >> + * | | >> + * +----+----+ +-------+ | >> + * | rd0 +<-+chardev| | >> + * +---------+ +---+---+ | >> + * ^ | >> + * +---------+ | | >> + * | rd1 +------+ | >> + * +----^----+ | >> + * | | >> + * +----+----+ | +-------+ >> + * | rd2 <---------------+sock0 | >> + * +---------+ | +-------+ >> + * + >> + */ >> + >> +#include >> +#include "libqtest.h" >> +#include "qemu/iov.h" >> +#include "qemu/sockets.h" >> +#include "qemu/error-report.h" >> +#include "qemu/main-loop.h" >> + >> +static void test_redirector_tx(void) >> +{ >> +#ifndef _WIN32 >> +/* socketpair(PF_UNIX) which does not exist on windows */ >> + >> + int backend_sock[2], recv_sock; >> + char *cmdline; >> + uint32_t ret = 0, len = 0; >> + char send_buf[] = "Hello!!"; >> + char sock_path0[] = "filter-redirector0.XXXXXX"; >> + char sock_path1[] = "filter-redirector1.XXXXXX"; >> + char *recv_buf; >> + uint32_t size = sizeof(send_buf); >> + size = htonl(size); >> + >> + ret = socketpair(PF_UNIX, SOCK_STREAM, 0, backend_sock); >> + g_assert_cmpint(ret, !=, -1); >> + >> + ret = mkstemp(sock_path0); >> + g_assert_cmpint(ret, !=, -1); >> + ret = mkstemp(sock_path1); >> + g_assert_cmpint(ret, !=, -1); >> + >> + cmdline = g_strdup_printf("-netdev socket,id=qtest-bn0,fd=%d " >> + "-device rtl8139,netdev=qtest-bn0,id=qtest-e0 " >> + "-chardev socket,id=redirector0,path=%s,server,nowait " >> + "-chardev socket,id=redirector1,path=%s,server,nowait " >> + "-chardev socket,id=redirector2,path=%s,nowait " >> + "-object filter-redirector,id=qtest-f0,netdev=qtest-bn0," >> + "queue=tx,outdev=redirector0 " >> + "-object filter-redirector,id=qtest-f1,netdev=qtest-bn0," >> + "queue=tx,indev=redirector2 " >> + "-object filter-redirector,id=qtest-f2,netdev=qtest-bn0," >> + "queue=tx,outdev=redirector1 " >> + , backend_sock[1], sock_path0, sock_path1, sock_path0); >> + qtest_start(cmdline); >> + g_free(cmdline); >> + >> + recv_sock = unix_connect(sock_path1, NULL); >> + g_assert_cmpint(recv_sock, !=, -1); >> + >> + struct iovec iov[] = { >> + { >> + .iov_base = &size, >> + .iov_len = sizeof(size), >> + }, { >> + .iov_base = send_buf, >> + .iov_len = sizeof(send_buf), >> + }, >> + }; >> + >> + ret = iov_send(backend_sock[0], iov, 2, 0, sizeof(size) + sizeof(send_buf)); >> + g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size)); >> + close(backend_sock[0]); >> + >> + ret = qemu_recv(recv_sock, &len, sizeof(len), 0); >> + g_assert_cmpint(ret, ==, sizeof(len)); >> + len = ntohl(len); >> + >> + g_assert_cmpint(len, ==, sizeof(send_buf)); >> + recv_buf = g_malloc(len); >> + ret = qemu_recv(recv_sock, recv_buf, len, 0); >> + g_assert_cmpstr(recv_buf, ==, send_buf); >> + >> + g_free(recv_buf); >> + close(recv_sock); >> + unlink(sock_path0); >> + unlink(sock_path1); >> + qtest_end(); >> + >> +#endif >> +} >> + >> +static void test_redirector_rx(void) >> +{ >> +#ifndef _WIN32 >> +/* socketpair(PF_UNIX) which does not exist on windows */ >> + >> + int backend_sock[2],send_sock, recv_sock; >> + char *cmdline; >> + uint32_t ret = 0, len = 0; >> + char send_buf[] = "Hello!!"; >> + char sock_path0[] = "filter-redirector0.XXXXXX"; >> + char sock_path1[] = "filter-redirector1.XXXXXX"; >> + char *recv_buf; >> + uint32_t size = sizeof(send_buf); >> + size = htonl(size); >> + >> + ret = socketpair(PF_UNIX, SOCK_STREAM, 0, backend_sock); >> + g_assert_cmpint(ret, !=, -1); >> + >> + ret = mkstemp(sock_path0); >> + g_assert_cmpint(ret, !=, -1); >> + ret = mkstemp(sock_path1); >> + g_assert_cmpint(ret, !=, -1); >> + >> + cmdline = g_strdup_printf("-netdev socket,id=qtest-bn0,fd=%d " >> + "-device rtl8139,netdev=qtest-bn0,id=qtest-e0 " >> + "-chardev socket,id=redirector0,path=%s,server,nowait " >> + "-chardev socket,id=redirector1,path=%s,server,nowait " >> + "-chardev socket,id=redirector2,path=%s,nowait " >> + "-object filter-redirector,id=qtest-f0,netdev=qtest-bn0," >> + "queue=rx,indev=redirector0 " >> + "-object filter-redirector,id=qtest-f1,netdev=qtest-bn0," >> + "queue=rx,outdev=redirector2 " >> + "-object filter-redirector,id=qtest-f2,netdev=qtest-bn0," >> + "queue=rx,indev=redirector1 " >> + , backend_sock[1], sock_path0, sock_path1, sock_path0); >> + qtest_start(cmdline); >> + g_free(cmdline); >> + >> + struct iovec iov[] = { >> + { >> + .iov_base = &size, >> + .iov_len = sizeof(size), >> + }, { >> + .iov_base = send_buf, >> + .iov_len = sizeof(send_buf), >> + }, >> + }; >> + >> + send_sock = unix_connect(sock_path1, NULL); >> + ret = iov_send(send_sock, iov, 2, 0, sizeof(size) + sizeof(send_buf)); >> + g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size)); >> + close(send_sock); >> + >> + ret = qemu_recv(backend_sock[0], &len, sizeof(len), 0); >> + g_assert_cmpint(ret, ==, sizeof(len)); >> + len = ntohl(len); >> + >> + g_assert_cmpint(len, ==, sizeof(send_buf)); >> + recv_buf = g_malloc(len); >> + ret = qemu_recv(backend_sock[0], recv_buf, len, 0); >> + g_assert_cmpstr(recv_buf, ==, send_buf); >> + >> + g_free(recv_buf); >> + close(recv_sock); >> + unlink(sock_path0); >> + unlink(sock_path1); >> + qtest_end(); >> + >> +#endif >> +} >> + >> +int main(int argc, char **argv) >> +{ >> + int ret; >> + >> + g_test_init(&argc, &argv, NULL); >> + qtest_add_func("/netfilter/redirector_tx", test_redirector_tx); >> + qtest_add_func("/netfilter/redirector_rx", test_redirector_rx); >> + ret = g_test_run(); >> + >> + return ret; >> +} > > > . > -- Thanks zhangchen