test: fix kni test to check kni module dependency

Message ID 1536933422-3103-1-git-send-email-naga.sureshx.somarowthu@intel.com
State Accepted, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • test: fix kni test to check kni module dependency
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Naga Suresh Somarowthu Sept. 14, 2018, 1:57 p.m.
Check the prerequisites to run the test
1.checked whether the rte_kni module is loaded, if not fail testcase
2.checked whether the rte_kni module is loaded with loop back mode,
  if not skip packet forwarding testcase and log
3.Disabled the test in freebsd as test is not supported

Fixes: 5233e5924a ("app/test: update kni")

Signed-off-by: Naga Suresh Somarowthu <naga.sureshx.somarowthu@intel.com>
---
 test/test/test_kni.c | 49 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 11 deletions(-)

Comments

Ferruh Yigit Sept. 14, 2018, 2:40 p.m. | #1
On 9/14/2018 2:57 PM, Naga Suresh Somarowthu wrote:
> Check the prerequisites to run the test
> 1.checked whether the rte_kni module is loaded, if not fail testcase
> 2.checked whether the rte_kni module is loaded with loop back mode,
>   if not skip packet forwarding testcase and log
> 3.Disabled the test in freebsd as test is not supported
> 
> Fixes: 5233e5924a ("app/test: update kni")
> 
> Signed-off-by: Naga Suresh Somarowthu <naga.sureshx.somarowthu@intel.com>

Cc: stable@dpdk.org

Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
Thomas Monjalon Oct. 26, 2018, 5:54 p.m. | #2
14/09/2018 16:40, Ferruh Yigit:
> On 9/14/2018 2:57 PM, Naga Suresh Somarowthu wrote:
> > Check the prerequisites to run the test
> > 1.checked whether the rte_kni module is loaded, if not fail testcase
> > 2.checked whether the rte_kni module is loaded with loop back mode,
> >   if not skip packet forwarding testcase and log
> > 3.Disabled the test in freebsd as test is not supported
> > 
> > Fixes: 5233e5924a ("app/test: update kni")
> > 
> > Signed-off-by: Naga Suresh Somarowthu <naga.sureshx.somarowthu@intel.com>
> 
> Cc: stable@dpdk.org
> 
> Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied, thanks

Patch

diff --git a/test/test/test_kni.c b/test/test/test_kni.c
index 1b876719a..6c1420a16 100644
--- a/test/test/test_kni.c
+++ b/test/test/test_kni.c
@@ -7,10 +7,11 @@ 
 #include <unistd.h>
 #include <string.h>
 #include <sys/wait.h>
+#include <dirent.h>
 
 #include "test.h"
 
-#ifndef RTE_LIBRTE_KNI
+#if !defined(RTE_EXEC_ENV_LINUXAPP) || !defined(RTE_LIBRTE_KNI)
 
 static int
 test_kni(void)
@@ -40,6 +41,8 @@  test_kni(void)
 
 #define IFCONFIG      "/sbin/ifconfig "
 #define TEST_KNI_PORT "test_kni_port"
+#define KNI_MODULE_PATH "/sys/module/rte_kni"
+#define KNI_MODULE_PARAM_LO KNI_MODULE_PATH"/parameters/lo_mode"
 #define KNI_TEST_MAX_PORTS 4
 /* The threshold number of mbufs to be transmitted or received. */
 #define KNI_NUM_MBUF_THRESHOLD 100
@@ -462,7 +465,7 @@  static int
 test_kni(void)
 {
 	int ret = -1;
-	uint16_t nb_ports, port_id;
+	uint16_t port_id;
 	struct rte_kni *kni;
 	struct rte_mempool *mp;
 	struct rte_kni_conf conf;
@@ -470,6 +473,20 @@  test_kni(void)
 	struct rte_kni_ops ops;
 	const struct rte_pci_device *pci_dev;
 	const struct rte_bus *bus;
+	FILE *fd;
+	DIR *dir;
+	char buf[16];
+
+	dir = opendir(KNI_MODULE_PATH);
+	if (!dir) {
+		if (errno == ENOENT) {
+			printf("Cannot run UT due to missing rte_kni module\n");
+			return -1;
+		}
+		printf("opendir: %s", strerror(errno));
+		return -1;
+	}
+	closedir(dir);
 
 	/* Initialize KNI subsytem */
 	rte_kni_init(KNI_TEST_MAX_PORTS);
@@ -485,12 +502,6 @@  test_kni(void)
 		return -1;
 	}
 
-	nb_ports = rte_eth_dev_count_avail();
-	if (nb_ports == 0) {
-		printf("no supported nic port found\n");
-		return -1;
-	}
-
 	/* configuring port 0 for the test is enough */
 	port_id = 0;
 	ret = rte_eth_dev_configure(port_id, 1, 1, &port_conf);
@@ -519,9 +530,25 @@  test_kni(void)
 	rte_eth_promiscuous_enable(port_id);
 
 	/* basic test of kni processing */
-	ret = test_kni_processing(port_id, mp);
-	if (ret < 0)
-		goto fail;
+	fd = fopen(KNI_MODULE_PARAM_LO, "r");
+	if (fd == NULL) {
+		printf("fopen: %s", strerror(errno));
+		return -1;
+	}
+	memset(&buf, 0, sizeof(buf));
+	if (fgets(buf, sizeof(buf), fd)) {
+		if (!strncmp(buf, "lo_mode_fifo", strlen("lo_mode_fifo")) ||
+			!strncmp(buf, "lo_mode_fifo_skb",
+				  strlen("lo_mode_fifo_skb"))) {
+			ret = test_kni_processing(port_id, mp);
+			if (ret < 0) {
+				fclose(fd);
+				goto fail;
+			}
+		} else
+			printf("test_kni_processing skipped because of missing rte_kni module lo_mode argument\n");
+	}
+	fclose(fd);
 
 	/* test of allocating KNI with NULL mempool pointer */
 	memset(&info, 0, sizeof(info));