* [dpdk-dev] [PATCH v1 1/2] common/cnxk: fix: use appropriate zuc constants
@ 2021-11-03 11:22 Vidya Sagar Velumuri
2021-11-03 11:22 ` [dpdk-dev] [PATCH v1 2/2] crypto/cnxk: fix: supported iv length for zuc 256 Vidya Sagar Velumuri
2021-11-03 13:18 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants Vidya Sagar Velumuri
0 siblings, 2 replies; 5+ messages in thread
From: Vidya Sagar Velumuri @ 2021-11-03 11:22 UTC (permalink / raw)
To: adwivedi, anoobj, ktejasree, ndabilpuram, gakhil, roy.fan.zhang
Cc: dev, vvelumuri
Use appropriate ZUC constants based on key length and mac length
Fixes: a90db80d7d72 ("common/cnxk: set key length for PDCP algos")
Cc: vvelumuri@marvell.com
Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
Change-Id: Ie982110035916d2168cc4e79b7f5145c6d6ac021
diff --git a/drivers/common/cnxk/roc_se.c b/drivers/common/cnxk/roc_se.c
index 4edbc8e547..e81a0c9ecb 100644
--- a/drivers/common/cnxk/roc_se.c
+++ b/drivers/common/cnxk/roc_se.c
@@ -4,10 +4,26 @@
#include "roc_api.h"
-static uint8_t zuc_d[32] = {0x44, 0xD7, 0x26, 0xBC, 0x62, 0x6B, 0x13, 0x5E,
- 0x57, 0x89, 0x35, 0xE2, 0x71, 0x35, 0x09, 0xAF,
- 0x4D, 0x78, 0x2F, 0x13, 0x6B, 0xC4, 0x1A, 0xF1,
- 0x5E, 0x26, 0x3C, 0x4D, 0x78, 0x9A, 0x47, 0xAC};
+static uint8_t zuc_key128[32] = {
+ 0x44, 0xD7, 0x26, 0xBC, 0x62, 0x6B, 0x13, 0x5E, 0x57, 0x89, 0x35,
+ 0xE2, 0x71, 0x35, 0x09, 0xAF, 0x4D, 0x78, 0x2F, 0x13, 0x6B, 0xC4,
+ 0x1A, 0xF1, 0x5E, 0x26, 0x3C, 0x4D, 0x78, 0x9A, 0x47, 0xAC};
+
+static uint8_t zuc_key256[16] = {0x22, 0x2f, 0x24, 0x2a, 0x6d, 0x40,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x40, 0x52, 0x10, 0x30};
+
+static uint8_t zuc_key256_mac4[16] = {0x22, 0x2f, 0x25, 0x2a, 0x6d, 0x40,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x40, 0x52, 0x10, 0x30};
+
+static uint8_t zuc_key256_mac8[16] = {0x23, 0x2f, 0x24, 0x2a, 0x6d, 0x40,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x40, 0x52, 0x10, 0x30};
+
+static uint8_t zuc_key256_mac16[16] = {0x23, 0x2f, 0x25, 0x2a, 0x6d, 0x40,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x40, 0x52, 0x10, 0x30};
static inline void
cpt_snow3g_key_gen(const uint8_t *ck, uint32_t *keyx)
@@ -185,6 +201,28 @@ cpt_pdcp_mac_len_set(struct roc_se_zuc_snow3g_ctx *zs_ctx, uint16_t mac_len)
return 0;
}
+static void
+cpt_pdcp_update_zuc_const(uint8_t *zuc_const, int key_len, int mac_len)
+{
+ if (key_len == 16) {
+ memcpy(zuc_const, zuc_key128, 32);
+ } else if (key_len == 32) {
+ switch (mac_len) {
+ case 4:
+ memcpy(zuc_const, zuc_key256_mac4, 16);
+ break;
+ case 8:
+ memcpy(zuc_const, zuc_key256_mac8, 16);
+ break;
+ case 16:
+ memcpy(zuc_const, zuc_key256_mac16, 16);
+ break;
+ default:
+ plt_err("Unsupported mac len");
+ }
+ }
+}
+
int
roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type,
const uint8_t *key, uint16_t key_len, uint16_t mac_len)
@@ -245,7 +283,7 @@ roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type,
return ret;
se_ctx->pdcp_alg_type = ROC_SE_PDCP_ALG_TYPE_ZUC;
memcpy(ci_key, key, key_len);
- memcpy(zuc_const, zuc_d, 32);
+ cpt_pdcp_update_zuc_const(zuc_const, key_len, mac_len);
se_ctx->fc_type = ROC_SE_PDCP;
se_ctx->zsk_flags = 0x1;
break;
@@ -421,7 +459,11 @@ roc_se_ciph_key_set(struct roc_se_ctx *se_ctx, roc_se_cipher_type type,
zs_ctx->zuc.otk_ctx.w0.s.alg_type = ROC_SE_PDCP_ALG_TYPE_ZUC;
se_ctx->pdcp_alg_type = ROC_SE_PDCP_ALG_TYPE_ZUC;
memcpy(ci_key, key, key_len);
- memcpy(zuc_const, zuc_d, 32);
+ if (key_len == 32)
+ memcpy(zuc_const, zuc_key256, 16);
+ else
+ memcpy(zuc_const, zuc_key128, 32);
+
se_ctx->zsk_flags = 0;
goto success;
case ROC_SE_AES_CTR_EEA2:
diff --git a/drivers/common/cnxk/roc_se.h b/drivers/common/cnxk/roc_se.h
index 051d496f88..5be832fa75 100644
--- a/drivers/common/cnxk/roc_se.h
+++ b/drivers/common/cnxk/roc_se.h
@@ -259,7 +259,8 @@ struct roc_se_fc_params {
struct roc_se_buf_ptr meta_buf;
struct roc_se_buf_ptr ctx_buf;
uint32_t rsvd2;
- uint16_t rsvd3;
+ uint8_t rsvd3;
+ uint8_t iv_ovr;
uint8_t cipher_iv_len;
uint8_t auth_iv_len;
--
2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [dpdk-dev] [PATCH v1 2/2] crypto/cnxk: fix: supported iv length for zuc 256
2021-11-03 11:22 [dpdk-dev] [PATCH v1 1/2] common/cnxk: fix: use appropriate zuc constants Vidya Sagar Velumuri
@ 2021-11-03 11:22 ` Vidya Sagar Velumuri
2021-11-03 13:18 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants Vidya Sagar Velumuri
1 sibling, 0 replies; 5+ messages in thread
From: Vidya Sagar Velumuri @ 2021-11-03 11:22 UTC (permalink / raw)
To: adwivedi, anoobj, ktejasree, ndabilpuram, gakhil, roy.fan.zhang
Cc: dev, vvelumuri
Fix supported IV length for ZUC 256
Add support in capability for 4 byte mac len for zuc 256
Pack the last 8 bytes of IV to 6 bytes by ignoring the 2 msb bits of
each byte.
Fixes: 29742632ac9e ("crypto/cnxk: support ZUC with 256-bit key")
Cc: vvelumuri@marvell.com
Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
Change-Id: I00e103323a4018e26452717fa31238aec668ec25
diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
index a53b489a04..b94ff851a3 100644
--- a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
+++ b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
@@ -874,8 +874,8 @@ cn10k_crypto_caps_update(struct rte_cryptodev_capabilities cnxk_caps[])
caps->sym.cipher.key_size.max = 32;
caps->sym.cipher.key_size.increment = 16;
- caps->sym.cipher.iv_size.max = 24;
- caps->sym.cipher.iv_size.increment = 8;
+ caps->sym.cipher.iv_size.max = 25;
+ caps->sym.cipher.iv_size.increment = 1;
}
if ((caps->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC) &&
@@ -886,8 +886,8 @@ cn10k_crypto_caps_update(struct rte_cryptodev_capabilities cnxk_caps[])
caps->sym.auth.key_size.increment = 16;
caps->sym.auth.digest_size.max = 16;
caps->sym.auth.digest_size.increment = 4;
- caps->sym.auth.iv_size.max = 24;
- caps->sym.auth.iv_size.increment = 8;
+ caps->sym.auth.iv_size.max = 25;
+ caps->sym.auth.iv_size.increment = 1;
}
}
}
diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h
index 7959c4c7af..e4e554e8b7 100644
--- a/drivers/crypto/cnxk/cnxk_se.h
+++ b/drivers/crypto/cnxk/cnxk_se.h
@@ -37,7 +37,24 @@ struct cnxk_se_sess {
} __rte_cache_aligned;
static inline void
-pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type)
+cpt_pack_iv(uint8_t *iv_src, uint8_t *iv_dst)
+{
+ iv_dst[16] = iv_src[16];
+ /* pack the last 8 bytes of IV to 6 bytes.
+ * discard the 2 MSB bits of each byte
+ */
+ iv_dst[17] = (((iv_src[17] & 0x3f) << 2) | ((iv_src[18] >> 4) & 0x3));
+ iv_dst[18] = (((iv_src[18] & 0xf) << 4) | ((iv_src[19] >> 2) & 0xf));
+ iv_dst[19] = (((iv_src[19] & 0x3) << 6) | (iv_src[20] & 0x3f));
+
+ iv_dst[20] = (((iv_src[21] & 0x3f) << 2) | ((iv_src[22] >> 4) & 0x3));
+ iv_dst[21] = (((iv_src[22] & 0xf) << 4) | ((iv_src[23] >> 2) & 0xf));
+ iv_dst[22] = (((iv_src[23] & 0x3) << 6) | (iv_src[24] & 0x3f));
+}
+
+static inline void
+pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type,
+ uint8_t pack_iv)
{
uint32_t *iv_s_temp, iv_temp[4];
int j;
@@ -56,6 +73,8 @@ pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type)
} else {
/* ZUC doesn't need a swap */
memcpy(iv_d, iv_s, 16);
+ if (pack_iv)
+ cpt_pack_iv(iv_s, iv_d);
}
}
@@ -984,6 +1003,7 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
uint64_t offset_ctrl;
uint64_t *offset_vaddr;
uint8_t *iv_s;
+ uint8_t pack_iv = 0;
union cpt_inst_w4 cpt_inst_w4;
se_ctx = params->ctx_buf.vaddr;
@@ -999,6 +1019,11 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
iv_s = params->auth_iv_buf;
iv_len = params->auth_iv_len;
+ if (iv_len == 25) {
+ iv_len -= 2;
+ pack_iv = 1;
+ }
+
/*
* Microcode expects offsets in bytes
* TODO: Rounding off
@@ -1023,6 +1048,11 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
iv_s = params->iv_buf;
iv_len = params->cipher_iv_len;
+ if (iv_len == 25) {
+ iv_len -= 2;
+ pack_iv = 1;
+ }
+
/* EEA3 or UEA2 */
/*
* Microcode expects offsets in bytes
@@ -1081,7 +1111,7 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
cpt_inst_w4.s.dlen = inputlen + ROC_SE_OFF_CTRL_LEN;
uint8_t *iv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN);
- pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type);
+ pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type, pack_iv);
*offset_vaddr = offset_ctrl;
} else {
@@ -1095,7 +1125,8 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
/* save space for iv */
offset_vaddr = m_vaddr;
- m_vaddr = (uint8_t *)m_vaddr + ROC_SE_OFF_CTRL_LEN + iv_len;
+ m_vaddr = (uint8_t *)m_vaddr + ROC_SE_OFF_CTRL_LEN +
+ RTE_ALIGN_CEIL(iv_len, 8);
cpt_inst_w4.s.opcode_major |= (uint64_t)ROC_SE_DMA_MODE;
@@ -1123,7 +1154,7 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
*offset_vaddr = offset_ctrl;
iv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN);
- pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type);
+ pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type, pack_iv);
/* input data */
size = inputlen - iv_len;
--
2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants
2021-11-03 11:22 [dpdk-dev] [PATCH v1 1/2] common/cnxk: fix: use appropriate zuc constants Vidya Sagar Velumuri
2021-11-03 11:22 ` [dpdk-dev] [PATCH v1 2/2] crypto/cnxk: fix: supported iv length for zuc 256 Vidya Sagar Velumuri
@ 2021-11-03 13:18 ` Vidya Sagar Velumuri
2021-11-03 13:18 ` [dpdk-dev] [PATCH v2 2/2] crypto/cnxk: fix: supported iv length for zuc 256 Vidya Sagar Velumuri
2021-11-03 19:25 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants Akhil Goyal
1 sibling, 2 replies; 5+ messages in thread
From: Vidya Sagar Velumuri @ 2021-11-03 13:18 UTC (permalink / raw)
To: adwivedi, anoobj, ktejasree, ndabilpuram, gakhil, roy.fan.zhang
Cc: dev, vvelumuri
Use appropriate ZUC constants based on key length and mac length
Fixes: a90db80d7d72 ("common/cnxk: set key length for PDCP algos")
Cc: vvelumuri@marvell.com
Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
v2:
* Fixed remove gerrit ID warning
diff --git a/drivers/common/cnxk/roc_se.c b/drivers/common/cnxk/roc_se.c
index 4edbc8e547..e81a0c9ecb 100644
--- a/drivers/common/cnxk/roc_se.c
+++ b/drivers/common/cnxk/roc_se.c
@@ -4,10 +4,26 @@
#include "roc_api.h"
-static uint8_t zuc_d[32] = {0x44, 0xD7, 0x26, 0xBC, 0x62, 0x6B, 0x13, 0x5E,
- 0x57, 0x89, 0x35, 0xE2, 0x71, 0x35, 0x09, 0xAF,
- 0x4D, 0x78, 0x2F, 0x13, 0x6B, 0xC4, 0x1A, 0xF1,
- 0x5E, 0x26, 0x3C, 0x4D, 0x78, 0x9A, 0x47, 0xAC};
+static uint8_t zuc_key128[32] = {
+ 0x44, 0xD7, 0x26, 0xBC, 0x62, 0x6B, 0x13, 0x5E, 0x57, 0x89, 0x35,
+ 0xE2, 0x71, 0x35, 0x09, 0xAF, 0x4D, 0x78, 0x2F, 0x13, 0x6B, 0xC4,
+ 0x1A, 0xF1, 0x5E, 0x26, 0x3C, 0x4D, 0x78, 0x9A, 0x47, 0xAC};
+
+static uint8_t zuc_key256[16] = {0x22, 0x2f, 0x24, 0x2a, 0x6d, 0x40,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x40, 0x52, 0x10, 0x30};
+
+static uint8_t zuc_key256_mac4[16] = {0x22, 0x2f, 0x25, 0x2a, 0x6d, 0x40,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x40, 0x52, 0x10, 0x30};
+
+static uint8_t zuc_key256_mac8[16] = {0x23, 0x2f, 0x24, 0x2a, 0x6d, 0x40,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x40, 0x52, 0x10, 0x30};
+
+static uint8_t zuc_key256_mac16[16] = {0x23, 0x2f, 0x25, 0x2a, 0x6d, 0x40,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x40, 0x52, 0x10, 0x30};
static inline void
cpt_snow3g_key_gen(const uint8_t *ck, uint32_t *keyx)
@@ -185,6 +201,28 @@ cpt_pdcp_mac_len_set(struct roc_se_zuc_snow3g_ctx *zs_ctx, uint16_t mac_len)
return 0;
}
+static void
+cpt_pdcp_update_zuc_const(uint8_t *zuc_const, int key_len, int mac_len)
+{
+ if (key_len == 16) {
+ memcpy(zuc_const, zuc_key128, 32);
+ } else if (key_len == 32) {
+ switch (mac_len) {
+ case 4:
+ memcpy(zuc_const, zuc_key256_mac4, 16);
+ break;
+ case 8:
+ memcpy(zuc_const, zuc_key256_mac8, 16);
+ break;
+ case 16:
+ memcpy(zuc_const, zuc_key256_mac16, 16);
+ break;
+ default:
+ plt_err("Unsupported mac len");
+ }
+ }
+}
+
int
roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type,
const uint8_t *key, uint16_t key_len, uint16_t mac_len)
@@ -245,7 +283,7 @@ roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type,
return ret;
se_ctx->pdcp_alg_type = ROC_SE_PDCP_ALG_TYPE_ZUC;
memcpy(ci_key, key, key_len);
- memcpy(zuc_const, zuc_d, 32);
+ cpt_pdcp_update_zuc_const(zuc_const, key_len, mac_len);
se_ctx->fc_type = ROC_SE_PDCP;
se_ctx->zsk_flags = 0x1;
break;
@@ -421,7 +459,11 @@ roc_se_ciph_key_set(struct roc_se_ctx *se_ctx, roc_se_cipher_type type,
zs_ctx->zuc.otk_ctx.w0.s.alg_type = ROC_SE_PDCP_ALG_TYPE_ZUC;
se_ctx->pdcp_alg_type = ROC_SE_PDCP_ALG_TYPE_ZUC;
memcpy(ci_key, key, key_len);
- memcpy(zuc_const, zuc_d, 32);
+ if (key_len == 32)
+ memcpy(zuc_const, zuc_key256, 16);
+ else
+ memcpy(zuc_const, zuc_key128, 32);
+
se_ctx->zsk_flags = 0;
goto success;
case ROC_SE_AES_CTR_EEA2:
diff --git a/drivers/common/cnxk/roc_se.h b/drivers/common/cnxk/roc_se.h
index 051d496f88..5be832fa75 100644
--- a/drivers/common/cnxk/roc_se.h
+++ b/drivers/common/cnxk/roc_se.h
@@ -259,7 +259,8 @@ struct roc_se_fc_params {
struct roc_se_buf_ptr meta_buf;
struct roc_se_buf_ptr ctx_buf;
uint32_t rsvd2;
- uint16_t rsvd3;
+ uint8_t rsvd3;
+ uint8_t iv_ovr;
uint8_t cipher_iv_len;
uint8_t auth_iv_len;
--
2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [dpdk-dev] [PATCH v2 2/2] crypto/cnxk: fix: supported iv length for zuc 256
2021-11-03 13:18 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants Vidya Sagar Velumuri
@ 2021-11-03 13:18 ` Vidya Sagar Velumuri
2021-11-03 19:25 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants Akhil Goyal
1 sibling, 0 replies; 5+ messages in thread
From: Vidya Sagar Velumuri @ 2021-11-03 13:18 UTC (permalink / raw)
To: adwivedi, anoobj, ktejasree, ndabilpuram, gakhil, roy.fan.zhang
Cc: dev, vvelumuri
Fix supported IV length for ZUC 256
Add support in capability for 4 byte mac len for zuc 256
Pack the last 8 bytes of IV to 6 bytes by ignoring the 2 msb bits of
each byte.
Fixes: 29742632ac9e ("crypto/cnxk: support ZUC with 256-bit key")
Cc: vvelumuri@marvell.com
Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
v2:
* Fixed remove gerrit ID warning
diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
index a53b489a04..b94ff851a3 100644
--- a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
+++ b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
@@ -874,8 +874,8 @@ cn10k_crypto_caps_update(struct rte_cryptodev_capabilities cnxk_caps[])
caps->sym.cipher.key_size.max = 32;
caps->sym.cipher.key_size.increment = 16;
- caps->sym.cipher.iv_size.max = 24;
- caps->sym.cipher.iv_size.increment = 8;
+ caps->sym.cipher.iv_size.max = 25;
+ caps->sym.cipher.iv_size.increment = 1;
}
if ((caps->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC) &&
@@ -886,8 +886,8 @@ cn10k_crypto_caps_update(struct rte_cryptodev_capabilities cnxk_caps[])
caps->sym.auth.key_size.increment = 16;
caps->sym.auth.digest_size.max = 16;
caps->sym.auth.digest_size.increment = 4;
- caps->sym.auth.iv_size.max = 24;
- caps->sym.auth.iv_size.increment = 8;
+ caps->sym.auth.iv_size.max = 25;
+ caps->sym.auth.iv_size.increment = 1;
}
}
}
diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h
index 7959c4c7af..e4e554e8b7 100644
--- a/drivers/crypto/cnxk/cnxk_se.h
+++ b/drivers/crypto/cnxk/cnxk_se.h
@@ -37,7 +37,24 @@ struct cnxk_se_sess {
} __rte_cache_aligned;
static inline void
-pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type)
+cpt_pack_iv(uint8_t *iv_src, uint8_t *iv_dst)
+{
+ iv_dst[16] = iv_src[16];
+ /* pack the last 8 bytes of IV to 6 bytes.
+ * discard the 2 MSB bits of each byte
+ */
+ iv_dst[17] = (((iv_src[17] & 0x3f) << 2) | ((iv_src[18] >> 4) & 0x3));
+ iv_dst[18] = (((iv_src[18] & 0xf) << 4) | ((iv_src[19] >> 2) & 0xf));
+ iv_dst[19] = (((iv_src[19] & 0x3) << 6) | (iv_src[20] & 0x3f));
+
+ iv_dst[20] = (((iv_src[21] & 0x3f) << 2) | ((iv_src[22] >> 4) & 0x3));
+ iv_dst[21] = (((iv_src[22] & 0xf) << 4) | ((iv_src[23] >> 2) & 0xf));
+ iv_dst[22] = (((iv_src[23] & 0x3) << 6) | (iv_src[24] & 0x3f));
+}
+
+static inline void
+pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type,
+ uint8_t pack_iv)
{
uint32_t *iv_s_temp, iv_temp[4];
int j;
@@ -56,6 +73,8 @@ pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type)
} else {
/* ZUC doesn't need a swap */
memcpy(iv_d, iv_s, 16);
+ if (pack_iv)
+ cpt_pack_iv(iv_s, iv_d);
}
}
@@ -984,6 +1003,7 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
uint64_t offset_ctrl;
uint64_t *offset_vaddr;
uint8_t *iv_s;
+ uint8_t pack_iv = 0;
union cpt_inst_w4 cpt_inst_w4;
se_ctx = params->ctx_buf.vaddr;
@@ -999,6 +1019,11 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
iv_s = params->auth_iv_buf;
iv_len = params->auth_iv_len;
+ if (iv_len == 25) {
+ iv_len -= 2;
+ pack_iv = 1;
+ }
+
/*
* Microcode expects offsets in bytes
* TODO: Rounding off
@@ -1023,6 +1048,11 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
iv_s = params->iv_buf;
iv_len = params->cipher_iv_len;
+ if (iv_len == 25) {
+ iv_len -= 2;
+ pack_iv = 1;
+ }
+
/* EEA3 or UEA2 */
/*
* Microcode expects offsets in bytes
@@ -1081,7 +1111,7 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
cpt_inst_w4.s.dlen = inputlen + ROC_SE_OFF_CTRL_LEN;
uint8_t *iv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN);
- pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type);
+ pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type, pack_iv);
*offset_vaddr = offset_ctrl;
} else {
@@ -1095,7 +1125,8 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
/* save space for iv */
offset_vaddr = m_vaddr;
- m_vaddr = (uint8_t *)m_vaddr + ROC_SE_OFF_CTRL_LEN + iv_len;
+ m_vaddr = (uint8_t *)m_vaddr + ROC_SE_OFF_CTRL_LEN +
+ RTE_ALIGN_CEIL(iv_len, 8);
cpt_inst_w4.s.opcode_major |= (uint64_t)ROC_SE_DMA_MODE;
@@ -1123,7 +1154,7 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
*offset_vaddr = offset_ctrl;
iv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN);
- pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type);
+ pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type, pack_iv);
/* input data */
size = inputlen - iv_len;
--
2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants
2021-11-03 13:18 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants Vidya Sagar Velumuri
2021-11-03 13:18 ` [dpdk-dev] [PATCH v2 2/2] crypto/cnxk: fix: supported iv length for zuc 256 Vidya Sagar Velumuri
@ 2021-11-03 19:25 ` Akhil Goyal
1 sibling, 0 replies; 5+ messages in thread
From: Akhil Goyal @ 2021-11-03 19:25 UTC (permalink / raw)
To: Vidya Sagar Velumuri, Ankur Dwivedi, Anoob Joseph,
Tejasree Kondoj, Nithin Kumar Dabilpuram, roy.fan.zhang
Cc: dev, Vidya Sagar Velumuri
> Use appropriate ZUC constants based on key length and mac length
>
> Fixes: a90db80d7d72 ("common/cnxk: set key length for PDCP algos")
> Cc: vvelumuri@marvell.com
>
> Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
> v2:
> * Fixed remove gerrit ID warning
Applied to dpdk-next-crypto
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-03 19:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-03 11:22 [dpdk-dev] [PATCH v1 1/2] common/cnxk: fix: use appropriate zuc constants Vidya Sagar Velumuri
2021-11-03 11:22 ` [dpdk-dev] [PATCH v1 2/2] crypto/cnxk: fix: supported iv length for zuc 256 Vidya Sagar Velumuri
2021-11-03 13:18 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants Vidya Sagar Velumuri
2021-11-03 13:18 ` [dpdk-dev] [PATCH v2 2/2] crypto/cnxk: fix: supported iv length for zuc 256 Vidya Sagar Velumuri
2021-11-03 19:25 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants Akhil Goyal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).