From patchwork Sun Oct 22 19:35:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alok.makhariya@nxp.com X-Patchwork-Id: 30680 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F36A01B384; Sun, 22 Oct 2017 21:38:52 +0200 (CEST) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0071.outbound.protection.outlook.com [104.47.32.71]) by dpdk.org (Postfix) with ESMTP id D94671B384 for ; Sun, 22 Oct 2017 21:38:49 +0200 (CEST) Received: from MWHPR03CA0030.namprd03.prod.outlook.com (10.174.173.147) by BN6PR03MB2692.namprd03.prod.outlook.com (10.173.144.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Sun, 22 Oct 2017 19:38:47 +0000 Received: from BL2FFO11OLC014.protection.gbl (2a01:111:f400:7c09::139) by MWHPR03CA0030.outlook.office365.com (2603:10b6:301:3b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.156.4 via Frontend Transport; Sun, 22 Oct 2017 19:38:47 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; NXP1.onmicrosoft.com; dkim=none (message not signed) header.d=none;NXP1.onmicrosoft.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11OLC014.mail.protection.outlook.com (10.173.160.144) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.156.4 via Frontend Transport; Sun, 22 Oct 2017 19:38:46 +0000 Received: from netperf2.ap.freescale.net ([10.232.133.164]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v9MJccOA027128; Sun, 22 Oct 2017 12:38:44 -0700 From: To: CC: , , Alok Makhariya Date: Mon, 23 Oct 2017 01:05:51 +0530 Message-ID: <20171022193551.953-2-alok.makhariya@nxp.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171022193551.953-1-alok.makhariya@nxp.com> References: <20171012130726.4332-5-alok.makhariya@nxp.com> <20171022193551.953-1-alok.makhariya@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131531747272789632; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39860400002)(39380400002)(376002)(346002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(2876002)(104016004)(6916009)(54906003)(36756003)(2906002)(50986999)(76176999)(305945005)(106466001)(5660300001)(2950100002)(105606002)(77096006)(85426001)(6666003)(2351001)(8656005)(8676002)(8656005)(1076002)(356003)(97736004)(47776003)(33646002)(50226002)(189998001)(316002)(81156014)(16586007)(81166006)(8936002)(53936002)(86362001)(86152003)(498600001)(68736007)(5003940100001)(48376002)(4326008)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2692; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC014; 1:8PwDvXS/Qh66nTXuUPJntqFxkqExaFgVa4km9GFKPdYdFc36myQY7kEGwXC/3SNvMCRytu1j4UCfwKCL8jo8lBTUahpPVjJKJ1C6VRg7nOCOmWl23z0Hox9WyqGWUnnh MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1a6989d8-db9d-48b6-c0ca-08d519848340 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603199); SRVR:BN6PR03MB2692; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 3:YQocysomnpp6l44GovZgnBl+u8JFWfzy+ackHgfIxvD2n4qDNMZwgTXdMvE/Zbcv7p5LFPmQMZwbbH/EcXFMjdQ1yZiXWGOH050GoeXgzG9ofc36Y5koldxX8hq+fNAVQUfC7PsQ0mg0q7ZV2Lo9+JbtFqTIf9jXwsSO1QJVTQMLb25tQU9ztoaD/3zPbcTObV8ywETJw2Fb/OlSD30U7wDa6igWpA5FMRbiuNike7pMnq4htK9zE58Cg69KPogaCzDztcSYvtn5J7NyQHFRkZfA13VrGowmqe7R9zUPVI6lG3NxHdl+Y/tQka6oalT37zSSkEPV7bFFi9Kw/IdqBdLB6FFbcH9w53EBIQUlABI=; 25:8DXyOUk7gqJYtb3RCLbsKfZqJwZN86W0GkqPZU+HYie+kUqUUbutBZpKwXBQSpXsaeB9+Tz7IQAitCbBGVHFJNtaIWruwfW0QOxaO4asATpFbxE+H0fasSyuFdvJlKYKIvGiKyj7tj0q/0ivUDibY6R97+lXpseiCtV1lbkEzhmjg7ymw49flCzUQuonmV0HGljAYuh/bBl1Q8gFVbHnQjFyZzvel6pYaEOARglfkhXhlY3YrAP0HSPywnQUYxbfWTMSUH1NAip/hY74YuB51ltDJtQBEbT18EaC+vCtSwcRT0+Ynen7mwu6vGJRTfnVHkHozhlTB8JEdMSDytpqyA== X-MS-TrafficTypeDiagnostic: BN6PR03MB2692: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 31:2v4ehZ07fXLthFyLAiFrybxXgpYm+3fNNszllzBzYh+gZRbcWp5apEDdAaHu2M3Ro4M2gVwEG5Yv6iSNJBNmR1ZDBpCcR3y+ItWFJZ/qfho/7cTsV5Jgp+OOgiUk2ifZ9H/TeNLet3gY1YT4qHRUBWrdumkpAquYh460L7eSjQa0XkEnoyQp9NdlpzzJjiQTFAC/iygZ0DvcgfSs+LKlDSqQZKEDeVdJ9kGTsr08qeE=; 4:2Ut5GQBIMtQkWRUBcxNJktFwyf4N0UDDK+m6Nvn4cTUalMLpLM3QE/U6F2ctKwg2DR9OUxIClA5NybeQDreuSswBrLxMKJB6wUm3I1I2PKHQZLf0mT+8de/dC/dUifWCSoxDlh8/QqMPfU0hUL0UlMbADc9x1Plk8X4TGlJALIWEDqROMNYYntSZkPCxQ2ssCYTytG5XcbHnnOqP58A3tfaL+w6rQYonNX26eIAK+L55YaZAzEzyO3ADs85CKPutXQplfuqmzWyrVRVGIGlWZ5EdsF6c8Uyajk8Q+PKk03k= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231020)(3002001)(100000703101)(100105400095)(6055026)(6096035)(20161123559100)(20161123563025)(20161123561025)(20161123556025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR03MB2692; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR03MB2692; X-Forefront-PRVS: 0468FE4A2B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2692; 23:4V9qaVerb5I9XLfp7zQ7ZKgd5Rm39PUgFdD1syVnU?= c9ycIMxfGsMo0FLHfVyqnG5SbiUCWRWXkjcXZ9jNmxzswCslCKIKJaxMR6mcARRJ/rtfU1wGmzjiZYc2kwpKcNHbpw3BoVfDH8KHNFVl/hFkfWY7vDT1QCcvYmcnxrsik5BFUIrewBAGcCyT501akhMzYMX+UxjYMkKjG+cTpThAbWbbKA8zehE6btD9BYhb9QvkX/fY/nAjWYA/N5ENPt3EoJUY4Mbyo5UMAhaUk3j3UaSO3wNDb2RgF+8CPqkpkY3m6o318QrwFNH9/nOAByCTk8jlYCicmff/2UoamUC3MXKzCcnlVWKwrCFqfGc/NlfigoU2Ezq3P0N+b/Lt1/VN5R1J575T0nwVD0rw7+fIhHdmJZO1b0Jl+0AZZl6fAwicGoGbOQ+WCtBX1NYrFKMHF5dYe0AqLRD2fg7AhasV48ojMsUo2nF4qs7d3iX03HjVoL8VxSdraCguGoQUWweKvky1cxitZDds5sWQaCwcibHjeD2jyFubH4jbcW9Pl8sNX/iNpSkVx0UI6/uIDeyCtDPL9ykwS/tcvdmikh/XKrJeHPjfbnPfID06N4G6BpfHlFaTI9MFU4LIEVWG+4VVKbIpxWhqWOSYJA0EmR7Gc6zEkzLThk9U/FNOdTtpCxN4Zca4qYac/M45Sr4wh39Hy/mJAHI3f9z95tXP1F/HNqKrwUOM22EjY+UIs+GeiXO8oic9xf2ijaNLUu7gALJDNwFhtjsNj3PNbohf8dmBeaISevPVgOML1wOJ6Zh2KA8vwmOGPjmFVj9956NnVJs01I4eBE42vtPM6gkpxQoxyoD1GBKMwlULuMFe3lpr0w6LX9+NdUzeo2psrCPVgrgHGOrZBiy9Fu0Yf4HiUWcv47mLEHKAqJaOC1Rzuv3NXh9mQNrZ7PGlIoWmWjfxsmodDZBTM5GKNjR2B+dsrJznQFyYUdbhz5sBWCPLCBs39qeTz04qi+MDlUW+qoscfE8bDTBK3zVG8BNWTF0NBe+D5rPCVmXKeR6VZv8epLZz+JAUlVfdN1RGbVzvD5s10h/NN/vO2ioecd+qQ4PyuBU0Pmdl+9FlAw9JVkLLtOa8gkloCbf3Bs7yW7Ya2DbqOhUhvTZPwy4UFmkAaWY7UAOnPsufSTeYx6iGgaaUJATxAzC1f9td6cEX/Kc+H9g6r5BslYnO+Eq5VmyEwi/LEbhiBL4epVFgJbYmuQ6DontTuA= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 6:AeyASbaFFRDJDZTpOCvKCSnlCRS45TO4heZrz4AJ0rPoQRnKk7s7VjZR+Kd9zybYZZrC9SXS+o6hqaRLRughmFEWCCH2Wxv3DTSorupQfAxTS+1p4RDvOyX9c9vBDyMhzOvcrS2kip/0upoIXBV7xoJuwg9ZBY4zksV3sBuEcK4hwG3M5QUvH7i1zwTsQO/DC1KbUDIhrVcMaNms2vzguP0L97X1IOGjpS7JYa/A0xZdzWcJaBJx1om+zqQQ3Nc2qW5rsXkqIp9epwtSK2nU6W9wV4HkwcMP2R5+nOh6dcIapVp//9X0zPaKYizVbAvDCtLSE88oE/MY4MXqRhZDow==; 5:vUnhSFQraKCix4axcNB2D4/Y0r/kn9BGSe/MAXEb96jj/Plezi1a5SF3In+yETCKnxep6fXPLcCaJl01ZKAEGjCYMBggqGBLf2E6TTaszgVpxgERunDk8B8AYvf7SJM/jhE+WFu9EH+2vclelBcWbA==; 24:jzEfukpfxyPFzZPEgmXv445URHQhy1Hyor/DKkHJPqnNtSh6uBRXaGqBPzAgl32unF+88Ny6IfqhtVObXhU6psetA7K1vmHa36I3/970kXI=; 7:0G+oYAipleX07bezOOBWjsKunTNywjREN87He7eIHnzHuYtvLnWDxaGdc0V3k5XUZWEPiPDELnKnBxHEojL0yzVudVNNttgNol/fe0Ia8bVctq5awD1690EawGc8eqjC8sH55xnl/R+ky0RIjVk5TKHWooOM6UbfIrrLOekaisFLzUYtp1od1/x6tY5mpWlFEwvhx7sH0bG90ewQ4yaSVkDHqsIL18BNyJL6CE+v+Cg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2017 19:38:46.9669 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2692 Subject: [dpdk-dev] [PATCH v2 2/2] crypto/dpaa_sec: add support for out of place buffers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Alok Makhariya Enable out of place buffer test cases in dpaa_sec Signed-off-by: Alok Makhariya Acked-by: Akhil Goyal --- changes in v2: corrected compilation issues in test drivers/crypto/dpaa_sec/dpaa_sec.c | 46 ++++++++++++++++++----------- test/test/test_cryptodev.c | 6 ++++ test/test/test_cryptodev_aes_test_vectors.h | 12 +++++--- test/test/test_cryptodev_des_test_vectors.h | 6 ++-- 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 53f004e..26a29a4 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -623,11 +623,10 @@ static inline struct dpaa_sec_job * build_cipher_only(struct rte_crypto_op *op, dpaa_sec_session *ses) { struct rte_crypto_sym_op *sym = op->sym; - struct rte_mbuf *mbuf = sym->m_src; struct dpaa_sec_job *cf; struct dpaa_sec_op_ctx *ctx; struct qm_sg_entry *sg; - phys_addr_t start_addr; + phys_addr_t src_start_addr, dst_start_addr; uint8_t *IV_ptr = rte_crypto_op_ctod_offset(op, uint8_t *, ses->iv.offset); @@ -637,11 +636,17 @@ build_cipher_only(struct rte_crypto_op *op, dpaa_sec_session *ses) cf = &ctx->job; ctx->op = op; - start_addr = rte_pktmbuf_mtophys(mbuf); + + src_start_addr = rte_pktmbuf_mtophys(sym->m_src); + + if (sym->m_dst) + dst_start_addr = rte_pktmbuf_mtophys(sym->m_dst); + else + dst_start_addr = src_start_addr; /* output */ sg = &cf->sg[0]; - qm_sg_entry_set64(sg, start_addr + sym->cipher.data.offset); + qm_sg_entry_set64(sg, dst_start_addr + sym->cipher.data.offset); sg->length = sym->cipher.data.length + ses->iv.length; cpu_to_hw_sg(sg); @@ -661,7 +666,7 @@ build_cipher_only(struct rte_crypto_op *op, dpaa_sec_session *ses) cpu_to_hw_sg(sg); sg++; - qm_sg_entry_set64(sg, start_addr + sym->cipher.data.offset); + qm_sg_entry_set64(sg, src_start_addr + sym->cipher.data.offset); sg->length = sym->cipher.data.length; sg->final = 1; cpu_to_hw_sg(sg); @@ -673,16 +678,20 @@ static inline struct dpaa_sec_job * build_cipher_auth_gcm(struct rte_crypto_op *op, dpaa_sec_session *ses) { struct rte_crypto_sym_op *sym = op->sym; - struct rte_mbuf *mbuf = sym->m_src; struct dpaa_sec_job *cf; struct dpaa_sec_op_ctx *ctx; struct qm_sg_entry *sg; - phys_addr_t start_addr; uint32_t length = 0; + phys_addr_t src_start_addr, dst_start_addr; uint8_t *IV_ptr = rte_crypto_op_ctod_offset(op, uint8_t *, ses->iv.offset); - start_addr = mbuf->buf_physaddr + mbuf->data_off; + src_start_addr = sym->m_src->buf_physaddr + sym->m_src->data_off; + + if (sym->m_dst) + dst_start_addr = sym->m_dst->buf_physaddr + sym->m_dst->data_off; + else + dst_start_addr = src_start_addr; ctx = dpaa_sec_alloc_ctx(ses); if (!ctx) @@ -710,7 +719,7 @@ build_cipher_auth_gcm(struct rte_crypto_op *op, dpaa_sec_session *ses) cpu_to_hw_sg(sg); sg++; } - qm_sg_entry_set64(sg, start_addr + sym->aead.data.offset); + qm_sg_entry_set64(sg, src_start_addr + sym->aead.data.offset); sg->length = sym->aead.data.length; length += sg->length; sg->final = 1; @@ -730,7 +739,7 @@ build_cipher_auth_gcm(struct rte_crypto_op *op, dpaa_sec_session *ses) cpu_to_hw_sg(sg); sg++; } - qm_sg_entry_set64(sg, start_addr + sym->aead.data.offset); + qm_sg_entry_set64(sg, src_start_addr + sym->aead.data.offset); sg->length = sym->aead.data.length; length += sg->length; cpu_to_hw_sg(sg); @@ -755,7 +764,7 @@ build_cipher_auth_gcm(struct rte_crypto_op *op, dpaa_sec_session *ses) sg++; qm_sg_entry_set64(&cf->sg[0], dpaa_mem_vtop(sg)); qm_sg_entry_set64(sg, - start_addr + sym->aead.data.offset - ses->auth_only_len); + dst_start_addr + sym->aead.data.offset - ses->auth_only_len); sg->length = sym->aead.data.length + ses->auth_only_len; length = sg->length; if (is_encode(ses)) { @@ -781,16 +790,19 @@ static inline struct dpaa_sec_job * build_cipher_auth(struct rte_crypto_op *op, dpaa_sec_session *ses) { struct rte_crypto_sym_op *sym = op->sym; - struct rte_mbuf *mbuf = sym->m_src; struct dpaa_sec_job *cf; struct dpaa_sec_op_ctx *ctx; struct qm_sg_entry *sg; - phys_addr_t start_addr; + phys_addr_t src_start_addr, dst_start_addr; uint32_t length = 0; uint8_t *IV_ptr = rte_crypto_op_ctod_offset(op, uint8_t *, ses->iv.offset); - start_addr = mbuf->buf_physaddr + mbuf->data_off; + src_start_addr = sym->m_src->buf_physaddr + sym->m_src->data_off; + if (sym->m_dst) + dst_start_addr = sym->m_dst->buf_physaddr + sym->m_dst->data_off; + else + dst_start_addr = src_start_addr; ctx = dpaa_sec_alloc_ctx(ses); if (!ctx) @@ -810,7 +822,7 @@ build_cipher_auth(struct rte_crypto_op *op, dpaa_sec_session *ses) cpu_to_hw_sg(sg); sg++; - qm_sg_entry_set64(sg, start_addr + sym->auth.data.offset); + qm_sg_entry_set64(sg, src_start_addr + sym->auth.data.offset); sg->length = sym->auth.data.length; length += sg->length; sg->final = 1; @@ -823,7 +835,7 @@ build_cipher_auth(struct rte_crypto_op *op, dpaa_sec_session *ses) sg++; - qm_sg_entry_set64(sg, start_addr + sym->auth.data.offset); + qm_sg_entry_set64(sg, src_start_addr + sym->auth.data.offset); sg->length = sym->auth.data.length; length += sg->length; cpu_to_hw_sg(sg); @@ -847,7 +859,7 @@ build_cipher_auth(struct rte_crypto_op *op, dpaa_sec_session *ses) /* output */ sg++; qm_sg_entry_set64(&cf->sg[0], dpaa_mem_vtop(sg)); - qm_sg_entry_set64(sg, start_addr + sym->cipher.data.offset); + qm_sg_entry_set64(sg, dst_start_addr + sym->cipher.data.offset); sg->length = sym->cipher.data.length; length = sg->length; if (is_encode(ses)) { diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c index cb9b486..72988c5 100644 --- a/test/test/test_cryptodev.c +++ b/test/test/test_cryptodev.c @@ -9370,6 +9370,12 @@ static struct unit_test_suite cryptodev_dpaa_sec_testsuite = { TEST_CASE_ST(ut_setup, ut_teardown, test_AES_GCM_auth_decryption_test_case_256_7), + /** Out of place tests */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_AES_GCM_authenticated_encryption_oop_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_AES_GCM_authenticated_decryption_oop_test_case_1), + TEST_CASES_END() /**< NULL terminate unit test array */ } }; diff --git a/test/test/test_cryptodev_aes_test_vectors.h b/test/test/test_cryptodev_aes_test_vectors.h index 050d868..9c13041 100644 --- a/test/test/test_cryptodev_aes_test_vectors.h +++ b/test/test/test_cryptodev_aes_test_vectors.h @@ -1446,7 +1446,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 | BLOCKCIPHER_TEST_TARGET_PMD_QAT | BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | - BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC + BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC | + BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC }, { .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest " @@ -1457,7 +1458,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 | BLOCKCIPHER_TEST_TARGET_PMD_QAT | BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | - BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC + BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC | + BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC }, { .test_descr = "AES-128-CBC HMAC-SHA224 Encryption Digest", @@ -1614,7 +1616,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = { .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT | - BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC + BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC | + BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC }, { .test_descr = "AES-256-CBC OOP Decryption", @@ -1623,7 +1626,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = { .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT | - BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC + BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC | + BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC }, { .test_descr = "AES-128-CTR Encryption", diff --git a/test/test/test_cryptodev_des_test_vectors.h b/test/test/test_cryptodev_des_test_vectors.h index 0602df7..d09e23d 100644 --- a/test/test/test_cryptodev_des_test_vectors.h +++ b/test/test/test_cryptodev_des_test_vectors.h @@ -1188,7 +1188,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = { .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT | - BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC + BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC | + BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC }, { .test_descr = "3DES-128-CBC HMAC-SHA1 Decryption Digest" @@ -1198,7 +1199,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = { .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT | - BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC + BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC | + BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC }, { .test_descr = "3DES-128-CBC HMAC-SHA1 Encryption Digest"