diff mbox

[dpdk-dev] crypto/mrvl: add MRVL to hash test cases

Message ID 1519829633-32295-1-git-send-email-tdu@semihalf.com (mailing list archive)
State Superseded, archived
Delegated to: Pablo de Lara Guarch
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Tomasz Duszynski Feb. 28, 2018, 2:53 p.m. UTC 
  MRVL Crypto PMD supports most of the hash algorithms covered
by test suites thus specific bits should be set in pmd_masks.

Otherwise blockcipher authonly test returns success even though no
real tests have been executed.

Fixes: 84e0ded38ac5 ("test/crypto: add mrvl crypto unit tests")
Cc: stable@dpdk.org

Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
---
 test/test/test_cryptodev_hash_test_vectors.h | 66 ++++++++++++++++++----------
 1 file changed, 44 insertions(+), 22 deletions(-)

Comments

Tomasz Duszynski March 8, 2018, 1:27 p.m. UTC | #1 
This patch has been here for a while already. Should I respin it?

On Wed, Feb 28, 2018 at 03:53:53PM +0100, Tomasz Duszynski wrote:
> MRVL Crypto PMD supports most of the hash algorithms covered
> by test suites thus specific bits should be set in pmd_masks.
>
> Otherwise blockcipher authonly test returns success even though no
> real tests have been executed.
>
> Fixes: 84e0ded38ac5 ("test/crypto: add mrvl crypto unit tests")
> Cc: stable@dpdk.org
>
> Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
> ---
>  test/test/test_cryptodev_hash_test_vectors.h | 66 ++++++++++++++++++----------
>  1 file changed, 44 insertions(+), 22 deletions(-)
>
> diff --git a/test/test/test_cryptodev_hash_test_vectors.h b/test/test/test_cryptodev_hash_test_vectors.h
> index 93dacb7..df9202f 100644
> --- a/test/test/test_cryptodev_hash_test_vectors.h
> +++ b/test/test/test_cryptodev_hash_test_vectors.h
> @@ -324,13 +324,15 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  		.test_descr = "MD5 Digest",
>  		.test_data = &md5_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "MD5 Digest Verify",
>  		.test_data = &md5_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-MD5 Digest",
> @@ -341,7 +343,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-MD5 Digest Verify",
> @@ -352,19 +355,22 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "SHA1 Digest",
>  		.test_data = &sha1_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "SHA1 Digest Verify",
>  		.test_data = &sha1_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA1 Digest",
> @@ -375,7 +381,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA1 Digest Scatter Gather",
> @@ -394,7 +401,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA1 Digest Verify Scatter Gather",
> @@ -408,13 +416,15 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  		.test_descr = "SHA224 Digest",
>  		.test_data = &sha224_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "SHA224 Digest Verify",
>  		.test_data = &sha224_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA224 Digest",
> @@ -442,13 +452,15 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  		.test_descr = "SHA256 Digest",
>  		.test_data = &sha256_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "SHA256 Digest Verify",
>  		.test_data = &sha256_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA256 Digest",
> @@ -459,7 +471,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA256 Digest Verify",
> @@ -470,19 +483,22 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "SHA384 Digest",
>  		.test_data = &sha384_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "SHA384 Digest Verify",
>  		.test_data = &sha384_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA384 Digest",
> @@ -493,7 +509,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA384 Digest Verify",
> @@ -504,19 +521,22 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "SHA512 Digest",
>  		.test_data = &sha512_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "SHA512 Digest Verify",
>  		.test_data = &sha512_test_vector,
>  		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
> -		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
> +		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
> +			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA512 Digest",
> @@ -527,7 +547,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  	{
>  		.test_descr = "HMAC-SHA512 Digest Verify",
> @@ -538,7 +559,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
>  			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
>  			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
> -			BLOCKCIPHER_TEST_TARGET_PMD_QAT
> +			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
> +			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
>  	},
>  };
>
> --
> 2.7.4
>

--
- Tomasz Duszyński
De Lara Guarch, Pablo March 13, 2018, 9:32 a.m. UTC | #2 
Hi Tomasz,

> -----Original Message-----

> From: Tomasz Duszynski [mailto:tdu@semihalf.com]

> Sent: Thursday, March 8, 2018 1:27 PM

> To: dev@dpdk.org

> Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Doherty,

> Declan <declan.doherty@intel.com>; Richardson, Bruce

> <bruce.richardson@intel.com>; Tomasz Duszynski <tdu@semihalf.com>;

> stable@dpdk.org

> Subject: Re: [PATCH] crypto/mrvl: add MRVL to hash test cases

> 

> This patch has been here for a while already. Should I respin it?

