test: fix ring PMD initialisation

(bitratestats_autotest|latencystats_autotest|pdump_autotest) tests
generate a log of error messages like that:

test_packet_forward() line 104: Error sending packet to port 0
Send pkts Failed

These tests use of app/test/sample_packet_forward.* code.
This code creates a portid from a ring, but doesn't properly
configure/start it.
The fix adds code to configure/start given port before usage.

Fixes: 7a0935239b9e ("ethdev: make fast-path functions to use new flat array")
Fixes: a52966cd48fd ("test: add helpers using ring PMD Rx/Tx")
Cc: stable@dpdk.org
Reported-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Tested-by: David Marchand <david.marchand@redhat.com>

diff --git a/app/test/sample_packet_forward.c b/app/test/sample_packet_forward.c
index 61384b3d9bdb50823d6e5e82ae0f99839bf21087..aa897274d851d98c17380d4bac7b131c5315f905 100644 (file)
--- a/app/test/sample_packet_forward.c
+++ b/app/test/sample_packet_forward.c
@@ -15,6 +15,35 @@
 
 #include "sample_packet_forward.h"
 
+/*
+ * heper function: configure and start test device
+ */
+int
+test_dev_start(uint16_t port, struct rte_mempool *mp)
+{
+       int32_t rc;
+       struct rte_eth_conf pconf;
+
+       memset(&pconf, 0, sizeof(pconf));
+
+       rc =  rte_eth_dev_configure(port, NUM_QUEUES, NUM_QUEUES, &pconf);
+       if (rc != 0)
+               return rc;
+
+       rc = rte_eth_rx_queue_setup(port, 0, RING_SIZE, SOCKET_ID_ANY,
+               NULL, mp);
+       if (rc != 0)
+               return rc;
+
+       rc = rte_eth_tx_queue_setup(port, 0, RING_SIZE, SOCKET_ID_ANY,
+               NULL);
+       if (rc != 0)
+               return rc;
+
+       rc = rte_eth_dev_start(port);
+       return rc;
+}
+
 /* Sample test to create virtual rings and tx,rx portid from rings */
 int
 test_ring_setup(struct rte_ring **ring, uint16_t *portid)

diff --git a/app/test/sample_packet_forward.h b/app/test/sample_packet_forward.h
index 6789217de3b8f709890ebec3395b54c6e79d1557..af0b1d9924f5f403a0d528579ee01c5b4033d590 100644 (file)
--- a/app/test/sample_packet_forward.h
+++ b/app/test/sample_packet_forward.h
@@ -21,6 +21,9 @@ struct rte_ring;
 /* Sample test to create virtual rings and tx,rx portid from rings */
 int test_ring_setup(struct rte_ring **ring, uint16_t *portid);
 
+/* configure and start device created by test_ring_setup */
+int test_dev_start(uint16_t port, struct rte_mempool *mp);
+
 /* Sample test to free the virtual rings */
 void test_ring_free(struct rte_ring *rxtx);
 

diff --git a/app/test/test_bitratestats.c b/app/test/test_bitratestats.c
index f4a92c9be6941ebe429f3f4c09a03f32f6194a3a..1ff540f4c48ab9a9ef947b4513b2a7d32c514fa0 100644 (file)
--- a/app/test/test_bitratestats.c
+++ b/app/test/test_bitratestats.c
@@ -11,6 +11,7 @@
 #include <rte_memzone.h>
 #include <rte_metrics.h>
 #include <rte_bitrate.h>
+#include <rte_ethdev.h>
 
 #include "sample_packet_forward.h"
 #include "test.h"
@@ -159,12 +160,21 @@ test_bit_packet_forward(void)
                printf("allocate mbuf pool Failed\n");
                return TEST_FAILED;
        }
+       ret = test_dev_start(portid, mp);
+       if (ret < 0) {
+               printf("test_dev_start(%hu, %p) failed, error code: %d\n",
+                       portid, mp, ret);
+               return TEST_FAILED;
+       }
+
        ret = test_packet_forward(pbuf, portid, QUEUE_ID);
        if (ret < 0)
                printf("send pkts Failed\n");
+
+       rte_eth_dev_stop(portid);
        test_put_mbuf_to_pool(mp, pbuf);
 
-       return TEST_SUCCESS;
+       return (ret >= 0) ? TEST_SUCCESS : TEST_FAILED;
 }
 
 static int

diff --git a/app/test/test_latencystats.c b/app/test/test_latencystats.c
index 724acbc31556c4bb5e72ebde71fe35c7714d7601..db06c7d5c703837ef7623148305b217559e34dbc 100644 (file)
--- a/app/test/test_latencystats.c
+++ b/app/test/test_latencystats.c
@@ -6,6 +6,7 @@
 #include <stdint.h>
 #include <string.h>
 
+#include <rte_ethdev.h>
 #include <rte_latencystats.h>
 #include "rte_lcore.h"
 #include "rte_metrics.h"
@@ -158,12 +159,21 @@ static int test_latency_packet_forward(void)
                printf("allocate mbuf pool Failed\n");
                return TEST_FAILED;
        }
+       ret = test_dev_start(portid, mp);
+       if (ret < 0) {
+               printf("test_dev_start(%hu, %p) failed, error code: %d\n",
+                       portid, mp, ret);
+               return TEST_FAILED;
+       }
+
        ret = test_packet_forward(pbuf, portid, QUEUE_ID);
        if (ret < 0)
                printf("send pkts Failed\n");
+
+       rte_eth_dev_stop(portid);
        test_put_mbuf_to_pool(mp, pbuf);
 
-       return TEST_SUCCESS;
+       return (ret >= 0) ? TEST_SUCCESS : TEST_FAILED;
 }
 
 static struct

diff --git a/app/test/test_pdump.c b/app/test/test_pdump.c
index b49fcfb3f18f8b88e02ba95914d17c73c75acdf1..ea03056b475df78557edfdd931a8ba88254f4ea5 100644 (file)
--- a/app/test/test_pdump.c
+++ b/app/test/test_pdump.c
@@ -147,11 +147,19 @@ send_pkts(void *empty)
        ret = test_get_mbuf_from_pool(&mp, pbuf, poolname);
        if (ret < 0)
                printf("get_mbuf_from_pool failed\n");
-       do {
+
+       ret = test_dev_start(portid, mp);
+       if (ret < 0)
+               printf("test_dev_start(%hu, %p) failed, error code: %d\n",
+                       portid, mp, ret);
+
+       while (ret >= 0 && flag_for_send_pkts) {
                ret = test_packet_forward(pbuf, portid, QUEUE_ID);
                if (ret < 0)
                        printf("send pkts Failed\n");
-       } while (flag_for_send_pkts);
+       };
+
+       rte_eth_dev_stop(portid);
        test_put_mbuf_to_pool(mp, pbuf);
        return empty;
 }