X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eventdev%2Frte_event_crypto_adapter.c;h=22d9108168f134645c09fcc5ff2115a35a876e5c;hb=3b635472a99844ea47e0dbe9231294ccd6c07f85;hp=ba63a87b772694f25c4ab0ba1f527bee5c735618;hpb=454878ff834449ecd55fdb00b8da249c89e7ca75;p=dpdk.git diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/librte_eventdev/rte_event_crypto_adapter.c index ba63a87b77..22d9108168 100644 --- a/lib/librte_eventdev/rte_event_crypto_adapter.c +++ b/lib/librte_eventdev/rte_event_crypto_adapter.c @@ -159,6 +159,9 @@ eca_default_config_cb(uint8_t id, uint8_t dev_id, struct rte_event_port_conf *port_conf = arg; struct rte_event_crypto_adapter *adapter = eca_id_to_adapter(id); + if (adapter == NULL) + return -EINVAL; + dev = &rte_eventdevs[adapter->eventdev_id]; dev_conf = dev->data->dev_conf; @@ -192,7 +195,7 @@ eca_default_config_cb(uint8_t id, uint8_t dev_id, return ret; } -int __rte_experimental +int rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id, rte_event_crypto_adapter_conf_cb conf_cb, enum rte_event_crypto_adapter_mode mode, @@ -268,7 +271,7 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id, } -int __rte_experimental +int rte_event_crypto_adapter_create(uint8_t id, uint8_t dev_id, struct rte_event_port_conf *port_config, enum rte_event_crypto_adapter_mode mode) @@ -294,7 +297,7 @@ rte_event_crypto_adapter_create(uint8_t id, uint8_t dev_id, return ret; } -int __rte_experimental +int rte_event_crypto_adapter_free(uint8_t id) { struct rte_event_crypto_adapter *adapter; @@ -342,7 +345,7 @@ eca_enq_to_cryptodev(struct rte_event_crypto_adapter *adapter, if (crypto_op == NULL) continue; if (crypto_op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { - m_data = rte_cryptodev_sym_session_get_private_data( + m_data = rte_cryptodev_sym_session_get_user_data( crypto_op->sym->session); if (m_data == NULL) { rte_pktmbuf_free(crypto_op->sym->m_src); @@ -353,7 +356,7 @@ eca_enq_to_cryptodev(struct rte_event_crypto_adapter *adapter, cdev_id = m_data->request_info.cdev_id; qp_id = m_data->request_info.queue_pair_id; qp_info = &adapter->cdevs[cdev_id].qpairs[qp_id]; - if (qp_info == NULL) { + if (!qp_info->qp_enabled) { rte_pktmbuf_free(crypto_op->sym->m_src); rte_crypto_op_free(crypto_op); continue; @@ -369,7 +372,7 @@ eca_enq_to_cryptodev(struct rte_event_crypto_adapter *adapter, cdev_id = m_data->request_info.cdev_id; qp_id = m_data->request_info.queue_pair_id; qp_info = &adapter->cdevs[cdev_id].qpairs[qp_id]; - if (qp_info == NULL) { + if (!qp_info->qp_enabled) { rte_pktmbuf_free(crypto_op->sym->m_src); rte_crypto_op_free(crypto_op); continue; @@ -427,10 +430,9 @@ eca_crypto_enq_flush(struct rte_event_crypto_adapter *adapter) ret = 0; for (cdev_id = 0; cdev_id < num_cdev; cdev_id++) { curr_dev = &adapter->cdevs[cdev_id]; - if (curr_dev == NULL) - continue; dev = curr_dev->dev; - + if (dev == NULL) + continue; for (qp = 0; qp < dev->data->nb_queue_pairs; qp++) { curr_queue = &curr_dev->qpairs[qp]; @@ -512,7 +514,7 @@ eca_ops_enqueue_burst(struct rte_event_crypto_adapter *adapter, for (i = 0; i < num; i++) { struct rte_event *ev = &events[nb_ev++]; if (ops[i]->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { - m_data = rte_cryptodev_sym_session_get_private_data( + m_data = rte_cryptodev_sym_session_get_user_data( ops[i]->sym->session); } else if (ops[i]->sess_type == RTE_CRYPTO_OP_SESSIONLESS && ops[i]->private_data_offset) { @@ -579,9 +581,9 @@ eca_crypto_adapter_deq_run(struct rte_event_crypto_adapter *adapter, for (cdev_id = adapter->next_cdev_id; cdev_id < num_cdev; cdev_id++) { curr_dev = &adapter->cdevs[cdev_id]; - if (curr_dev == NULL) - continue; dev = curr_dev->dev; + if (dev == NULL) + continue; dev_qps = dev->data->nb_queue_pairs; for (qp = curr_dev->next_queue_pair_id; @@ -760,7 +762,7 @@ eca_add_queue_pair(struct rte_event_crypto_adapter *adapter, return 0; } -int __rte_experimental +int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, @@ -875,7 +877,7 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, return 0; } -int __rte_experimental +int rte_event_crypto_adapter_queue_pair_del(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id) { @@ -1002,7 +1004,7 @@ eca_adapter_ctrl(uint8_t id, int start) return 0; } -int __rte_experimental +int rte_event_crypto_adapter_start(uint8_t id) { struct rte_event_crypto_adapter *adapter; @@ -1015,13 +1017,13 @@ rte_event_crypto_adapter_start(uint8_t id) return eca_adapter_ctrl(id, 1); } -int __rte_experimental +int rte_event_crypto_adapter_stop(uint8_t id) { return eca_adapter_ctrl(id, 0); } -int __rte_experimental +int rte_event_crypto_adapter_stats_get(uint8_t id, struct rte_event_crypto_adapter_stats *stats) { @@ -1066,7 +1068,7 @@ rte_event_crypto_adapter_stats_get(uint8_t id, return 0; } -int __rte_experimental +int rte_event_crypto_adapter_stats_reset(uint8_t id) { struct rte_event_crypto_adapter *adapter; @@ -1094,7 +1096,7 @@ rte_event_crypto_adapter_stats_reset(uint8_t id) return 0; } -int __rte_experimental +int rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t *service_id) { struct rte_event_crypto_adapter *adapter; @@ -1111,7 +1113,7 @@ rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t *service_id) return adapter->service_inited ? 0 : -ESRCH; } -int __rte_experimental +int rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id) { struct rte_event_crypto_adapter *adapter;