From patchwork Fri Jan 18 09:15:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Zhang X-Patchwork-Id: 49939 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E3F0F1150; Fri, 18 Jan 2019 10:16:01 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 916AE239 for ; Fri, 18 Jan 2019 10:16:00 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2019 01:15:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,489,1539673200"; d="scan'208";a="268102874" Received: from silpixa00398673.ir.intel.com (HELO silpixa00398673.ger.corp.intel.com) ([10.237.223.54]) by orsmga004.jf.intel.com with ESMTP; 18 Jan 2019 01:15:58 -0800 From: Fan Zhang To: dev@dpdk.org Cc: akhil.goyal@nxp.com Date: Fri, 18 Jan 2019 09:15:57 +0000 Message-Id: <20190118091557.12769-1-roy.fan.zhang@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-dev] [PATCH] examples/fips_validation: fix physical address X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes the missed digest and aad data physical addresses filling to crypto operations in fips_validation sample application. Fixes: 41d561cbdd24 ("examples/fips_validation: add power on self test") Signed-off-by: Fan Zhang Acked-by: Marko Kovacevic --- examples/fips_validation/fips_dev_self_test.c | 39 ++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/examples/fips_validation/fips_dev_self_test.c b/examples/fips_validation/fips_dev_self_test.c index ac366cbac..df1c0e82e 100644 --- a/examples/fips_validation/fips_dev_self_test.c +++ b/examples/fips_validation/fips_dev_self_test.c @@ -10,6 +10,7 @@ #define IV_OFF (sizeof(struct rte_crypto_op) + sizeof(struct rte_crypto_sym_op)) #define FIPS_DEV_TEST_DATA_MAX_SIZE 8096 +#define AES_CCM_AAD_PAD_SIZE 18 struct fips_dev_self_test_vector { const char *name; @@ -1236,6 +1237,8 @@ prepare_auth_op(struct rte_crypto_op *op, memcpy(dst, vec->input.data, vec->input.len); sym->auth.data.length = vec->input.len; sym->auth.digest.data = dst + vec->input.len; + sym->auth.digest.phys_addr = rte_pktmbuf_iova_offset(mbuf, + vec->input.len); if (dir == self_test_dir_dec_auth_verify) memcpy(dst + vec->input.len, vec->digest.data, vec->digest.len); @@ -1277,7 +1280,8 @@ prepare_aead_op(struct rte_crypto_op *op, return -ENOMEM; } - dst = (uint8_t *)rte_pktmbuf_append(mbuf, len + vec->digest.len); + dst = (uint8_t *)rte_pktmbuf_append(mbuf, RTE_ALIGN_CEIL(len + + vec->digest.len, 16)); if (!dst) { RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM); return -ENOMEM; @@ -1286,13 +1290,33 @@ prepare_aead_op(struct rte_crypto_op *op, sym->m_src = mbuf; sym->aead.data.length = len; sym->aead.data.offset = 0; - sym->aead.aad.data = vec->aead.aad.data; - sym->aead.digest.data = dst + vec->input.len; memcpy(dst, src, len); + sym->aead.digest.data = dst + vec->input.len; + sym->aead.digest.phys_addr = rte_pktmbuf_iova_offset(mbuf, + vec->input.len); if (dir == self_test_dir_dec_auth_verify) memcpy(sym->aead.digest.data, vec->digest.data, vec->digest.len); + len = (vec->aead.algo == RTE_CRYPTO_AEAD_AES_CCM) ? + (vec->aead.aad.len + AES_CCM_AAD_PAD_SIZE) : + vec->aead.aad.len; + + dst = rte_malloc(NULL, len, 16); + if (!dst) { + RTE_LOG(ERR, PMD, "Error %i: Not enough memory\n", -ENOMEM); + return -ENOMEM; + } + + sym->aead.aad.data = dst; + sym->aead.aad.phys_addr = rte_malloc_virt2iova(dst); + if (vec->aead.algo == RTE_CRYPTO_AEAD_AES_CCM) + memcpy(dst, vec->aead.aad.data, + vec->aead.aad.len + AES_CCM_AAD_PAD_SIZE); + else + memcpy(dst, vec->aead.aad.data, + vec->aead.aad.len); + rte_crypto_op_attach_sym_session(op, session); return 0; @@ -1318,7 +1342,7 @@ check_cipher_result(struct rte_crypto_op *op, } GET_MBUF_DATA(data, len, mbuf); - if (len != src_len) + if (!data && !len) return -1; ret = memcmp(data, src, src_len); @@ -1339,7 +1363,7 @@ check_auth_result(struct rte_crypto_op *op, int ret; GET_MBUF_DATA(data, len, mbuf); - if (len != vec->input.len + vec->digest.len) + if (!data && !len) return -1; if (dir == self_test_dir_enc_auth_gen) { @@ -1363,6 +1387,9 @@ check_aead_result(struct rte_crypto_op *op, uint32_t len, src_len; int ret; + if (op->sym->aead.aad.data) + rte_free(op->sym->aead.aad.data); + if (dir == self_test_dir_enc_auth_gen) { src = vec->output.data; src_len = vec->output.len; @@ -1372,7 +1399,7 @@ check_aead_result(struct rte_crypto_op *op, } GET_MBUF_DATA(data, len, mbuf); - if (len != src_len + vec->digest.len) + if (!data && !len) return -1; ret = memcmp(data, src, src_len);