[dpdk-stable] patch 'crypto/qat: fix cipher descriptor for ZUC and SNOW' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 0665fb6e097a758af43ef525e9e0dde16d960ff5 Mon Sep 17 00:00:00 2001
From: Arek Kusztal <arkadiuszx.kusztal at intel.com>
Date: Wed, 29 Apr 2020 16:51:34 +0200
Subject: [PATCH] crypto/qat: fix cipher descriptor for ZUC and SNOW

[ upstream commit fae347cb345a844442c18e1384b832912e07daa0 ]

Offset of cd pointer is too big by state1size + state2size, so few extra
unnecessary bytes will be copied into cd. Snow offset was improved as well.

Fixes: d9b7d5bbc845 ("crypto/qat: add ZUC EEA3/EIA3 capability")

Signed-off-by: Arek Kusztal <arkadiuszx.kusztal at intel.com>
Acked-by: Fiona Trahe <fiona.trahe at intel.com>
---
 drivers/crypto/qat/qat_sym_session.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
index 72290ba480..f69c2e2fd7 100644
--- a/drivers/crypto/qat/qat_sym_session.c
+++ b/drivers/crypto/qat/qat_sym_session.c
@@ -1524,7 +1524,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
 		(struct icp_qat_fw_la_auth_req_params *)
 		((char *)&req_tmpl->serv_specif_rqpars +
 		ICP_QAT_FW_HASH_REQUEST_PARAMETERS_OFFSET);
-	uint16_t state1_size = 0, state2_size = 0;
+	uint16_t state1_size = 0, state2_size = 0, cd_extra_size = 0;
 	uint16_t hash_offset, cd_size;
 	uint32_t *aad_len = NULL;
 	uint32_t wordIndex  = 0;
@@ -1700,7 +1700,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
 		memcpy(cipherconfig->key, authkey, authkeylen);
 		memset(cipherconfig->key + authkeylen,
 				0, ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ);
-		cdesc->cd_cur_ptr += sizeof(struct icp_qat_hw_cipher_config) +
+		cd_extra_size += sizeof(struct icp_qat_hw_cipher_config) +
 				authkeylen + ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ;
 		auth_param->hash_state_sz = ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ >> 3;
 		break;
@@ -1716,8 +1716,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
 			+ ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ);
 
 		memcpy(cdesc->cd_cur_ptr + state1_size, authkey, authkeylen);
-		cdesc->cd_cur_ptr += state1_size + state2_size
-			+ ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ;
+		cd_extra_size += ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ;
 		auth_param->hash_state_sz = ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ >> 3;
 		cdesc->min_qat_dev_gen = QAT_GEN2;
 
@@ -1803,7 +1802,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
 			 RTE_ALIGN_CEIL(hash_cd_ctrl->inner_state1_sz, 8))
 					>> 3);
 
-	cdesc->cd_cur_ptr += state1_size + state2_size;
+	cdesc->cd_cur_ptr += state1_size + state2_size + cd_extra_size;
 	cd_size = cdesc->cd_cur_ptr-(uint8_t *)&cdesc->cd;
 
 	cd_pars->u.s.content_desc_addr = cdesc->cd_paddr;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:51.704190182 +0100
+++ 0176-crypto-qat-fix-cipher-descriptor-for-ZUC-and-SNOW.patch	2020-05-19 14:04:44.520653884 +0100
@@ -1,13 +1,14 @@
-From fae347cb345a844442c18e1384b832912e07daa0 Mon Sep 17 00:00:00 2001
+From 0665fb6e097a758af43ef525e9e0dde16d960ff5 Mon Sep 17 00:00:00 2001
 From: Arek Kusztal <arkadiuszx.kusztal at intel.com>
 Date: Wed, 29 Apr 2020 16:51:34 +0200
 Subject: [PATCH] crypto/qat: fix cipher descriptor for ZUC and SNOW
 
+[ upstream commit fae347cb345a844442c18e1384b832912e07daa0 ]
+
 Offset of cd pointer is too big by state1size + state2size, so few extra
 unnecessary bytes will be copied into cd. Snow offset was improved as well.
 
 Fixes: d9b7d5bbc845 ("crypto/qat: add ZUC EEA3/EIA3 capability")
-Cc: stable at dpdk.org
 
 Signed-off-by: Arek Kusztal <arkadiuszx.kusztal at intel.com>
 Acked-by: Fiona Trahe <fiona.trahe at intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
-index 3727d564d8..58bdbd3438 100644
+index 72290ba480..f69c2e2fd7 100644
 --- a/drivers/crypto/qat/qat_sym_session.c
 +++ b/drivers/crypto/qat/qat_sym_session.c
-@@ -1664,7 +1664,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
+@@ -1524,7 +1524,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
  		(struct icp_qat_fw_la_auth_req_params *)
  		((char *)&req_tmpl->serv_specif_rqpars +
  		ICP_QAT_FW_HASH_REQUEST_PARAMETERS_OFFSET);
@@ -28,7 +29,7 @@
  	uint16_t hash_offset, cd_size;
  	uint32_t *aad_len = NULL;
  	uint32_t wordIndex  = 0;
-@@ -1886,7 +1886,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
+@@ -1700,7 +1700,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
  		memcpy(cipherconfig->key, authkey, authkeylen);
  		memset(cipherconfig->key + authkeylen,
  				0, ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ);
@@ -37,7 +38,7 @@
  				authkeylen + ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ;
  		auth_param->hash_state_sz = ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ >> 3;
  		break;
-@@ -1902,8 +1902,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
+@@ -1716,8 +1716,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
  			+ ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ);
  
  		memcpy(cdesc->cd_cur_ptr + state1_size, authkey, authkeylen);
@@ -47,7 +48,7 @@
  		auth_param->hash_state_sz = ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ >> 3;
  		cdesc->min_qat_dev_gen = QAT_GEN2;
  
-@@ -1989,7 +1988,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
+@@ -1803,7 +1802,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
  			 RTE_ALIGN_CEIL(hash_cd_ctrl->inner_state1_sz, 8))
  					>> 3);