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 993204555B; Wed, 3 Jul 2024 12:27:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9780F42DD5; Wed, 3 Jul 2024 12:27:30 +0200 (CEST) Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11011053.outbound.protection.outlook.com [52.101.65.53]) by mails.dpdk.org (Postfix) with ESMTP id 2C2DD42D9D for ; Wed, 3 Jul 2024 12:27:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZOCnIkv6S1kRLf39ErD92C1wktwloPQg2JpzsVqyh4+D2xtXCGtJJ7nUo5LrH/ggxts7fh0EU2jWncsQAEZ/6yU9k+gWy0HRVKCMGvqzdeRdfD7XStgpqxDwwLl49kE6Ox+n8mgNPi3dyj/8snRLMB+2ciY3/3PACu1PY39gRr+0HoHSYeqrWahCA6sNP8pv7tbAqE4qYtxXYScMX2WdEKs3l7Mub954Z5+/eyvVXAoPcA19v4lOKxKRJzHpNGF+kRdbxQmjUDZ7SI86ofIRuGna/CR9xmUBfY0XQ28ZzMcXQKO4bivfIeE1FwF0/oVgl+F4qq/ELN3Zi/Y6V6kiLw== 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=Ggo1883vIx7C3aM02+5c0vFs6mhCkAo8hGQv/0c31sM=; b=IFCBxTdUX6KZrIesTVDeNLeL2EWfnC1QqY96T7Oeo7LKxH0lcrlXixlUg99dvsMB6dc2GOVD54Vc0cxOJ0vMcgE75ByaKMV7dfYFxA6877zNUVGGnDyw69HWI/ZMul7GOs2lTpHTgEZPY4uWe36COm4zGyzuPshOmEPZlyvylLv5KnzzDJtPYxlRQCw5SuREX5sCrFXh5oLZ8L+jv72nUEcYNFrQxpTfehdxh/xkw1se+ZrSq07Z2mAFIbAK+fqXUP88p/AT+y4Umw2ADOw0xqo2GEnOr9XPA5ghZrHKgJG1ZQ5S+XgohQsEq5gbjJ4cnM6rf/rsviYeJZQgPNQLBg== 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=Ggo1883vIx7C3aM02+5c0vFs6mhCkAo8hGQv/0c31sM=; b=a5TgmCOG497ogivh2SEJPKnCm2+ULqVBFMYrT3IF906lueq3TkOhtwowSKghQuGkuFO7Iw/lXvSJhS9895KWPVaFP7sVgWIcuVB9TklT/q2Iaz0fMr78R7eJTDzgO2V0V+WbMGSMwY7zY2MK/HtPb4Bv1Xrb33hU2vnlflP+hSs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8SPR01MB0024.eurprd04.prod.outlook.com (2603:10a6:20b:3d0::24) by PA2PR04MB10238.eurprd04.prod.outlook.com (2603:10a6:102:404::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.25; Wed, 3 Jul 2024 10:27:27 +0000 Received: from AS8SPR01MB0024.eurprd04.prod.outlook.com ([fe80::c634:479e:8f8a:a325]) by AS8SPR01MB0024.eurprd04.prod.outlook.com ([fe80::c634:479e:8f8a:a325%4]) with mapi id 15.20.7741.017; Wed, 3 Jul 2024 10:27:27 +0000 From: Gagandeep Singh To: dev@dpdk.org, Hemant Agrawal Subject: [PATCH 06/11] crypto/dpaax_sec: improve non-supported algo logs Date: Wed, 3 Jul 2024 15:56:44 +0530 Message-Id: <20240703102649.3096530-7-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240703102649.3096530-1-g.singh@nxp.com> References: <20240703102649.3096530-1-g.singh@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SGBP274CA0010.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::22) To AS8SPR01MB0024.eurprd04.prod.outlook.com (2603:10a6:20b:3d0::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8SPR01MB0024:EE_|PA2PR04MB10238:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e4d0831-e4cd-4b04-3d5d-08dc9b4abcbb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RjFlqkw83GdL9wmH1CCwCA74smF+XELxv3Kjntf00rLGfu1hg/q7nttzv6Wu?= =?us-ascii?Q?B3dy+VPY8grorsTgcNPIeAC67vgJ4Um9sOgEf3AToPNQ1QEzFACQ0IhG3vx3?= =?us-ascii?Q?6mNITltZoz3e5PC3eDPHMz/mI7emUuX4vHJq2lzxhOVyxwrzhQ5cy39NonuA?= =?us-ascii?Q?1a44AyxbuYzyAYjO8W4lzSCPTiqdJJSZ3BFohyoD2KT7KbfGpre3PpuJvFL8?= =?us-ascii?Q?oGoVXede+5n8tUFVbkR4CiEpeJX19C3taz0zfSryvTf1fFNiL50M3Og4LX9M?= =?us-ascii?Q?pCpNuu/238J5Efw3tKcK0mtyoFuKPvsDSPSxBWqDfusSsrEgM3wGdVZluAyJ?= =?us-ascii?Q?utSm62dCe/siRqYxhplY7FI+5zExuGHXgwJvd01LegqVACVlWk/7IMElueoS?= =?us-ascii?Q?jRbY1ay4WvdE5Pm7pnU5Zh1VYW3l6sgespCHDUMoc/uIdKTHDbuWgiizGWO3?= =?us-ascii?Q?aPrIaI5Wu2o9t4a+YxV6/gvf0a5Tt9cn3jv77IASXRdJV3D9Z0x8AVsNEskb?= =?us-ascii?Q?QnYd9e2V3eIm0WnwgjSvl1qLR8K0m3s6GSWr5cf1KxmxUPXAEb4KP787zIRz?= =?us-ascii?Q?5Oc0Lsm8IU8+llhVJAAQGMV9TofRwYTvaHLq98myAsftV0CCC8yLv15HhmaG?= =?us-ascii?Q?VuiZNV4sEfIo4wKcc3SFkLSfRP6UNgLe3hS7Yn7hrV4MZGW81zxgi+8V3Hmh?= =?us-ascii?Q?RLkxu2JzKt9ZUJed0zNET+aq6trTFOvwcbzZq9aTlUSEoyZFDJkJnSwII/mb?= =?us-ascii?Q?qiJKPi8YRLSZ8JViehuIQ+4KzjS6wYdLSzWPoH67DMvuHDtqz+Xb5Bo29O6l?= =?us-ascii?Q?3cT66ziMB9Lm7V1Bt5fNPFO5dpaaIKx5nZDkwETMxKRSRYqPOWCedNrYC0N5?= =?us-ascii?Q?LjU6QRVJq4cBB5CWjpJey/4QGFUJLttvriW+lxiuh0cEaa3boNp2dWaww58j?= =?us-ascii?Q?FkdsYCD5GOKr1aimicIFDAYcb+8dFtvNBvlgPzkfVdlQC4p9b4/Dc1Ba3HVO?= =?us-ascii?Q?Z8u4nJQk/zQEUAxbslynx4DgFTqShZJg5GVZAKA0dHjRgz0vDxj5y93XH/yi?= =?us-ascii?Q?oE+avFoBGLM6qHPkT0MufeKYUUDjWJEtka8XF345gQnvHZBy4gMQzCIHqgiy?= =?us-ascii?Q?CkYF9+FNBaVy1FB25w9G4INc5RVWu76h9e4ae5j7OAZWIF25BII3Q1AozITd?= =?us-ascii?Q?jACPVG7jcNU9zK/ZRx10APBX+ZvwQaTG1aBQsxHqLVYVidA8WCmzaSUgYxaY?= =?us-ascii?Q?+OvwlMwcmsYiK6Wc23YHjdM1spPvgIjSlEOOoqKIkJTfbh8+zLyyEJxFxpta?= =?us-ascii?Q?EuklizhA8Vk+ibzPRUFTf87KjNFQHfo5uRL7rImDuT5dmnJF7s2M3aH3RsPB?= =?us-ascii?Q?y7F9hZxJ9b/UUo+pH6EAaxxlmf8Bc2T/OCD0abI9K6TQy8LdCQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8SPR01MB0024.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Q0AfxOB3fPqP39bFZzCOXM6GYfqFPvkYprHFaagnHGUMhWXehnH8u9RgmV8s?= =?us-ascii?Q?ztkbC9BK/SYRTE0Rq6sKDNCmJSl/iXJ65xG1OLoUDEtpRUZcJwE0PzB4GqOG?= =?us-ascii?Q?NuA4Ka0//1kWmYI+pmin/hkF+kuy8SZnmGw4uQkyVIt8HE57YQ7UMySpgb4m?= =?us-ascii?Q?9xbPIRhogiuieOHqEEU6/WjEesqATyvMb0UEUywHb0h+gUzfwIEY4mosRuaf?= =?us-ascii?Q?AzOLhoVGjkM0vlGhjSeVQGnshH2PW6gCYmbsbhWEA4b+oza2zK6qXjqwGMYc?= =?us-ascii?Q?RiptNv+9J1nRVY34juiLhlMcEJM0CcL1p6aJPFLFrJTnbOOkM9jhUC5xpFFx?= =?us-ascii?Q?JLdv2a6q+nBtJ7Q1ymfw7e49wSetXlGonJqMkwKtAmLWjAoyIJqH95W5eHrL?= =?us-ascii?Q?jCA0ouYnm8hMHhCGzPtecCRE3ipsTchBYMphbKgcriY/BPOZoTtfnxZ3Om/u?= =?us-ascii?Q?HxyRLbhJieg4inI1u9aPY+dRf0eFo6rvT9jh/d2hP4mc40qaZEd0ylm8F8Ju?= =?us-ascii?Q?k3QVYhKUPbmIRv+cwD55WKEoBeZVUmLZ8scyt7yMo8BbPpmKd8bhVpuNp5oU?= =?us-ascii?Q?o+BVT28oMWRfK5U0DukPOtH38teV7cuH/j3qhBBTmpxQzX4GF8C2bJbxlbiE?= =?us-ascii?Q?A5XED7lOpRbb9pyy3rpHdma2PtmUbxwAwP3uv2aOslZj9VCpaHHdf+HLU5AZ?= =?us-ascii?Q?SkJXxS3cfK9lZ/d6XL8r6AMwPIlHoxyykEyCVgfeyR7EjYJmiLtnCcaGdsdy?= =?us-ascii?Q?cML3yh8rUAoS17GXOCZ8rBTXK9yu3olGtdQiXkjFxRv7llUyKkDJLNX2AIlY?= =?us-ascii?Q?ecMRuQZDttEAWc/debIGz7OfkkW3ZV3pNUP1C3YaEUyR6ErpAH5+VpZUgcNI?= =?us-ascii?Q?v2lm3hpp9X6zJ0BnOqihzjRuVBr6f0J6DZnm7XrBL8Cyq6YYFREvv4fItkdz?= =?us-ascii?Q?Y5BozQPBw+9/3kBLcCb1MbzFnpc5VAqpeBsoOzt+zp9DhkAf8HdrcqpHlIL+?= =?us-ascii?Q?HOn2Gf82/h/VmxzSCGZF9w8DCFeoJphXToJ/eC8dEHWF0o/MIRqENfqJ1rbP?= =?us-ascii?Q?VRHULjFqtfFicSoGAuchRgTpSBT2vqr39pOu+mVvGSmtuqQwHvZ80Eq2SXze?= =?us-ascii?Q?XnyuCCikmMPYJoW4qyLmfehVZPf62ce/aIc8u+Y50v26NOV1+8uxlbpYTWcm?= =?us-ascii?Q?p6h3iDv3PPPZlNplx8mhaPD1l6lUPwgbn8rgsTksz3XIbz2MbS/GZTeqx2+z?= =?us-ascii?Q?D8jRz4LurmnPbl0Y2Y7RRhiUU30PhEbU0BwlIqmSdbluRTUfmvylC9RSvlIg?= =?us-ascii?Q?JeLVlRWQLZPeCQ/6x3ZmXlU90j1u0iH+CpCGHoJnXA/jh1upuOrcpw1HLSR9?= =?us-ascii?Q?mOqIwmpIrmhwdF5SxBArju9aQZBsGAeEIsrWOOsDaazsd4Hp+eqyJYl5qJDR?= =?us-ascii?Q?bmnFen3EbZjIeRWhmDESMrJwyk42P4xhQihTATgx+t2sn4ONMlQfD4oXO1Qd?= =?us-ascii?Q?Nz6fKmBXMY+exuNeCuBsYB2bQjA5aJ/hIoqxTWbZVngt9Ku7eQQbptYpUUZZ?= =?us-ascii?Q?zU6IuKjGjevBIOoRoDqdw4MSiXoYjn/KW4RzJAnE?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e4d0831-e4cd-4b04-3d5d-08dc9b4abcbb X-MS-Exchange-CrossTenant-AuthSource: AS8SPR01MB0024.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2024 10:27:27.9023 (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: 7IRggXqqOJVzgxLMounZ2+c1CBeHB7GFa+GKukHaIEU3KGVuoDjTe+F74kAfJSOt X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA2PR04MB10238 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: Hemant Agrawal This patch improves the debug logs for un-supported algo sessions. Signed-off-by: Hemant Agrawal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 128 +++++--------------- drivers/crypto/dpaa_sec/dpaa_sec.c | 56 ++++----- 2 files changed, 53 insertions(+), 131 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 1cae6c4505..922a35e3ee 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1378,9 +1378,10 @@ build_sec_fd(struct rte_crypto_op *op, case DPAA2_SEC_PDCP: ret = build_proto_compound_sg_fd(sess, op, fd, bpid); break; - case DPAA2_SEC_HASH_CIPHER: default: - DPAA2_SEC_ERR("error: Unsupported session"); + DPAA2_SEC_ERR("error: Unsupported session %d", + sess->ctxt_type); + ret = -ENOTSUP; } } else { switch (sess->ctxt_type) { @@ -1402,9 +1403,9 @@ build_sec_fd(struct rte_crypto_op *op, case DPAA2_SEC_PDCP: ret = build_proto_compound_fd(sess, op, fd, bpid, qp); break; - case DPAA2_SEC_HASH_CIPHER: default: - DPAA2_SEC_ERR("error: Unsupported session"); + DPAA2_SEC_ERR("error: Unsupported session%d", + sess->ctxt_type); ret = -ENOTSUP; } } @@ -2169,20 +2170,9 @@ dpaa2_sec_cipher_init(struct rte_crypto_sym_xform *xform, &cipherdata, session->dir); break; - case RTE_CRYPTO_CIPHER_KASUMI_F8: - case RTE_CRYPTO_CIPHER_AES_F8: - case RTE_CRYPTO_CIPHER_AES_ECB: - case RTE_CRYPTO_CIPHER_3DES_ECB: - case RTE_CRYPTO_CIPHER_3DES_CTR: - case RTE_CRYPTO_CIPHER_AES_XTS: - case RTE_CRYPTO_CIPHER_ARC4: - case RTE_CRYPTO_CIPHER_NULL: - DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %u", - xform->cipher.algo); - ret = -ENOTSUP; - goto error_out; default: - DPAA2_SEC_ERR("Crypto: Undefined Cipher specified %u", + DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %s (%u)", + rte_cryptodev_get_cipher_algo_string(xform->cipher.algo), xform->cipher.algo); ret = -ENOTSUP; goto error_out; @@ -2407,23 +2397,16 @@ dpaa2_sec_auth_init(struct rte_crypto_sym_xform *xform, !session->dir, session->digest_length); break; - case RTE_CRYPTO_AUTH_AES_CBC_MAC: - case RTE_CRYPTO_AUTH_AES_GMAC: - case RTE_CRYPTO_AUTH_KASUMI_F9: - case RTE_CRYPTO_AUTH_NULL: - DPAA2_SEC_ERR("Crypto: Unsupported auth alg %un", - xform->auth.algo); - ret = -ENOTSUP; - goto error_out; default: - DPAA2_SEC_ERR("Crypto: Undefined Auth specified %u", - xform->auth.algo); + DPAA2_SEC_ERR("Crypto: Unsupported Auth alg %s (%u)", + rte_cryptodev_get_auth_algo_string(xform->auth.algo), + xform->auth.algo); ret = -ENOTSUP; goto error_out; } if (bufsize < 0) { - DPAA2_SEC_ERR("Crypto: Invalid buffer length"); + DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length"); ret = -EINVAL; goto error_out; } @@ -2500,14 +2483,11 @@ dpaa2_sec_aead_init(struct rte_crypto_sym_xform *xform, aeaddata.algmode = OP_ALG_AAI_GCM; session->aead_alg = RTE_CRYPTO_AEAD_AES_GCM; break; - case RTE_CRYPTO_AEAD_AES_CCM: - DPAA2_SEC_ERR("Crypto: Unsupported AEAD alg %u", - aead_xform->algo); - ret = -ENOTSUP; - goto error_out; default: - DPAA2_SEC_ERR("Crypto: Undefined AEAD specified %u", - aead_xform->algo); + + DPAA2_SEC_ERR("Crypto: Unsupported AEAD alg %s (%u)", + rte_cryptodev_get_aead_algo_string(aead_xform->algo), + aead_xform->algo); ret = -ENOTSUP; goto error_out; } @@ -2545,7 +2525,7 @@ dpaa2_sec_aead_init(struct rte_crypto_sym_xform *xform, &aeaddata, session->iv.length, session->digest_length); if (bufsize < 0) { - DPAA2_SEC_ERR("Crypto: Invalid buffer length"); + DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length"); ret = -EINVAL; goto error_out; } @@ -2680,24 +2660,9 @@ dpaa2_sec_aead_chain_init(struct rte_crypto_sym_xform *xform, authdata.algmode = OP_ALG_AAI_CMAC; session->auth_alg = RTE_CRYPTO_AUTH_AES_CMAC; break; - case RTE_CRYPTO_AUTH_AES_CBC_MAC: - case RTE_CRYPTO_AUTH_AES_GMAC: - case RTE_CRYPTO_AUTH_SNOW3G_UIA2: - case RTE_CRYPTO_AUTH_NULL: - case RTE_CRYPTO_AUTH_SHA1: - case RTE_CRYPTO_AUTH_SHA256: - case RTE_CRYPTO_AUTH_SHA512: - case RTE_CRYPTO_AUTH_SHA224: - case RTE_CRYPTO_AUTH_SHA384: - case RTE_CRYPTO_AUTH_MD5: - case RTE_CRYPTO_AUTH_KASUMI_F9: - case RTE_CRYPTO_AUTH_ZUC_EIA3: - DPAA2_SEC_ERR("Crypto: Unsupported auth alg %u", - auth_xform->algo); - ret = -ENOTSUP; - goto error_out; default: - DPAA2_SEC_ERR("Crypto: Undefined Auth specified %u", + DPAA2_SEC_ERR("Crypto: Undefined Auth specified %s (%u)", + rte_cryptodev_get_auth_algo_string(auth_xform->algo), auth_xform->algo); ret = -ENOTSUP; goto error_out; @@ -2728,20 +2693,10 @@ dpaa2_sec_aead_chain_init(struct rte_crypto_sym_xform *xform, cipherdata.algmode = OP_ALG_AAI_CTR; session->cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR; break; - case RTE_CRYPTO_CIPHER_SNOW3G_UEA2: - case RTE_CRYPTO_CIPHER_ZUC_EEA3: - case RTE_CRYPTO_CIPHER_NULL: - case RTE_CRYPTO_CIPHER_3DES_ECB: - case RTE_CRYPTO_CIPHER_3DES_CTR: - case RTE_CRYPTO_CIPHER_AES_ECB: - case RTE_CRYPTO_CIPHER_KASUMI_F8: - DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %u", - cipher_xform->algo); - ret = -ENOTSUP; - goto error_out; default: - DPAA2_SEC_ERR("Crypto: Undefined Cipher specified %u", - cipher_xform->algo); + DPAA2_SEC_ERR("Crypto: Undefined Cipher specified %s (%u)", + rte_cryptodev_get_cipher_algo_string(cipher_xform->algo), + cipher_xform->algo); ret = -ENOTSUP; goto error_out; } @@ -2784,7 +2739,7 @@ dpaa2_sec_aead_chain_init(struct rte_crypto_sym_xform *xform, session->digest_length, session->dir); if (bufsize < 0) { - DPAA2_SEC_ERR("Crypto: Invalid buffer length"); + DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length"); ret = -EINVAL; goto error_out; } @@ -3041,22 +2996,9 @@ dpaa2_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform, case RTE_CRYPTO_AUTH_NULL: authdata->algtype = OP_PCL_IPSEC_HMAC_NULL; break; - case RTE_CRYPTO_AUTH_SNOW3G_UIA2: - case RTE_CRYPTO_AUTH_SHA1: - case RTE_CRYPTO_AUTH_SHA256: - case RTE_CRYPTO_AUTH_SHA512: - case RTE_CRYPTO_AUTH_SHA224: - case RTE_CRYPTO_AUTH_SHA384: - case RTE_CRYPTO_AUTH_MD5: - case RTE_CRYPTO_AUTH_AES_GMAC: - case RTE_CRYPTO_AUTH_KASUMI_F9: - case RTE_CRYPTO_AUTH_AES_CBC_MAC: - case RTE_CRYPTO_AUTH_ZUC_EIA3: - DPAA2_SEC_ERR("Crypto: Unsupported auth alg %u", - session->auth_alg); - return -ENOTSUP; default: - DPAA2_SEC_ERR("Crypto: Undefined Auth specified %u", + DPAA2_SEC_ERR("Crypto: Unsupported auth alg %s (%u)", + rte_cryptodev_get_auth_algo_string(session->auth_alg), session->auth_alg); return -ENOTSUP; } @@ -3085,18 +3027,10 @@ dpaa2_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform, case RTE_CRYPTO_CIPHER_NULL: cipherdata->algtype = OP_PCL_IPSEC_NULL; break; - case RTE_CRYPTO_CIPHER_SNOW3G_UEA2: - case RTE_CRYPTO_CIPHER_ZUC_EEA3: - case RTE_CRYPTO_CIPHER_3DES_ECB: - case RTE_CRYPTO_CIPHER_3DES_CTR: - case RTE_CRYPTO_CIPHER_AES_ECB: - case RTE_CRYPTO_CIPHER_KASUMI_F8: - DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %u", - session->cipher_alg); - return -ENOTSUP; default: - DPAA2_SEC_ERR("Crypto: Undefined Cipher specified %u", - session->cipher_alg); + DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %s (%u)", + rte_cryptodev_get_cipher_algo_string(session->cipher_alg), + session->cipher_alg); return -ENOTSUP; } @@ -3380,7 +3314,7 @@ dpaa2_sec_set_ipsec_session(struct rte_cryptodev *dev, goto out; if (bufsize < 0) { - DPAA2_SEC_ERR("Crypto: Invalid buffer length"); + DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length"); goto out; } @@ -3679,7 +3613,7 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev, } if (bufsize < 0) { - DPAA2_SEC_ERR("Crypto: Invalid buffer length"); + DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length"); goto out; } @@ -3739,7 +3673,7 @@ dpaa2_sec_security_session_create(void *dev, return -EINVAL; } if (ret != 0) { - DPAA2_SEC_ERR("Failed to configure session parameters"); + DPAA2_SEC_DEBUG("Failed to configure session parameters %d", ret); return ret; } @@ -3781,7 +3715,7 @@ dpaa2_sec_sym_session_configure(struct rte_cryptodev *dev __rte_unused, ret = dpaa2_sec_set_session_parameters(xform, sess_private_data); if (ret != 0) { - DPAA2_SEC_ERR("Failed to configure session parameters"); + DPAA2_SEC_DEBUG("Failed to configure session parameters %d", ret); /* Return session to mempool */ return ret; } diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 105274e49e..453066fded 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -495,7 +495,8 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) ses->dir); break; default: - DPAA_SEC_ERR("unsupported cipher alg %d", + DPAA_SEC_ERR("unsupported cipher alg %s (%d)", + rte_cryptodev_get_cipher_algo_string(ses->cipher_alg), ses->cipher_alg); return -ENOTSUP; } @@ -556,7 +557,9 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) ses->digest_length); break; default: - DPAA_SEC_ERR("unsupported auth alg %u", ses->auth_alg); + DPAA_SEC_ERR("unsupported auth alg %s (%u)", + rte_cryptodev_get_auth_algo_string(ses->auth_alg), + ses->auth_alg); } break; case DPAA_SEC_AEAD: @@ -635,9 +638,8 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) ses->iv.length, ses->digest_length, ses->dir); break; - case DPAA_SEC_HASH_CIPHER: default: - DPAA_SEC_ERR("error: Unsupported session"); + DPAA_SEC_ERR("error: Unsupported session %d", ses->ctxt); return -ENOTSUP; } @@ -2221,8 +2223,9 @@ dpaa_sec_cipher_init(struct rte_cryptodev *dev __rte_unused, session->cipher_key.alg = OP_ALG_ALGSEL_ZUCE; break; default: - DPAA_SEC_ERR("Crypto: Undefined Cipher specified %u", - xform->cipher.algo); + DPAA_SEC_ERR("Crypto: Unsupported Cipher specified %s (%u)", + rte_cryptodev_get_cipher_algo_string(xform->cipher.algo), + xform->cipher.algo); return -ENOTSUP; } session->dir = (xform->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ? @@ -2323,7 +2326,8 @@ dpaa_sec_auth_init(struct rte_cryptodev *dev __rte_unused, session->auth_key.algmode = OP_ALG_AAI_CMAC; break; default: - DPAA_SEC_ERR("Crypto: Unsupported Auth specified %u", + DPAA_SEC_ERR("Crypto: Unsupported Auth specified %s (%u)", + rte_cryptodev_get_auth_algo_string(xform->auth.algo), xform->auth.algo); return -ENOTSUP; } @@ -2412,7 +2416,8 @@ dpaa_sec_chain_init(struct rte_cryptodev *dev __rte_unused, session->auth_key.algmode = OP_ALG_AAI_CMAC; break; default: - DPAA_SEC_ERR("Crypto: Unsupported Auth specified %u", + DPAA_SEC_ERR("Crypto: Unsupported Auth specified %s (%u)", + rte_cryptodev_get_auth_algo_string(auth_xform->algo), auth_xform->algo); return -ENOTSUP; } @@ -2437,7 +2442,9 @@ dpaa_sec_chain_init(struct rte_cryptodev *dev __rte_unused, session->cipher_key.algmode = OP_ALG_AAI_CTR; break; default: - DPAA_SEC_ERR("Crypto: Undefined Cipher specified %u", + + DPAA_SEC_ERR("Crypto: Undefined Cipher specified %s (%u)", + rte_cryptodev_get_cipher_algo_string(cipher_xform->algo), cipher_xform->algo); return -ENOTSUP; } @@ -2849,22 +2856,9 @@ dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform, session->auth_key.alg = OP_PCL_IPSEC_AES_XCBC_MAC_96; session->auth_key.algmode = OP_ALG_AAI_XCBC_MAC; break; - case RTE_CRYPTO_AUTH_SNOW3G_UIA2: - case RTE_CRYPTO_AUTH_SHA1: - case RTE_CRYPTO_AUTH_SHA256: - case RTE_CRYPTO_AUTH_SHA512: - case RTE_CRYPTO_AUTH_SHA224: - case RTE_CRYPTO_AUTH_SHA384: - case RTE_CRYPTO_AUTH_MD5: - case RTE_CRYPTO_AUTH_AES_GMAC: - case RTE_CRYPTO_AUTH_KASUMI_F9: - case RTE_CRYPTO_AUTH_AES_CBC_MAC: - case RTE_CRYPTO_AUTH_ZUC_EIA3: - DPAA_SEC_ERR("Crypto: Unsupported auth alg %u", - session->auth_alg); - return -ENOTSUP; default: - DPAA_SEC_ERR("Crypto: Undefined Auth specified %u", + DPAA_SEC_ERR("Crypto: Unsupported auth alg %s (%u)", + rte_cryptodev_get_auth_algo_string(session->auth_alg), session->auth_alg); return -ENOTSUP; } @@ -2896,16 +2890,9 @@ dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform, case RTE_CRYPTO_CIPHER_NULL: session->cipher_key.alg = OP_PCL_IPSEC_NULL; break; - case RTE_CRYPTO_CIPHER_SNOW3G_UEA2: - case RTE_CRYPTO_CIPHER_ZUC_EEA3: - case RTE_CRYPTO_CIPHER_3DES_ECB: - case RTE_CRYPTO_CIPHER_AES_ECB: - case RTE_CRYPTO_CIPHER_KASUMI_F8: - DPAA_SEC_ERR("Crypto: Unsupported Cipher alg %u", - session->cipher_alg); - return -ENOTSUP; default: - DPAA_SEC_ERR("Crypto: Undefined Cipher specified %u", + DPAA_SEC_ERR("Crypto: Unsupported Cipher alg %s (%u)", + rte_cryptodev_get_cipher_algo_string(session->cipher_alg), session->cipher_alg); return -ENOTSUP; } @@ -3181,7 +3168,8 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev, session->auth_key.alg = PDCP_AUTH_TYPE_NULL; break; default: - DPAA_SEC_ERR("Crypto: Unsupported auth alg %u", + DPAA_SEC_ERR("Crypto: Unsupported auth alg %s (%u)", + rte_cryptodev_get_auth_algo_string(session->auth_alg), session->auth_alg); rte_free(session->cipher_key.data); return -EINVAL; -- 2.25.1