diff options
Diffstat (limited to 'platform/linux-generic/arch/aarch64/odp_crypto_armv8.c')
-rw-r--r-- | platform/linux-generic/arch/aarch64/odp_crypto_armv8.c | 98 |
1 files changed, 54 insertions, 44 deletions
diff --git a/platform/linux-generic/arch/aarch64/odp_crypto_armv8.c b/platform/linux-generic/arch/aarch64/odp_crypto_armv8.c index 4531ebc28..32341dd02 100644 --- a/platform/linux-generic/arch/aarch64/odp_crypto_armv8.c +++ b/platform/linux-generic/arch/aarch64/odp_crypto_armv8.c @@ -904,53 +904,71 @@ int odp_crypto_result(odp_crypto_packet_result_t *result, return 0; } -static -int crypto_int(odp_packet_t pkt_in, - odp_packet_t *pkt_out, - const odp_crypto_packet_op_param_t *param) +static int copy_data_and_metadata(odp_packet_t dst, odp_packet_t src) { - odp_crypto_generic_session_t *session; - odp_bool_t allocated = false; - odp_packet_t out_pkt = *pkt_out; - - session = (odp_crypto_generic_session_t *)(intptr_t)param->session; + int md_copy; + int rc; - /* Resolve output buffer */ - if (odp_unlikely(ODP_PACKET_INVALID == out_pkt) && - ODP_POOL_INVALID != session->p.output_pool) { - out_pkt = odp_packet_alloc(session->p.output_pool, - odp_packet_len(pkt_in)); - allocated = true; + md_copy = _odp_packet_copy_md_possible(odp_packet_pool(dst), + odp_packet_pool(src)); + if (odp_unlikely(md_copy < 0)) { + ODP_ERR("Unable to copy packet metadata\n"); + return -1; } - if (odp_unlikely(ODP_PACKET_INVALID == out_pkt)) { - ODP_DBG("Alloc failed.\n"); + rc = odp_packet_copy_from_pkt(dst, 0, src, 0, odp_packet_len(src)); + if (odp_unlikely(rc < 0)) { + ODP_ERR("Unable to copy packet data\n"); return -1; } - if (odp_unlikely(pkt_in != out_pkt)) { - int ret; - int md_copy; + _odp_packet_copy_md(packet_hdr(dst), packet_hdr(src), md_copy); + return 0; +} - md_copy = _odp_packet_copy_md_possible(session->p.output_pool, - odp_packet_pool(pkt_in)); - if (odp_unlikely(md_copy < 0)) { - ODP_ERR("Unable to copy packet metadata\n"); - goto err; - } +static odp_packet_t get_output_packet(const odp_crypto_generic_session_t *session, + odp_packet_t pkt_in, + odp_packet_t pkt_out) +{ + int rc; - ret = odp_packet_copy_from_pkt(out_pkt, - 0, - pkt_in, - 0, - odp_packet_len(pkt_in)); - if (odp_unlikely(ret < 0)) - goto err; + if (odp_likely(pkt_in == pkt_out)) + return pkt_out; - _odp_packet_copy_md(packet_hdr(out_pkt), packet_hdr(pkt_in), md_copy); - odp_packet_free(pkt_in); - pkt_in = ODP_PACKET_INVALID; + if (pkt_out == ODP_PACKET_INVALID) { + odp_pool_t pool = session->p.output_pool; + + ODP_ASSERT(pool != ODP_POOL_INVALID); + if (pool == odp_packet_pool(pkt_in)) { + pkt_out = pkt_in; + } else { + pkt_out = odp_packet_copy(pkt_in, pool); + if (odp_likely(pkt_out != ODP_PACKET_INVALID)) + odp_packet_free(pkt_in); + } + return pkt_out; } + rc = copy_data_and_metadata(pkt_out, pkt_in); + if (odp_unlikely(rc < 0)) + return ODP_PACKET_INVALID; + + odp_packet_free(pkt_in); + return pkt_out; +} + +static +int crypto_int(odp_packet_t pkt_in, + odp_packet_t *pkt_out, + const odp_crypto_packet_op_param_t *param) +{ + odp_crypto_generic_session_t *session; + odp_packet_t out_pkt; + + session = (odp_crypto_generic_session_t *)(intptr_t)param->session; + + out_pkt = get_output_packet(session, pkt_in, *pkt_out); + if (odp_unlikely(out_pkt == ODP_PACKET_INVALID)) + return -1; /* Invoke the crypto function */ session->func(out_pkt, param, session); @@ -961,14 +979,6 @@ int crypto_int(odp_packet_t pkt_in, *pkt_out = out_pkt; return 0; - -err: - if (allocated) { - odp_packet_free(out_pkt); - *pkt_out = ODP_PACKET_INVALID; - } - - return -1; } int odp_crypto_op(const odp_packet_t pkt_in[], |