examples/ipsec-secgw: add event mode
[dpdk.git] / examples / ipsec-secgw / ipsec-secgw.c
index fcd656b..ad16606 100644 (file)
@@ -2,6 +2,7 @@
  * Copyright(c) 2016 Intel Corporation
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <sys/queue.h>
 #include <stdarg.h>
 #include <errno.h>
+#include <signal.h>
 #include <getopt.h>
 
 #include <rte_common.h>
+#include <rte_bitmap.h>
 #include <rte_byteorder.h>
 #include <rte_log.h>
 #include <rte_eal.h>
 #include <rte_jhash.h>
 #include <rte_cryptodev.h>
 #include <rte_security.h>
+#include <rte_eventdev.h>
 #include <rte_ip.h>
 #include <rte_ip_frag.h>
 
+#include "event_helper.h"
 #include "ipsec.h"
 #include "parser.h"
+#include "sad.h"
+
+volatile bool force_quit;
 
 #define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1
 
@@ -112,7 +120,7 @@ static uint16_t nb_txd = IPSEC_SECGW_TX_DESC_DEFAULT;
                0, 0)
 
 #define        FRAG_TBL_BUCKET_ENTRIES 4
-#define        FRAG_TTL_MS             (10 * MS_PER_S)
+#define        MAX_FRAG_TTL_NS         (10LL * NS_PER_S)
 
 #define MTU_TO_FRAMELEN(x)     ((x) + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN)
 
@@ -128,13 +136,24 @@ struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS] = {
        { 0, ETHADDR(0x00, 0x16, 0x3e, 0x49, 0x9e, 0xdd) }
 };
 
+struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS];
+
 #define CMD_LINE_OPT_CONFIG            "config"
 #define CMD_LINE_OPT_SINGLE_SA         "single-sa"
 #define CMD_LINE_OPT_CRYPTODEV_MASK    "cryptodev_mask"
+#define CMD_LINE_OPT_TRANSFER_MODE     "transfer-mode"
+#define CMD_LINE_OPT_SCHEDULE_TYPE     "event-schedule-type"
 #define CMD_LINE_OPT_RX_OFFLOAD                "rxoffload"
 #define CMD_LINE_OPT_TX_OFFLOAD                "txoffload"
 #define CMD_LINE_OPT_REASSEMBLE                "reassemble"
 #define CMD_LINE_OPT_MTU               "mtu"
