examples/ipsec-secgw: integrate inbound SAD

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

diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index dac0d18..3e5f82e 100644 (file)
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -112,7 +112,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)
 
@@ -135,6 +135,7 @@ struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS] = {
 #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"
 
 enum {
        /* long options mapped to a short option */
@@ -150,6 +151,7 @@ enum {
        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[] = {
@@ -160,6 +162,7 @@ static const struct option lgopts[] = {
        {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 +189,11 @@ 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};
+static const char *cfgfile;
 
 struct lcore_rx_queue {
        uint16_t port_id;
@@ -596,7 +601,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;
@@ -683,7 +688,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)
@@ -1304,6 +1309,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);
 }
@@ -1340,14 +1348,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;
@@ -1415,18 +1424,17 @@ 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 int32_t
 parse_args(int32_t argc, char **argv)
 {
-       int32_t opt, ret;
+       int opt;
+       int64_t ret;
        char **argvopt;
        int32_t option_index;
        char *prgname = argv[0];
@@ -1465,12 +1473,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':
@@ -1489,11 +1492,9 @@ 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':
@@ -1510,7 +1511,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;
@@ -1553,7 +1554,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);
@@ -1571,6 +1572,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;
@@ -1632,6 +1643,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);
@@ -1641,7 +1653,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)
@@ -1926,7 +1945,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");
@@ -2335,8 +2359,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);
@@ -2405,6 +2429,14 @@ main(int32_t argc, char **argv)
        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",