From patchwork Thu Oct 29 16:26:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Zhang X-Patchwork-Id: 82832 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2DA84A04B5; Thu, 29 Oct 2020 17:26:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9DA97C972; Thu, 29 Oct 2020 17:26:13 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id CC4A2C95E for ; Thu, 29 Oct 2020 17:26:10 +0100 (CET) IronPort-SDR: AW8auyuIs07djbvnosQm+Wo2GkuVT6UVZ7wSkA7elNvnwBA6IbZx8BTiSzNTXDB4JaxRX0PF00 K3tV7EUxh9RQ== X-IronPort-AV: E=McAfee;i="6000,8403,9789"; a="155433657" X-IronPort-AV: E=Sophos;i="5.77,430,1596524400"; d="scan'208";a="155433657" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2020 09:26:07 -0700 IronPort-SDR: 6vLqPSUlexgNU/fbsgSOHAdtLpD3ToHvcAyiXalseQiit7NfZEZdlKd2DNRuliKWxAce3PL6o5 zk/Me4R5dOfQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,430,1596524400"; d="scan'208";a="323758517" Received: from silpixa00398673.ir.intel.com (HELO silpixa00398673.ger.corp.intel.com) ([10.237.223.11]) by orsmga006.jf.intel.com with ESMTP; 29 Oct 2020 09:26:06 -0700 From: Fan Zhang To: dev@dpdk.org Cc: akhil.goyal@nxp.com, Fan Zhang Date: Thu, 29 Oct 2020 16:26:04 +0000 Message-Id: <20201029162604.1034183-1-roy.fan.zhang@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] crypto/aesni_mb: fix cpu crypto cipher auth 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 AESNI-MB PMD CPU crypto process function. Orignally the function tried to access crypto vector's aad buffer even it is not needed. Fixes: 8d928d47a29a ("cryptodev: change crypto symmetric vector structure") Cc: roy.fan.zhang@intel.com Signed-off-by: Fan Zhang --- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 69 +++++++++++++++------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index fbbb38af0..53834f9f3 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -1990,33 +1990,62 @@ aesni_mb_cpu_crypto_process_bulk(struct rte_cryptodev *dev, RTE_PER_LCORE(sync_mb_mgr) = mb_mgr; } - for (i = 0, j = 0, k = 0; i != vec->num; i++) { + if (is_aead_algo(s->auth.algo, s->cipher.mode)) { + for (i = 0, j = 0, k = 0; i != vec->num; i++) { + ret = check_crypto_sgl(sofs, vec->sgl + i); + if (ret != 0) { + vec->status[i] = ret; + continue; + } + buf = vec->sgl[i].vec[0].base; + len = vec->sgl[i].vec[0].len; - ret = check_crypto_sgl(sofs, vec->sgl + i); - if (ret != 0) { - vec->status[i] = ret; - continue; + job = IMB_GET_NEXT_JOB(mb_mgr); + if (job == NULL) { + k += flush_mb_sync_mgr(mb_mgr); + job = IMB_GET_NEXT_JOB(mb_mgr); + RTE_ASSERT(job != NULL); + } + + /* Submit job for processing */ + set_cpu_mb_job_params(job, s, sofs, buf, len, + vec->iv[i].va, vec->aad[i].va, tmp_dgst[i], + &vec->status[i]); + job = submit_sync_job(mb_mgr); + j++; + + /* handle completed jobs */ + k += handle_completed_sync_jobs(job, mb_mgr); } + } else { + for (i = 0, j = 0, k = 0; i != vec->num; i++) { + ret = check_crypto_sgl(sofs, vec->sgl + i); + if (ret != 0) { + vec->status[i] = ret; + continue; + } - buf = vec->sgl[i].vec[0].base; - len = vec->sgl[i].vec[0].len; + buf = vec->sgl[i].vec[0].base; + len = vec->sgl[i].vec[0].len; - job = IMB_GET_NEXT_JOB(mb_mgr); - if (job == NULL) { - k += flush_mb_sync_mgr(mb_mgr); job = IMB_GET_NEXT_JOB(mb_mgr); - RTE_ASSERT(job != NULL); + if (job == NULL) { + k += flush_mb_sync_mgr(mb_mgr); + job = IMB_GET_NEXT_JOB(mb_mgr); + RTE_ASSERT(job != NULL); + } + + /* Submit job for processing */ + set_cpu_mb_job_params(job, s, sofs, buf, len, + vec->iv[i].va, NULL, tmp_dgst[i], + &vec->status[i]); + job = submit_sync_job(mb_mgr); + j++; + + /* handle completed jobs */ + k += handle_completed_sync_jobs(job, mb_mgr); } - - /* Submit job for processing */ - set_cpu_mb_job_params(job, s, sofs, buf, len, vec->iv[i].va, - vec->aad[i].va, tmp_dgst[i], &vec->status[i]); - job = submit_sync_job(mb_mgr); - j++; - - /* handle completed jobs */ - k += handle_completed_sync_jobs(job, mb_mgr); } /* flush remaining jobs */