From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
---
/** Email created from pull request 64 (lumag:crypto-packet)
** https://github.com/Linaro/odp/pull/64
** Patch: https://github.com/Linaro/odp/pull/64.patch
** Base sha: 7a5813042d58598e1c66243d8cfed548302edfc4
** Merge commit sha: 503ae4dbca9c82be6657b05369d23a484ef0cba8
**/
example/ipsec/odp_ipsec.c | 116 +++++++++++++++++++++++-----------------
example/ipsec/odp_ipsec_cache.c | 17 ++++--
example/ipsec/odp_ipsec_cache.h | 7 ++-
example/ipsec/odp_ipsec_misc.h | 2 +-
4 files changed, 89 insertions(+), 53 deletions(-)
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index c618cc46..91d19abf 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -144,7 +144,7 @@ typedef struct {
uint32_t dst_ip; /**< SA dest IP address */
/* Output only */
- odp_crypto_op_param_t params; /**< Parameters for crypto call */
+ odp_crypto_packet_op_param_t params; /**< Parameters for crypto call */
uint32_t *ah_seq; /**< AH sequence number location */
uint32_t *esp_seq; /**< ESP sequence number location */
uint16_t *tun_hdr_id; /**< Tunnel header ID > */
@@ -393,7 +393,9 @@ void ipsec_init_post(crypto_api_mode_e api_mode)
auth_sa,
tun,
api_mode,
- entry->input)) {
+ entry->input,
+ completionq,
+ out_pool)) {
EXAMPLE_ERR("Error: IPSec cache entry failed.\n"
);
exit(EXIT_FAILURE);
@@ -627,19 +629,18 @@ pkt_disposition_e do_route_fwd_db(odp_packet_t pkt,
pkt_ctx_t *ctx)
* @return PKT_CONTINUE if done else PKT_POSTED
*/
static
-pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt,
+pkt_disposition_e do_ipsec_in_classify(odp_packet_t *pkt,
pkt_ctx_t *ctx,
- odp_bool_t *skip,
- odp_crypto_op_result_t *result)
+ odp_bool_t *skip)
{
- uint8_t *buf = odp_packet_data(pkt);
- odph_ipv4hdr_t *ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL);
+ uint8_t *buf = odp_packet_data(*pkt);
+ odph_ipv4hdr_t *ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(*pkt, NULL);
int hdr_len;
odph_ahhdr_t *ah = NULL;
odph_esphdr_t *esp = NULL;
ipsec_cache_entry_t *entry;
- odp_crypto_op_param_t params;
- odp_bool_t posted = 0;
+ odp_crypto_packet_op_param_t params;
+ odp_packet_t out_pkt;
/* Default to skip IPsec */
*skip = TRUE;
@@ -661,8 +662,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt,
/* Initialize parameters block */
memset(¶ms, 0, sizeof(params));
params.session = entry->state.session;
- params.pkt = pkt;
- params.out_pkt = entry->in_place ? pkt : ODP_PACKET_INVALID;
+ out_pkt = entry->in_place ? *pkt : ODP_PACKET_INVALID;
/*Save everything to context */
ctx->ipsec.ip_tos = ip->tos;
@@ -697,12 +697,16 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt,
/* Issue crypto request */
*skip = FALSE;
ctx->state = PKT_STATE_IPSEC_IN_FINISH;
- if (odp_crypto_operation(¶ms,
- &posted,
- result)) {
- abort();
+ if (entry->async) {
+ if (odp_crypto_packet_op_enq(pkt, &out_pkt, ¶ms, 1))
+ abort();
+ return PKT_POSTED;
+ } else {
+ if (odp_crypto_packet_op(pkt, &out_pkt, ¶ms, 1))
+ abort();
+ *pkt = out_pkt;
+ return PKT_CONTINUE;
}
- return (posted) ? PKT_POSTED : PKT_CONTINUE;
}
/**
@@ -715,18 +719,20 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt,
*/
static
pkt_disposition_e do_ipsec_in_finish(odp_packet_t pkt,
- pkt_ctx_t *ctx,
- odp_crypto_op_result_t *result)
+ pkt_ctx_t *ctx)
{
odph_ipv4hdr_t *ip;
+ odp_crypto_packet_op_result_t result;
int hdr_len = ctx->ipsec.hdr_len;
int trl_len = 0;
+ odp_crypto_packet_result(&result, pkt);
+
/* Check crypto result */
- if (!result->ok) {
- if (!is_crypto_op_status_ok(&result->cipher_status))
+ if (!result.ok) {
+ if (!is_crypto_op_status_ok(&result.cipher_status))
return PKT_DROP;
- if (!is_crypto_op_status_ok(&result->auth_status))
+ if (!is_crypto_op_status_ok(&result.auth_status))
return PKT_DROP;
}
ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL);
@@ -816,7 +822,7 @@ pkt_disposition_e do_ipsec_out_classify(odp_packet_t pkt,
uint16_t ip_data_len = ipv4_data_len(ip);
uint8_t *ip_data = ipv4_data_p(ip);
ipsec_cache_entry_t *entry;
- odp_crypto_op_param_t params;
+ odp_crypto_packet_op_param_t params;
int hdr_len = 0;
int trl_len = 0;
odph_ahhdr_t *ah = NULL;
@@ -840,8 +846,6 @@ pkt_disposition_e do_ipsec_out_classify(odp_packet_t pkt,
/* Initialize parameters block */
memset(¶ms, 0, sizeof(params));
params.session = entry->state.session;
- params.pkt = pkt;
- params.out_pkt = entry->in_place ? pkt : ODP_PACKET_INVALID;
if (entry->mode == IPSEC_SA_MODE_TUNNEL) {
hdr_len += sizeof(odph_ipv4hdr_t);
@@ -949,12 +953,19 @@ pkt_disposition_e do_ipsec_out_classify(odp_packet_t pkt,
* @return PKT_CONTINUE if done else PKT_POSTED
*/
static
-pkt_disposition_e do_ipsec_out_seq(odp_packet_t pkt,
- pkt_ctx_t *ctx,
- odp_crypto_op_result_t *result)
+pkt_disposition_e do_ipsec_out_seq(odp_packet_t *pkt,
+ pkt_ctx_t *ctx)
{
- uint8_t *buf = odp_packet_data(pkt);
- odp_bool_t posted = 0;
+ uint8_t *buf = odp_packet_data(*pkt);
+ odph_ipv4hdr_t *ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(*pkt, NULL);
+ odp_packet_t out_pkt;
+ ipsec_cache_entry_t *entry;
+
+ entry = find_ipsec_cache_entry_out(odp_be_to_cpu_32(ip->src_addr),
+ odp_be_to_cpu_32(ip->dst_addr),
+ ip->proto);
+ if (!entry)
+ return PKT_DROP;
/* We were dispatched from atomic queue, assign sequence numbers */
if (ctx->ipsec.ah_offset) {
@@ -985,13 +996,21 @@ pkt_disposition_e do_ipsec_out_seq(odp_packet_t pkt,
}
}
+ out_pkt = entry->in_place ? *pkt : ODP_PACKET_INVALID;
+
/* Issue crypto request */
- if (odp_crypto_operation(&ctx->ipsec.params,
- &posted,
- result)) {
- abort();
+ if (entry->async) {
+ if (odp_crypto_packet_op_enq(pkt, &out_pkt,
+ &ctx->ipsec.params, 1))
+ abort();
+ return PKT_POSTED;
+ } else {
+ if (odp_crypto_packet_op(pkt, &out_pkt,
+ &ctx->ipsec.params, 1))
+ abort();
+ *pkt = out_pkt;
+ return PKT_CONTINUE;
}
- return (posted) ? PKT_POSTED : PKT_CONTINUE;
}
/**
@@ -1004,16 +1023,18 @@ pkt_disposition_e do_ipsec_out_seq(odp_packet_t pkt,
*/
static
pkt_disposition_e do_ipsec_out_finish(odp_packet_t pkt,
- pkt_ctx_t *ctx,
- odp_crypto_op_result_t *result)
+ pkt_ctx_t *ctx)
{
odph_ipv4hdr_t *ip;
+ odp_crypto_packet_op_result_t result;
+
+ odp_crypto_packet_result(&result, pkt);
/* Check crypto result */
- if (!result->ok) {
- if (!is_crypto_op_status_ok(&result->cipher_status))
+ if (!result.ok) {
+ if (!is_crypto_op_status_ok(&result.cipher_status))
return PKT_DROP;
- if (!is_crypto_op_status_ok(&result->auth_status))
+ if (!is_crypto_op_status_ok(&result.auth_status))
return PKT_DROP;
}
ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL);
@@ -1063,15 +1084,15 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
pkt_disposition_e rc;
pkt_ctx_t *ctx;
odp_queue_t dispatchq;
- odp_crypto_op_result_t result;
+ odp_event_subtype_t subtype;
/* Use schedule to get event from any input queue */
ev = schedule(&dispatchq);
/* Determine new work versus completion or sequence number */
- if (ODP_EVENT_PACKET == odp_event_type(ev)) {
+ if (ODP_EVENT_PACKET == odp_event_types(ev, &subtype)) {
pkt = odp_packet_from_event(ev);
- if (seqnumq == dispatchq) {
+ if (seqnumq == dispatchq || completionq == dispatchq) {
ctx = get_pkt_ctx_from_pkt(pkt);
} else {
ctx = alloc_pkt_ctx(pkt);
@@ -1110,15 +1131,14 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
case PKT_STATE_IPSEC_IN_CLASSIFY:
ctx->state = PKT_STATE_ROUTE_LOOKUP;
- rc = do_ipsec_in_classify(pkt,
+ rc = do_ipsec_in_classify(&pkt,
ctx,
- &skip,
- &result);
+ &skip);
break;
case PKT_STATE_IPSEC_IN_FINISH:
- rc = do_ipsec_in_finish(pkt, ctx, &result);
+ rc = do_ipsec_in_finish(pkt, ctx);
ctx->state = PKT_STATE_ROUTE_LOOKUP;
break;
@@ -1145,12 +1165,12 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
case PKT_STATE_IPSEC_OUT_SEQ:
ctx->state = PKT_STATE_IPSEC_OUT_FINISH;
- rc = do_ipsec_out_seq(pkt, ctx, &result);
+ rc = do_ipsec_out_seq(&pkt, ctx);
break;
case PKT_STATE_IPSEC_OUT_FINISH:
- rc = do_ipsec_out_finish(pkt, ctx, &result);
+ rc = do_ipsec_out_finish(pkt, ctx);
ctx->state = PKT_STATE_TRANSMIT;
break;
diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c
index e4150336..18a98a29 100644
--- a/example/ipsec/odp_ipsec_cache.c
+++ b/example/ipsec/odp_ipsec_cache.c
@@ -40,7 +40,9 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa,
sa_db_entry_t *auth_sa,
tun_db_entry_t *tun,
crypto_api_mode_e api_mode,
- odp_bool_t in)
+ odp_bool_t in,
+ odp_queue_t completionq,
+ odp_pool_t out_pool)
{
odp_crypto_session_param_t params;
ipsec_cache_entry_t *entry;
@@ -63,8 +65,17 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa,
/* Setup parameters and call crypto library to create session */
params.op = (in) ? ODP_CRYPTO_OP_DECODE : ODP_CRYPTO_OP_ENCODE;
params.auth_cipher_text = TRUE;
- params.compl_queue = ODP_QUEUE_INVALID;
- params.output_pool = ODP_POOL_INVALID;
+ if (CRYPTO_API_SYNC == api_mode) {
+ params.packet_op_mode = ODP_CRYPTO_SYNC;
+ params.compl_queue = ODP_QUEUE_INVALID;
+ params.output_pool = ODP_POOL_INVALID;
+ entry->async = FALSE;
+ } else {
+ params.packet_op_mode = ODP_CRYPTO_ASYNC;
+ params.compl_queue = completionq;
+ params.output_pool = out_pool;
+ entry->async = TRUE;
+ }
if (CRYPTO_API_ASYNC_NEW_BUFFER == api_mode)
entry->in_place = FALSE;
diff --git a/example/ipsec/odp_ipsec_cache.h b/example/ipsec/odp_ipsec_cache.h
index ce37ccce..45010249 100644
--- a/example/ipsec/odp_ipsec_cache.h
+++ b/example/ipsec/odp_ipsec_cache.h
@@ -32,6 +32,7 @@ typedef enum {
typedef struct ipsec_cache_entry_s {
struct ipsec_cache_entry_s *next; /**< Next entry on list */
odp_bool_t in_place; /**< Crypto API mode */
+ odp_bool_t async; /**< ASYNC or SYNC mode */
uint32_t src_ip; /**< Source v4 address */
uint32_t dst_ip; /**< Destination v4 address */
sa_mode_t mode; /**< SA mode - transport/tun
*/
@@ -85,6 +86,8 @@ void init_ipsec_cache(void);
* @param tun Tunnel DB entry pointer
* @param api_mode Crypto API mode for testing
* @param in Direction (input versus output)
+ * @param completionq Completion queue
+ * @param out_pool Output buffer pool
*
* @return 0 if successful else -1
*/
@@ -92,7 +95,9 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa,
sa_db_entry_t *auth_sa,
tun_db_entry_t *tun,
crypto_api_mode_e api_mode,
- odp_bool_t in);
+ odp_bool_t in,
+ odp_queue_t completionq,
+ odp_pool_t out_pool);
/**
* Find a matching IPsec cache entry for input packet
diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h
index 20ebe9fc..346cc1c2 100644
--- a/example/ipsec/odp_ipsec_misc.h
+++ b/example/ipsec/odp_ipsec_misc.h
@@ -321,7 +321,7 @@ void ipv4_adjust_len(odph_ipv4hdr_t *ip, int adj)
/**
* Verify crypto operation completed successfully
*
- * @param status Pointer to crypto op status structure
+ * @param status Pointer to cryto completion structure
*
* @return TRUE if all OK else FALSE
*/
