[dpdk-dev] [PATCH] app/test: fix aad padding size in SGL operation

Arek Kusztal arkadiuszx.kusztal at intel.com
Tue Jan 3 16:38:31 CET 2017


This commit fixes unnecessary padding of aad for GCM using
scatter-gather list

Fixes: b71990ffa7e4 ("app/test: add SGL tests to cryptodev QAT suite")

Signed-off-by: Arek Kusztal <arkadiuszx.kusztal at intel.com>
---
 app/test/test_cryptodev.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index ba6bbb5..3eaf1b7 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -5983,7 +5983,7 @@ create_gcm_operation_SGL(enum rte_crypto_cipher_operation op,
 	const unsigned int iv_len = tdata->iv.len;
 	const unsigned int aad_len = tdata->aad.len;
 
-	unsigned int iv_pad_len = 0, aad_buffer_len = 0;
+	unsigned int iv_pad_len = 0;
 
 	/* Generate Crypto op data structure */
 	ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
@@ -6023,17 +6023,15 @@ create_gcm_operation_SGL(enum rte_crypto_cipher_operation op,
 
 	rte_memcpy(sym_op->cipher.iv.data, tdata->iv.data, iv_pad_len);
 
-	aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 16);
-
 	sym_op->auth.aad.data = (uint8_t *)rte_pktmbuf_prepend(
-			ut_params->ibuf, aad_buffer_len);
+			ut_params->ibuf, aad_len);
 	TEST_ASSERT_NOT_NULL(sym_op->auth.aad.data,
 			"no room to prepend aad");
 	sym_op->auth.aad.phys_addr = rte_pktmbuf_mtophys(
 			ut_params->ibuf);
 	sym_op->auth.aad.length = aad_len;
 
-	memset(sym_op->auth.aad.data, 0, aad_buffer_len);
+	memset(sym_op->auth.aad.data, 0, aad_len);
 	rte_memcpy(sym_op->auth.aad.data, tdata->aad.data, aad_len);
 
 	TEST_HEXDUMP(stdout, "iv:", sym_op->cipher.iv.data, iv_pad_len);
@@ -6041,9 +6039,9 @@ create_gcm_operation_SGL(enum rte_crypto_cipher_operation op,
 			sym_op->auth.aad.data, aad_len);
 
 	sym_op->cipher.data.length = tdata->plaintext.len;
-	sym_op->cipher.data.offset = aad_buffer_len + iv_pad_len;
+	sym_op->cipher.data.offset = aad_len + iv_pad_len;
 
-	sym_op->auth.data.offset = aad_buffer_len + iv_pad_len;
+	sym_op->auth.data.offset = aad_len + iv_pad_len;
 	sym_op->auth.data.length = tdata->plaintext.len;
 
 	return 0;
-- 
2.1.0



More information about the dev mailing list