> 

> On Wed, Feb 28, 2018 at 03:53:53PM +0100, Tomasz Duszynski wrote:

> > MRVL Crypto PMD supports most of the hash algorithms covered by test

> > suites thus specific bits should be set in pmd_masks.

> >

> > Otherwise blockcipher authonly test returns success even though no

> > real tests have been executed.

> >

> > Fixes: 84e0ded38ac5 ("test/crypto: add mrvl crypto unit tests")

> > Cc: stable@dpdk.org

> >

> > Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>


Apologies for the delay. There is no need to respin this, will review this patch tomorrow and apply it if it is OK.

Pablo
De Lara Guarch, Pablo March 14, 2018, 10:13 a.m. UTC | #3 
Hi Tomasz,

> -----Original Message-----

> From: Tomasz Duszynski [mailto:tdu@semihalf.com]

> Sent: Thursday, March 8, 2018 1:27 PM

> To: dev@dpdk.org

> Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Doherty,

> Declan <declan.doherty@intel.com>; Richardson, Bruce

> <bruce.richardson@intel.com>; Tomasz Duszynski <tdu@semihalf.com>;

> stable@dpdk.org

> Subject: Re: [PATCH] crypto/mrvl: add MRVL to hash test cases

> 


This is targetting the crypto tests, so title should be "test/crypto: ... "


> This patch has been here for a while already. Should I respin it?

> 

> On Wed, Feb 28, 2018 at 03:53:53PM +0100, Tomasz Duszynski wrote:

> > MRVL Crypto PMD supports most of the hash algorithms covered by test

> > suites thus specific bits should be set in pmd_masks.

> >

> > Otherwise blockcipher authonly test returns success even though no

> > real tests have been executed.


> >

> > Fixes: 84e0ded38ac5 ("test/crypto: add mrvl crypto unit tests")

> > Cc: stable@dpdk.org


I don't think this is a fix, so I would remove the fixes and CC stable lines.

Thanks,
Pablo

> >

> > Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
Tomasz Duszynski March 14, 2018, 10:29 a.m. UTC | #4 
On Wed, Mar 14, 2018 at 10:13:58AM +0000, De Lara Guarch, Pablo wrote:
> Hi Tomasz,
>
> > -----Original Message-----
> > From: Tomasz Duszynski [mailto:tdu@semihalf.com]
> > Sent: Thursday, March 8, 2018 1:27 PM
> > To: dev@dpdk.org
> > Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Doherty,
> > Declan <declan.doherty@intel.com>; Richardson, Bruce
> > <bruce.richardson@intel.com>; Tomasz Duszynski <tdu@semihalf.com>;
> > stable@dpdk.org
> > Subject: Re: [PATCH] crypto/mrvl: add MRVL to hash test cases
> >
>
> This is targetting the crypto tests, so title should be "test/crypto: ... "

Ack.

>
>
> > This patch has been here for a while already. Should I respin it?
> >
> > On Wed, Feb 28, 2018 at 03:53:53PM +0100, Tomasz Duszynski wrote:
> > > MRVL Crypto PMD supports most of the hash algorithms covered by test
> > > suites thus specific bits should be set in pmd_masks.
> > >
> > > Otherwise blockcipher authonly test returns success even though no
> > > real tests have been executed.
>
> > >
> > > Fixes: 84e0ded38ac5 ("test/crypto: add mrvl crypto unit tests")
> > > Cc: stable@dpdk.org
>
> I don't think this is a fix, so I would remove the fixes and CC stable lines.

Why? I think this should have been here since introduction on mrvl/cryto.
If you take a look at 84e0ded38ac5 there is
test called: test_authonly_mrvl_all()
which runs blockcipher tests with BLKCIPHER_AUTHONLY_TYPE flag.

Since MRVL pmd flag was missing from pmd_mask in
blockcipher_test_case_hash_test_cases table tests were not run. Moreover
overall_status variable was not touched thus test suite completed without
errors.

>
> Thanks,
> Pablo
>
> > >
> > > Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
>

--
- Tomasz Duszyński
De Lara Guarch, Pablo March 14, 2018, 12:03 p.m. UTC | #5 
> -----Original Message-----

> From: Tomasz Duszynski [mailto:tdu@semihalf.com]

> Sent: Wednesday, March 14, 2018 10:30 AM

> To: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>

> Cc: Tomasz Duszynski <tdu@semihalf.com>; dev@dpdk.org; Doherty,

> Declan <declan.doherty@intel.com>; Richardson, Bruce

> <bruce.richardson@intel.com>; stable@dpdk.org

