From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 45626A0547; Fri, 29 Oct 2021 16:43:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08FBB4111F; Fri, 29 Oct 2021 16:43:53 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 060D7410E1 for ; Fri, 29 Oct 2021 16:43:50 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10151"; a="217590279" X-IronPort-AV: E=Sophos;i="5.87,193,1631602800"; d="scan'208";a="217590279" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2021 07:43:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,193,1631602800"; d="scan'208";a="557225439" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga004.fm.intel.com with ESMTP; 29 Oct 2021 07:43:47 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Fri, 29 Oct 2021 07:43:46 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Fri, 29 Oct 2021 07:43:46 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Fri, 29 Oct 2021 07:43:46 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Fri, 29 Oct 2021 07:43:46 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EDEOJcjyGR7whEJdE3sxOMeCYjV2/NyNO3Y8qERcDGZ67Mpu5a9S8Yu/6LwFZ6kpXb6ks4XdCYEvTahIc0O/ESivUJHAyUQA5Xp02NcpGxMQGtI7FY0xrINQax7lkWxGN9WsL0LKalXpGp5paKaknuZGkVSqXKyOrKT8JS+ksKmYJWrWrMOfIeF5xrAC4qM2Piogi42vQfg0rmLsySyTeU4Sk0fFteorGIOKyp+ka8AVAQY29xZzEpN/VcPqtRe+0vKpSs7YNNcwYc3W7vD2jHmQPg+6jc8YlYbyTVpVd5RDJBiZPwmC3eFG0jbAnRRM7wezks+9K9PXI24A67DSgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=s1LlAMahFAmROa7MynLXov0ffJ3YaPE76WMSxwzXx7M=; b=ViTzRVE15LOBykRm4FHVHDxrgUW2XuknCn9o+LSAzAUkFlA+0z0Ku70KVfF2EXlEZOGuLxFUX2AKR3e2kXmQjJmt9wfgAou/qvlpWRcX32cq1dxsOhATGY7FzXUrpH5RPEIwIzwdey5Gk72qArfNrbsRJdC88x3ujG15Ed2ANg/vSvh/fOXqn9CrEL+ZbEBV3yD7belgMgyZ6XOc3dq34XnUNN9zr4ANLiLFzyK9EyWU6j31OSwxyHMbHIQ0oDUtvRCtod6QgYttvW7qgEPZfWlQVun+HmiDr9Gv1qNyS7QCiTq+7rlewtX1riNfpa3qVHd+rjUKbkQLtXZCrl/ouA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=s1LlAMahFAmROa7MynLXov0ffJ3YaPE76WMSxwzXx7M=; b=e4upbcpQG4FViQJVS1h+al4jIbXEgiQQRVRnaHcn1kGCpE3DUGtmb942aYo9jOg2HTCCimDCGGVWNIXKZpktDimDvCF6/NIpPQG41xw8S22guHpOAcrgmDGMDVJNFrKTCcysYi1/YiM7WiytBw/gi6dDffE8+uLFouHnYTfvKW0= Received: from MW5PR11MB5809.namprd11.prod.outlook.com (2603:10b6:303:197::6) by MW4PR11MB5821.namprd11.prod.outlook.com (2603:10b6:303:184::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14; Fri, 29 Oct 2021 14:43:36 +0000 Received: from MW5PR11MB5809.namprd11.prod.outlook.com ([fe80::2c31:1470:3036:959b]) by MW5PR11MB5809.namprd11.prod.outlook.com ([fe80::2c31:1470:3036:959b%6]) with mapi id 15.20.4649.015; Fri, 29 Oct 2021 14:43:36 +0000 From: "Zhang, Roy Fan" To: "Ji, Kai" , "dev@dpdk.org" CC: "Ji, Kai" , "De Lara Guarch, Pablo" , "adamx.dybkowski@intel.com" Thread-Topic: [dpdk-dev] [dpdk-dev v1 6/7] app/test: cryptodev test fix Thread-Index: AQHXyo6nWyCpvW04uUOaZ9UYs7wEmqvqES5A Date: Fri, 29 Oct 2021 14:43:36 +0000 Message-ID: References: <20211026172518.20183-1-kai.ji@intel.com> <20211026172518.20183-7-kai.ji@intel.com> In-Reply-To: <20211026172518.20183-7-kai.ji@intel.com> Accept-Language: zh-Hans-HK, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.200.16 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 354ff20f-e1e8-4b26-f42f-08d99aea7d38 x-ms-traffictypediagnostic: MW4PR11MB5821: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: epVdGqlXymAYn3lpQx4TVV8eSFsytImEjW+ozkv0LYNvDKjMPKNuymk9DL+VIRhKhj9VDY66cBk6IPX7kX8AdQ85bJJUqjDhrfdCk6iTpWd/Y1SV3vOT1uOw7iepsHfo76mrrWIfSvoenuFJkH68BH0wCaeHgYGs0s0imoEEcSmVOGPC4EVgLyP+VmG/oVsQop4CDxo6KuxXOJSrki/aXh1osyPXtT/NBDmyMtDeBanKosnqGewjMCMPgansgH0d2hM6r9uzHhhl0iemStc66JoBzl/2bNmT9u5OR6OSrhS4lYo2zVrsrj5/B51nGbkX4JK2fAruYu3+Uy/BFpaWK4keHf771NON4fLaBGjGmglFOxpILjA04rpgcle8XR9d0J4u+yqNr9DxEpqF9O0yMf3jq9uqL1Gqhg6v7BPgVhRFXiGocK4JbNB35kdhObkpcxRz2A+/ck8OBYHAjUn016WcFdKVWhmgHkAiqZou2pAuzlSaHKOLXikqttLei5muUJJkmPk2SNbvy6n95TZJY69KQB/sqqpXu6EyD3uGnGABrr6yeES8pWH4zCzoU+1vXIc8dpHjfbZ63UeTFPp/8QZn15ao/1gpzgaQLF6FZUYTJTlpNrA5UkaPqjYM5l0vJZMAyLygQHDNuZzrsdnxgKOWuZ6AJ7ZpqKzjT2PzkeqzoRtUIMXasrYWWzFruXJ2jeAQgr/8j1KMx+q/HIxH6A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MW5PR11MB5809.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(53546011)(83380400001)(6506007)(5660300002)(2906002)(26005)(55016002)(9686003)(508600001)(52536014)(186003)(33656002)(4326008)(38070700005)(82960400001)(316002)(110136005)(122000001)(66446008)(66946007)(71200400001)(66556008)(66476007)(64756008)(76116006)(8676002)(107886003)(8936002)(7696005)(54906003)(38100700002)(86362001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?Windows-1252?Q?iYP+TfMfF0D4jUiFMTtYBHL+iI7XXhDoNceuRLye5TJXylRTJMj3gD/g?= =?Windows-1252?Q?wReQKdQnzaJr2K75yrs8HnIwsrPba3f1K3gbxTH9FiayUd/IM0E+trto?= =?Windows-1252?Q?IJ13BqjHx99yYdrcu5vuSMeI9RYb6Isy8/uot2dB+HFLfVWic5l3jJxV?= =?Windows-1252?Q?5m2Ehj69utr2dvBxewMMAADE71sqY1BXyjKWeh3XcPHWTZsA6r6Rxoc7?= =?Windows-1252?Q?lzDX1TZtm77Si8Tw39Ey7oV2YLVG5yv4e17uy9/ef2MJ3ibyhatV5qnL?= =?Windows-1252?Q?DZa0cZR2lQaMVcWz3NRdXb909Rx8wOrLFj0uVir23IxPp8FsVgl7OnjW?= =?Windows-1252?Q?ie3W4aHKGcOnnLe21v+6Hchn0h8PimwgD2zeP3bRVtnugMGMfEho2qEz?= =?Windows-1252?Q?5Kv4ToAriN8H9qSCebKsDJCDU2lFOhdS2uPQbgqgx+2Oue/B+SyL3ypt?= =?Windows-1252?Q?9kOb4gviUIHnoF9FGWvJT6Iu1swu5tkEJc2ejbVYRpIV368Dt9ArrIae?= =?Windows-1252?Q?AqAlKXm1sGJyYqF3yGN9WXViCZjAmBbCE4mfSIBVU36ft2nqWGwOv3Rz?= =?Windows-1252?Q?O963UIsNsv63j/lyN3DNJfIq7BJI23y3ygAIfDzu5aHkg6GCKUwxcoaR?= =?Windows-1252?Q?7m8SYRefLPyWGviOB0aRxmacgycGoyb71bH//CAIIWxs0fw00S9FiB6L?= =?Windows-1252?Q?96LO2JvCWmqwACWTAlJ2wdyqdUTfvVPvWvfl6Lh4LkSUX7lAuBTb/Imw?= =?Windows-1252?Q?9rpfDtyqa8cYfSooodkHc2szvpPeka9OmC6rVp0atczEYIiWgGOutoIE?= =?Windows-1252?Q?JK9XiRXJJw4YN83dzem32+XxazaBREZ0NyQvSzUXmTprKscMJA2+wUIb?= =?Windows-1252?Q?YRHp9fV6aEDpoeYogKRKwWSvDHFLV7BgnLaAfiWgqO3AJxww8CDdmezT?= =?Windows-1252?Q?xid07hUXpwa1DngOlaFnJnQCEQHecVTNasK8aBF46PJZ+PFnmSUm6Nxq?= =?Windows-1252?Q?7F6zHVjl6j1V3LBCBBFuOQnSRptEIqp4PA/CBppw/t8CHcBo2iQpLNg3?= =?Windows-1252?Q?LDGsDV+CSgdu8n6wY81mppTPJZ6TdnI0mzmkkKC7XqYIukRfALNEVrpT?= =?Windows-1252?Q?0bX5kNOCX3boT6k/vvZIYdd49AXOF40VuR4TJIiY2gBtb6yeDbKIrEc8?= =?Windows-1252?Q?VvV4o41FTyxJx8eFh/Pi9H4kheNXBP3eEWfPIFjml903tSR9jCUjtAnJ?= =?Windows-1252?Q?tNbt+Ho6aG+PZZ5hJ1E6Gn6VoJpV0Jpv6sdOoXW2cNy4pEdUsl2HDL9g?= =?Windows-1252?Q?RMBxLX5h/1qgzwJfmYtNZAdwUISdwIK1O035XBneqwyUrHuAEJZ61eyR?= =?Windows-1252?Q?OsB5i87xkUhN5psNpGQnZ5881Ab3aKIJHjFdaidRtbJc9inQKLoYTXY/?= =?Windows-1252?Q?U4jwhUpThXXZ5MzF57dCXuNCdc7canNDb3DBr+cgD5Du5izBZv2sK5cL?= =?Windows-1252?Q?NdpxZ+uYBMf17IIYb/9RNQS2F7kioXk2DsHdvH+rmLPGFo05kp4pih7E?= =?Windows-1252?Q?t8GIfrM+QCL1kURyoU1VQlwQFxlq5ei2ZL3OvY1uHmJ4gkXIroxfrG/d?= =?Windows-1252?Q?CxKH6KtKZSG4LUI9vJNsQrCJdZ0gRTx82oXJHOTW9OU2hWklVAwYOGXY?= =?Windows-1252?Q?Yf5hTuYn+dxw/x3kw8IbscDUr+agvUx9SNJaHvjt4NtE5oxtdCAnMItC?= =?Windows-1252?Q?iYFPlnvEX2rZfBMJCuI=3D?= Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5809.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 354ff20f-e1e8-4b26-f42f-08d99aea7d38 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Oct 2021 14:43:36.2280 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Hmmd4rg2gXRN/czfzPDSnStt44904uVJOJ+DkiG3rqOp/VxzP7eHDM6a9lCBvywUAtvTPXY0+Fxc4AP9QuYTHQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB5821 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [dpdk-dev v1 6/7] app/test: cryptodev test fix X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Hi Kai, > -----Original Message----- > From: dev On Behalf Of Kai Ji > Sent: Tuesday, October 26, 2021 6:25 PM > To: dev@dpdk.org > Cc: Ji, Kai ; De Lara Guarch, Pablo > ; adamx.dybkowski@intel.com > Subject: [dpdk-dev] [dpdk-dev v1 6/7] app/test: cryptodev test fix >=20 > test_mixed_auth_cipher: ensure enough space allocate in ibuf & obuf > for mbuf to vec conversion > test_kasumi_decryption: cipher length update. > qat/dev: support sgl oop operation >=20 > Fixes: 681f540da52b ("cryptodev: do not use AAD in wireless algorithms") > Cc: pablo.de.lara.guarch@intel.com >=20 > Fixes: e847fc512817 ("test/crypto: add encrypted digest case for AES-CTR- > CMAC") > Cc: adamx.dybkowski@intel.com >=20 > Signed-off-by: Kai Ji > --- > app/test/test_cryptodev.c | 52 ++++++++++++++---- > drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 28 ++++++++-- > drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c | 14 ++++- > drivers/crypto/qat/dev/qat_sym_pmd_gen1.c | 55 +++++++++++++++++- > -- > 4 files changed, 124 insertions(+), 25 deletions(-) >=20 > diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c > index 814a0b401d..dd791a181a 100644 > --- a/app/test/test_cryptodev.c > +++ b/app/test/test_cryptodev.c > @@ -179,6 +179,10 @@ post_process_raw_dp_op(void *user_data, > uint32_t index __rte_unused, > RTE_CRYPTO_OP_STATUS_ERROR; > } >=20 > +static struct crypto_testsuite_params testsuite_params =3D { NULL }; > +struct crypto_testsuite_params *p_testsuite_params =3D &testsuite_params= ; > +static struct crypto_unittest_params unittest_params; > + > void > process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id, > struct rte_crypto_op *op, uint8_t is_cipher, uint8_t is_auth, > @@ -193,6 +197,7 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t > qp_id, > struct rte_crypto_sgl sgl, dest_sgl; > uint32_t max_len; > union rte_cryptodev_session_ctx sess; > + uint64_t auth_end_iova; > uint32_t count =3D 0; > struct rte_crypto_raw_dp_ctx *ctx; > uint32_t cipher_offset =3D 0, cipher_len =3D 0, auth_offset =3D 0, > @@ -202,6 +207,9 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t > qp_id, > int ctx_service_size; > int32_t status =3D 0; > int enqueue_status, dequeue_status; > + struct crypto_unittest_params *ut_params =3D &unittest_params; > + /* oop is not supported in raw hw dp api*/ > + int is_sgl =3D sop->m_src->nb_segs > 1; >=20 > ctx_service_size =3D rte_cryptodev_get_raw_dp_ctx_size(dev_id); > if (ctx_service_size < 0) { > @@ -267,6 +275,30 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t > qp_id, > digest.va =3D (void *)sop->auth.digest.data; > digest.iova =3D sop->auth.digest.phys_addr; >=20 > + if (is_sgl) { > + uint32_t remaining_off =3D auth_offset + auth_len; > + struct rte_mbuf *sgl_buf =3D sop->m_src; > + > + while (remaining_off >=3D > rte_pktmbuf_data_len(sgl_buf) > + && sgl_buf->next !=3D NULL) { > + remaining_off -=3D > rte_pktmbuf_data_len(sgl_buf); > + sgl_buf =3D sgl_buf->next; > + } > + > + auth_end_iova =3D > (uint64_t)rte_pktmbuf_iova_offset( > + sgl_buf, remaining_off); > + } else { > + /* oop is not supported in raw hw dp api */ > + auth_end_iova =3D rte_pktmbuf_iova(op->sym- > >m_src) + > + auth_offset + > auth_len; > + } > + /* Then check if digest-encrypted conditions are met */ > + if ((auth_offset + auth_len < cipher_offset + cipher_len) && > + (digest.iova =3D=3D auth_end_iova) && is_sgl) > + max_len =3D RTE_MAX(max_len, > + auth_offset + auth_len + > + ut_params->auth_xform.auth.digest_length); > + This fix to me only address the in-place SGL problem but not the out-of-pla= ce SGL. Regards, Fan