X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fcrypto%2Fkasumi%2Frte_kasumi_pmd.c;h=c3f0dfc2f2dddaab15176930c8e81ee82339a1b0;hb=9c99878aa1b16de26fcce82c112b401766dd910e;hp=205dc1de7dfbb0829f486f70df5e6132d67f4332;hpb=a106fcce2cfed0fdee7922594e3199d28dfcce59;p=dpdk.git diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c index 205dc1de7d..c3f0dfc2f2 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2016-2017 Intel Corporation + * Copyright(c) 2016-2018 Intel Corporation */ #include @@ -10,7 +10,7 @@ #include #include -#include "rte_kasumi_pmd_private.h" +#include "kasumi_pmd_private.h" #define KASUMI_KEY_LENGTH 16 #define KASUMI_IV_LENGTH 8 @@ -54,7 +54,7 @@ kasumi_get_mode(const struct rte_crypto_sym_xform *xform) /** Parse crypto xform chain and set private session parameters. */ int -kasumi_set_session_parameters(struct kasumi_session *sess, +kasumi_set_session_parameters(MB_MGR *mgr, struct kasumi_session *sess, const struct rte_crypto_sym_xform *xform) { const struct rte_crypto_sym_xform *auth_xform = NULL; @@ -79,40 +79,44 @@ kasumi_set_session_parameters(struct kasumi_session *sess, break; case KASUMI_OP_NOT_SUPPORTED: default: - KASUMI_LOG_ERR("Unsupported operation chain order parameter"); + KASUMI_LOG(ERR, "Unsupported operation chain order parameter"); return -ENOTSUP; } if (cipher_xform) { /* Only KASUMI F8 supported */ - if (cipher_xform->cipher.algo != RTE_CRYPTO_CIPHER_KASUMI_F8) + if (cipher_xform->cipher.algo != RTE_CRYPTO_CIPHER_KASUMI_F8) { + KASUMI_LOG(ERR, "Unsupported cipher algorithm "); return -ENOTSUP; + } sess->cipher_iv_offset = cipher_xform->cipher.iv.offset; if (cipher_xform->cipher.iv.length != KASUMI_IV_LENGTH) { - KASUMI_LOG_ERR("Wrong IV length"); + KASUMI_LOG(ERR, "Wrong IV length"); return -EINVAL; } /* Initialize key */ - sso_kasumi_init_f8_key_sched(cipher_xform->cipher.key.data, + IMB_KASUMI_INIT_F8_KEY_SCHED(mgr, cipher_xform->cipher.key.data, &sess->pKeySched_cipher); } if (auth_xform) { /* Only KASUMI F9 supported */ - if (auth_xform->auth.algo != RTE_CRYPTO_AUTH_KASUMI_F9) + if (auth_xform->auth.algo != RTE_CRYPTO_AUTH_KASUMI_F9) { + KASUMI_LOG(ERR, "Unsupported authentication"); return -ENOTSUP; + } if (auth_xform->auth.digest_length != KASUMI_DIGEST_LENGTH) { - KASUMI_LOG_ERR("Wrong digest length"); + KASUMI_LOG(ERR, "Wrong digest length"); return -EINVAL; } sess->auth_op = auth_xform->auth.op; /* Initialize key */ - sso_kasumi_init_f9_key_sched(auth_xform->auth.key.data, + IMB_KASUMI_INIT_F9_KEY_SCHED(mgr, auth_xform->auth.key.data, &sess->pKeySched_hash); } @@ -131,7 +135,7 @@ kasumi_get_session(struct kasumi_qp *qp, struct rte_crypto_op *op) if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { if (likely(op->sym->session != NULL)) sess = (struct kasumi_session *) - get_session_private_data( + get_sym_session_private_data( op->sym->session, cryptodev_driver_id); } else { @@ -141,20 +145,21 @@ kasumi_get_session(struct kasumi_qp *qp, struct rte_crypto_op *op) if (rte_mempool_get(qp->sess_mp, (void **)&_sess)) return NULL; - if (rte_mempool_get(qp->sess_mp, (void **)&_sess_private_data)) + if (rte_mempool_get(qp->sess_mp_priv, + (void **)&_sess_private_data)) return NULL; sess = (struct kasumi_session *)_sess_private_data; - if (unlikely(kasumi_set_session_parameters(sess, + if (unlikely(kasumi_set_session_parameters(qp->mgr, sess, op->sym->xform) != 0)) { rte_mempool_put(qp->sess_mp, _sess); - rte_mempool_put(qp->sess_mp, _sess_private_data); + rte_mempool_put(qp->sess_mp_priv, _sess_private_data); sess = NULL; } op->sym->session = (struct rte_cryptodev_sym_session *)_sess; - set_session_private_data(op->sym->session, cryptodev_driver_id, - _sess_private_data); + set_sym_session_private_data(op->sym->session, + cryptodev_driver_id, _sess_private_data); } if (unlikely(sess == NULL)) @@ -165,13 +170,13 @@ kasumi_get_session(struct kasumi_qp *qp, struct rte_crypto_op *op) /** Encrypt/decrypt mbufs with same cipher key. */ static uint8_t -process_kasumi_cipher_op(struct rte_crypto_op **ops, - struct kasumi_session *session, - uint8_t num_ops) +process_kasumi_cipher_op(struct kasumi_qp *qp, struct rte_crypto_op **ops, + struct kasumi_session *session, uint8_t num_ops) { unsigned i; uint8_t processed_ops = 0; - uint8_t *src[num_ops], *dst[num_ops]; + const void *src[num_ops]; + void *dst[num_ops]; uint8_t *iv_ptr; uint64_t iv[num_ops]; uint32_t num_bytes[num_ops]; @@ -193,7 +198,7 @@ process_kasumi_cipher_op(struct rte_crypto_op **ops, } if (processed_ops != 0) - sso_kasumi_f8_n_buffer(&session->pKeySched_cipher, iv, + IMB_KASUMI_F8_N_BUFFER(qp->mgr, &session->pKeySched_cipher, iv, src, dst, num_bytes, processed_ops); return processed_ops; @@ -201,7 +206,7 @@ process_kasumi_cipher_op(struct rte_crypto_op **ops, /** Encrypt/decrypt mbuf (bit level function). */ static uint8_t -process_kasumi_cipher_op_bit(struct rte_crypto_op *op, +process_kasumi_cipher_op_bit(struct kasumi_qp *qp, struct rte_crypto_op *op, struct kasumi_session *session) { uint8_t *src, *dst; @@ -211,18 +216,16 @@ process_kasumi_cipher_op_bit(struct rte_crypto_op *op, offset_in_bits = op->sym->cipher.data.offset; src = rte_pktmbuf_mtod(op->sym->m_src, uint8_t *); - if (op->sym->m_dst == NULL) { - op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS; - KASUMI_LOG_ERR("bit-level in-place not supported\n"); - return 0; - } - dst = rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *); + if (op->sym->m_dst == NULL) + dst = src; + else + dst = rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *); iv_ptr = rte_crypto_op_ctod_offset(op, uint8_t *, session->cipher_iv_offset); iv = *((uint64_t *)(iv_ptr)); length_in_bits = op->sym->cipher.data.length; - sso_kasumi_f8_1_buffer_bit(&session->pKeySched_cipher, iv, + IMB_KASUMI_F8_1_BUFFER_BIT(qp->mgr, &session->pKeySched_cipher, iv, src, dst, length_in_bits, offset_in_bits); return 1; @@ -244,7 +247,7 @@ process_kasumi_hash_op(struct kasumi_qp *qp, struct rte_crypto_op **ops, /* Data must be byte aligned */ if ((ops[i]->sym->auth.data.offset % BYTE_LEN) != 0) { ops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS; - KASUMI_LOG_ERR("offset"); + KASUMI_LOG(ERR, "Invalid Offset"); break; } @@ -257,7 +260,8 @@ process_kasumi_hash_op(struct kasumi_qp *qp, struct rte_crypto_op **ops, if (session->auth_op == RTE_CRYPTO_AUTH_OP_VERIFY) { dst = qp->temp_digest; - sso_kasumi_f9_1_buffer(&session->pKeySched_hash, src, + IMB_KASUMI_F9_1_BUFFER(qp->mgr, + &session->pKeySched_hash, src, num_bytes, dst); /* Verify digest. */ @@ -267,7 +271,8 @@ process_kasumi_hash_op(struct kasumi_qp *qp, struct rte_crypto_op **ops, } else { dst = ops[i]->sym->auth.digest.data; - sso_kasumi_f9_1_buffer(&session->pKeySched_hash, src, + IMB_KASUMI_F9_1_BUFFER(qp->mgr, + &session->pKeySched_hash, src, num_bytes, dst); } processed_ops++; @@ -287,7 +292,7 @@ process_ops(struct rte_crypto_op **ops, struct kasumi_session *session, switch (session->op) { case KASUMI_OP_ONLY_CIPHER: - processed_ops = process_kasumi_cipher_op(ops, + processed_ops = process_kasumi_cipher_op(qp, ops, session, num_ops); break; case KASUMI_OP_ONLY_AUTH: @@ -295,14 +300,14 @@ process_ops(struct rte_crypto_op **ops, struct kasumi_session *session, num_ops); break; case KASUMI_OP_CIPHER_AUTH: - processed_ops = process_kasumi_cipher_op(ops, session, + processed_ops = process_kasumi_cipher_op(qp, ops, session, num_ops); process_kasumi_hash_op(qp, ops, session, processed_ops); break; case KASUMI_OP_AUTH_CIPHER: processed_ops = process_kasumi_hash_op(qp, ops, session, num_ops); - process_kasumi_cipher_op(ops, session, processed_ops); + process_kasumi_cipher_op(qp, ops, session, processed_ops); break; default: /* Operation not supported. */ @@ -320,8 +325,9 @@ process_ops(struct rte_crypto_op **ops, struct kasumi_session *session, if (ops[i]->sess_type == RTE_CRYPTO_OP_SESSIONLESS) { memset(session, 0, sizeof(struct kasumi_session)); memset(ops[i]->sym->session, 0, - rte_cryptodev_sym_get_header_session_size()); - rte_mempool_put(qp->sess_mp, session); + rte_cryptodev_sym_get_existing_header_session_size( + ops[i]->sym->session)); + rte_mempool_put(qp->sess_mp_priv, session); rte_mempool_put(qp->sess_mp, ops[i]->sym->session); ops[i]->sym->session = NULL; } @@ -344,21 +350,21 @@ process_op_bit(struct rte_crypto_op *op, struct kasumi_session *session, switch (session->op) { case KASUMI_OP_ONLY_CIPHER: - processed_op = process_kasumi_cipher_op_bit(op, + processed_op = process_kasumi_cipher_op_bit(qp, op, session); break; case KASUMI_OP_ONLY_AUTH: processed_op = process_kasumi_hash_op(qp, &op, session, 1); break; case KASUMI_OP_CIPHER_AUTH: - processed_op = process_kasumi_cipher_op_bit(op, session); + processed_op = process_kasumi_cipher_op_bit(qp, op, session); if (processed_op == 1) process_kasumi_hash_op(qp, &op, session, 1); break; case KASUMI_OP_AUTH_CIPHER: processed_op = process_kasumi_hash_op(qp, &op, session, 1); if (processed_op == 1) - process_kasumi_cipher_op_bit(op, session); + process_kasumi_cipher_op_bit(qp, op, session); break; default: /* Operation not supported. */ @@ -409,9 +415,9 @@ kasumi_pmd_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops, (curr_c_op->sym->m_dst != NULL && !rte_pktmbuf_is_contiguous( curr_c_op->sym->m_dst))) { - KASUMI_LOG_ERR("PMD supports only contiguous mbufs, " + KASUMI_LOG(ERR, "PMD supports only contiguous mbufs, " "op (%p) provides noncontiguous mbuf as " - "source/destination buffer.\n", curr_c_op); + "source/destination buffer.", curr_c_op); curr_c_op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS; break; } @@ -527,20 +533,14 @@ cryptodev_kasumi_create(const char *name, { struct rte_cryptodev *dev; struct kasumi_private *internals; - uint64_t cpu_flags = 0; + MB_MGR *mgr; dev = rte_cryptodev_pmd_create(name, &vdev->device, init_params); if (dev == NULL) { - KASUMI_LOG_ERR("failed to create cryptodev vdev"); + KASUMI_LOG(ERR, "failed to create cryptodev vdev"); goto init_error; } - /* Check CPU for supported vector instruction set */ - if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX)) - cpu_flags |= RTE_CRYPTODEV_FF_CPU_AVX; - else - cpu_flags |= RTE_CRYPTODEV_FF_CPU_SSE; - dev->driver_id = cryptodev_driver_id; dev->dev_ops = rte_kasumi_pmd_ops; @@ -550,16 +550,29 @@ cryptodev_kasumi_create(const char *name, dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | - cpu_flags; + RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA | + RTE_CRYPTODEV_FF_SYM_SESSIONLESS; + + mgr = alloc_mb_mgr(0); + if (mgr == NULL) + return -ENOMEM; + + if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX)) { + dev->feature_flags |= RTE_CRYPTODEV_FF_CPU_AVX; + init_mb_mgr_avx(mgr); + } else { + dev->feature_flags |= RTE_CRYPTODEV_FF_CPU_SSE; + init_mb_mgr_sse(mgr); + } internals = dev->data->dev_private; internals->max_nb_queue_pairs = init_params->max_nb_queue_pairs; - internals->max_nb_sessions = init_params->max_nb_sessions; + internals->mgr = mgr; return 0; init_error: - KASUMI_LOG_ERR("driver %s: cryptodev_kasumi_create failed", + KASUMI_LOG(ERR, "driver %s: failed", init_params->name); cryptodev_kasumi_remove(vdev); @@ -573,8 +586,7 @@ cryptodev_kasumi_probe(struct rte_vdev_device *vdev) "", sizeof(struct kasumi_private), rte_socket_id(), - RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS, - RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_SESSIONS + RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS }; const char *name; const char *input_args; @@ -594,6 +606,7 @@ cryptodev_kasumi_remove(struct rte_vdev_device *vdev) { struct rte_cryptodev *cryptodev; const char *name; + struct kasumi_private *internals; name = rte_vdev_device_name(vdev); if (name == NULL) @@ -603,6 +616,10 @@ cryptodev_kasumi_remove(struct rte_vdev_device *vdev) if (cryptodev == NULL) return -ENODEV; + internals = cryptodev->data->dev_private; + + free_mb_mgr(internals->mgr); + return rte_cryptodev_pmd_destroy(cryptodev); } @@ -617,7 +634,8 @@ RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd_drv); RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_KASUMI_PMD, "max_nb_queue_pairs= " - "max_nb_sessions= " "socket_id="); RTE_PMD_REGISTER_CRYPTO_DRIVER(kasumi_crypto_drv, cryptodev_kasumi_pmd_drv.driver, cryptodev_driver_id); + +RTE_LOG_REGISTER(kasumi_logtype_driver, pmd.crypto.kasumi, NOTICE);