ethdev: increase port id range

[dpdk.git] / examples / kni / main.c

diff --git a/examples/kni/main.c b/examples/kni/main.c
index 96ca473..c2c9e04 100644 (file)
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -65,8 +65,6 @@
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ring.h>
-#include <rte_log.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
@@ -112,7 +110,7 @@
  * Structure of port parameters
  */
 struct kni_port_params {
-       uint8_t port_id;/* Port ID */
+       uint16_t port_id;/* Port ID */
        unsigned lcore_rx; /* lcore ID for RX */
        unsigned lcore_tx; /* lcore ID for TX */
        uint32_t nb_lcore_k; /* Number of lcores for KNI multi kernel threads */
@@ -131,7 +129,7 @@ static struct rte_eth_conf port_conf = {
                .hw_ip_checksum = 0,    /* IP checksum offload disabled */
                .hw_vlan_filter = 0,    /* VLAN filtering disabled */
                .jumbo_frame = 0,       /* Jumbo Frame Support disabled */
-               .hw_strip_crc = 0,      /* CRC stripped by hardware */
+               .hw_strip_crc = 1,      /* CRC stripped by hardware */
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -164,8 +162,8 @@ struct kni_interface_stats {
 /* kni device statistics array */
 static struct kni_interface_stats kni_stats[RTE_MAX_ETHPORTS];
 
-static int kni_change_mtu(uint8_t port_id, unsigned new_mtu);
-static int kni_config_network_interface(uint8_t port_id, uint8_t if_up);
+static int kni_change_mtu(uint16_t port_id, unsigned int new_mtu);
+static int kni_config_network_interface(uint16_t port_id, uint8_t if_up);
 
 static rte_atomic32_t kni_stop = RTE_ATOMIC32_INIT(0);
 
@@ -173,7 +171,7 @@ static rte_atomic32_t kni_stop = RTE_ATOMIC32_INIT(0);
 static void
 print_stats(void)
 {
-       uint8_t i;
+       uint16_t i;
 
        printf("\n**KNI example application statistics**\n"
               "======  ==============  ============  ============  ============  ============\n"
@@ -240,7 +238,8 @@ kni_burst_free_mbufs(struct rte_mbuf **pkts, unsigned num)
 static void
 kni_ingress(struct kni_port_params *p)
 {
-       uint8_t i, port_id;
+       uint8_t i;
+       uint16_t port_id;
        unsigned nb_rx, num;
        uint32_t nb_kni;
        struct rte_mbuf *pkts_burst[PKT_BURST_SZ];
@@ -276,7 +275,8 @@ kni_ingress(struct kni_port_params *p)
 static void
 kni_egress(struct kni_port_params *p)
 {
-       uint8_t i, port_id;
+       uint8_t i;
+       uint16_t port_id;
        unsigned nb_tx, num;
        uint32_t nb_kni;
        struct rte_mbuf *pkts_burst[PKT_BURST_SZ];
@@ -318,8 +318,6 @@ main_loop(__rte_unused void *arg)
        };
        enum lcore_rxtx flag = LCORE_NONE;
 
-       nb_ports = (uint8_t)(nb_ports < RTE_MAX_ETHPORTS ?
-                               nb_ports : RTE_MAX_ETHPORTS);
        for (i = 0; i < nb_ports; i++) {
                if (!kni_port_params_array[i])
                        continue;
@@ -420,7 +418,7 @@ parse_config(const char *arg)
        int i, j, nb_token;
        char *str_fld[_NUM_FLD];
        unsigned long int_fld[_NUM_FLD];
-       uint8_t port_id, nb_kni_port_params = 0;
+       uint16_t port_id, nb_kni_port_params = 0;
 
        memset(&kni_port_params_array, 0, sizeof(kni_port_params_array));
        while (((p = strchr(p0, '(')) != NULL) &&
@@ -449,7 +447,7 @@ parse_config(const char *arg)
                }
 
                i = 0;
-               port_id = (uint8_t)int_fld[i++];
+               port_id = int_fld[i++];
                if (port_id >= RTE_MAX_ETHPORTS) {
                        printf("Port ID %d could not exceed the maximum %d\n",
                                                port_id, RTE_MAX_ETHPORTS);
@@ -608,6 +606,8 @@ static void
 init_port(uint8_t port)
 {
        int ret;
+       uint16_t nb_rxd = NB_RXD;
+       uint16_t nb_txd = NB_TXD;
 
        /* Initialise device and RX/TX queues */
        RTE_LOG(INFO, APP, "Initialising port %u ...\n", (unsigned)port);
@@ -617,13 +617,18 @@ init_port(uint8_t port)
                rte_exit(EXIT_FAILURE, "Could not configure port%u (%d)\n",
                            (unsigned)port, ret);
 
-       ret = rte_eth_rx_queue_setup(port, 0, NB_RXD,
+       ret = rte_eth_dev_adjust_nb_rx_tx_desc(port, &nb_rxd, &nb_txd);
+       if (ret < 0)
+               rte_exit(EXIT_FAILURE, "Could not adjust number of descriptors "
+                               "for port%u (%d)\n", (unsigned)port, ret);
+
+       ret = rte_eth_rx_queue_setup(port, 0, nb_rxd,
                rte_eth_dev_socket_id(port), NULL, pktmbuf_pool);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Could not setup up RX queue for "
                                "port%u (%d)\n", (unsigned)port, ret);
 
-       ret = rte_eth_tx_queue_setup(port, 0, NB_TXD,
+       ret = rte_eth_tx_queue_setup(port, 0, nb_txd,
                rte_eth_dev_socket_id(port), NULL);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Could not setup up TX queue for "
@@ -670,7 +675,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
                                continue;
                        }
                        /* clear all_ports_up flag if any link down */
-                       if (link.link_status == 0) {
+                       if (link.link_status == ETH_LINK_DOWN) {
                                all_ports_up = 0;
                                break;
                        }
@@ -695,7 +700,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
 
 /* Callback for request of changing MTU */
 static int
-kni_change_mtu(uint8_t port_id, unsigned new_mtu)
+kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
 {
        int ret;
        struct rte_eth_conf conf;
@@ -738,7 +743,7 @@ kni_change_mtu(uint8_t port_id, unsigned new_mtu)
 
 /* Callback for request of configuring network interface up/down */
 static int
-kni_config_network_interface(uint8_t port_id, uint8_t if_up)
+kni_config_network_interface(uint16_t port_id, uint8_t if_up)
 {
        int ret = 0;
 
@@ -763,7 +768,7 @@ kni_config_network_interface(uint8_t port_id, uint8_t if_up)
 }
 
 static int
-kni_alloc(uint8_t port_id)
+kni_alloc(uint16_t port_id)
 {
        uint8_t i;
        struct rte_kni *kni;
@@ -787,7 +792,7 @@ kni_alloc(uint8_t port_id)
                } else
                        snprintf(conf.name, RTE_KNI_NAMESIZE,
                                                "vEth%u", port_id);
-               conf.group_id = (uint16_t)port_id;
+               conf.group_id = port_id;
                conf.mbuf_size = MAX_PACKET_SZ;
                /*
                 * The first KNI device associated to a port
@@ -822,7 +827,7 @@ kni_alloc(uint8_t port_id)
 }
 
 static int
-kni_free_kni(uint8_t port_id)
+kni_free_kni(uint16_t port_id)
 {
        uint8_t i;
        struct kni_port_params **p = kni_port_params_array;
@@ -830,9 +835,10 @@ kni_free_kni(uint8_t port_id)
        if (port_id >= RTE_MAX_ETHPORTS || !p[port_id])
                return -1;
 
-       for (i = 0; i < p[i]->nb_kni; i++) {
-               rte_kni_release(p[i]->kni[i]);
-               p[i]->kni[i] = NULL;
+       for (i = 0; i < p[port_id]->nb_kni; i++) {
+               if (rte_kni_release(p[port_id]->kni[i]))
+                       printf("Fail to release kni\n");
+               p[port_id]->kni[i] = NULL;
        }
        rte_eth_dev_stop(port_id);
 
@@ -844,7 +850,7 @@ int
 main(int argc, char** argv)
 {
        int ret;
-       uint8_t nb_sys_ports, port;
+       uint16_t nb_sys_ports, port;
        unsigned i;
 
        /* Associate signal_hanlder function with USR signals */
@@ -926,4 +932,3 @@ main(int argc, char** argv)
 
        return 0;
 }
-