> Subject: Re: [PATCH] crypto/mrvl: add MRVL to hash test cases

> 

> On Wed, Mar 14, 2018 at 10:13:58AM +0000, De Lara Guarch, Pablo wrote:

> > Hi Tomasz,

> >

> > > -----Original Message-----

> > > From: Tomasz Duszynski [mailto:tdu@semihalf.com]

> > > Sent: Thursday, March 8, 2018 1:27 PM

> > > To: dev@dpdk.org

> > > Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Doherty,

> > > Declan <declan.doherty@intel.com>; Richardson, Bruce

> > > <bruce.richardson@intel.com>; Tomasz Duszynski

> <tdu@semihalf.com>;

> > > stable@dpdk.org

> > > Subject: Re: [PATCH] crypto/mrvl: add MRVL to hash test cases

> > >

> >

> > This is targetting the crypto tests, so title should be "test/crypto: ... "

> 

> Ack.

> 

> >

> >

> > > This patch has been here for a while already. Should I respin it?

> > >

> > > On Wed, Feb 28, 2018 at 03:53:53PM +0100, Tomasz Duszynski wrote:

> > > > MRVL Crypto PMD supports most of the hash algorithms covered by

> > > > test suites thus specific bits should be set in pmd_masks.

> > > >

> > > > Otherwise blockcipher authonly test returns success even though no

> > > > real tests have been executed.

> >

> > > >

> > > > Fixes: 84e0ded38ac5 ("test/crypto: add mrvl crypto unit tests")

> > > > Cc: stable@dpdk.org

> >

> > I don't think this is a fix, so I would remove the fixes and CC stable lines.

> 

> Why? I think this should have been here since introduction on mrvl/cryto.

> If you take a look at 84e0ded38ac5 there is test called:

> test_authonly_mrvl_all() which runs blockcipher tests with

> BLKCIPHER_AUTHONLY_TYPE flag.

> 

> Since MRVL pmd flag was missing from pmd_mask in

> blockcipher_test_case_hash_test_cases table tests were not run. Moreover

> overall_status variable was not touched thus test suite completed without

> errors.


Right, I thought that this patch was just adding the PMD to the hast test cases,
I wasn't looking at it from a fix point of view, but I guess you are right.

Thanks for clarifying.
Pablo

> 

> >

> > Thanks,

> > Pablo

> >

> > > >

> > > > Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>

> >

> 

> --

> - Tomasz Duszyński
diff mbox

Patch

diff --git a/test/test/test_cryptodev_hash_test_vectors.h b/test/test/test_cryptodev_hash_test_vectors.h
index 93dacb7..df9202f 100644
--- a/test/test/test_cryptodev_hash_test_vectors.h
+++ b/test/test/test_cryptodev_hash_test_vectors.h
@@ -324,13 +324,15 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 		.test_descr = "MD5 Digest",
 		.test_data = &md5_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "MD5 Digest Verify",
 		.test_data = &md5_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-MD5 Digest",
@@ -341,7 +343,8 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-MD5 Digest Verify",
@@ -352,19 +355,22 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "SHA1 Digest",
 		.test_data = &sha1_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "SHA1 Digest Verify",
 		.test_data = &sha1_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA1 Digest",
@@ -375,7 +381,8 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA1 Digest Scatter Gather",
@@ -394,7 +401,8 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA1 Digest Verify Scatter Gather",
@@ -408,13 +416,15 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 		.test_descr = "SHA224 Digest",
 		.test_data = &sha224_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "SHA224 Digest Verify",
 		.test_data = &sha224_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA224 Digest",
@@ -442,13 +452,15 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 		.test_descr = "SHA256 Digest",
 		.test_data = &sha256_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "SHA256 Digest Verify",
 		.test_data = &sha256_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA256 Digest",
@@ -459,7 +471,8 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA256 Digest Verify",
@@ -470,19 +483,22 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "SHA384 Digest",
 		.test_data = &sha384_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "SHA384 Digest Verify",
 		.test_data = &sha384_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA384 Digest",
@@ -493,7 +509,8 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA384 Digest Verify",
@@ -504,19 +521,22 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "SHA512 Digest",
 		.test_data = &sha512_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "SHA512 Digest Verify",
 		.test_data = &sha512_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			    BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA512 Digest",
@@ -527,7 +547,8 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 	{
 		.test_descr = "HMAC-SHA512 Digest Verify",
@@ -538,7 +559,8 @@  static const struct blockcipher_test_case hash_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
 			BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-			BLOCKCIPHER_TEST_TARGET_PMD_QAT
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT |
+			BLOCKCIPHER_TEST_TARGET_PMD_MRVL
 	},
 };