examples/fips_validation: fix buffer overflow

[dpdk.git] / examples / ipsec-secgw / event_helper.c

diff --git a/examples/ipsec-secgw/event_helper.c b/examples/ipsec-secgw/event_helper.c
index fe047ab..865dc91 100644 (file)
--- a/examples/ipsec-secgw/event_helper.c
+++ b/examples/ipsec-secgw/event_helper.c
@@ -100,12 +100,15 @@ static inline bool
 eh_dev_has_rx_internal_port(uint8_t eventdev_id)
 {
        bool flag = true;
-       int j;
+       int j, ret;
 
        RTE_ETH_FOREACH_DEV(j) {
                uint32_t caps = 0;
 
-               rte_event_eth_rx_adapter_caps_get(eventdev_id, j, &caps);
+               ret = rte_event_eth_rx_adapter_caps_get(eventdev_id, j, &caps);
+               if (ret < 0)
+                       return false;
+
                if (!(caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT))
                        flag = false;
        }
@@ -116,12 +119,15 @@ static inline bool
 eh_dev_has_tx_internal_port(uint8_t eventdev_id)
 {
        bool flag = true;
-       int j;
+       int j, ret;
 
        RTE_ETH_FOREACH_DEV(j) {
                uint32_t caps = 0;
 
-               rte_event_eth_tx_adapter_caps_get(eventdev_id, j, &caps);
+               ret = rte_event_eth_tx_adapter_caps_get(eventdev_id, j, &caps);
+               if (ret < 0)
+                       return false;
+
                if (!(caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT))
                        flag = false;
        }
@@ -323,6 +329,7 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)
        int nb_eth_dev;
        int adapter_id;
        int conn_id;
+       int ret;
        int i;
 
        /* Create one adapter with eth queues mapped to event queue(s) */
@@ -385,7 +392,12 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)
                conn->ethdev_rx_qid = -1;
 
                /* Get Rx adapter capabilities */
-               rte_event_eth_rx_adapter_caps_get(eventdev_id, i, &caps);
+               ret = rte_event_eth_rx_adapter_caps_get(eventdev_id, i, &caps);
+               if (ret < 0) {
+                       EH_LOG_ERR("Failed to get event device %d eth rx adapter"
+                                  " capabilities for port %d", eventdev_id, i);
+                       return ret;
+               }
                if (!(caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT))
                        rx_internal_port = false;
 
@@ -420,6 +432,7 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)
        int adapter_id;
        int nb_eth_dev;
        int conn_id;
+       int ret;
        int i;
 
        /*
@@ -479,7 +492,12 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)
                conn->ethdev_tx_qid = -1;
 
                /* Get Tx adapter capabilities */
-               rte_event_eth_tx_adapter_caps_get(eventdev_id, i, &caps);
+               ret = rte_event_eth_tx_adapter_caps_get(eventdev_id, i, &caps);
+               if (ret < 0) {
+                       EH_LOG_ERR("Failed to get event device %d eth tx adapter"
+                                  " capabilities for port %d", eventdev_id, i);
+                       return ret;
+               }
                if (!(caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT))
                        tx_internal_port = false;
 
@@ -960,6 +978,8 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,
        else
                curr_conf.cap.burst = EH_RX_TYPE_NON_BURST;
 
+       curr_conf.cap.ipsec_mode = conf->ipsec_mode;
+
        /* Parse the passed list and see if we have matching capabilities */
 
        /* Initialize the pointer used to traverse the list */
@@ -1379,6 +1399,110 @@ eh_display_link_conf(struct eventmode_conf *em_conf)
        EH_LOG_INFO("");
 }
 
+struct eh_conf *
+eh_conf_init(void)
+{
+       struct eventmode_conf *em_conf = NULL;
+       struct eh_conf *conf = NULL;
+       unsigned int eth_core_id;
+       void *bitmap = NULL;
+       uint32_t nb_bytes;
+
+       /* Allocate memory for config */
+       conf = calloc(1, sizeof(struct eh_conf));
+       if (conf == NULL) {
+               EH_LOG_ERR("Failed to allocate memory for eventmode helper "
+                          "config");
+               return NULL;
+       }
+
+       /* Set default conf */
+
+       /* Packet transfer mode: poll */
+       conf->mode = EH_PKT_TRANSFER_MODE_POLL;
+       conf->ipsec_mode = EH_IPSEC_MODE_TYPE_APP;
+
+       /* Keep all ethernet ports enabled by default */
+       conf->eth_portmask = -1;
+
+       /* Allocate memory for event mode params */
+       conf->mode_params = calloc(1, sizeof(struct eventmode_conf));
+       if (conf->mode_params == NULL) {
+               EH_LOG_ERR("Failed to allocate memory for event mode params");
+               goto free_conf;
+       }
+
+       /* Get eventmode conf */
+       em_conf = conf->mode_params;
+
+       /* Allocate and initialize bitmap for eth cores */
+       nb_bytes = rte_bitmap_get_memory_footprint(RTE_MAX_LCORE);
+       if (!nb_bytes) {
+               EH_LOG_ERR("Failed to get bitmap footprint");
+               goto free_em_conf;
+       }
+
+       bitmap = rte_zmalloc("event-helper-ethcore-bitmap", nb_bytes,
+                            RTE_CACHE_LINE_SIZE);
+       if (!bitmap) {
+               EH_LOG_ERR("Failed to allocate memory for eth cores bitmap\n");
+               goto free_em_conf;
+       }
+
+       em_conf->eth_core_mask = rte_bitmap_init(RTE_MAX_LCORE, bitmap,
+                                                nb_bytes);
+       if (!em_conf->eth_core_mask) {
+               EH_LOG_ERR("Failed to initialize bitmap");
+               goto free_bitmap;
+       }
+
+       /* Set schedule type as not set */
+       em_conf->ext_params.sched_type = SCHED_TYPE_NOT_SET;
+
+       /* Set two cores as eth cores for Rx & Tx */
+
+       /* Use first core other than master core as Rx core */
+       eth_core_id = rte_get_next_lcore(0,     /* curr core */
+                                        1,     /* skip master core */
+                                        0      /* wrap */);
+
+       rte_bitmap_set(em_conf->eth_core_mask, eth_core_id);
+
+       /* Use next core as Tx core */
+       eth_core_id = rte_get_next_lcore(eth_core_id,   /* curr core */
+                                        1,             /* skip master core */
+                                        0              /* wrap */);
+
+       rte_bitmap_set(em_conf->eth_core_mask, eth_core_id);
+
+       return conf;
+
+free_bitmap:
+       rte_free(bitmap);
+free_em_conf:
+       free(em_conf);
+free_conf:
+       free(conf);
+       return NULL;
+}
+
+void
+eh_conf_uninit(struct eh_conf *conf)
+{
+       struct eventmode_conf *em_conf = NULL;
+
+       if (!conf || !conf->mode_params)
+               return;
+
+       /* Get eventmode conf */
+       em_conf = conf->mode_params;
+
+       /* Free evenmode configuration memory */
+       rte_free(em_conf->eth_core_mask);
+       free(em_conf);
+       free(conf);
+}
+
 void
 eh_display_conf(struct eh_conf *conf)
 {