X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fipsec%2Fipsec.c;h=e665db4a0f4b46801015fcf9c32a0ba01631c80f;hb=b4d3053445499a115f0f4debde6a8c7b29a8c071;hp=b42d208094b0ddadb3eb22c427e58e45cd284a28;hpb=45b485099d8bdf5985e9869bc8221852073f9369;p=vpp.git diff --git a/src/plugins/dpdk/ipsec/ipsec.c b/src/plugins/dpdk/ipsec/ipsec.c index b42d208094b..e665db4a0f4 100644 --- a/src/plugins/dpdk/ipsec/ipsec.c +++ b/src/plugins/dpdk/ipsec/ipsec.c @@ -328,10 +328,9 @@ create_sym_session (struct rte_cryptodev_sym_session **session, struct rte_crypto_sym_xform cipher_xform = { 0 }; struct rte_crypto_sym_xform auth_xform = { 0 }; struct rte_crypto_sym_xform *xfs; - crypto_session_key_t key = { 0 }; + struct rte_cryptodev_sym_session **s; + clib_error_t *erorr = 0; - key.drv_id = res->drv_id; - key.sa_idx = sa_idx; sa = pool_elt_at_index (im->sad, sa_idx); @@ -360,24 +359,28 @@ create_sym_session (struct rte_cryptodev_sym_session **session, } data = vec_elt_at_index (dcm->data, res->numa); + clib_spinlock_lock_if_init (&data->lockp); /* * DPDK_VER >= 1708: * Multiple worker/threads share the session for an SA * Single session per SA, initialized for each device driver */ - session[0] = (void *) hash_get (data->session_by_sa_index, sa_idx); + s = (void *) hash_get (data->session_by_sa_index, sa_idx); - if (!session[0]) + if (!s) { session[0] = rte_cryptodev_sym_session_create (data->session_h); if (!session[0]) { data->session_h_failed += 1; - return clib_error_return (0, "failed to create session header"); + erorr = clib_error_return (0, "failed to create session header"); + goto done; } hash_set (data->session_by_sa_index, sa_idx, session[0]); } + else + session[0] = s[0]; struct rte_mempool **mp; mp = vec_elt_at_index (data->session_drv, res->drv_id); @@ -388,20 +391,23 @@ create_sym_session (struct rte_cryptodev_sym_session **session, if (ret) { data->session_drv_failed[res->drv_id] += 1; - return clib_error_return (0, "failed to init session for drv %u", - res->drv_id); + erorr = clib_error_return (0, "failed to init session for drv %u", + res->drv_id); + goto done; } - hash_set (cwm->session_by_drv_id_and_sa_index, key.val, session[0]); + add_session_by_drv_and_sa_idx (session[0], data, res->drv_id, sa_idx); - return 0; +done: + clib_spinlock_unlock_if_init (&data->lockp); + return erorr; } static void __attribute__ ((unused)) clear_and_free_obj (void *obj) { struct rte_mempool *mp = rte_mempool_from_obj (obj); - memset (obj, 0, mp->elt_size); + clib_memset (obj, 0, mp->elt_size); rte_mempool_put (mp, obj); } @@ -422,19 +428,63 @@ set_session_private_data (struct rte_cryptodev_sym_session *sess, sess->sess_private_data[driver_id] = private_data; } +static clib_error_t * +dpdk_crypto_session_disposal (crypto_session_disposal_t * v, u64 ts) +{ + dpdk_crypto_main_t *dcm = &dpdk_crypto_main; + crypto_session_disposal_t *s; + void *drv_session; + u32 drv_id; + i32 ret; + + /* *INDENT-OFF* */ + vec_foreach (s, v) + { + /* ordered vector by timestamp */ + if (!(s->ts + dcm->session_timeout < ts)) + break; + + vec_foreach_index (drv_id, dcm->drv) + { + drv_session = get_session_private_data (s->session, drv_id); + if (!drv_session) + continue; + + /* + * Custom clear to avoid finding a dev_id for drv_id: + * ret = rte_cryptodev_sym_session_clear (dev_id, drv_session); + * ASSERT (!ret); + */ + clear_and_free_obj (drv_session); + + set_session_private_data (s->session, drv_id, NULL); + } + + if (rte_mempool_from_obj(s->session)) + { + ret = rte_cryptodev_sym_session_free (s->session); + ASSERT (!ret); + } + } + /* *INDENT-ON* */ + + if (s < vec_end (v)) + vec_delete (v, s - v, 0); + else + vec_reset_length (v); + + return 0; +} + static clib_error_t * add_del_sa_session (u32 sa_index, u8 is_add) { ipsec_main_t *im = &ipsec_main; dpdk_crypto_main_t *dcm = &dpdk_crypto_main; - crypto_worker_main_t *cwm; + crypto_data_t *data; struct rte_cryptodev_sym_session *s; - crypto_session_key_t key = { 0 }; uword *val; u32 drv_id; - i32 ret; - - key.sa_idx = sa_index; if (is_add) { @@ -456,58 +506,33 @@ add_del_sa_session (u32 sa_index, u8 is_add) return 0; } - /* XXX Wait N cycles to be sure session is not in use OR - * keep refcnt at SA level per worker/thread ? */ - unix_sleep (0.2); - - /* *INDENT-OFF* */ - vec_foreach (cwm, dcm->workers_main) - { - for (drv_id = 0; drv_id < dcm->max_drv_id; drv_id++) - { - key.drv_id = drv_id; - val = hash_get (cwm->session_by_drv_id_and_sa_index, key.val); - s = (struct rte_cryptodev_sym_session *) val; - - if (!s) - continue; - - hash_unset (cwm->session_by_drv_id_and_sa_index, key.val); - } - } - /* *INDENT-ON* */ - - crypto_data_t *data; /* *INDENT-OFF* */ vec_foreach (data, dcm->data) { + clib_spinlock_lock_if_init (&data->lockp); val = hash_get (data->session_by_sa_index, sa_index); - s = (struct rte_cryptodev_sym_session *) val; - - if (!s) - continue; - - hash_unset (data->session_by_sa_index, sa_index); - - void *drv_session; - vec_foreach_index (drv_id, dcm->drv) - { - drv_session = get_session_private_data (s, drv_id); - if (!drv_session) - continue; - - /* - * Custom clear to avoid finding a dev_id for drv_id: - * ret = rte_cryptodev_sym_session_clear (dev_id, drv_session); - * ASSERT (!ret); - */ - clear_and_free_obj (drv_session); - - set_session_private_data (s, drv_id, NULL); - } - - ret = rte_cryptodev_sym_session_free(s); - ASSERT (!ret); + if (val) + { + s = (struct rte_cryptodev_sym_session *) val[0]; + vec_foreach_index (drv_id, dcm->drv) + { + val = (uword*) get_session_by_drv_and_sa_idx (data, drv_id, sa_index); + if (val) + add_session_by_drv_and_sa_idx(NULL, data, drv_id, sa_index); + } + + hash_unset (data->session_by_sa_index, sa_index); + + u64 ts = unix_time_now_nsec (); + dpdk_crypto_session_disposal (data->session_disposal, ts); + + crypto_session_disposal_t sd; + sd.ts = ts; + sd.session = s; + + vec_add1 (data->session_disposal, sd); + } + clib_spinlock_unlock_if_init (&data->lockp); } /* *INDENT-ON* */ @@ -522,6 +547,7 @@ dpdk_ipsec_check_support (ipsec_sa_t * sa) if (sa->integ_alg == IPSEC_INTEG_ALG_NONE) switch (sa->crypto_alg) { + case IPSEC_CRYPTO_ALG_NONE: case IPSEC_CRYPTO_ALG_AES_GCM_128: case IPSEC_CRYPTO_ALG_AES_GCM_192: case IPSEC_CRYPTO_ALG_AES_GCM_256: @@ -607,7 +633,7 @@ crypto_dev_conf (u8 dev, u16 n_qp, u8 numa) struct rte_cryptodev_qp_conf qp_conf; i32 ret; u16 qp; - i8 *error_str; + char *error_str; dev_conf.socket_id = numa; dev_conf.nb_queue_pairs = n_qp; @@ -626,6 +652,10 @@ crypto_dev_conf (u8 dev, u16 n_qp, u8 numa) return clib_error_return (0, error_str, dev, qp); } + error_str = "failed to start crypto device %u"; + if (rte_cryptodev_start (dev)) + return clib_error_return (0, error_str, dev); + return 0; } @@ -782,7 +812,7 @@ crypto_op_init (struct rte_mempool *mempool, op->sess_type = RTE_CRYPTO_OP_WITH_SESSION; op->type = RTE_CRYPTO_OP_TYPE_SYMMETRIC; op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; - op->phys_addr = rte_mem_virt2phy (_obj); + op->phys_addr = rte_mempool_virt2iova (_obj); op->mempool = mempool; } @@ -797,7 +827,7 @@ crypto_create_crypto_op_pool (vlib_main_t * vm, u8 numa) struct rte_crypto_op_pool_private *priv; struct rte_mempool *mp; clib_error_t *error = NULL; - vlib_physmem_region_index_t pri; + u32 map_index; data = vec_elt_at_index (dcm->data, numa); @@ -807,9 +837,8 @@ crypto_create_crypto_op_pool (vlib_main_t * vm, u8 numa) pool_name = format (0, "crypto_pool_numa%u%c", numa, 0); - error = - dpdk_pool_create (vm, pool_name, crypto_op_len (), conf->num_mbufs, - pool_priv_size, 512, numa, &mp, &pri); + error = dpdk_pool_create (vm, pool_name, crypto_op_len (), conf->num_mbufs, + pool_priv_size, 512, numa, &mp, &map_index); vec_free (pool_name); @@ -837,8 +866,8 @@ crypto_create_session_h_pool (vlib_main_t * vm, u8 numa) u8 *pool_name; struct rte_mempool *mp; clib_error_t *error = NULL; - vlib_physmem_region_index_t pri; u32 elt_size; + u32 map_index; data = vec_elt_at_index (dcm->data, numa); @@ -847,11 +876,11 @@ crypto_create_session_h_pool (vlib_main_t * vm, u8 numa) pool_name = format (0, "session_h_pool_numa%u%c", numa, 0); - elt_size = rte_cryptodev_get_header_session_size (); - error = - dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS, - 0, 512, numa, &mp, &pri); + elt_size = rte_cryptodev_sym_get_header_session_size (); + + error = dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS, + 0, 512, numa, &mp, &map_index); vec_free (pool_name); @@ -871,24 +900,26 @@ crypto_create_session_drv_pool (vlib_main_t * vm, crypto_dev_t * dev) u8 *pool_name; struct rte_mempool *mp; clib_error_t *error = NULL; - vlib_physmem_region_index_t pri; u32 elt_size; u8 numa = dev->numa; + u32 map_index; data = vec_elt_at_index (dcm->data, numa); vec_validate (data->session_drv, dev->drv_id); vec_validate (data->session_drv_failed, dev->drv_id); + vec_validate_aligned (data->session_by_drv_id_and_sa_index, 32, + CLIB_CACHE_LINE_BYTES); if (data->session_drv[dev->drv_id]) return NULL; pool_name = format (0, "session_drv%u_pool_numa%u%c", dev->drv_id, numa, 0); - elt_size = rte_cryptodev_get_private_session_size (dev->id); - error = - dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS, - 0, 512, numa, &mp, &pri); + elt_size = rte_cryptodev_sym_get_private_session_size (dev->id); + + error = dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS, + 0, 512, numa, &mp, &map_index); vec_free (pool_name); @@ -896,6 +927,7 @@ crypto_create_session_drv_pool (vlib_main_t * vm, crypto_dev_t * dev) return error; data->session_drv[dev->drv_id] = mp; + clib_spinlock_init (&data->lockp); return NULL; } @@ -948,12 +980,12 @@ crypto_disable (void) rte_mempool_free (data->session_drv[i]); vec_free (data->session_drv); + clib_spinlock_free (&data->lockp); } /* *INDENT-ON* */ vec_free (dcm->data); vec_free (dcm->workers_main); - vec_free (dcm->sa_session); vec_free (dcm->dev); vec_free (dcm->resource); vec_free (dcm->cipher_algs); @@ -985,6 +1017,8 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt, return 0; } + dcm->session_timeout = 10e9; + vec_validate_init_empty_aligned (dcm->workers_main, n_mains - 1, (crypto_worker_main_t) EMPTY_STRUCT, CLIB_CACHE_LINE_BYTES); @@ -994,9 +1028,9 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt, { vec_validate_init_empty_aligned (cwm->ops, VLIB_FRAME_SIZE - 1, 0, CLIB_CACHE_LINE_BYTES); - memset (cwm->cipher_resource_idx, ~0, + clib_memset (cwm->cipher_resource_idx, ~0, IPSEC_CRYPTO_N_ALG * sizeof(*cwm->cipher_resource_idx)); - memset (cwm->auth_resource_idx, ~0, + clib_memset (cwm->auth_resource_idx, ~0, IPSEC_INTEG_N_ALG * sizeof(*cwm->auth_resource_idx)); } /* *INDENT-ON* */ @@ -1011,29 +1045,15 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt, return 0; } - /* Add new next node and set it as default */ - vlib_node_t *node, *next_node; - - next_node = vlib_get_node_by_name (vm, (u8 *) "dpdk-esp-encrypt"); - ASSERT (next_node); - node = vlib_get_node_by_name (vm, (u8 *) "ipsec-output-ip4"); - ASSERT (node); - im->esp_encrypt_node_index = next_node->index; - im->esp_encrypt_next_index = - vlib_node_add_next (vm, node->index, next_node->index); - - next_node = vlib_get_node_by_name (vm, (u8 *) "dpdk-esp-decrypt"); - ASSERT (next_node); - node = vlib_get_node_by_name (vm, (u8 *) "ipsec-input-ip4"); - ASSERT (node); - im->esp_decrypt_node_index = next_node->index; - im->esp_decrypt_next_index = - vlib_node_add_next (vm, node->index, next_node->index); - im->cb.check_support_cb = dpdk_ipsec_check_support; - im->cb.add_del_sa_sess_cb = add_del_sa_session; + ipsec_register_esp_backend (vm, im, "dpdk backend", + "dpdk-esp4-encrypt", + "dpdk-esp4-decrypt", + "dpdk-esp6-encrypt", + "dpdk-esp6-decrypt", + dpdk_ipsec_check_support, add_del_sa_session); - node = vlib_get_node_by_name (vm, (u8 *) "dpdk-crypto-input"); + vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "dpdk-crypto-input"); ASSERT (node); for (i = skip_master; i < n_mains; i++) vlib_node_set_state (vlib_mains[i], node->index, VLIB_NODE_STATE_POLLING);