X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_ipsec.c;h=79d00d7e02d14961879cdff0c79a5293e9edbe17;hb=e6cf7bee1c77a0f321cea3494a106bfa5de6f53c;hp=8e87ac0294b12171d202bc7c8ba1b0eeac37d166;hpb=9ab6ff970ce8f98fe2d2eda24c1b98daf780b3d6;p=dpdk.git diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c index 8e87ac0294..79d00d7e02 100644 --- a/app/test/test_ipsec.c +++ b/app/test/test_ipsec.c @@ -26,7 +26,7 @@ #include "test_cryptodev.h" #define VDEV_ARGS_SIZE 100 -#define MAX_NB_SESSIONS 100 +#define MAX_NB_SESSIONS 200 #define MAX_NB_SAS 2 #define REPLAY_WIN_0 0 #define REPLAY_WIN_32 32 @@ -93,8 +93,8 @@ struct ipsec_test_cfg { }; static const struct ipsec_test_cfg test_cfg[] = { - {REPLAY_WIN_0, ESN_DISABLED, 0, DATA_64_BYTES, 1, 0}, + {REPLAY_WIN_0, ESN_DISABLED, 0, DATA_64_BYTES, BURST_SIZE, 0}, {REPLAY_WIN_0, ESN_DISABLED, 0, DATA_80_BYTES, BURST_SIZE, REORDER_PKTS}, {REPLAY_WIN_32, ESN_ENABLED, 0, DATA_100_BYTES, 1, 0}, @@ -237,7 +237,7 @@ fill_crypto_xform(struct ipsec_unitest_params *ut_params, } static int -check_cryptodev_capablity(const struct ipsec_unitest_params *ut, +check_cryptodev_capability(const struct ipsec_unitest_params *ut, uint8_t dev_id) { struct rte_cryptodev_sym_capability_idx cap_idx; @@ -302,7 +302,7 @@ testsuite_setup(void) /* Find first valid crypto device */ for (i = 0; i < nb_devs; i++) { - rc = check_cryptodev_capablity(ut_params, i); + rc = check_cryptodev_capability(ut_params, i); if (rc == 0) { ts_params->valid_dev = i; ts_params->valid_dev_found = 1; @@ -452,8 +452,10 @@ ut_teardown(void) for (i = 0; i < BURST_SIZE; i++) { /* free crypto operation structure */ - if (ut_params->cop[i]) + if (ut_params->cop[i]) { rte_crypto_op_free(ut_params->cop[i]); + ut_params->cop[i] = NULL; + } /* * free mbuf - both obuf and ibuf are usually the same, @@ -463,17 +465,17 @@ ut_teardown(void) if (ut_params->obuf[i]) { rte_pktmbuf_free(ut_params->obuf[i]); if (ut_params->ibuf[i] == ut_params->obuf[i]) - ut_params->ibuf[i] = 0; - ut_params->obuf[i] = 0; + ut_params->ibuf[i] = NULL; + ut_params->obuf[i] = NULL; } if (ut_params->ibuf[i]) { rte_pktmbuf_free(ut_params->ibuf[i]); - ut_params->ibuf[i] = 0; + ut_params->ibuf[i] = NULL; } if (ut_params->testbuf[i]) { rte_pktmbuf_free(ut_params->testbuf[i]); - ut_params->testbuf[i] = 0; + ut_params->testbuf[i] = NULL; } } @@ -572,7 +574,7 @@ setup_test_string_tunneled(struct rte_mempool *mpool, const char *string, struct rte_mbuf *m = rte_pktmbuf_alloc(mpool); uint32_t hdrlen = sizeof(struct rte_ipv4_hdr) + sizeof(struct rte_esp_hdr); - uint32_t taillen = sizeof(struct esp_tail); + uint32_t taillen = sizeof(struct rte_esp_tail); uint32_t t_len = len + hdrlen + taillen; uint32_t padlen; @@ -584,7 +586,7 @@ setup_test_string_tunneled(struct rte_mempool *mpool, const char *string, padlen = RTE_ALIGN(t_len, 4) - t_len; t_len += padlen; - struct esp_tail espt = { + struct rte_esp_tail espt = { .pad_len = padlen, .next_proto = IPPROTO_IPIP, }; @@ -687,11 +689,11 @@ fill_ipsec_param(uint32_t replay_win_sz, uint64_t flags) prm->userdata = 1; prm->flags = flags; - prm->replay_win_sz = replay_win_sz; /* setup ipsec xform */ prm->ipsec_xform = ut_params->ipsec_xform; prm->ipsec_xform.salt = (uint32_t)rte_rand(); + prm->ipsec_xform.replay_win_sz = replay_win_sz; /* setup tunnel related fields */ prm->tun.hdr_len = sizeof(ipv4_outer); @@ -881,6 +883,19 @@ lksd_proto_ipsec(uint16_t num_pkts) return TEST_SUCCESS; } +static void +dump_grp_pkt(uint32_t i, struct rte_ipsec_group *grp, uint32_t k) +{ + RTE_LOG(ERR, USER1, + "After rte_ipsec_pkt_process grp[%d].cnt=%d k=%d fail\n", + i, grp[i].cnt, k); + RTE_LOG(ERR, USER1, + "After rte_ipsec_pkt_process grp[%d].m=%p grp[%d].m[%d]=%p\n", + i, grp[i].m, i, k, grp[i].m[k]); + + rte_pktmbuf_dump(stdout, grp[i].m[k], grp[i].m[k]->data_len); +} + static int crypto_ipsec_2sa(void) { @@ -916,7 +931,7 @@ crypto_ipsec_2sa(void) ut_params->obuf, grp, BURST_SIZE); if (ng != BURST_SIZE) { RTE_LOG(ERR, USER1, "rte_ipsec_pkt_crypto_group fail ng=%d\n", - ng); + ng); return TEST_FAILED; } @@ -924,7 +939,7 @@ crypto_ipsec_2sa(void) for (i = 0; i < ng; i++) { k = rte_ipsec_pkt_process(grp[i].id.ptr, grp[i].m, grp[i].cnt); if (k != grp[i].cnt) { - RTE_LOG(ERR, USER1, "rte_ipsec_pkt_process fail\n"); + dump_grp_pkt(i, grp, k); return TEST_FAILED; } } @@ -1059,7 +1074,7 @@ crypto_ipsec_2sa_4grp(void) for (i = 0; i < ng; i++) { k = rte_ipsec_pkt_process(grp[i].id.ptr, grp[i].m, grp[i].cnt); if (k != grp[i].cnt) { - RTE_LOG(ERR, USER1, "rte_ipsec_pkt_process fail\n"); + dump_grp_pkt(i, grp, k); return TEST_FAILED; } rc = crypto_ipsec_4grp_check_cnt(i, grp); @@ -1152,15 +1167,44 @@ test_ipsec_dump_buffers(struct ipsec_unitest_params *ut_params, int i) } } +static void +destroy_dummy_sec_session(struct ipsec_unitest_params *ut, + uint32_t j) +{ + rte_security_session_destroy(&dummy_sec_ctx, + ut->ss[j].security.ses); + ut->ss[j].security.ctx = NULL; +} + +static void +destroy_crypto_session(struct ipsec_unitest_params *ut, + uint8_t crypto_dev, uint32_t j) +{ + rte_cryptodev_sym_session_clear(crypto_dev, ut->ss[j].crypto.ses); + rte_cryptodev_sym_session_free(ut->ss[j].crypto.ses); + memset(&ut->ss[j], 0, sizeof(ut->ss[j])); +} + +static void +destroy_session(struct ipsec_unitest_params *ut, + uint8_t crypto_dev, uint32_t j) +{ + if (ut->ss[j].type == RTE_SECURITY_ACTION_TYPE_NONE) + return destroy_crypto_session(ut, crypto_dev, j); + else + return destroy_dummy_sec_session(ut, j); +} + static void destroy_sa(uint32_t j) { struct ipsec_unitest_params *ut = &unittest_params; + struct ipsec_testsuite_params *ts = &testsuite_params; rte_ipsec_sa_fini(ut->ss[j].sa); rte_free(ut->ss[j].sa); - rte_cryptodev_sym_session_free(ut->ss[j].crypto.ses); - memset(&ut->ss[j], 0, sizeof(ut->ss[j])); + + destroy_session(ut, ts->valid_dev, j); } static int