diff mbox series

[v5,1/2] test/crypto: add capability check

Message ID 1587057864-160450-2-git-send-email-pablo.de.lara.guarch@intel.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series Crypto test refactoring (first phase) |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-nxp-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing fail Testing issues
ci/iol-intel-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK

Commit Message

De Lara Guarch, Pablo April 16, 2020, 5:24 p.m. UTC 
  Check if test case is supported by the crypto device,
including algorithm and some of its parameter, such as key length,
IV length, etc, using the capabilities API.
If it is not supported, test case is skipped.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Adam Dybkowski <adamx.dybkowski@intel.com>
Tested-by: Ruifeng Wang <ruifeng.wang@arm.com>

---
 app/test/test_cryptodev_blockcipher.c | 56 +++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

Comments

Fiona Trahe April 16, 2020, 5:53 p.m. UTC | #1 
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Pablo de Lara
> Sent: Thursday, April 16, 2020 6:24 PM
> To: Doherty, Declan <declan.doherty@intel.com>
> Cc: dev@dpdk.org; akhil.goyal@nxp.com; De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> Subject: [dpdk-dev] [PATCH v5 1/2] test/crypto: add capability check
> 
> Check if test case is supported by the crypto device,
> including algorithm and some of its parameter, such as key length,
> IV length, etc, using the capabilities API.
> If it is not supported, test case is skipped.
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> Acked-by: Adam Dybkowski <adamx.dybkowski@intel.com>
> Tested-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
diff mbox series

Patch

diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c
index 4973c74..8453470 100644
--- a/app/test/test_cryptodev_blockcipher.c
+++ b/app/test/test_cryptodev_blockcipher.c
@@ -21,6 +21,49 @@ 
 #include "test_cryptodev_hash_test_vectors.h"
 
 static int
+verify_algo_support(const struct blockcipher_test_case *t,
+		const uint8_t dev_id, const uint32_t digest_len)
+{
+	int ret = 0;
+	const struct blockcipher_test_data *tdata = t->test_data;
+	struct rte_cryptodev_sym_capability_idx cap_idx;
+	const struct rte_cryptodev_symmetric_capability *capability;
+
+	if (t->op_mask & BLOCKCIPHER_TEST_OP_CIPHER) {
+		cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+		cap_idx.algo.cipher = tdata->crypto_algo;
+		capability = rte_cryptodev_sym_capability_get(dev_id, &cap_idx);
+		if (capability == NULL)
+			return -1;
+
+		if (cap_idx.algo.cipher != RTE_CRYPTO_CIPHER_NULL)
+			ret = rte_cryptodev_sym_capability_check_cipher(capability,
+							tdata->cipher_key.len,
+							tdata->iv.len);
+		if (ret != 0)
+			return -1;
+	}
+
+	if (t->op_mask & BLOCKCIPHER_TEST_OP_AUTH) {
+		cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+		cap_idx.algo.auth = tdata->auth_algo;
+		capability = rte_cryptodev_sym_capability_get(dev_id, &cap_idx);
+		if (capability == NULL)
+			return -1;
+
+		if (cap_idx.algo.auth != RTE_CRYPTO_AUTH_NULL)
+			ret = rte_cryptodev_sym_capability_check_auth(capability,
+							tdata->auth_key.len,
+							digest_len,
+							0);
+		if (ret != 0)
+			return -1;
+	}
+
+	return 0;
+}
+
+static int
 test_blockcipher_one_case(const struct blockcipher_test_case *t,
 	struct rte_mempool *mbuf_pool,
 	struct rte_mempool *op_mpool,
@@ -98,6 +141,8 @@  test_blockcipher_one_case(const struct blockcipher_test_case *t,
 				printf("Device doesn't support out-of-place "
 					"scatter-gather in input mbuf. "
 					"Test Skipped.\n");
+				snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
+					"SKIPPED");
 				return 0;
 			}
 		} else {
@@ -105,6 +150,8 @@  test_blockcipher_one_case(const struct blockcipher_test_case *t,
 				printf("Device doesn't support in-place "
 					"scatter-gather mbufs. "
 					"Test Skipped.\n");
+				snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
+					"SKIPPED");
 				return 0;
 			}
 		}
@@ -144,6 +191,15 @@  test_blockcipher_one_case(const struct blockcipher_test_case *t,
 		goto error_exit;
 	}
 
+	/* Check if PMD is capable of performing that test */
+	if (verify_algo_support(t, dev_id, digest_len) < 0) {
+		RTE_LOG(DEBUG, USER1,
+			"Device does not support this algorithm."
+			"Test Skipped.\n");
+		snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN, "SKIPPED");
+		return 0;
+	}
+
 	/* preparing data */
 	if (t->op_mask & BLOCKCIPHER_TEST_OP_AUTH)
 		buf_len += digest_len;