+#define CMD_LINE_OPT_FRAG_TTL          "frag-ttl"
+
+#define CMD_LINE_ARG_EVENT     "event"
+#define CMD_LINE_ARG_POLL      "poll"
+#define CMD_LINE_ARG_ORDERED   "ordered"
+#define CMD_LINE_ARG_ATOMIC    "atomic"
+#define CMD_LINE_ARG_PARALLEL  "parallel"
 
 enum {
        /* long options mapped to a short option */
@@ -146,20 +165,26 @@ enum {
        CMD_LINE_OPT_CONFIG_NUM,
        CMD_LINE_OPT_SINGLE_SA_NUM,
        CMD_LINE_OPT_CRYPTODEV_MASK_NUM,
+       CMD_LINE_OPT_TRANSFER_MODE_NUM,
+       CMD_LINE_OPT_SCHEDULE_TYPE_NUM,
        CMD_LINE_OPT_RX_OFFLOAD_NUM,
        CMD_LINE_OPT_TX_OFFLOAD_NUM,
        CMD_LINE_OPT_REASSEMBLE_NUM,
        CMD_LINE_OPT_MTU_NUM,
+       CMD_LINE_OPT_FRAG_TTL_NUM,
 };
 
 static const struct option lgopts[] = {
        {CMD_LINE_OPT_CONFIG, 1, 0, CMD_LINE_OPT_CONFIG_NUM},
        {CMD_LINE_OPT_SINGLE_SA, 1, 0, CMD_LINE_OPT_SINGLE_SA_NUM},
        {CMD_LINE_OPT_CRYPTODEV_MASK, 1, 0, CMD_LINE_OPT_CRYPTODEV_MASK_NUM},
+       {CMD_LINE_OPT_TRANSFER_MODE, 1, 0, CMD_LINE_OPT_TRANSFER_MODE_NUM},
+       {CMD_LINE_OPT_SCHEDULE_TYPE, 1, 0, CMD_LINE_OPT_SCHEDULE_TYPE_NUM},
        {CMD_LINE_OPT_RX_OFFLOAD, 1, 0, CMD_LINE_OPT_RX_OFFLOAD_NUM},
        {CMD_LINE_OPT_TX_OFFLOAD, 1, 0, CMD_LINE_OPT_TX_OFFLOAD_NUM},
        {CMD_LINE_OPT_REASSEMBLE, 1, 0, CMD_LINE_OPT_REASSEMBLE_NUM},
        {CMD_LINE_OPT_MTU, 1, 0, CMD_LINE_OPT_MTU_NUM},
+       {CMD_LINE_OPT_FRAG_TTL, 1, 0, CMD_LINE_OPT_FRAG_TTL_NUM},
        {NULL, 0, 0, 0}
 };
 
@@ -186,9 +211,14 @@ static uint64_t dev_tx_offload = UINT64_MAX;
 static uint32_t frag_tbl_sz;
 static uint32_t frame_buf_size = RTE_MBUF_DEFAULT_BUF_SIZE;
 static uint32_t mtu_size = RTE_ETHER_MTU;
+static uint64_t frag_ttl_ns = MAX_FRAG_TTL_NS;
 
 /* application wide librte_ipsec/SA parameters */
-struct app_sa_prm app_sa_prm = {.enable = 0};
+struct app_sa_prm app_sa_prm = {
+                       .enable = 0,
+                       .cache_sz = SA_CACHE_SZ
+               };
+static const char *cfgfile;
 
 struct lcore_rx_queue {
        uint16_t port_id;
@@ -314,6 +344,7 @@ prepare_one_packet(struct rte_mbuf *pkt, struct ipsec_traffic *t)
                }
                pkt->l2_len = 0;
                pkt->l3_len = sizeof(*iph4);
+               pkt->packet_type |= RTE_PTYPE_L3_IPV4;
        } else if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) {
                int next_proto;
                size_t l3len, ext_len;
@@ -348,6 +379,7 @@ prepare_one_packet(struct rte_mbuf *pkt, struct ipsec_traffic *t)
                }
                pkt->l2_len = 0;
                pkt->l3_len = l3len;
+               pkt->packet_type |= RTE_PTYPE_L3_IPV6;
        } else {
                /* Unknown/Unsupported type, drop the packet */
                RTE_LOG(ERR, IPSEC, "Unsupported packet type 0x%x\n",
@@ -549,8 +581,10 @@ send_single_packet(struct rte_mbuf *m, uint16_t port, uint8_t proto)
                len++;
 
        /* need to fragment the packet */
-       } else
+       } else if (frag_tbl_sz > 0)
                len = send_fragment_packet(qconf, m, port, proto);
