#include <vnet/api_errno.h>
#include <vnet/ipsec/ipsec.h>
#include <vlib/node_funcs.h>
+#include <vlib/log.h>
#include <dpdk/device/dpdk.h>
+#include <dpdk/buffer.h>
#include <dpdk/ipsec/ipsec.h>
dpdk_crypto_main_t dpdk_crypto_main;
#define EMPTY_STRUCT {0}
+#define NUM_CRYPTO_MBUFS 16384
static void
algos_init (u32 n_mains)
a->key_len = 32;
a->iv_len = 8;
-#if DPDK_NO_AEAD
-#define AES_GCM_TYPE RTE_CRYPTO_SYM_XFORM_CIPHER
-#define AES_GCM_ALG RTE_CRYPTO_CIPHER_AES_GCM
-#else
#define AES_GCM_TYPE RTE_CRYPTO_SYM_XFORM_AEAD
#define AES_GCM_ALG RTE_CRYPTO_AEAD_AES_GCM
-#endif
a = &dcm->cipher_algs[IPSEC_CRYPTO_ALG_AES_GCM_128];
a->type = AES_GCM_TYPE;
(cap->sym.cipher.algo == alg->alg) &&
(alg->key_len == key_len))
return alg;
-#if ! DPDK_NO_AEAD
if ((cap->sym.xform_type == RTE_CRYPTO_SYM_XFORM_AEAD) &&
(alg->type == RTE_CRYPTO_SYM_XFORM_AEAD) &&
(cap->sym.aead.algo == alg->alg) &&
(alg->key_len == key_len))
return alg;
-#endif
}
/* *INDENT-ON* */
return NULL;
}
-#if ! DPDK_NO_AEAD
static void
crypto_set_aead_xform (struct rte_crypto_sym_xform *xform,
ipsec_sa_t * sa, u8 is_outbound)
xform->type = RTE_CRYPTO_SYM_XFORM_AEAD;
xform->aead.algo = c->alg;
- xform->aead.key.data = sa->crypto_key;
+ xform->aead.key.data = sa->crypto_key.data;
xform->aead.key.length = c->key_len;
xform->aead.iv.offset =
crypto_op_get_priv_offset () + offsetof (dpdk_op_priv_t, cb);
xform->aead.iv.length = 12;
xform->aead.digest_length = c->trunc_size;
- xform->aead.aad_length = sa->use_esn ? 12 : 8;
+ xform->aead.aad_length = ipsec_sa_is_set_USE_ESN (sa) ? 12 : 8;
xform->next = NULL;
if (is_outbound)
else
xform->aead.op = RTE_CRYPTO_AEAD_OP_DECRYPT;
}
-#endif
static void
crypto_set_cipher_xform (struct rte_crypto_sym_xform *xform,
xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
xform->cipher.algo = c->alg;
- xform->cipher.key.data = sa->crypto_key;
+ xform->cipher.key.data = sa->crypto_key.data;
xform->cipher.key.length = c->key_len;
-#if ! DPDK_NO_AEAD
xform->cipher.iv.offset =
crypto_op_get_priv_offset () + offsetof (dpdk_op_priv_t, cb);
xform->cipher.iv.length = c->iv_len;
-#endif
xform->next = NULL;
if (is_outbound)
xform->type = RTE_CRYPTO_SYM_XFORM_AUTH;
xform->auth.algo = a->alg;
- xform->auth.key.data = sa->integ_key;
+ xform->auth.key.data = sa->integ_key.data;
xform->auth.key.length = a->key_len;
xform->auth.digest_length = a->trunc_size;
-#if DPDK_NO_AEAD
- if (sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128 ||
- sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_192 ||
- sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_256)
- xform->auth.algo = RTE_CRYPTO_AUTH_AES_GCM;
- xform->auth.add_auth_data_length = sa->use_esn ? 12 : 8;
-#else
-#if 0
- xform->auth.iv.offset =
- sizeof (struct rte_crypto_op) + sizeof (struct rte_crypto_sym_op) +
- offsetof (dpdk_op_priv_t, cb);
- xform->auth.iv.length = a->iv_len;
-#endif
-#endif
xform->next = NULL;
if (is_outbound)
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 *error = 0;
- key.drv_id = res->drv_id;
- key.sa_idx = sa_idx;
sa = pool_elt_at_index (im->sad, sa_idx);
-#if ! DPDK_NO_AEAD
if ((sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128) |
(sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_192) |
(sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_256))
xfs = &cipher_xform;
}
else
-#endif /* ! DPDK_NO_AEAD */
{
crypto_set_cipher_xform (&cipher_xform, sa, is_outbound);
crypto_set_auth_xform (&auth_xform, sa, is_outbound);
}
data = vec_elt_at_index (dcm->data, res->numa);
+ clib_spinlock_lock_if_init (&data->lockp);
-#if DPDK_NO_AEAD
- /*
- * DPDK_VER <= 1705:
- * Each worker/thread has its own session per device driver
- */
- session[0] = rte_cryptodev_sym_session_create (res->dev_id, xfs);
- if (!session[0])
- {
- data->session_drv_failed[res->drv_id] += 1;
- return clib_error_return (0, "failed to create session for dev %u",
- res->dev_id);
- }
-#else
/*
* 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");
+ error = 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);
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);
+ error = clib_error_return (0, "failed to init session for drv %u",
+ res->drv_id);
+ goto done;
}
-#endif /* DPDK_NO_AEAD */
- 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 error;
}
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);
}
-#if ! DPDK_NO_AEAD
/* This is from rte_cryptodev_pmd.h */
static inline void *
get_session_private_data (const struct rte_cryptodev_sym_session *sess,
uint8_t driver_id)
{
+#if RTE_VERSION < RTE_VERSION_NUM(19, 2, 0, 0)
return sess->sess_private_data[driver_id];
+#else
+ if (unlikely (sess->nb_drivers <= driver_id))
+ return 0;
+
+ return sess->sess_data[driver_id].data;
+#endif
}
/* This is from rte_cryptodev_pmd.h */
set_session_private_data (struct rte_cryptodev_sym_session *sess,
uint8_t driver_id, void *private_data)
{
+#if RTE_VERSION < RTE_VERSION_NUM(19, 2, 0, 0)
sess->sess_private_data[driver_id] = private_data;
-}
+#else
+ if (unlikely (sess->nb_drivers <= driver_id))
+ return;
+ sess->sess_data[driver_id].data = private_data;
#endif
+}
static clib_error_t *
-add_del_sa_session (u32 sa_index, u8 is_add)
+dpdk_crypto_session_disposal (crypto_session_disposal_t * v, u64 ts)
{
- ipsec_main_t *im = &ipsec_main;
dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
- crypto_worker_main_t *cwm;
- struct rte_cryptodev_sym_session *s;
- crypto_session_key_t key = { 0 };
- uword *val;
+ crypto_session_disposal_t *s;
+ void *drv_session;
u32 drv_id;
i32 ret;
- key.sa_idx = sa_index;
-
- if (is_add)
- {
-#if 1
- ipsec_sa_t *sa = pool_elt_at_index (im->sad, sa_index);
- u32 seed;
- switch (sa->crypto_alg)
- {
- case IPSEC_CRYPTO_ALG_AES_GCM_128:
- case IPSEC_CRYPTO_ALG_AES_GCM_192:
- case IPSEC_CRYPTO_ALG_AES_GCM_256:
- clib_memcpy (&sa->salt, &sa->crypto_key[sa->crypto_key_len - 4], 4);
- break;
- default:
- seed = (u32) clib_cpu_time_now ();
- sa->salt = random_u32 (&seed);
- }
-#endif
- 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)
+ vec_foreach (s, v)
{
- 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;
-
-#if DPDK_NO_AEAD
- ret = (rte_cryptodev_sym_session_free (s->dev_id, s) == NULL);
- ASSERT (ret);
-#endif
- hash_unset (cwm->session_by_drv_id_and_sa_index, key.val);
- }
- }
- /* *INDENT-ON* */
-
-#if ! DPDK_NO_AEAD
- crypto_data_t *data;
- /* *INDENT-OFF* */
- vec_foreach (data, dcm->data)
- {
- 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);
+ /* ordered vector by timestamp */
+ if (!(s->ts + dcm->session_timeout < ts))
+ break;
- void *drv_session;
vec_foreach_index (drv_id, dcm->drv)
{
- drv_session = get_session_private_data (s, drv_id);
+ drv_session = get_session_private_data (s->session, drv_id);
if (!drv_session)
continue;
*/
clear_and_free_obj (drv_session);
- set_session_private_data (s, drv_id, NULL);
+ set_session_private_data (s->session, drv_id, NULL);
}
- ret = rte_cryptodev_sym_session_free(s);
- ASSERT (!ret);
+ 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)
+{
+ dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
+ crypto_data_t *data;
+ struct rte_cryptodev_sym_session *s;
+ uword *val;
+ u32 drv_id;
+
+ if (is_add)
+ return 0;
+
+ /* *INDENT-OFF* */
+ vec_foreach (data, dcm->data)
+ {
+ clib_spinlock_lock_if_init (&data->lockp);
+ val = hash_get (data->session_by_sa_index, sa_index);
+ 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* */
-#endif
return 0;
}
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:
/* A single capability maps to multiple cipher/auth algorithms */
switch (cap->sym.xform_type)
{
-#if ! DPDK_NO_AEAD
case RTE_CRYPTO_SYM_XFORM_AEAD:
-#endif
case RTE_CRYPTO_SYM_XFORM_CIPHER:
inc = cap->sym.cipher.key_size.increment;
inc = inc ? inc : 1;
}
}
-#define DPDK_CRYPTO_N_QUEUE_DESC 2048
-#define DPDK_CRYPTO_NB_SESS_OBJS 20000
-
static clib_error_t *
crypto_dev_conf (u8 dev, u16 n_qp, u8 numa)
{
- struct rte_cryptodev_config dev_conf;
- struct rte_cryptodev_qp_conf qp_conf;
+ struct rte_cryptodev_config dev_conf = { 0 };
+ struct rte_cryptodev_qp_conf qp_conf = { 0 };
i32 ret;
u16 qp;
- i8 *error_str;
+ char *error_str;
dev_conf.socket_id = numa;
dev_conf.nb_queue_pairs = n_qp;
-#if DPDK_NO_AEAD
- dev_conf.session_mp.nb_objs = DPDK_CRYPTO_NB_SESS_OBJS;
- dev_conf.session_mp.cache_size = 512;
-#endif
error_str = "failed to configure crypto device %u";
ret = rte_cryptodev_configure (dev, &dev_conf);
qp_conf.nb_descriptors = DPDK_CRYPTO_N_QUEUE_DESC;
for (qp = 0; qp < n_qp; qp++)
{
-#if DPDK_NO_AEAD
- ret = rte_cryptodev_queue_pair_setup (dev, qp, &qp_conf, numa);
-#else
+#if RTE_VERSION < RTE_VERSION_NUM(19, 2, 0, 0)
ret = rte_cryptodev_queue_pair_setup (dev, qp, &qp_conf, numa, NULL);
+#else
+ ret = rte_cryptodev_queue_pair_setup (dev, qp, &qp_conf, numa);
#endif
if (ret < 0)
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;
}
{
dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
struct rte_cryptodev *cryptodev;
- struct rte_cryptodev_info info;
+ struct rte_cryptodev_info info = { 0 };
crypto_dev_t *dev;
crypto_resource_t *res;
clib_error_t *error;
dev->numa = rte_cryptodev_socket_id (i);
dev->features = info.feature_flags;
dev->max_qp = info.max_nb_queue_pairs;
-#if DPDK_NO_AEAD
- drv_id = cryptodev->dev_type;
-#else
drv_id = info.driver_id;
-#endif
if (drv_id >= vec_len (dcm->drv))
vec_validate_init_empty (dcm->drv, drv_id,
(crypto_drv_t) EMPTY_STRUCT);
continue;
}
- max_res_idx = (dev->max_qp / 2) - 1;
+ max_res_idx = dev->max_qp - 1;
vec_validate (dev->free_resources, max_res_idx);
(crypto_resource_t) EMPTY_STRUCT,
CLIB_CACHE_LINE_BYTES);
- for (j = 0; j <= max_res_idx; j++, res_idx++)
+ for (j = 0; j <= max_res_idx; j++)
{
- vec_elt (dev->free_resources, max_res_idx - j) = res_idx;
- res = &dcm->resource[res_idx];
+ vec_elt (dev->free_resources, max_res_idx - j) = res_idx + j;
+ res = &dcm->resource[res_idx + j];
res->dev_id = i;
res->drv_id = drv_id;
- res->qp_id = j * 2;
+ res->qp_id = j;
res->numa = dev->numa;
res->thread_idx = (u16) ~ 0;
}
{
struct rte_crypto_op *op = _obj;
-#if DPDK_NO_AEAD
- op->sym = (struct rte_crypto_sym_op *) (op + 1);
- op->sym->sess_type = RTE_CRYPTO_SYM_OP_WITH_SESSION;
-#else
op->sess_type = RTE_CRYPTO_OP_WITH_SESSION;
-#endif
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;
}
static clib_error_t *
-crypto_create_crypto_op_pool (u8 numa)
+crypto_create_crypto_op_pool (vlib_main_t * vm, u8 numa)
{
dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
dpdk_config_main_t *conf = &dpdk_config_main;
u8 *pool_name;
u32 pool_priv_size = sizeof (struct rte_crypto_op_pool_private);
struct rte_crypto_op_pool_private *priv;
- clib_error_t *error = NULL;
+ struct rte_mempool *mp;
data = vec_elt_at_index (dcm->data, numa);
+ /* Already allocated */
if (data->crypto_op)
return NULL;
pool_name = format (0, "crypto_pool_numa%u%c", numa, 0);
- data->crypto_op =
- rte_mempool_create ((i8 *) pool_name, conf->num_mbufs, crypto_op_len (),
- 512, pool_priv_size, NULL, NULL, crypto_op_init, NULL,
- numa, 0);
+ if (conf->num_crypto_mbufs == 0)
+ conf->num_crypto_mbufs = NUM_CRYPTO_MBUFS;
- if (!data->crypto_op)
- {
- error = clib_error_return (0, "failed to allocate %s", pool_name);
- goto done;
- }
+ mp = rte_mempool_create ((char *) pool_name, conf->num_crypto_mbufs,
+ crypto_op_len (), 512, pool_priv_size, NULL, NULL,
+ crypto_op_init, NULL, numa, 0);
- priv = rte_mempool_get_priv (data->crypto_op);
+ vec_free (pool_name);
+ if (!mp)
+ return clib_error_return (0, "failed to create crypto op mempool");
+
+ /* Initialize mempool private data */
+ priv = rte_mempool_get_priv (mp);
priv->priv_size = pool_priv_size;
priv->type = RTE_CRYPTO_OP_TYPE_SYMMETRIC;
-done:
- vec_free (pool_name);
+ data->crypto_op = mp;
- return error;
+ return NULL;
}
static clib_error_t *
-crypto_create_session_h_pool (u8 numa)
+crypto_create_session_h_pool (vlib_main_t * vm, u8 numa)
{
-#if DPDK_NO_AEAD
- return NULL;
-#else
dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
crypto_data_t *data;
u8 *pool_name;
+ struct rte_mempool *mp;
u32 elt_size;
- clib_error_t *error = NULL;
data = vec_elt_at_index (dcm->data, numa);
return NULL;
pool_name = format (0, "session_h_pool_numa%u%c", numa, 0);
- elt_size = rte_cryptodev_get_header_session_size ();
- data->session_h =
- rte_mempool_create ((i8 *) pool_name, DPDK_CRYPTO_NB_SESS_OBJS, elt_size,
- 512, 0, NULL, NULL, NULL, NULL, numa, 0);
- if (!data->session_h)
- error = clib_error_return (0, "failed to allocate %s", pool_name);
+ elt_size = rte_cryptodev_sym_get_header_session_size ();
+#if RTE_VERSION < RTE_VERSION_NUM(19, 2, 0, 0)
+ mp = rte_mempool_create ((char *) pool_name, DPDK_CRYPTO_NB_SESS_OBJS,
+ elt_size, 512, 0, NULL, NULL, NULL, NULL, numa, 0);
+#else
+ /* XXX Experimental tag in DPDK 19.02 */
+ mp = rte_cryptodev_sym_session_pool_create ((char *) pool_name,
+ DPDK_CRYPTO_NB_SESS_OBJS,
+ elt_size, 512, 0, numa);
+#endif
vec_free (pool_name);
- return error;
-#endif
+ if (!mp)
+ return clib_error_return (0, "failed to create crypto session mempool");
+
+ data->session_h = mp;
+
+ return NULL;
}
static clib_error_t *
-crypto_create_session_drv_pool (crypto_dev_t * dev)
+crypto_create_session_drv_pool (vlib_main_t * vm, crypto_dev_t * dev)
{
-#if DPDK_NO_AEAD
- return NULL;
-#else
dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
crypto_data_t *data;
u8 *pool_name;
+ struct rte_mempool *mp;
u32 elt_size;
- clib_error_t *error = NULL;
u8 numa = dev->numa;
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);
-
- data->session_drv[dev->drv_id] =
- rte_mempool_create ((i8 *) pool_name, DPDK_CRYPTO_NB_SESS_OBJS, elt_size,
- 512, 0, NULL, NULL, NULL, NULL, numa, 0);
- if (!data->session_drv[dev->drv_id])
- error = clib_error_return (0, "failed to allocate %s", pool_name);
+ elt_size = rte_cryptodev_sym_get_private_session_size (dev->id);
+ mp =
+ rte_mempool_create ((char *) pool_name, DPDK_CRYPTO_NB_SESS_OBJS,
+ elt_size, 512, 0, NULL, NULL, NULL, NULL, numa, 0);
vec_free (pool_name);
- return error;
-#endif
+ if (!mp)
+ return clib_error_return (0, "failed to create session drv mempool");
+
+ data->session_drv[dev->drv_id] = mp;
+ clib_spinlock_init (&data->lockp);
+
+ return NULL;
}
static clib_error_t *
-crypto_create_pools (void)
+crypto_create_pools (vlib_main_t * vm)
{
dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
clib_error_t *error = NULL;
/* *INDENT-OFF* */
vec_foreach (dev, dcm->dev)
{
- vec_validate (dcm->data, dev->numa);
+ vec_validate_aligned (dcm->data, dev->numa, CLIB_CACHE_LINE_BYTES);
- error = crypto_create_crypto_op_pool (dev->numa);
+ error = crypto_create_crypto_op_pool (vm, dev->numa);
if (error)
return error;
- error = crypto_create_session_h_pool (dev->numa);
+ error = crypto_create_session_h_pool (vm, dev->numa);
if (error)
return error;
- error = crypto_create_session_drv_pool (dev);
+ error = crypto_create_session_drv_pool (vm, dev);
if (error)
return error;
}
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);
vec_free (dcm->auth_algs);
}
-static uword
-dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
- vlib_frame_t * f)
+static clib_error_t *
+dpdk_ipsec_enable_disable (int is_enable)
+{
+ vlib_main_t *vm = vlib_get_main ();
+ vlib_thread_main_t *tm = vlib_get_thread_main ();
+ vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "dpdk-crypto-input");
+ u32 skip_master = vlib_num_workers () > 0;
+ u32 n_mains = tm->n_vlib_mains;
+ u32 i;
+
+ ASSERT (node);
+ for (i = skip_master; i < n_mains; i++)
+ vlib_node_set_state (vlib_mains[i], node->index, is_enable != 0 ?
+ VLIB_NODE_STATE_POLLING : VLIB_NODE_STATE_DISABLED);
+
+ return 0;
+}
+
+static clib_error_t *
+dpdk_ipsec_main_init (vlib_main_t * vm)
{
ipsec_main_t *im = &ipsec_main;
dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
vlib_thread_main_t *tm = vlib_get_thread_main ();
crypto_worker_main_t *cwm;
clib_error_t *error = NULL;
- u32 i, skip_master, n_mains;
+ u32 skip_master, n_mains;
n_mains = tm->n_vlib_mains;
skip_master = vlib_num_workers () > 0;
if (!(dcm->enabled))
{
- clib_warning ("not enough DPDK crypto resources, default to OpenSSL");
+ vlib_log_warn (dpdk_main.log_default,
+ "not enough DPDK crypto resources");
crypto_disable ();
return 0;
}
- vec_validate_init_empty (dcm->workers_main, n_mains - 1,
- (crypto_worker_main_t) EMPTY_STRUCT);
+ 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);
/* *INDENT-OFF* */
vec_foreach (cwm, dcm->workers_main)
{
- memset (cwm->cipher_resource_idx, ~0,
+ vec_validate_init_empty_aligned (cwm->ops, VLIB_FRAME_SIZE - 1, 0,
+ CLIB_CACHE_LINE_BYTES);
+ 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* */
crypto_auto_placement ();
- error = crypto_create_pools ();
+ error = crypto_create_pools (vm);
if (error)
{
clib_error_report (error);
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;
-
- 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);
+ u32 idx = ipsec_register_esp_backend (
+ vm, im, "dpdk backend", "dpdk-esp4-encrypt", "dpdk-esp4-encrypt-tun",
+ "dpdk-esp4-decrypt", "dpdk-esp4-decrypt", "dpdk-esp6-encrypt",
+ "dpdk-esp6-encrypt-tun", "dpdk-esp6-decrypt", "dpdk-esp6-decrypt",
+ "error-drop", dpdk_ipsec_check_support, add_del_sa_session,
+ dpdk_ipsec_enable_disable);
+ int rv;
+ if (im->esp_current_backend == ~0)
+ {
+ rv = ipsec_select_esp_backend (im, idx);
+ ASSERT (rv == 0);
+ }
return 0;
}
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (dpdk_ipsec_process_node,static) = {
- .function = dpdk_ipsec_process,
- .type = VLIB_NODE_TYPE_PROCESS,
- .name = "dpdk-ipsec-process",
- .process_log2_n_stack_bytes = 17,
-};
-/* *INDENT-ON* */
+VLIB_MAIN_LOOP_ENTER_FUNCTION (dpdk_ipsec_main_init);
/*
* fd.io coding-style-patch-verification: ON
Code Review / vpp.git / blobdiff