/*-
* BSD LICENSE
- *
- * Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ * Copyright(c) 2010-2014 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
* * 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
*/
#include "test.h"
-#ifdef RTE_LIBRTE_PMD_RING
-
#include <stdio.h>
#include <rte_eth_ring.h>
#include <rte_ethdev.h>
-/* two test rings, r1 is used by two ports, r2 just by one */
-static struct rte_ring *r1[2], *r2;
-
-static struct rte_ring *nullring = NULL;
static struct rte_mempool *mp;
-static uint8_t start_idx; /* will store the port id of the first of our new ports */
-
-#define TX_PORT (uint8_t)(start_idx + 1)
-#define RX_PORT (uint8_t)(start_idx + 2)
-#define RXTX_PORT (uint8_t)(start_idx + 3)
-#define RXTX_PORT2 (uint8_t)(start_idx + 4)
-#define RXTX_PORT4 (uint8_t)(start_idx + 6)
-#define RXTX_PORT5 (uint8_t)(start_idx + 7)
+
+#define TX_PORT 0
+#define RX_PORT 1
+#define RXTX_PORT 2
+#define RXTX_PORT2 3
+#define RXTX_PORT3 4
#define SOCKET0 0
#define RING_SIZE 256
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
+#define MBUF_DATA_SIZE (2048 + RTE_PKTMBUF_HEADROOM)
#define NB_MBUF 512
-
-static int
-test_ring_ethdev_create(void)
-{
- int retval;
- printf("Testing ring pmd create\n");
-
- retval = rte_eth_from_rings(NULL, 0, NULL, 0, SOCKET0);
- if (retval < 0) {
- printf("Failure, failed to create zero-sized RXTX ring pmd\n");
- return -1;
- }
-
- retval = rte_eth_from_rings(NULL, 0, NULL, 0, RTE_MAX_NUMA_NODES);
- if (retval >= 0) {
- printf("Failure, can create ring pmd on socket %d\n", RTE_MAX_NUMA_NODES);
- return -1;
- }
-
- retval = rte_eth_from_rings(NULL, 1, &r2, 1, SOCKET0);
- if (retval >= 0) {
- printf("Failure, can create pmd with null rx rings\n");
- return -1;
- }
-
- retval = rte_eth_from_rings(r1, 1, NULL, 1, SOCKET0);
- if (retval >= 0) {
- printf("Failure, can create pmd with null tx rings\n");
- return -1;
- }
-
- retval = rte_eth_from_rings(&nullring, 1, r1, 2, SOCKET0);
- if (retval < 0) {
- printf("Failure, failed to create TX-only ring pmd\n");
- return -1;
- }
-
- retval = rte_eth_from_rings(r1, 1, &nullring, 1, SOCKET0);
- if (retval < 0) {
- printf("Failure, failed to create RX-only ring pmd\n");
- return -1;
- }
-
- retval = rte_eth_from_rings(&r2, 1, &r2, 1, SOCKET0);
- if (retval < 0) {
- printf("Failure, failed to create RXTX ring pmd\n");
- return -1;
- }
-
- return 0;
-}
-
static int
test_ethdev_configure(void)
{
struct rte_eth_link link;
memset(&null_conf, 0, sizeof(struct rte_eth_conf));
-
+
if ((TX_PORT >= RTE_MAX_ETHPORTS) || (RX_PORT >= RTE_MAX_ETHPORTS)\
|| (RXTX_PORT >= RTE_MAX_ETHPORTS)) {
printf(" TX/RX port exceed max eth ports\n");
return -1;
}
if (rte_eth_dev_configure(RXTX_PORT, 1, 1, &null_conf) < 0) {
- printf("Configure failed for RX port\n");
+ printf("Configure failed for RXTX port\n");
return -1;
}
printf("Testing ring PMD stats reset\n");
rte_eth_stats_reset(RXTX_PORT);
-
+
/* check stats of RXTX port, should all be zero */
rte_eth_stats_get(RXTX_PORT, &stats);
if (stats.ipackets != 0 || stats.opackets != 0 ||
}
rte_eth_stats_reset(RXTX_PORT);
-
+
/* check stats of RXTX port, should all be zero */
rte_eth_stats_get(RXTX_PORT, &stats);
if (stats.ipackets != 0 || stats.opackets != 0 ||
return 0;
}
-static int
-test_pmd_ring_init(void)
+static int
+test_pmd_ring_pair_create_attach(void)
{
- const char * name1 = "R3";
- const char * name2 = "R4";
- const char * params_null = NULL;
- const char * params = "PARAMS";
- struct rte_eth_stats stats;
+ struct rte_eth_stats stats, stats2;
struct rte_mbuf buf, *pbuf = &buf;
struct rte_eth_conf null_conf;
- printf("Testing ring pmd init\n");
-
- if (rte_pmd_ring_init(name1, params_null) < 0) {
- printf("Testing ring pmd init fail\n");
- return -1;
- }
-
- if (rte_pmd_ring_init(name2, params) < 0) {
- printf("Testing ring pmd init fail\n");
- return -1;
- }
-
- if (RXTX_PORT2 >= RTE_MAX_ETHPORTS) {
+ if ((RXTX_PORT2 >= RTE_MAX_ETHPORTS) || (RXTX_PORT3 >= RTE_MAX_ETHPORTS)) {
printf(" TX/RX port exceed max eth ports\n");
return -1;
}
- if (rte_eth_dev_configure(RXTX_PORT2, 1, 1, &null_conf) < 0) {
+ if ((rte_eth_dev_configure(RXTX_PORT2, 1, 1, &null_conf) < 0)
+ || (rte_eth_dev_configure(RXTX_PORT3, 1, 1, &null_conf) < 0)) {
printf("Configure failed for RXTX port\n");
return -1;
}
- if (rte_eth_tx_queue_setup(RXTX_PORT2, 0, RING_SIZE, SOCKET0, NULL) < 0) {
+ if ((rte_eth_tx_queue_setup(RXTX_PORT2, 0, RING_SIZE, SOCKET0, NULL) < 0)
+ || (rte_eth_tx_queue_setup(RXTX_PORT3, 0, RING_SIZE, SOCKET0, NULL) < 0)) {
printf("TX queue setup failed\n");
return -1;
}
- if (rte_eth_rx_queue_setup(RXTX_PORT2, 0, RING_SIZE, SOCKET0,
- NULL, mp) < 0) {
+ if ((rte_eth_rx_queue_setup(RXTX_PORT2, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)
+ || (rte_eth_rx_queue_setup(RXTX_PORT3, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {
printf("RX queue setup failed\n");
return -1;
}
- if (rte_eth_dev_start(RXTX_PORT2) < 0) {
- printf("Error starting RX port\n");
+ if ((rte_eth_dev_start(RXTX_PORT2) < 0)
+ || (rte_eth_dev_start(RXTX_PORT3) < 0)) {
+ printf("Error starting RXTX port\n");
return -1;
}
- /* send and receive 1 packet and check for stats update */
+ /*
+ * send and receive 1 packet (RXTX_PORT2 -> RXTX_PORT3)
+ * and check for stats update
+ */
if (rte_eth_tx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) {
printf("Error sending packet to RXTX port\n");
return -1;
}
- if (rte_eth_rx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) {
+ if (rte_eth_rx_burst(RXTX_PORT3, 0, &pbuf, 1) != 1) {
printf("Error receiving packet from RXTX port\n");
return -1;
}
rte_eth_stats_get(RXTX_PORT2, &stats);
- if (stats.ipackets != 1 || stats.opackets != 1 ||
+ rte_eth_stats_get(RXTX_PORT3, &stats2);
+ if (stats.ipackets != 0 || stats.opackets != 1 ||
stats.ibytes != 0 || stats.obytes != 0 ||
stats.ierrors != 0 || stats.oerrors != 0) {
printf("Error: RXTX port stats are not as expected\n");
return -1;
}
- rte_eth_dev_stop(RXTX_PORT2);
-
- /* Test init same name pmd ring */
- rte_pmd_ring_init(name1, params_null);
- return 0;
-}
-
-static int
-test_pmd_ring_pair_create(void)
-{
- const char * name1 = "_RNG_P0";
- struct rte_eth_stats stats, stats2;
- struct rte_mbuf buf, *pbuf = &buf;
- struct rte_eth_conf null_conf;
-
- if (rte_eth_ring_pair_create(name1, SOCKET0) < 0) {
- printf("Create ring pair failed\n");
- return -1;
- }
-
- if ((RXTX_PORT4 >= RTE_MAX_ETHPORTS) || (RXTX_PORT5 >= RTE_MAX_ETHPORTS)) {
- printf(" TX/RX port exceed max eth ports\n");
- return -1;
- }
- if ((rte_eth_dev_configure(RXTX_PORT4, 1, 1, &null_conf) < 0)
- || (rte_eth_dev_configure(RXTX_PORT5, 1, 1, &null_conf) < 0)) {
- printf("Configure failed for RXTX port\n");
- return -1;
- }
-
- if ((rte_eth_tx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL) < 0)
- || (rte_eth_tx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL) < 0)) {
- printf("TX queue setup failed\n");
- return -1;
- }
-
- if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)
- || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {
- printf("RX queue setup failed\n");
- return -1;
- }
-
- if ((rte_eth_dev_start(RXTX_PORT4) < 0)
- || (rte_eth_dev_start(RXTX_PORT5) < 0)) {
- printf("Error starting RXTX port\n");
+ if (stats2.ipackets != 1 || stats2.opackets != 0 ||
+ stats2.ibytes != 0 || stats2.obytes != 0 ||
+ stats2.ierrors != 0 || stats2.oerrors != 0) {
+ printf("Error: RXTX port stats are not as expected\n");
return -1;
}
- /* send and receive 1 packet and check for stats update */
- if (rte_eth_tx_burst(RXTX_PORT4, 0, &pbuf, 1) != 1) {
+ /*
+ * send and receive 1 packet (RXTX_PORT3 -> RXTX_PORT2)
+ * and check for stats update
+ */
+ if (rte_eth_tx_burst(RXTX_PORT3, 0, &pbuf, 1) != 1) {
printf("Error sending packet to RXTX port\n");
return -1;
}
- if (rte_eth_rx_burst(RXTX_PORT5, 0, &pbuf, 1) != 1) {
+ if (rte_eth_rx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) {
printf("Error receiving packet from RXTX port\n");
return -1;
}
- rte_eth_stats_get(RXTX_PORT4, &stats);
- rte_eth_stats_get(RXTX_PORT5, &stats2);
- if (stats.ipackets != 0 || stats.opackets != 1 ||
+ rte_eth_stats_get(RXTX_PORT2, &stats);
+ rte_eth_stats_get(RXTX_PORT3, &stats2);
+ if (stats.ipackets != 1 || stats.opackets != 1 ||
stats.ibytes != 0 || stats.obytes != 0 ||
stats.ierrors != 0 || stats.oerrors != 0) {
printf("Error: RXTX port stats are not as expected\n");
return -1;
}
- if (stats2.ipackets != 1 || stats2.opackets != 0 ||
+ if (stats2.ipackets != 1 || stats2.opackets != 1 ||
stats2.ibytes != 0 || stats2.obytes != 0 ||
stats2.ierrors != 0 || stats2.oerrors != 0) {
printf("Error: RXTX port stats are not as expected\n");
return -1;
}
- rte_eth_dev_stop(RXTX_PORT4);
- rte_eth_dev_stop(RXTX_PORT5);
-
- /* Test create same name ring pair */
- if (rte_eth_ring_pair_create(name1, SOCKET0) == 0) {
- printf("Create same name ring pair error\n");
- return -1;
- }
- return 0;
-}
-
-static int
-test_pmd_ring_pair_attach(void)
-{
- const char * name1 = "_RNG_P0";
- const char * name2 = "_RNG_P1";
- struct rte_eth_stats stats, stats2;
- struct rte_mbuf buf, *pbuf = &buf;
- struct rte_eth_conf null_conf;
-
- if (rte_eth_ring_pair_attach(name1, SOCKET0) < 0) {
- printf("Attach ring pair failed\n");
- return -1;
- }
-
- if ((RXTX_PORT4 >= RTE_MAX_ETHPORTS) || (RXTX_PORT5 >= RTE_MAX_ETHPORTS)) {
- printf(" TX/RX port exceed max eth ports\n");
- return -1;
- }
- if ((rte_eth_dev_configure(RXTX_PORT4, 1, 1, &null_conf) < 0)
- || (rte_eth_dev_configure(RXTX_PORT5, 1, 1, &null_conf) < 0)) {
- printf("Configure failed for RXTX port\n");
+ /*
+ * send and receive 1 packet (RXTX_PORT2 -> RXTX_PORT2)
+ * and check for stats update
+ */
+ if (rte_eth_tx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) {
+ printf("Error sending packet to RXTX port\n");
return -1;
}
- if ((rte_eth_tx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL) < 0)
- || (rte_eth_tx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL) < 0)) {
- printf("TX queue setup failed\n");
+ if (rte_eth_rx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) {
+ printf("Error receiving packet from RXTX port\n");
return -1;
}
- if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)
- || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {
- printf("RX queue setup failed\n");
+ rte_eth_stats_get(RXTX_PORT2, &stats);
+ rte_eth_stats_get(RXTX_PORT3, &stats2);
+ if (stats.ipackets != 2 || stats.opackets != 2 ||
+ stats.ibytes != 0 || stats.obytes != 0 ||
+ stats.ierrors != 0 || stats.oerrors != 0) {
+ printf("Error: RXTX port stats are not as expected\n");
return -1;
}
- if ((rte_eth_dev_start(RXTX_PORT4) < 0)
- || (rte_eth_dev_start(RXTX_PORT5) < 0)) {
- printf("Error starting RXTX port\n");
+ if (stats2.ipackets != 1 || stats2.opackets != 1 ||
+ stats2.ibytes != 0 || stats2.obytes != 0 ||
+ stats2.ierrors != 0 || stats2.oerrors != 0) {
+ printf("Error: RXTX port stats are not as expected\n");
return -1;
}
-
- rte_eth_stats_reset(RXTX_PORT4);
- rte_eth_stats_reset(RXTX_PORT5);
- /* send and receive 1 packet and check for stats update */
- if (rte_eth_tx_burst(RXTX_PORT4, 0, &pbuf, 1) != 1) {
+ /*
+ * send and receive 1 packet (RXTX_PORT3 -> RXTX_PORT3)
+ * and check for stats update
+ */
+ if (rte_eth_tx_burst(RXTX_PORT3, 0, &pbuf, 1) != 1) {
printf("Error sending packet to RXTX port\n");
return -1;
}
- if (rte_eth_rx_burst(RXTX_PORT5, 0, &pbuf, 1) != 1) {
+
+ if (rte_eth_rx_burst(RXTX_PORT3, 0, &pbuf, 1) != 1) {
printf("Error receiving packet from RXTX port\n");
return -1;
}
- rte_eth_stats_get(RXTX_PORT4, &stats);
- rte_eth_stats_get(RXTX_PORT5, &stats2);
- if (stats.ipackets != 0 || stats.opackets != 1 ||
+ rte_eth_stats_get(RXTX_PORT2, &stats);
+ rte_eth_stats_get(RXTX_PORT3, &stats2);
+ if (stats.ipackets != 2 || stats.opackets != 2 ||
stats.ibytes != 0 || stats.obytes != 0 ||
stats.ierrors != 0 || stats.oerrors != 0) {
printf("Error: RXTX port stats are not as expected\n");
return -1;
}
- if (stats2.ipackets != 1 || stats2.opackets != 0 ||
+ if (stats2.ipackets != 2 || stats2.opackets != 2 ||
stats2.ibytes != 0 || stats2.obytes != 0 ||
stats2.ierrors != 0 || stats2.oerrors != 0) {
printf("Error: RXTX port stats are not as expected\n");
return -1;
}
- rte_eth_dev_stop(RXTX_PORT4);
- rte_eth_dev_stop(RXTX_PORT5);
-
- /* Test attach non-existing ring pair */
- if (rte_eth_ring_pair_attach(name2, SOCKET0) == 0) {
- printf("Attach non-existing ring pair error\n");
- return -1;
- }
+ rte_eth_dev_stop(RXTX_PORT2);
+ rte_eth_dev_stop(RXTX_PORT3);
+
return 0;
}
-int
+static int
test_pmd_ring(void)
{
- r1[0] = rte_ring_create("R1", RING_SIZE, 0, 0);
- r1[1] = rte_ring_create("R2", RING_SIZE, 0, 0);
- if (r1[0] == NULL && (r1[0] = rte_ring_lookup("R1")) == NULL)
- return -1;
- if (r1[1] == NULL && (r1[1] = rte_ring_lookup("R2")) == NULL)
- return -1;
-
- r2 = rte_ring_create("R3", RING_SIZE, 0, RING_F_SP_ENQ|RING_F_SC_DEQ);
- if (r2 == NULL && (r2 = rte_ring_lookup("R3")) == NULL)
- return -1;
-
- mp = rte_mempool_create("mbuf_pool", NB_MBUF,
- MBUF_SIZE, 32,
- sizeof(struct rte_pktmbuf_pool_private),
- rte_pktmbuf_pool_init, NULL,
- rte_pktmbuf_init, NULL,
- rte_socket_id(), 0);
+ mp = rte_pktmbuf_pool_create("mbuf_pool", NB_MBUF, 32,
+ 0, MBUF_DATA_SIZE, rte_socket_id());
if (mp == NULL)
return -1;
- start_idx = rte_eth_dev_count();
-
if ((TX_PORT >= RTE_MAX_ETHPORTS) || (RX_PORT >= RTE_MAX_ETHPORTS)\
|| (RXTX_PORT >= RTE_MAX_ETHPORTS)) {
printf(" TX/RX port exceed max eth ports\n");
return -1;
}
- if (test_ring_ethdev_create() < 0)
- return -1;
-
if (test_ethdev_configure() < 0)
return -1;
rte_eth_dev_stop(TX_PORT);
rte_eth_dev_stop(RXTX_PORT);
- if (test_pmd_ring_init() < 0)
+ if (test_pmd_ring_pair_create_attach() < 0)
return -1;
- if (test_pmd_ring_pair_create() < 0)
- return -1;
-
- if (test_pmd_ring_pair_attach() < 0)
- return -1;
return 0;
}
-#else
-
-int
-test_pmd_ring(void)
-{
- return 0;
-}
-
-#endif
-
+static struct test_command ring_pmd_cmd = {
+ .command = "ring_pmd_autotest",
+ .callback = test_pmd_ring,
+};
+REGISTER_TEST_COMMAND(ring_pmd_cmd);
git.droids-corp.org / dpdk.git / blobdiff