From patchwork Wed Aug 23 07:08:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 130668 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 488F3430DE; Wed, 23 Aug 2023 09:09:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D1EF40A79; Wed, 23 Aug 2023 09:09:24 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2040.outbound.protection.outlook.com [40.107.6.40]) by mails.dpdk.org (Postfix) with ESMTP id A1D6B4325D for ; Wed, 23 Aug 2023 09:09:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VQtzXRF00w7x+t17+FlurQZb89gArhV/X10EHIhFBj9Wi0kfZ/IWt10Ofj0NXfsQCyc1VHvE7ni1/HGsZ8bGFyF5q/CgcQ49vdpJTr7cjc39TMRUBFSBrYTrCIXxxqnU+FlzLzQGLgRRK5vOkaCieb6FNsKSw5HFim6WUplCEWLNNg6cahrcZMSl9UFLzNPi2Qjzp09qieidxW+ZVUt7prNUzfz29gfaLkkIq+mNg0esxUAPoNgw1P6QL2OOhME1IIlE3mIQdeQVT3W832yf0HlKY8xKqaMKAji7HKVAVTe1cBtg927QEHzTVPSB3xekZR3cWgRK2P7BdhFUrLOs6w== 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=aVPxROqttZMgdM2aLBnLj9fPLrUGjsgjlwOeUHo0QXo=; b=IjbAZGfZvUeUyFxAd3ObtWSOFIgmn36i6CQNFkMMbmQzaS9fPK9SR7u8DWn1v7O0SEngRobkTb2KMkIML8McBbhwCiy6ONhjyok1zgYX9bFZVTtFUbBAaStsahvOvbFwzqyJPbKWrc/e4Y4T44hL32124Fmwp5vJGPDFmbACjpw9MOw1NVKZ9ju6GVOHq0Oj5ZJkraQlG4c0JwPnKwMt8B+Zu2F0tdHswqhEF+P5jzWfadAsWbuN8OJ/AKbyIDJ58gaSn+EX/z6flMZOISdj83ncJJLjKTIwD0gsznE8sNF+V09u305pTeceAXlZK9b9+CG4S5QJ/uEduoKn4c8QXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aVPxROqttZMgdM2aLBnLj9fPLrUGjsgjlwOeUHo0QXo=; b=k2NWzMi0w19YEktHbgaKs0DERQKc81Okl9e0UZK4UUNLoc8bhd7cD0DUMWNX88VDpHrliI91B5shFUA3sEcCbjWtQeyPUKBDZaWXlCVc8dCsTbXJ6+nBQEzdqskDMyIfkWNKjrk1uZLOC5rzzzbRhxUdQqeZje9ymAoai/cTgTs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9328.eurprd04.prod.outlook.com (2603:10a6:102:2b6::15) by PA4PR04MB9711.eurprd04.prod.outlook.com (2603:10a6:102:267::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.26; Wed, 23 Aug 2023 07:09:19 +0000 Received: from PAXPR04MB9328.eurprd04.prod.outlook.com ([fe80::450d:89ac:4f6a:6ae2]) by PAXPR04MB9328.eurprd04.prod.outlook.com ([fe80::450d:89ac:4f6a:6ae2%4]) with mapi id 15.20.6699.020; Wed, 23 Aug 2023 07:09:19 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: gakhil@marvell.com, Gagandeep Singh Subject: [PATCH 06/12] crypto/dpaax_sec: set the authdata in non-auth case Date: Wed, 23 Aug 2023 12:38:49 +0530 Message-Id: <20230823070855.27532-7-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230823070855.27532-1-hemant.agrawal@nxp.com> References: <20230823070855.27532-1-hemant.agrawal@nxp.com> X-ClientProxiedBy: SG2PR02CA0072.apcprd02.prod.outlook.com (2603:1096:4:54::36) To PAXPR04MB9328.eurprd04.prod.outlook.com (2603:10a6:102:2b6::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9328:EE_|PA4PR04MB9711:EE_ X-MS-Office365-Filtering-Correlation-Id: cb6d1be0-cb24-44a9-8d21-08dba3a7deb8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a+H8ujgJd0O64gCJ0WZFAZg6876e23BOmClLMohB+Pnm2JJRmFljvYxpuUDCsXqrUOhyAjhJwJWQduuCOA3mQcts8P3HcV7XWeOlLRO3COKZfEip/p2X73Rt0sYLc8s5LdLY6QB+umT5XvbFOC9qJH7oBp+P4ScEKGqNvKHrhr6SlJ3NjBAlcEcEVFEkvqewK17hVJlsLzhha0dSbfwTsX6FVUW3dR3e2pgipMp6Pk2CTQVJp0i1IKpJE7P58vXXX9NcZ48nMR6PIf7vRkbCdaKcmsB3OWvnXA1YXG8XxCRctkC3u0J6vqYO2vN9xm8qJN39eKrrNT+eoLLDq+YDmfoIR9jcOswc7EjHRMhH8e/U1YP5EqSLP0gByACdHxuh2CcpGTHaDk/os95MnpWkBQTlWx7Sr1vYHNUh0y5FkicJdBJdmkJatBf3AVs8Bcd9jvg1Hifw2FbMNUfCW3B5/Uw/x7gEKvsmH6iaUAq//dJ7Hp9aJO9NhJ9Y4K4VugcqPu7YIVrCgPIU/Dub5sT4HaQsyNAHe6N3H7+L7brBKySYTNsx8C00mRxUAiMczOw0c6jW8jDvMwia56mKTN22ElYIckx2NU5/OS/L0M0ToQwY2lngOVLEfqPZN7B6r2yv X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9328.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(366004)(346002)(136003)(376002)(396003)(1800799009)(451199024)(186009)(83380400001)(2906002)(52116002)(66946007)(6486002)(6506007)(478600001)(2616005)(26005)(5660300002)(44832011)(1076003)(4326008)(8936002)(8676002)(38100700002)(38350700002)(6666004)(66556008)(316002)(6916009)(66476007)(41300700001)(6512007)(86362001)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GhDdzZ/awU4Zad37EcLNlo4WP2uvdydK4AqToBDiP87G+2+xq8S3UNllhQb8Hgo74IvsfVR3Zw7I+NBoGVXoedjjTa6UYZikJauAM2EOjiDBcf6FzL3Jw/Q4XR55gGoYLCSdBGfa/E1MUod8XKkTczXYdIjM04zaB1dFlkxeL4ds7EvF3bPg+ynn6g4bbJR+z6Z/pq91BIFLeyr67GM/uDM44xaS2QT/eWD5WU35cAjVHmMjbOoacVw1iwbAvf8iWN20mYtiK3SaNpMqsA85xcems5edDqjXqUF61gCrBNderOV7VTuK06HqlIE2eoh3BHikqqitVjiyo1Gq7WKkjI7S+GlLyJSIGxdWikhzYvIqKGZaZx29GcxUAtxAgxjvWURuuA1lFnKZaiJMrt7riOwV25GTV3hp/+9R7XH99XhJF4pYZ72EyP9IjU23rrcYEQxiuJJovXog1gDG7ypg9p9kygDcCDkxANbmghou9pt06M1Ihrul85wssIDhYi6wLr2fXkxto2617eeMBwCkX7jU43Z4vKrk8GOfnYKOJx3Tj7RbCtM4vciiedr0jpAwivoL6eIy/AKv6PVBgmJmIZ29dT5NnHqvRzhEsB8vd9BtreV88hbFpEgbJy4+LKfkX6yDoGCqMtlR8R4yTi61+41c6XZ2/6LsCTyV3C2E4WVFr4f2IYDZCOKaeYam4WgrpBx7f/gszcOi62h6JhzbwwaYdU9DjfrXf1p2ud3vlNQwZT8e4OL2TGMBJDvrwiIh7NJ5rxn9+goV+C6ujjSzwvwp0qrMrTELQ4pOMTFnfhbsCtxpwS0hq61pDDoFeKeLd88rzvnghtoUO1fhOKDll0coQdgGtptAqIFdp6Lk7GpvT2rO6xTEVc+fsDMBU2+15WpFfrRVA7vfw4KFp0n3IZ8SD0xjwryVm6GuxrgTtiV7FU4WK/TCoxq4XFqm7Sk955n+eQwBocy0Erl8qQpm26QJZkV4nQN9HUBp1uk3YtdOOH3JEN4hEQUrHhrqSereqKlwSvda7QIhzGAKrPeOCAhc9GqeTAjogTBJF8pjR9LY7TOFgGJendD4w0y0jrwa4RKJX6cmfmtZufB/oW+qyMwyw9+5k8+i2Iweoi9OWdSxQWios0EWXsrSXzaVca/208FvH4r8YR7EWEalVz3ZOruFoQpG7bpytl+/pgelt2CvzrG8G/2vKjBmxfK7Eg3s8Envdufulc9j0XtRtck8vZ47WxhpP8btdX3oA5+1T4yCZM/vmXcatSOLUwQv3ZK52nSQ/XW6qZ7G0/ui4gvdSelE7Ao2zi6TIHSyp7sjnRQpst81JdP6HQ/+l018sdDlHlh63T5yl4Jbq5/guN9r817rOtvKKJhionljJIGBr+dNw+06jZU0HGGzWl37cemVvWVCcGN9nzJO0AtrmBdY0qa9a2mk4GC1wQA7EgLt2XO1KpCNlED9yHUXmz/idZsB50dNDcDIqPOjz7VvJ/Oj4IEO4pBSgd8rhKj4XdrF8kFnb0bCWkvEhRf5uKvXIIdSGXem6zmPC4qIj6MHGNG6yn8uf2X2yALOAalWhTVsNMJ9IuGJ3+QU6MJqQIhObkYpJg5+PGUFQbfNXOYZrKiOGQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb6d1be0-cb24-44a9-8d21-08dba3a7deb8 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9328.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2023 07:09:19.5912 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VApXTFSOp/q7oRZ1VD2Mc96vASYAR5RqURAYJUNVcg0Eg1+xZO7XzlT7tMjuGnDu3rBhzRJkdAE3DIw9lQggNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9711 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 From: Gagandeep Singh The descriptors refers to auth data as well, so initializing it properly for the non-auth cases. Signed-off-by: Gagandeep Singh --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 16 ++++++++++++---- drivers/crypto/dpaa_sec/dpaa_sec.c | 5 +++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index c2b836d716..0a0b7f15af 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -3538,12 +3538,20 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev, session->auth_alg); goto out; } - p_authdata = &authdata; - } else if (pdcp_xform->domain == RTE_SECURITY_PDCP_MODE_CONTROL) { - DPAA2_SEC_ERR("Crypto: Integrity must for c-plane"); - goto out; + } else { + if (pdcp_xform->domain == RTE_SECURITY_PDCP_MODE_CONTROL) { + DPAA2_SEC_ERR("Crypto: Integrity must for c-plane"); + goto out; + } + session->auth_key.data = NULL; + session->auth_key.length = 0; + session->auth_alg = 0; } + authdata.key = (size_t)session->auth_key.data; + authdata.keylen = session->auth_key.length; + authdata.key_enc_flags = 0; + authdata.key_type = RTA_DATA_IMM; if (pdcp_xform->sdap_enabled) { int nb_keys_to_inline = diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 7d47c32693..39babd76f8 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -3188,6 +3188,11 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev, auth_xform->key.length); session->auth_alg = auth_xform->algo; } else { + if (pdcp_xform->domain == RTE_SECURITY_PDCP_MODE_CONTROL) { + DPAA_SEC_ERR("Crypto: Integrity must for c-plane"); + ret = -EINVAL; + goto out; + } session->auth_key.data = NULL; session->auth_key.length = 0; session->auth_alg = 0;