From patchwork Fri Nov 1 17:51:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 178331 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp824788ill; Fri, 1 Nov 2019 10:56:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvgRnLi4Z3lJAHV97Vi6TbcCGvSr+1AuRipC8yH0p5jJU3/otC0EbS0NTrnLvj+9KaFinU X-Received: by 2002:a50:91f6:: with SMTP id h51mr13821644eda.99.1572630984650; Fri, 01 Nov 2019 10:56:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572630984; cv=none; d=google.com; s=arc-20160816; b=QOaVB3h2rZrbotZlPwdo/9M3NIA5Dcm2HJLjwF2Tr2M1J9rPkJVqfuShc892+7UY53 p3rgwmiGH/vyvgH3a7IqksrGSvOH55OJMvCgdliwHcvXZ6TvoA8Y8eZV9/1qRMtd5Kt5 hBpUOJiqvn2A6ECW/TovvXT0iqisj2lULV7yedECONiwMOLH2LLVXJLL6C39atbqVNZy 2xjJzyIu6bIYktWN5Aef6VYOtxZnoSKgMchP2nnkTNY8pnzlqMPt9mCW+nVnZ+0IrtFj 0U1nvya/Iv3+dbZw0qb4uV9ZIYcDI9UoeXSaQHGKSbqUKpd8qIIKE7219VlW0/KPkil2 PMzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from; bh=j7pme5OgY7pjWx0NiOCG2BU0gfJwx7pVD7O1LI78VqY=; b=oiLppaz9Lf5czlhICjmAVbzbC1Ut+qvwH3pT38JuDQleDVYY2mEqDHkDZxS3dhVVG9 955c2a7fIIhrKpHUhSSASu5gx/rwD+FvVhhFDZhIp5bpDT/559HUA/a/Mxej6wkYtXwr htvFLRye2ZcGCq+bK0RoszAVAODD7nSZkhMJOgLAS+8KPZfNulT/WOUMR/ZndyNlQeai xf5nqbKVVAoimh+qn9SHxvFPjdalMWbbrKfvQ8HSkSFtOnU0Uj3iBnYpV3tGTS1zVXqH likglU1bwado1hoLo5pxP2w3pDl4KWsbWJVe5bBfjZnXHU6FAY6vPaE4miPgs3Cvlkgn lqlg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id t30si938615edt.330.2019.11.01.10.56.24; Fri, 01 Nov 2019 10:56:24 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DF8951E8DD; Fri, 1 Nov 2019 18:55:06 +0100 (CET) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id 7094E1E570 for ; Fri, 1 Nov 2019 18:54:52 +0100 (CET) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 52199200122; Fri, 1 Nov 2019 18:54:52 +0100 (CET) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id B3060200133; Fri, 1 Nov 2019 18:54:50 +0100 (CET) Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.133.63]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id E3F1640318; Sat, 2 Nov 2019 01:54:48 +0800 (SGT) From: Hemant Agrawal To: dev@dpdk.org, akhil.goyal@nxp.com Date: Fri, 1 Nov 2019 23:21:41 +0530 Message-Id: <20191101175141.4663-13-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191101175141.4663-1-hemant.agrawal@nxp.com> References: <20191025083336.24212-1-hemant.agrawal@nxp.com> <20191101175141.4663-1-hemant.agrawal@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH v2 13/13] crypto/dpaa_sec: enable ipsec aes-ctr to use nonce 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" From: Vakul Garg The protocol aware ipsec descriptor has been modified to use ctr_initial value of 1 and salt configured for ipsec SA. Signed-off-by: Hemant Agrawal Signed-off-by: Vakul Garg --- drivers/common/dpaax/caamflib/desc/ipsec.h | 18 ++++++++---------- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 ++++++++ drivers/crypto/dpaa_sec/dpaa_sec.c | 12 ++++++++++-- 3 files changed, 26 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/drivers/common/dpaax/caamflib/desc/ipsec.h b/drivers/common/dpaax/caamflib/desc/ipsec.h index f33c68cc9..cf6fa4252 100644 --- a/drivers/common/dpaax/caamflib/desc/ipsec.h +++ b/drivers/common/dpaax/caamflib/desc/ipsec.h @@ -256,14 +256,14 @@ struct ipsec_encap_cbc { /** * struct ipsec_encap_ctr - PDB part for IPsec CTR encapsulation - * @ctr_nonce: 4-byte array nonce + * @ctr_nonce: 4-byte nonce * @ctr_initial: initial count constant * @iv: initialization vector */ struct ipsec_encap_ctr { - uint8_t ctr_nonce[4]; + uint32_t ctr_nonce; uint32_t ctr_initial; - uint64_t iv; + uint8_t iv[8]; }; /** @@ -346,10 +346,9 @@ __rta_copy_ipsec_encap_pdb(struct program *program, break; case OP_PCL_IPSEC_AES_CTR: - rta_copy_data(program, pdb->ctr.ctr_nonce, - sizeof(pdb->ctr.ctr_nonce)); + rta_copy_data(program, (uint8_t *)&pdb->ctr.ctr_nonce, 4); __rta_out32(program, pdb->ctr.ctr_initial); - __rta_out64(program, true, pdb->ctr.iv); + rta_copy_data(program, pdb->ctr.iv, sizeof(pdb->ctr.iv)); break; case OP_PCL_IPSEC_AES_CCM8: @@ -386,11 +385,11 @@ struct ipsec_decap_cbc { /** * struct ipsec_decap_ctr - PDB part for IPsec CTR decapsulation - * @ctr_nonce: 4-byte array nonce + * @ctr_nonce: 4-byte nonce * @ctr_initial: initial count constant */ struct ipsec_decap_ctr { - uint8_t ctr_nonce[4]; + uint32_t ctr_nonce; uint32_t ctr_initial; }; @@ -464,8 +463,7 @@ __rta_copy_ipsec_decap_pdb(struct program *program, break; case OP_PCL_IPSEC_AES_CTR: - rta_copy_data(program, pdb->ctr.ctr_nonce, - sizeof(pdb->ctr.ctr_nonce)); + rta_copy_data(program, (uint8_t *)&pdb->ctr.ctr_nonce, 4); __rta_out32(program, pdb->ctr.ctr_initial); break; diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 7368fc248..e774b379a 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -2814,6 +2814,10 @@ dpaa2_sec_set_ipsec_session(struct rte_cryptodev *dev, /* copy algo specific data to PDB */ switch (cipherdata.algtype) { + case OP_PCL_IPSEC_AES_CTR: + encap_pdb.ctr.ctr_initial = 0x00000001; + encap_pdb.ctr.ctr_nonce = ipsec_xform->salt; + break; case OP_PCL_IPSEC_AES_GCM8: case OP_PCL_IPSEC_AES_GCM12: case OP_PCL_IPSEC_AES_GCM16: @@ -2899,6 +2903,10 @@ dpaa2_sec_set_ipsec_session(struct rte_cryptodev *dev, memset(&decap_pdb, 0, sizeof(struct ipsec_decap_pdb)); /* copy algo specific data to PDB */ switch (cipherdata.algtype) { + case OP_PCL_IPSEC_AES_CTR: + decap_pdb.ctr.ctr_initial = 0x00000001; + decap_pdb.ctr.ctr_nonce = ipsec_xform->salt; + break; case OP_PCL_IPSEC_AES_GCM8: case OP_PCL_IPSEC_AES_GCM12: case OP_PCL_IPSEC_AES_GCM16: diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index c52593746..59f6097bb 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -2614,6 +2614,7 @@ dpaa_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform, static int dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform, struct rte_crypto_auth_xform *auth_xform, + struct rte_security_ipsec_xform *ipsec_xform, dpaa_sec_session *session) { if (cipher_xform) { @@ -2720,6 +2721,13 @@ dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform, case RTE_CRYPTO_CIPHER_AES_CTR: session->cipher_key.alg = OP_PCL_IPSEC_AES_CTR; session->cipher_key.algmode = OP_ALG_AAI_CTR; + if (session->dir == DIR_ENC) { + session->encap_pdb.ctr.ctr_initial = 0x00000001; + session->encap_pdb.ctr.ctr_nonce = ipsec_xform->salt; + } else { + session->decap_pdb.ctr.ctr_initial = 0x00000001; + session->decap_pdb.ctr.ctr_nonce = ipsec_xform->salt; + } break; case RTE_CRYPTO_CIPHER_NULL: session->cipher_key.alg = OP_PCL_IPSEC_NULL; @@ -2771,13 +2779,13 @@ dpaa_sec_set_ipsec_session(__rte_unused struct rte_cryptodev *dev, if (conf->crypto_xform->next) auth_xform = &conf->crypto_xform->next->auth; ret = dpaa_sec_ipsec_proto_init(cipher_xform, auth_xform, - session); + ipsec_xform, session); } else if (conf->crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) { auth_xform = &conf->crypto_xform->auth; if (conf->crypto_xform->next) cipher_xform = &conf->crypto_xform->next->cipher; ret = dpaa_sec_ipsec_proto_init(cipher_xform, auth_xform, - session); + ipsec_xform, session); } else if (conf->crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) { aead_xform = &conf->crypto_xform->aead; ret = dpaa_sec_ipsec_aead_init(aead_xform,