From patchwork Thu Oct 12 13:07:26 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: 30292 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 613921B317; Thu, 12 Oct 2017 15:10:53 +0200 (CEST) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0044.outbound.protection.outlook.com [104.47.33.44]) by dpdk.org (Postfix) with ESMTP id 2E3D01B30C for ; Thu, 12 Oct 2017 15:10:52 +0200 (CEST) Received: from CY1PR03CA0016.namprd03.prod.outlook.com (10.174.128.26) by CO2PR03MB2358.namprd03.prod.outlook.com (10.166.93.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Thu, 12 Oct 2017 13:10:50 +0000 Received: from BN1BFFO11FD048.protection.gbl (2a01:111:f400:7c10::1:117) by CY1PR03CA0016.outlook.office365.com (2603:10b6:600::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.9 via Frontend Transport; Thu, 12 Oct 2017 13:10:49 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD048.mail.protection.outlook.com (10.58.145.3) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Thu, 12 Oct 2017 13:10:49 +0000 Received: from netperf2.ap.freescale.net ([10.232.133.164]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v9CDAKSP008029; Thu, 12 Oct 2017 06:10:45 -0700 From: To: CC: , , , Alok Makhariya Date: Thu, 12 Oct 2017 18:37:26 +0530 Message-ID: <20171012130726.4332-6-alok.makhariya@nxp.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171012130726.4332-1-alok.makhariya@nxp.com> References: <20171012130726.4332-1-alok.makhariya@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131522874497823386; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7966004)(336005)(376002)(39380400002)(346002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(4326008)(47776003)(86152003)(53936002)(6666003)(76176999)(50986999)(2351001)(106466001)(356003)(2876002)(50226002)(33646002)(305945005)(498600001)(69596002)(68736007)(81166006)(189998001)(8656003)(50466002)(8936002)(48376002)(81156014)(8676002)(105606002)(2906002)(36756003)(5003940100001)(5660300001)(85426001)(54906003)(316002)(16586007)(1076002)(6916009)(104016004)(97736004)(86362001)(77096006)(2950100002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2358; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD048; 1:9GfawWmkdRWtSmRV1KZJ/B0aneT0eld/zzgmYnVbYfO1HGBZ9W4lnR0+qhMiftc23LHpQUtmB8aYHO1+83sIuPqUMk2/q3lPPvUf5JJUBtRMehgNQzWqxzawihaBGWlJ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a29c96d-ce34-46c7-2fde-08d51172a8ba X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:CO2PR03MB2358; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 3:edLBtMHid1+PJGb1AH+Rfnpal1shaAtMR/eKbpqAwEvl4PpEXT7xtss0yJGJ16AtXDIletL30VH468thpzB+7Z8cgbqdm3dbid+59YUqwm81KJ/2BtPu1ioWw9lEEKvCoR3TRct3ohxXqyDsT02mNBVjVjX9inyZVrs+jLNvFaZ5DfMCkT0onQHTCAmXoccK4Qdk++cyMd10kLLmD9mC6zzMpOVgDeQbOEsdkpYGpWl4vJeIYcK+N+CuFTs6Y4EX2nrryIOzS6ho818j+HPo9Shbt96kN+35b1N2bnFnCVoQMz3nEToQa4nSSN0eV3IN7AHwQoofISQrx6PQuxhtX/1cB9w1WNYw3OaQE2hwTqw=; 25:h1JBJfkWLXT7j8v01KDaVXdGJficeRPPpEOiyB2Hte7N5QaV23/VpQt8V5CuJqbJJ7hhxYiamaqkuHhxRy74ScJNGLHMYPERKlFWk2zLBfq5Duom5H+MhWfjgwyAX9I4hYcQUQdmPWrMUE2GBaPL1bYfmw+oNz37gbj+X0plPKelWkI6P/PhSh2oAm4axWIc+H8aRy95NtzgAct/CxiTVhhpzFtYEJ7sRkORdkADOegd6PzPIHtD16X8ACNs73aDgzOWRtQ7a2KuFX2K56NgL4vAqF7jmYwdK6aUuUKcWigBo0HUNDFo+Cf7WWdQvQ+wwH8JBmshTdVS6oUV5arhFg== X-MS-TrafficTypeDiagnostic: CO2PR03MB2358: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 31:dloaclrVQDjWHTxK9sDPf1jh3qC0RBBJweu/AHet68LNHx62Iaq61zGX4GX+D9i56jdxSc/+Wb9KDWyPQ37ISes0BBPcusIIIzMytOHTsyOWY6gLZj5gVScmS1GcD5zItUqGWzaTHQuJpU6lpPM+xcgluo9PUBamWf2791PVZIF2ozp8oJyYMTssF5VBOyFzwXOvMragjZw0PohjeUBnP0qRO7Em3BBfUI4QE5Ldc2s=; 4:RCzBoIxVxDuu/VBxidox1ZNlu1CfePBfUOJvvMHTo7M1xyrHQw/4TsJqfr+Cr3Itzq/sIywkvcQamPrY/wCrSS/Fc56TztSYcJ3K5x19hKnS6xBOBzLwLmsSEKNNpViWAG/f2KAP9wg5x2hADSXiNdZS1CAe5H/IbP/DRqQpa5ue9nNSlyJ8FyIon7Kg0riOb2WD8A7lrlWm7LVZu4uxfvGC0MxvNvWsXIheGMZMlhN0sGA9/0+ZPyq4tssrSFOQj3d1Ve2kgtNuB0+T6QzxyPSYSEP1qZZ46ZxLUVj656I= 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)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123559100)(20161123563025)(20161123561025)(20161123556025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2358; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2358; X-Forefront-PRVS: 04583CED1A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2358; 23:neekJLlkr+36SOJyp0Zy+ezsNzA0wOP9vQv8iQkdp?= tDwdFEeWfpI7lu8bq/4lKoEbrCECgh2TponXFR8GRZArPqdcZAJ88heeOr3MNRnmdtZg+ftZjBUitMoW4jG4LmkKQ9QJZNtcvtocXqf1ss+BwB9z7IjOFmBrIRhNrWysN7N9c2gGop27ptHAzCb0wuGKO5toQ40TKlcBzmvIqprWm1ZZ6XmdcWV8gXwXG0J+bZHDPwgvaY2EuXdLcz+mTKhsWpZTS4OqkfQbtahAeMSVPMAvJs4Hc7J8NzjgYSb5pQTjuJWryyxEeg+Ht/cr7Ok7+xslLFd62muwkFtu/h2J12KdvyMnl/ngyoCwaF1er8itiosoDCk22PxEEySOn7oj7ih5K4he++4a9mUHnmKtq/xomXkaz6yDeQ2vLdQVqKm+ADAoH4/L1lgFKrnm0/FcldUhp823h+0A3aVn4tXTdvMueibA2+bRwDQRGVPFnDTfM4KJWbuzE/fdhcUWq4H6XcTkX7iYe6GHWoh7npwNX/4X2OF/TIjd/dLt9+9vWWeyX3VccW8PBI8SerCg9Bouvhf6JmvhDI8yONGrXiSmiiJwyNMlQOdNMwvNSrgLYltE3Zj1jascDrMJY9s4a5Tz5qN7eI4w1b8hkBQWCDcGzstxcrtRkwiXl8yHvte26ND16z7W8aPA4Zi/KAPEeIXnE0amwhlmWdiClAig8voUF20+e6kUKn3lQyfRbi5fdIwR1ng0hCNKi/MkSNi3G4N54mVPyNVMFpD0nFPekgRA5UagV3MN9UGzLx/E+Vq0X23On2Ppe4hOSn2RELwKRF/U/t7fZ+TQtCgxoVu82xP4jZbWDXlOMq3dYRw7aiImZJscHS2bQnlOt1kvct/SrCWIi7/dP2dqPwkimNqfylEjLp11k+dqq6zdzcVEF3ZABAvrAg2PVDN2sCKFHXZmT5pmu2/1iQPPH8B5yUBKiNtwg3Jb1SxyWdB6HmtTYIaMfCJls4zdWuWZRLNzBKew81eVv2gBFAUdokc1wOtgciODPSuZrxwhU47UdL6Bs6ZEby2/vlvNKTBhr15B4Nt/3kGKyNSZ5utOIbUxboP5EVqYWlsmZNGqjy69ousfBFyaMk1OplMfeE2WpTqaa+7uANAy8GFEAYyyn4grW7pHsmJLshPkbtBiam9LHKq3Qt9ZAdBYNbRh1GuB1Rfc0Fa5iosTZfv8k9KHGlZN2XCyEFz3xE3Pa2zyYIah3p3k1S/gZsO/ZgyOf1uiSUZO4j/YQ5m X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 6:43GyQocdV7gQIIy83/RtFVenO5u33xp7R9iPLC3H/lpuqS6o4y290q7jP1kyy51e08Vt5mf1QLxITepGXeflKsoNy+OuIXDDQ9/0SnX+D+Q5kzdoinn5dQOQtfRuLqrpqa7sh0ke8XDMeWdZH1MjIiaXd79c5QyehyMDTytxYTiRqQTa0H7T1flsq+8dpmFqQgup1KYs5WLygfTEJ+3Yc8UhhGJs6pRwDUwmpIw/6nEpzR9MqLlwmYDC7yWbdITJJZFQHnS/2Siw6Iut0Na3p+INSIMRaznVlZsa/7CBtK1+XClMasQEEcCPQ3Ti4nOwi0THbTpQcBcw+CDGmIxjgg==; 5:Yo9LjUquwT4iCzJTSo7nXhg7BOoZ4DaZINq0CnJOlhI6DRNcPgurs2qivtyGl5vUsb98dn92tJtuMrmYWq2UCeOOg8Qh9Q5BdTFY6lCXt9FQM6nJ8HerMkqJtlah74IoV2yjL8o8NKzwgFIgY1DXKg==; 24:/3li8JB2lqMJc3ka7OAgip4KgVUYQcxygtpuZZ9Lmy0fFh4ZTspSTfY8sqiO+YIYlUrH4++YAWefdrGtgwVNWgvzlMs/nZR0AP3M1bq1IY8=; 7:Rp9YRJeRwqSaiyXSOFOJyndneUZ1XjQKHr1sodelWYMS0TwFMlL7Igjpn3Z/3adpX0G6Xc+C8TQS7fUh/DgcEOIjcUTzir7FaG5aLc91RXHAlUAMQlZbXFpd/hc0v1EnEqyt6uDOCXiizGh5AwkMP56EDm9zAttmlgLei9vsoqOAzSJrm1v7mjIRrLI9X27PCXT66RTgGORyGDh8iXypauQDuWDeXUYNNFx0OrYAMmc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2017 13:10:49.2363 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2358 Subject: [dpdk-dev] [PATCH] 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 --- drivers/crypto/dpaa_sec/dpaa_sec.c | 45 +++++++++++++++++++---------- 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(+), 22 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index b618b59..70db1bc 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); @@ -639,9 +638,16 @@ build_cipher_only(struct rte_crypto_op *op, dpaa_sec_session *ses) 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 +667,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 +679,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 +720,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 +740,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 +765,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 +791,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 = mbuf->buf_physaddr + mbuf->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 +823,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 +836,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 +860,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 f889ecd..72584ab 100644 --- a/test/test/test_cryptodev.c +++ b/test/test/test_cryptodev.c @@ -8629,6 +8629,12 @@ static struct unit_test_suite cryptodev_aesni_mb_testsuite = { TEST_CASE_ST(ut_setup, ut_teardown, test_DES_docsis_mb_all), + /** Out of place tests */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_mb_AES_GCM_authenticated_encryption_oop), + TEST_CASE_ST(ut_setup, ut_teardown, + test_mb_AES_GCM_authenticated_decryption_oop), + 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 32c5deb..54ac8d6 100644 --- a/test/test/test_cryptodev_aes_test_vectors.h +++ b/test/test/test_cryptodev_aes_test_vectors.h @@ -1432,7 +1432,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 " @@ -1443,7 +1444,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", @@ -1594,7 +1596,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", @@ -1603,7 +1606,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 e4efd23..259a540 100644 --- a/test/test/test_cryptodev_des_test_vectors.h +++ b/test/test/test_cryptodev_des_test_vectors.h @@ -1182,7 +1182,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" @@ -1192,7 +1193,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"