X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_sched.c;h=10d54c55a1001c308c1215d95b8faa3e344ded24;hb=24ac604ef7469eb5773c2504b313dd00257f8df3;hp=a0efa52491d2a8523a760a547be50d9369b48181;hpb=de3cfa2c9823a7e0391d4f4a355e2d78b83eec62;p=dpdk.git diff --git a/app/test/test_sched.c b/app/test/test_sched.c old mode 100755 new mode 100644 index a0efa52491..10d54c55a1 --- a/app/test/test_sched.c +++ b/app/test/test_sched.c @@ -1,35 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation */ #include @@ -38,12 +8,8 @@ #include #include -#include - #include "test.h" -#if defined(RTE_LIBRTE_SCHED) && defined(RTE_ARCH_X86_64) - #include #include #include @@ -51,17 +17,10 @@ #include -#define VERIFY(exp,fmt,args...) \ - if (!(exp)) { \ - printf(fmt, ##args); \ - return -1; \ - } - - -#define SUBPORT 0 -#define PIPE 1 -#define TC 2 -#define QUEUE 3 +#define SUBPORT 0 +#define PIPE 1 +#define TC 2 +#define QUEUE 3 static struct rte_sched_subport_params subport_param[] = { { @@ -86,22 +45,20 @@ static struct rte_sched_pipe_params pipe_profile[] = { }; static struct rte_sched_port_params port_param = { - .name = "port_0", .socket = 0, /* computed */ .rate = 0, /* computed */ + .mtu = 1522, .frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT, .n_subports_per_port = 1, - .n_pipes_per_subport = 4096, - .qsize = {64, 64, 64, 64}, + .n_pipes_per_subport = 1024, + .qsize = {32, 32, 32, 32}, .pipe_profiles = pipe_profile, .n_pipe_profiles = 1, }; #define NB_MBUF 32 -#define MAX_PACKET_SZ 2048 -#define MBUF_SZ (MAX_PACKET_SZ + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM) -#define PKT_BURST_SZ 32 -#define MEMPOOL_CACHE_SZ PKT_BURST_SZ +#define MBUF_DATA_SZ (2048 + RTE_PKTMBUF_HEADROOM) +#define MEMPOOL_CACHE_SZ 0 #define SOCKET 0 @@ -112,53 +69,49 @@ create_mempool(void) mp = rte_mempool_lookup("test_sched"); if (!mp) - mp = rte_mempool_create("test_sched", - NB_MBUF, - MBUF_SZ, - MEMPOOL_CACHE_SZ, - sizeof(struct rte_pktmbuf_pool_private), - rte_pktmbuf_pool_init, - NULL, - rte_pktmbuf_init, - NULL, - SOCKET, - 0); + mp = rte_pktmbuf_pool_create("test_sched", NB_MBUF, + MEMPOOL_CACHE_SZ, 0, MBUF_DATA_SZ, SOCKET); return mp; } static void -prepare_pkt(struct rte_mbuf *mbuf) +prepare_pkt(struct rte_sched_port *port, struct rte_mbuf *mbuf) { - struct ether_hdr *eth_hdr; - struct vlan_hdr *vlan1, *vlan2; - struct ipv4_hdr *ip_hdr; + struct rte_ether_hdr *eth_hdr; + struct rte_vlan_hdr *vlan1, *vlan2; + struct rte_ipv4_hdr *ip_hdr; /* Simulate a classifier */ - eth_hdr = rte_pktmbuf_mtod(mbuf, struct ether_hdr *); - vlan1 = (struct vlan_hdr *)(ð_hdr->ether_type ); - vlan2 = (struct vlan_hdr *)((uintptr_t)ð_hdr->ether_type + sizeof(struct vlan_hdr)); - eth_hdr = (struct ether_hdr *)((uintptr_t)ð_hdr->ether_type + 2 *sizeof(struct vlan_hdr)); - ip_hdr = (struct ipv4_hdr *)((uintptr_t)eth_hdr + sizeof(eth_hdr->ether_type)); + eth_hdr = rte_pktmbuf_mtod(mbuf, struct rte_ether_hdr *); + vlan1 = (struct rte_vlan_hdr *)(ð_hdr->ether_type); + vlan2 = (struct rte_vlan_hdr *)( + (uintptr_t)ð_hdr->ether_type + sizeof(struct rte_vlan_hdr)); + eth_hdr = (struct rte_ether_hdr *)( + (uintptr_t)ð_hdr->ether_type + + 2 * sizeof(struct rte_vlan_hdr)); + ip_hdr = (struct rte_ipv4_hdr *)( + (uintptr_t)eth_hdr + sizeof(eth_hdr->ether_type)); vlan1->vlan_tci = rte_cpu_to_be_16(SUBPORT); vlan2->vlan_tci = rte_cpu_to_be_16(PIPE); - eth_hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4); - ip_hdr->dst_addr = IPv4(0,0,TC,QUEUE); + eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + ip_hdr->dst_addr = RTE_IPv4(0,0,TC,QUEUE); - rte_sched_port_pkt_write(mbuf, SUBPORT, PIPE, TC, QUEUE, e_RTE_METER_YELLOW); + rte_sched_port_pkt_write(port, mbuf, SUBPORT, PIPE, TC, QUEUE, + RTE_COLOR_YELLOW); /* 64 byte packet */ - mbuf->pkt.pkt_len = 60; - mbuf->pkt.data_len = 60; + mbuf->pkt_len = 60; + mbuf->data_len = 60; } /** * test main entrance for library sched */ -int +static int test_sched(void) { struct rte_mempool *mp = NULL; @@ -171,49 +124,49 @@ test_sched(void) int err; mp = create_mempool(); + TEST_ASSERT_NOT_NULL(mp, "Error creating mempool\n"); port_param.socket = 0; port_param.rate = (uint64_t) 10000 * 1000 * 1000 / 8; - port_param.name = "port_0"; port = rte_sched_port_config(&port_param); - VERIFY(port != NULL, "Error config sched port\n"); + TEST_ASSERT_NOT_NULL(port, "Error config sched port\n"); - err = rte_sched_subport_config(port, SUBPORT, subport_param); - VERIFY(err == 0, "Error config sched, err=%d\n", err); + TEST_ASSERT_SUCCESS(err, "Error config sched, err=%d\n", err); for (pipe = 0; pipe < port_param.n_pipes_per_subport; pipe ++) { err = rte_sched_pipe_config(port, SUBPORT, pipe, 0); - VERIFY(err == 0, "Error config sched pipe %u, err=%d\n", pipe, err); + TEST_ASSERT_SUCCESS(err, "Error config sched pipe %u, err=%d\n", pipe, err); } for (i = 0; i < 10; i++) { in_mbufs[i] = rte_pktmbuf_alloc(mp); - prepare_pkt(in_mbufs[i]); + TEST_ASSERT_NOT_NULL(in_mbufs[i], "Packet allocation failed\n"); + prepare_pkt(port, in_mbufs[i]); } err = rte_sched_port_enqueue(port, in_mbufs, 10); - VERIFY(err == 10, "Wrong enqueue, err=%d\n", err); + TEST_ASSERT_EQUAL(err, 10, "Wrong enqueue, err=%d\n", err); err = rte_sched_port_dequeue(port, out_mbufs, 10); - VERIFY(err == 10, "Wrong dequeue, err=%d\n", err); + TEST_ASSERT_EQUAL(err, 10, "Wrong dequeue, err=%d\n", err); for (i = 0; i < 10; i++) { - enum rte_meter_color color; + enum rte_color color; uint32_t subport, traffic_class, queue; color = rte_sched_port_pkt_read_color(out_mbufs[i]); - VERIFY(color == e_RTE_METER_YELLOW, "Wrong color\n"); + TEST_ASSERT_EQUAL(color, RTE_COLOR_YELLOW, "Wrong color\n"); - rte_sched_port_pkt_read_tree_path(out_mbufs[i], + rte_sched_port_pkt_read_tree_path(port, out_mbufs[i], &subport, &pipe, &traffic_class, &queue); - VERIFY(subport == SUBPORT, "Wrong subport\n"); - VERIFY(pipe == PIPE, "Wrong pipe\n"); - VERIFY(traffic_class == TC, "Wrong traffic_class\n"); - VERIFY(queue == QUEUE, "Wrong queue\n"); + TEST_ASSERT_EQUAL(subport, SUBPORT, "Wrong subport\n"); + TEST_ASSERT_EQUAL(pipe, PIPE, "Wrong pipe\n"); + TEST_ASSERT_EQUAL(traffic_class, TC, "Wrong traffic_class\n"); + TEST_ASSERT_EQUAL(queue, QUEUE, "Wrong queue\n"); } @@ -221,24 +174,19 @@ test_sched(void) struct rte_sched_subport_stats subport_stats; uint32_t tc_ov; rte_sched_subport_read_stats(port, SUBPORT, &subport_stats, &tc_ov); - //VERIFY(subport_stats.n_pkts_tc[TC-1] == 10, "Wrong subport stats\n"); - +#if 0 + TEST_ASSERT_EQUAL(subport_stats.n_pkts_tc[TC-1], 10, "Wrong subport stats\n"); +#endif struct rte_sched_queue_stats queue_stats; uint16_t qlen; rte_sched_queue_read_stats(port, QUEUE, &queue_stats, &qlen); - //VERIFY(queue_stats.n_pkts == 10, "Wrong queue stats\n"); +#if 0 + TEST_ASSERT_EQUAL(queue_stats.n_pkts, 10, "Wrong queue stats\n"); +#endif rte_sched_port_free(port); return 0; } -#else /* RTE_LIBRTE_SCHED */ - -int -test_sched(void) -{ - printf("The Scheduler library is not included in this build\n"); - return 0; -} -#endif /* RTE_LIBRTE_SCHED */ +REGISTER_TEST_COMMAND(sched_autotest, test_sched);