From: Fan Zhang <roy.fan.zhang@intel.com> To: dev@dpdk.org Cc: akhil.goyal@nxp.com, Fan Zhang <roy.fan.zhang@intel.com> Subject: [dpdk-dev] [dpdk-dev v2] crypto/aesni_mb: fix cpu crypto cipher auth Date: Thu, 29 Oct 2020 16:30:20 +0000 Message-ID: <20201029163020.1034474-1-roy.fan.zhang@intel.com> (raw) In-Reply-To: <20201029162604.1034183-1-roy.fan.zhang@intel.com> This patch fixes the AESNI-MB PMD CPU crypto process function. Originally 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 <roy.fan.zhang@intel.com> --- V2: - fix typo. 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 */ -- 2.26.2
next prev parent reply other threads:[~2020-10-29 16:30 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-29 16:26 [dpdk-dev] [PATCH] " Fan Zhang 2020-10-29 16:30 ` Fan Zhang [this message] 2020-11-02 19:56 ` Akhil Goyal 2020-11-03 11:31 ` Zhang, Roy Fan 2020-11-03 12:24 ` Zhang, Roy Fan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201029163020.1034474-1-roy.fan.zhang@intel.com \ --to=roy.fan.zhang@intel.com \ --cc=akhil.goyal@nxp.com \ --cc=dev@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git