+       else
+               rte_pktmbuf_free(m);
 
        /* enough pkts to be sent */
        if (unlikely(len == MAX_PKT_BURST)) {
@@ -594,7 +628,7 @@ inbound_sp_sa(struct sp_ctx *sp, struct sa_ctx *sa, struct traffic_type *ip,
                        continue;
                }
 
-               sa_idx = SPI2IDX(res);
+               sa_idx = res - 1;
                if (!inbound_sa_check(sa, m, sa_idx)) {
                        rte_pktmbuf_free(m);
                        continue;
@@ -681,7 +715,7 @@ outbound_sp(struct sp_ctx *sp, struct traffic_type *ip,
        j = 0;
        for (i = 0; i < ip->num; i++) {
                m = ip->pkts[i];
-               sa_idx = SPI2IDX(ip->res[i]);
+               sa_idx = ip->res[i] - 1;
                if (ip->res[i] == DISCARD)
                        rte_pktmbuf_free(m);
                else if (ip->res[i] == BYPASS)
@@ -1095,7 +1129,7 @@ main_loop(__attribute__((unused)) void *dummy)
        uint16_t portid;
        uint8_t queueid;
        struct lcore_conf *qconf;
-       int32_t socket_id;
+       int32_t rc, socket_id;
        const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1)
                        / US_PER_S * BURST_TX_DRAIN_US;
        struct lcore_rx_queue *rxql;
@@ -1125,6 +1159,14 @@ main_loop(__attribute__((unused)) void *dummy)
        qconf->frag.pool_dir = socket_ctx[socket_id].mbuf_pool;
        qconf->frag.pool_indir = socket_ctx[socket_id].mbuf_pool_indir;
 
+       rc = ipsec_sad_lcore_cache_init(app_sa_prm.cache_sz);
+       if (rc != 0) {
+               RTE_LOG(ERR, IPSEC,
+                       "SAD cache init on lcore %u, failed with code: %d\n",
+                       lcore_id, rc);
+               return rc;
+       }
+
        if (qconf->nb_rx_queue == 0) {
                RTE_LOG(DEBUG, IPSEC, "lcore %u has nothing to do\n",
                        lcore_id);
@@ -1176,13 +1218,19 @@ main_loop(__attribute__((unused)) void *dummy)
 }
 
 static int32_t
-check_params(void)
+check_poll_mode_params(struct eh_conf *eh_conf)
 {
        uint8_t lcore;
        uint16_t portid;
        uint16_t i;
        int32_t socket_id;
 
+       if (!eh_conf)
+               return -EINVAL;
+
+       if (eh_conf->mode != EH_PKT_TRANSFER_MODE_POLL)
+               return 0;
+
        if (lcore_params == NULL) {
                printf("Error: No port/queue/core mappings\n");
                return -1;
@@ -1264,10 +1312,13 @@ print_usage(const char *prgname)
                " [-w REPLAY_WINDOW_SIZE]"
                " [-e]"
                " [-a]"
+               " [-c]"
                " -f CONFIG_FILE"
                " --config (port,queue,lcore)[,(port,queue,lcore)]"
                " [--single-sa SAIDX]"
                " [--cryptodev_mask MASK]"
+               " [--transfer-mode MODE]"
+               " [--event-schedule-type TYPE]"
                " [--" CMD_LINE_OPT_RX_OFFLOAD " RX_OFFLOAD_MASK]"
                " [--" CMD_LINE_OPT_TX_OFFLOAD " TX_OFFLOAD_MASK]"
                " [--" CMD_LINE_OPT_REASSEMBLE " REASSEMBLE_TABLE_SIZE]"
@@ -1283,12 +1334,27 @@ print_usage(const char *prgname)
                "     size for each SA\n"
                "  -e enables ESN\n"
                "  -a enables SA SQN atomic behaviour\n"
+               "  -c specifies inbound SAD cache size,\n"
+               "     zero value disables the cache (default value: 128)\n"
                "  -f CONFIG_FILE: Configuration file\n"
-               "  --config (port,queue,lcore): Rx queue configuration\n"
+               "  --config (port,queue,lcore): Rx queue configuration. In poll\n"
+               "                               mode determines which queues from\n"
+               "                               which ports are mapped to which cores.\n"
+               "                               In event mode this option is not used\n"
+               "                               as packets are dynamically scheduled\n"
+               "                               to cores by HW.\n"
                "  --single-sa SAIDX: Use single SA index for outbound traffic,\n"
                "                     bypassing the SP\n"
                "  --cryptodev_mask MASK: Hexadecimal bitmask of the crypto\n"
                "                         devices to configure\n"
+               "  --transfer-mode MODE\n"
+               "               \"poll\"  : Packet transfer via polling (default)\n"
+               "               \"event\" : Packet transfer via event device\n"
+               "  --event-schedule-type TYPE queue schedule type, used only when\n"
+               "                             transfer mode is set to event\n"
+               "               \"ordered\"  : Ordered (default)\n"
+               "               \"atomic\"   : Atomic\n"
+               "               \"parallel\" : Parallel\n"
                "  --" CMD_LINE_OPT_RX_OFFLOAD
                ": bitmask of the RX HW offload capabilities to enable/use\n"
                "                         (DEV_RX_OFFLOAD_*)\n"
@@ -1302,6 +1368,9 @@ print_usage(const char *prgname)
                ": MTU value on all ports (default value: 1500)\n"
                "    outgoing packets with bigger size will be fragmented\n"
                "    incoming packets with bigger size will be discarded\n"
+               "  --" CMD_LINE_OPT_FRAG_TTL " FRAG_TTL_NS"
+               ": fragments lifetime in nanoseconds, default\n"
+               "    and maximum value is 10.000.000.000 ns (10 s)\n"
                "\n",
                prgname);
 }
@@ -1338,14 +1407,15 @@ parse_portmask(const char *portmask)
        return pm;
 }
 
-static int32_t
+static int64_t
 parse_decimal(const char *str)
 {
        char *end = NULL;
-       unsigned long num;
+       uint64_t num;
 
-       num = strtoul(str, &end, 10);
-       if ((str[0] == '\0') || (end == NULL) || (*end != '\0'))
+       num = strtoull(str, &end, 10);
+       if ((str[0] == '\0') || (end == NULL) || (*end != '\0')
+               || num > INT64_MAX)
                return -1;
 
        return num;
@@ -1413,18 +1483,54 @@ print_app_sa_prm(const struct app_sa_prm *prm)
        printf("librte_ipsec usage: %s\n",
                (prm->enable == 0) ? "disabled" : "enabled");
 
-       if (prm->enable == 0)
-               return;
-
        printf("replay window size: %u\n", prm->window_size);
        printf("ESN: %s\n", (prm->enable_esn == 0) ? "disabled" : "enabled");
        printf("SA flags: %#" PRIx64 "\n", prm->flags);
+       printf("Frag TTL: %" PRIu64 " ns\n", frag_ttl_ns);
+}
+
+static int
+parse_transfer_mode(struct eh_conf *conf, const char *optarg)
+{
+       if (!strcmp(CMD_LINE_ARG_POLL, optarg))
+               conf->mode = EH_PKT_TRANSFER_MODE_POLL;
+       else if (!strcmp(CMD_LINE_ARG_EVENT, optarg))
+               conf->mode = EH_PKT_TRANSFER_MODE_EVENT;
+       else {
+               printf("Unsupported packet transfer mode\n");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int
+parse_schedule_type(struct eh_conf *conf, const char *optarg)
+{
+       struct eventmode_conf *em_conf = NULL;
+
+       /* Get eventmode conf */
+       em_conf = conf->mode_params;
+
+       if (!strcmp(CMD_LINE_ARG_ORDERED, optarg))
+               em_conf->ext_params.sched_type = RTE_SCHED_TYPE_ORDERED;
+       else if (!strcmp(CMD_LINE_ARG_ATOMIC, optarg))
+               em_conf->ext_params.sched_type = RTE_SCHED_TYPE_ATOMIC;
+       else if (!strcmp(CMD_LINE_ARG_PARALLEL, optarg))
+               em_conf->ext_params.sched_type = RTE_SCHED_TYPE_PARALLEL;
+       else {
+               printf("Unsupported queue schedule type\n");
+               return -EINVAL;
+       }
+
+       return 0;
 }
 
 static int32_t
-parse_args(int32_t argc, char **argv)
+parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf)
 {
-       int32_t opt, ret;
+       int opt;
+       int64_t ret;
        char **argvopt;
        int32_t option_index;
        char *prgname = argv[0];
@@ -1432,7 +1538,7 @@ parse_args(int32_t argc, char **argv)
 
        argvopt = argv;
 
-       while ((opt = getopt_long(argc, argvopt, "aelp:Pu:f:j:w:",
+       while ((opt = getopt_long(argc, argvopt, "aelp:Pu:f:j:w:c:",
                                lgopts, &option_index)) != EOF) {
 
                switch (opt) {
@@ -1463,12 +1569,7 @@ parse_args(int32_t argc, char **argv)
                                print_usage(prgname);
                                return -1;
                        }
-                       if (parse_cfg_file(optarg) < 0) {
-                               printf("parsing file \"%s\" failed\n",
-                                       optarg);
-                               print_usage(prgname);
-                               return -1;
-                       }
+                       cfgfile = optarg;
                        f_present = 1;
                        break;
                case 'j':
@@ -1487,17 +1588,24 @@ parse_args(int32_t argc, char **argv)
                        app_sa_prm.enable = 1;
                        break;
                case 'w':
-                       app_sa_prm.enable = 1;
                        app_sa_prm.window_size = parse_decimal(optarg);
                        break;
                case 'e':
-                       app_sa_prm.enable = 1;
                        app_sa_prm.enable_esn = 1;
                        break;
                case 'a':
                        app_sa_prm.enable = 1;
                        app_sa_prm.flags |= RTE_IPSEC_SAFLAG_SQN_ATOM;
                        break;
+               case 'c':
+                       ret = parse_decimal(optarg);
+                       if (ret < 0) {
+                               printf("Invalid SA cache size: %s\n", optarg);
+                               print_usage(prgname);
+                               return -1;
+                       }
+                       app_sa_prm.cache_sz = ret;
+                       break;
                case CMD_LINE_OPT_CONFIG_NUM:
                        ret = parse_config(optarg);
                        if (ret) {
@@ -1508,7 +1616,7 @@ parse_args(int32_t argc, char **argv)
                        break;
                case CMD_LINE_OPT_SINGLE_SA_NUM:
                        ret = parse_decimal(optarg);
-                       if (ret == -1) {
+                       if (ret == -1 || ret > UINT32_MAX) {
                                printf("Invalid argument[sa_idx]\n");
                                print_usage(prgname);
                                return -1;
@@ -1517,6 +1625,7 @@ parse_args(int32_t argc, char **argv)
                        /* else */
                        single_sa = 1;
                        single_sa_idx = ret;
+                       eh_conf->ipsec_mode = EH_IPSEC_MODE_TYPE_DRIVER;
                        printf("Configured with single SA index %u\n",
                                        single_sa_idx);
                        break;
@@ -1531,6 +1640,25 @@ parse_args(int32_t argc, char **argv)
                        /* else */
                        enabled_cryptodev_mask = ret;
                        break;
+
+               case CMD_LINE_OPT_TRANSFER_MODE_NUM:
+                       ret = parse_transfer_mode(eh_conf, optarg);
+                       if (ret < 0) {
+                               printf("Invalid packet transfer mode\n");
+                               print_usage(prgname);
+                               return -1;
+                       }
+                       break;
+
+               case CMD_LINE_OPT_SCHEDULE_TYPE_NUM:
+                       ret = parse_schedule_type(eh_conf, optarg);
+                       if (ret < 0) {
+                               printf("Invalid queue schedule type\n");
+                               print_usage(prgname);
+                               return -1;
+                       }
+                       break;
+
                case CMD_LINE_OPT_RX_OFFLOAD_NUM:
                        ret = parse_mask(optarg, &dev_rx_offload);
                        if (ret != 0) {
@@ -1551,7 +1679,7 @@ parse_args(int32_t argc, char **argv)
                        break;
                case CMD_LINE_OPT_REASSEMBLE_NUM:
                        ret = parse_decimal(optarg);
-                       if (ret < 0) {
+                       if (ret < 0 || ret > UINT32_MAX) {
                                printf("Invalid argument for \'%s\': %s\n",
                                        CMD_LINE_OPT_REASSEMBLE, optarg);
                                print_usage(prgname);
@@ -1569,6 +1697,16 @@ parse_args(int32_t argc, char **argv)
                        }
                        mtu_size = ret;
                        break;
+               case CMD_LINE_OPT_FRAG_TTL_NUM:
+                       ret = parse_decimal(optarg);
+                       if (ret < 0 || ret > MAX_FRAG_TTL_NS) {
+                               printf("Invalid argument for \'%s\': %s\n",
+                                       CMD_LINE_OPT_MTU, optarg);
+                               print_usage(prgname);
+                               return -1;
+                       }
+                       frag_ttl_ns = ret;
+                       break;
                default:
                        print_usage(prgname);
                        return -1;
@@ -1630,6 +1768,7 @@ check_all_ports_link_status(uint32_t port_mask)
        uint16_t portid;
        uint8_t count, all_ports_up, print_flag = 0;
        struct rte_eth_link link;
+       int ret;
 
        printf("\nChecking link status");
        fflush(stdout);
@@ -1639,7 +1778,14 @@ check_all_ports_link_status(uint32_t port_mask)
                        if ((port_mask & (1 << portid)) == 0)
                                continue;
                        memset(&link, 0, sizeof(link));
-                       rte_eth_link_get_nowait(portid, &link);
+                       ret = rte_eth_link_get_nowait(portid, &link);
+                       if (ret < 0) {
+                               all_ports_up = 0;
+                               if (print_flag == 1)
+                                       printf("Port %u link get failed: %s\n",
+                                               portid, rte_strerror(-ret));
+                               continue;
+                       }
                        /* print link status if flag set */
                        if (print_flag == 1) {
                                if (link.link_status)
@@ -1912,7 +2058,11 @@ port_init(uint16_t portid, uint64_t req_rx_offloads, uint64_t req_tx_offloads)
        struct rte_ether_addr ethaddr;
        struct rte_eth_conf local_port_conf = port_conf;
 
-       rte_eth_dev_info_get(portid, &dev_info);
+       ret = rte_eth_dev_info_get(portid, &dev_info);
+       if (ret != 0)
+               rte_exit(EXIT_FAILURE,
+                       "Error during getting device (port %u) info: %s\n",
+                       portid, strerror(-ret));
 
        /* limit allowed HW offloafs, as user requested */
        dev_info.rx_offload_capa &= dev_rx_offload;
@@ -1920,7 +2070,12 @@ port_init(uint16_t portid, uint64_t req_rx_offloads, uint64_t req_tx_offloads)
 
        printf("Configuring device port %u:\n", portid);
 
-       rte_eth_macaddr_get(portid, &ethaddr);
+       ret = rte_eth_macaddr_get(portid, &ethaddr);
+       if (ret != 0)
+               rte_exit(EXIT_FAILURE,
+                       "Error getting MAC address (port %u): %s\n",
+                       portid, rte_strerror(-ret));
+
        ethaddr_tbl[portid].src = ETHADDR_TO_UINT64(&ethaddr);
        print_ethaddr("Address: ", &ethaddr);
        printf("\n");
@@ -2329,8 +2484,8 @@ reassemble_lcore_init(struct lcore_conf *lc, uint32_t cid)
 
        /* create fragment table */
        sid = rte_lcore_to_socket_id(cid);
-       frag_cycles = (rte_get_tsc_hz() + MS_PER_S - 1) /
-               MS_PER_S * FRAG_TTL_MS;
+       frag_cycles = (rte_get_tsc_hz() + NS_PER_S - 1) /
+               NS_PER_S * frag_ttl_ns;
 
        lc->frag.tbl = rte_ip_frag_table_create(frag_tbl_sz,
                FRAG_TBL_BUCKET_ENTRIES, frag_tbl_sz, frag_cycles, sid);
@@ -2376,15 +2531,183 @@ reassemble_init(void)
        return rc;
 }
 
+static void
+create_default_ipsec_flow(uint16_t port_id, uint64_t rx_offloads)
+{
+       struct rte_flow_action action[2];
+       struct rte_flow_item pattern[2];
+       struct rte_flow_attr attr = {0};
+       struct rte_flow_error err;
+       struct rte_flow *flow;
+       int ret;
+
+       if (!(rx_offloads & DEV_RX_OFFLOAD_SECURITY))
+               return;
+
+       /* Add the default rte_flow to enable SECURITY for all ESP packets */
+
+       pattern[0].type = RTE_FLOW_ITEM_TYPE_ESP;
+       pattern[0].spec = NULL;
+       pattern[0].mask = NULL;
+       pattern[0].last = NULL;
+       pattern[1].type = RTE_FLOW_ITEM_TYPE_END;
+
+       action[0].type = RTE_FLOW_ACTION_TYPE_SECURITY;
+       action[0].conf = NULL;
+       action[1].type = RTE_FLOW_ACTION_TYPE_END;
+       action[1].conf = NULL;
+
+       attr.ingress = 1;
+
+       ret = rte_flow_validate(port_id, &attr, pattern, action, &err);
+       if (ret)
+               return;
+
+       flow = rte_flow_create(port_id, &attr, pattern, action, &err);
+       if (flow == NULL)
+               return;
+
+       flow_info_tbl[port_id].rx_def_flow = flow;
+       RTE_LOG(INFO, IPSEC,
+               "Created default flow enabling SECURITY for all ESP traffic on port %d\n",
+               port_id);
+}
+
+static void
+signal_handler(int signum)
+{
+       if (signum == SIGINT || signum == SIGTERM) {
+               printf("\n\nSignal %d received, preparing to exit...\n",
+                               signum);
+               force_quit = true;
+       }
+}
+
+static void
+ev_mode_sess_verify(struct ipsec_sa *sa, int nb_sa)
+{
+       struct rte_ipsec_session *ips;
+       int32_t i;
+
+       if (!sa || !nb_sa)
+               return;
+
+       for (i = 0; i < nb_sa; i++) {
+               ips = ipsec_get_primary_session(&sa[i]);
+               if (ips->type != RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL)
+                       rte_exit(EXIT_FAILURE, "Event mode supports only "
+                                "inline protocol sessions\n");
+       }
+
+}
+
+static int32_t
+check_event_mode_params(struct eh_conf *eh_conf)
+{
+       struct eventmode_conf *em_conf = NULL;
+       struct lcore_params *params;
+       uint16_t portid;
+
+       if (!eh_conf || !eh_conf->mode_params)
+               return -EINVAL;
+
+       /* Get eventmode conf */
+       em_conf = eh_conf->mode_params;
+
+       if (eh_conf->mode == EH_PKT_TRANSFER_MODE_POLL &&
+           em_conf->ext_params.sched_type != SCHED_TYPE_NOT_SET) {
+               printf("error: option --event-schedule-type applies only to "
+                      "event mode\n");
+               return -EINVAL;
+       }
+
+       if (eh_conf->mode != EH_PKT_TRANSFER_MODE_EVENT)
+               return 0;
+
+       /* Set schedule type to ORDERED if it wasn't explicitly set by user */
+       if (em_conf->ext_params.sched_type == SCHED_TYPE_NOT_SET)
+               em_conf->ext_params.sched_type = RTE_SCHED_TYPE_ORDERED;
+
+       /*
+        * Event mode currently supports only inline protocol sessions.
+        * If there are other types of sessions configured then exit with
+        * error.
+        */
+       ev_mode_sess_verify(sa_in, nb_sa_in);
+       ev_mode_sess_verify(sa_out, nb_sa_out);
+
+
+       /* Option --config does not apply to event mode */
+       if (nb_lcore_params > 0) {
+               printf("error: option --config applies only to poll mode\n");
+               return -EINVAL;
+       }
+
+       /*
+        * In order to use the same port_init routine for both poll and event
+        * modes initialize lcore_params with one queue for each eth port
+        */
+       lcore_params = lcore_params_array;
+       RTE_ETH_FOREACH_DEV(portid) {
+               if ((enabled_port_mask & (1 << portid)) == 0)
+                       continue;
+
+               params = &lcore_params[nb_lcore_params++];
+               params->port_id = portid;
+               params->queue_id = 0;
+               params->lcore_id = rte_get_next_lcore(0, 0, 1);
+       }
+
+       return 0;
+}
+
+static void
+inline_sessions_free(struct sa_ctx *sa_ctx)
+{
+       struct rte_ipsec_session *ips;
+       struct ipsec_sa *sa;
+       int32_t ret;
+       uint32_t i;
+
+       if (!sa_ctx)
+               return;
+
+       for (i = 0; i < sa_ctx->nb_sa; i++) {
+
+               sa = &sa_ctx->sa[i];
+               if (!sa->spi)
+                       continue;
+
+               ips = ipsec_get_primary_session(sa);
+               if (ips->type != RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL &&
+                   ips->type != RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO)
+                       continue;
+
+               if (!rte_eth_dev_is_valid_port(sa->portid))
+                       continue;
+
+               ret = rte_security_session_destroy(
+                               rte_eth_dev_get_sec_ctx(sa->portid),
+                               ips->security.ses);
+               if (ret)
+                       RTE_LOG(ERR, IPSEC, "Failed to destroy security "
+                                           "session type %d, spi %d\n",
+                                           ips->type, sa->spi);
+       }
+}
+
 int32_t
 main(int32_t argc, char **argv)
 {
        int32_t ret;
        uint32_t lcore_id;
+       uint32_t cdev_id;
        uint32_t i;
        uint8_t socket_id;
        uint16_t portid;
-       uint64_t req_rx_offloads, req_tx_offloads;
+       uint64_t req_rx_offloads[RTE_MAX_ETHPORTS];
+       uint64_t req_tx_offloads[RTE_MAX_ETHPORTS];
+       struct eh_conf *eh_conf = NULL;
        size_t sess_sz;
 
        /* init EAL */
@@ -2394,18 +2717,38 @@ main(int32_t argc, char **argv)
        argc -= ret;
        argv += ret;
 
+       force_quit = false;
+       signal(SIGINT, signal_handler);
+       signal(SIGTERM, signal_handler);
+
+       /* initialize event helper configuration */
+       eh_conf = eh_conf_init();
+       if (eh_conf == NULL)
+               rte_exit(EXIT_FAILURE, "Failed to init event helper config");
+
        /* parse application arguments (after the EAL ones) */
-       ret = parse_args(argc, argv);
+       ret = parse_args(argc, argv, eh_conf);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Invalid parameters\n");
 
+       /* parse configuration file */
+       if (parse_cfg_file(cfgfile) < 0) {
+               printf("parsing file \"%s\" failed\n",
+                       optarg);
+               print_usage(argv[0]);
+               return -1;
+       }
+
        if ((unprotected_port_mask & enabled_port_mask) !=
                        unprotected_port_mask)
                rte_exit(EXIT_FAILURE, "Invalid unprotected portmask 0x%x\n",
                                unprotected_port_mask);
 
-       if (check_params() < 0)
-               rte_exit(EXIT_FAILURE, "check_params failed\n");
+       if (check_poll_mode_params(eh_conf) < 0)
+               rte_exit(EXIT_FAILURE, "check_poll_mode_params failed\n");
+
+       if (check_event_mode_params(eh_conf) < 0)
+               rte_exit(EXIT_FAILURE, "check_event_mode_params failed\n");
 
        ret = init_lcore_rx_queues();
        if (ret < 0)
@@ -2438,22 +2781,34 @@ main(int32_t argc, char **argv)
                if ((enabled_port_mask & (1 << portid)) == 0)
                        continue;
 
-               sa_check_offloads(portid, &req_rx_offloads, &req_tx_offloads);
-               port_init(portid, req_rx_offloads, req_tx_offloads);
+               sa_check_offloads(portid, &req_rx_offloads[portid],
+                               &req_tx_offloads[portid]);
+               port_init(portid, req_rx_offloads[portid],
+                               req_tx_offloads[portid]);
        }
 
        cryptodevs_init();
 
+       /*
+        * Set the enabled port mask in helper config for use by helper
+        * sub-system. This will be used while initializing devices using
+        * helper sub-system.
+        */
+       eh_conf->eth_portmask = enabled_port_mask;
+
+       /* Initialize eventmode components */
+       ret = eh_devs_init(eh_conf);
+       if (ret < 0)
+               rte_exit(EXIT_FAILURE, "eh_devs_init failed, err=%d\n", ret);
+
        /* start ports */
        RTE_ETH_FOREACH_DEV(portid) {
                if ((enabled_port_mask & (1 << portid)) == 0)
                        continue;
 
-               /*
-                * Start device
-                * note: device must be started before a flow rule
-                * can be installed.
-                */
+               /* Create flow before starting the device */
+               create_default_ipsec_flow(portid, req_rx_offloads[portid]);
+
                ret = rte_eth_dev_start(portid);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_dev_start: "
@@ -2464,8 +2819,13 @@ main(int32_t argc, char **argv)
                 * to itself through 2 cross-connected  ports of the
                 * target machine.
                 */
-               if (promiscuous_on)
-                       rte_eth_promiscuous_enable(portid);
+               if (promiscuous_on) {
+                       ret = rte_eth_promiscuous_enable(portid);
+                       if (ret != 0)
+                               rte_exit(EXIT_FAILURE,
+                                       "rte_eth_promiscuous_enable: err=%s, port=%d\n",
+                                       rte_strerror(-ret), portid);
+               }
 
                rte_eth_dev_callback_register(portid,
                        RTE_ETH_EVENT_IPSEC, inline_ipsec_event_callback, NULL);
@@ -2500,5 +2860,48 @@ main(int32_t argc, char **argv)
                        return -1;
        }
 
+       /* Uninitialize eventmode components */
+       ret = eh_devs_uninit(eh_conf);
+       if (ret < 0)
+               rte_exit(EXIT_FAILURE, "eh_devs_uninit failed, err=%d\n", ret);
+
+       /* Free eventmode configuration memory */
+       eh_conf_uninit(eh_conf);
+
+       /* Destroy inline inbound and outbound sessions */
+       for (i = 0; i < NB_SOCKETS && i < rte_socket_count(); i++) {
+               socket_id = rte_socket_id_by_idx(i);
+               inline_sessions_free(socket_ctx[socket_id].sa_in);
+               inline_sessions_free(socket_ctx[socket_id].sa_out);
+       }
+
+       for (cdev_id = 0; cdev_id < rte_cryptodev_count(); cdev_id++) {
+               printf("Closing cryptodev %d...", cdev_id);
+               rte_cryptodev_stop(cdev_id);
+               rte_cryptodev_close(cdev_id);
+               printf(" Done\n");
+       }
+
+       RTE_ETH_FOREACH_DEV(portid) {
+               if ((enabled_port_mask & (1 << portid)) == 0)
+                       continue;
+
+               printf("Closing port %d...", portid);
+               if (flow_info_tbl[portid].rx_def_flow) {
+                       struct rte_flow_error err;
+
+                       ret = rte_flow_destroy(portid,
+                               flow_info_tbl[portid].rx_def_flow, &err);
+                       if (ret)
+                               RTE_LOG(ERR, IPSEC, "Failed to destroy flow "
+                                       " for port %u, err msg: %s\n", portid,
+                                       err.message);
+               }
+               rte_eth_dev_stop(portid);
+               rte_eth_dev_close(portid);
+               printf(" Done\n");
+       }
+       printf("Bye...\n");
+
        return 0;
 }