git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/sfc/base: fix ID retrieval in v3 licensing
[dpdk.git]
/
test
/
test
/
test_kni.c
diff --git
a/test/test/test_kni.c
b/test/test/test_kni.c
index
539d231
..
3dcadce
100644
(file)
--- a/
test/test/test_kni.c
+++ b/
test/test/test_kni.c
@@
-10,6
+10,17
@@
#include "test.h"
#include "test.h"
+#ifndef RTE_LIBRTE_KNI
+
+static int
+test_kni(void)
+{
+ printf("KNI not supported, skipping test\n");
+ return TEST_SKIPPED;
+}
+
+#else
+
#include <rte_string_fns.h>
#include <rte_mempool.h>
#include <rte_ethdev.h>
#include <rte_string_fns.h>
#include <rte_mempool.h>
#include <rte_ethdev.h>
@@
-23,8
+34,8
@@
#define PKT_BURST_SZ 32
#define MEMPOOL_CACHE_SZ PKT_BURST_SZ
#define SOCKET 0
#define PKT_BURST_SZ 32
#define MEMPOOL_CACHE_SZ PKT_BURST_SZ
#define SOCKET 0
-#define NB_RXD 1
28
-#define NB_TXD
512
+#define NB_RXD 1
024
+#define NB_TXD
1024
#define KNI_TIMEOUT_MS 5000 /* ms */
#define IFCONFIG "/sbin/ifconfig "
#define KNI_TIMEOUT_MS 5000 /* ms */
#define IFCONFIG "/sbin/ifconfig "
@@
-59,13
+70,6
@@
static const struct rte_eth_txconf tx_conf = {
};
static const struct rte_eth_conf port_conf = {
};
static const struct rte_eth_conf port_conf = {
- .rxmode = {
- .header_split = 0,
- .hw_ip_checksum = 0,
- .hw_vlan_filter = 0,
- .jumbo_frame = 0,
- .hw_strip_crc = 1,
- },
.txmode = {
.mq_mode = ETH_DCB_NONE,
},
.txmode = {
.mq_mode = ETH_DCB_NONE,
},
@@
-74,6
+78,8
@@
static const struct rte_eth_conf port_conf = {
static struct rte_kni_ops kni_ops = {
.change_mtu = NULL,
.config_network_if = NULL,
static struct rte_kni_ops kni_ops = {
.change_mtu = NULL,
.config_network_if = NULL,
+ .config_mac_address = NULL,
+ .config_promiscusity = NULL,
};
static unsigned lcore_master, lcore_ingress, lcore_egress;
};
static unsigned lcore_master, lcore_ingress, lcore_egress;
@@
-231,6
+237,8
@@
test_kni_register_handler_mp(void)
struct rte_kni_ops ops = {
.change_mtu = kni_change_mtu,
.config_network_if = NULL,
struct rte_kni_ops ops = {
.change_mtu = kni_change_mtu,
.config_network_if = NULL,
+ .config_mac_address = NULL,
+ .config_promiscusity = NULL,
};
if (!kni) {
};
if (!kni) {
@@
-342,6
+350,8
@@
test_kni_processing(uint16_t port_id, struct rte_mempool *mp)
struct rte_kni_conf conf;
struct rte_eth_dev_info info;
struct rte_kni_ops ops;
struct rte_kni_conf conf;
struct rte_eth_dev_info info;
struct rte_kni_ops ops;
+ const struct rte_pci_device *pci_dev;
+ const struct rte_bus *bus = NULL;
if (!mp)
return -1;
if (!mp)
return -1;
@@
-351,8
+361,13
@@
test_kni_processing(uint16_t port_id, struct rte_mempool *mp)
memset(&ops, 0, sizeof(ops));
rte_eth_dev_info_get(port_id, &info);
memset(&ops, 0, sizeof(ops));
rte_eth_dev_info_get(port_id, &info);
- conf.addr = info.pci_dev->addr;
- conf.id = info.pci_dev->id;
+ if (info.device)
+ bus = rte_bus_find_by_device(info.device);
+ if (bus && !strcmp(bus->name, "pci")) {
+ pci_dev = RTE_DEV_TO_PCI(info.device);
+ conf.addr = pci_dev->addr;
+ conf.id = pci_dev->id;
+ }
snprintf(conf.name, sizeof(conf.name), TEST_KNI_PORT);
/* core id 1 configured for kernel thread */
snprintf(conf.name, sizeof(conf.name), TEST_KNI_PORT);
/* core id 1 configured for kernel thread */
@@
-450,6
+465,8
@@
test_kni(void)
struct rte_kni_conf conf;
struct rte_eth_dev_info info;
struct rte_kni_ops ops;
struct rte_kni_conf conf;
struct rte_eth_dev_info info;
struct rte_kni_ops ops;
+ const struct rte_pci_device *pci_dev;
+ const struct rte_bus *bus;
/* Initialize KNI subsytem */
rte_kni_init(KNI_TEST_MAX_PORTS);
/* Initialize KNI subsytem */
rte_kni_init(KNI_TEST_MAX_PORTS);
@@
-465,7
+482,7
@@
test_kni(void)
return -1;
}
return -1;
}
- nb_ports = rte_eth_dev_count();
+ nb_ports = rte_eth_dev_count
_avail
();
if (nb_ports == 0) {
printf("no supported nic port found\n");
return -1;
if (nb_ports == 0) {
printf("no supported nic port found\n");
return -1;
@@
-508,8
+525,15
@@
test_kni(void)
memset(&conf, 0, sizeof(conf));
memset(&ops, 0, sizeof(ops));
rte_eth_dev_info_get(port_id, &info);
memset(&conf, 0, sizeof(conf));
memset(&ops, 0, sizeof(ops));
rte_eth_dev_info_get(port_id, &info);
- conf.addr = info.pci_dev->addr;
- conf.id = info.pci_dev->id;
+ if (info.device)
+ bus = rte_bus_find_by_device(info.device);
+ else
+ bus = NULL;
+ if (bus && !strcmp(bus->name, "pci")) {
+ pci_dev = RTE_DEV_TO_PCI(info.device);
+ conf.addr = pci_dev->addr;
+ conf.id = pci_dev->id;
+ }
conf.group_id = port_id;
conf.mbuf_size = MAX_PACKET_SZ;
conf.group_id = port_id;
conf.mbuf_size = MAX_PACKET_SZ;
@@
-537,8
+561,15
@@
test_kni(void)
memset(&info, 0, sizeof(info));
memset(&ops, 0, sizeof(ops));
rte_eth_dev_info_get(port_id, &info);
memset(&info, 0, sizeof(info));
memset(&ops, 0, sizeof(ops));
rte_eth_dev_info_get(port_id, &info);
- conf.addr = info.pci_dev->addr;
- conf.id = info.pci_dev->id;
+ if (info.device)
+ bus = rte_bus_find_by_device(info.device);
+ else
+ bus = NULL;
+ if (bus && !strcmp(bus->name, "pci")) {
+ pci_dev = RTE_DEV_TO_PCI(info.device);
+ conf.addr = pci_dev->addr;
+ conf.id = pci_dev->id;
+ }
conf.group_id = port_id;
conf.mbuf_size = MAX_PACKET_SZ;
conf.group_id = port_id;
conf.mbuf_size = MAX_PACKET_SZ;
@@
-605,4
+636,6
@@
fail:
return ret;
}
return ret;
}
+#endif
+
REGISTER_TEST_COMMAND(kni_autotest, test_kni);
REGISTER_TEST_COMMAND(kni_autotest, test_kni);