Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/70032/?format=api
{ "id": 70032, "url": "https://patches.dpdk.org/api/patches/70032/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200509222259.22510-2-akhil.goyal@nxp.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200509222259.22510-2-akhil.goyal@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200509222259.22510-2-akhil.goyal@nxp.com", "date": "2020-05-09T22:22:59", "name": "[v3,2/2] crypto/dpaa_sec: improve error handling", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e33a6992fc5dbd4ec2911a061ef6840bb08ea933", "submitter": { "id": 517, "url": "https://patches.dpdk.org/api/people/517/?format=api", "name": "Akhil Goyal", "email": "akhil.goyal@nxp.com" }, "delegate": { "id": 6690, "url": "https://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200509222259.22510-2-akhil.goyal@nxp.com/mbox/", "series": [ { "id": 9956, "url": "https://patches.dpdk.org/api/series/9956/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=9956", "date": "2020-05-09T22:22:58", "name": "[v3,1/2] crypto/dpaa2_sec: improve error handling", "version": 3, "mbox": "https://patches.dpdk.org/series/9956/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/70032/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/70032/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 23FF0A0353;\n\tSun, 10 May 2020 00:44:17 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6A6391D627;\n\tSun, 10 May 2020 00:44:09 +0200 (CEST)", "from inva020.nxp.com (inva020.nxp.com [92.121.34.13])\n by dpdk.org (Postfix) with ESMTP id 946131D616\n for <dev@dpdk.org>; Sun, 10 May 2020 00:44:06 +0200 (CEST)", "from inva020.nxp.com (localhost [127.0.0.1])\n by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 32C3D1A02AD;\n Sun, 10 May 2020 00:44:06 +0200 (CEST)", "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n [165.114.16.14])\n by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 592891A04F9;\n Sun, 10 May 2020 00:44:04 +0200 (CEST)", "from GDB1.ap.freescale.net (gdb1.ap.freescale.net [10.232.132.179])\n by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id CA00D402AB;\n Sun, 10 May 2020 06:44:01 +0800 (SGT)" ], "From": "Akhil Goyal <akhil.goyal@nxp.com>", "To": "dev@dpdk.org", "Cc": "hemant.agrawal@nxp.com,\n\tAkhil Goyal <akhil.goyal@nxp.com>", "Date": "Sun, 10 May 2020 03:52:59 +0530", "Message-Id": "<20200509222259.22510-2-akhil.goyal@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200509222259.22510-1-akhil.goyal@nxp.com>", "References": "<20200504213921.15449-1-akhil.goyal@nxp.com>\n <20200509222259.22510-1-akhil.goyal@nxp.com>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Subject": "[dpdk-dev] [PATCH v3 2/2] crypto/dpaa_sec: improve error handling", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The return values in cases of errors were not\nspecified properly. With this patch appropriate\nerror numbers are returned.\n\nSigned-off-by: Akhil Goyal <akhil.goyal@nxp.com>\n---\nChanges in v3: some return values were missed. It is now updated\n\n drivers/crypto/dpaa_sec/dpaa_sec.c | 46 ++++++++++++++++--------------\n 1 file changed, 25 insertions(+), 21 deletions(-)", "diff": "diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex 097ab8de9..25dcbd259 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -2047,7 +2047,7 @@ dpaa_sec_cipher_init(struct rte_cryptodev *dev __rte_unused,\n \tdefault:\n \t\tDPAA_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n \t\t\t xform->cipher.algo);\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \t}\n \tsession->dir = (xform->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?\n \t\t\tDIR_ENC : DIR_DEC;\n@@ -2114,7 +2114,7 @@ dpaa_sec_auth_init(struct rte_cryptodev *dev __rte_unused,\n \tdefault:\n \t\tDPAA_SEC_ERR(\"Crypto: Unsupported Auth specified %u\",\n \t\t\t xform->auth.algo);\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \t}\n \n \tsession->dir = (xform->auth.op == RTE_CRYPTO_AUTH_OP_GENERATE) ?\n@@ -2149,7 +2149,7 @@ dpaa_sec_chain_init(struct rte_cryptodev *dev __rte_unused,\n \t\t\t\t\t RTE_CACHE_LINE_SIZE);\n \tif (session->cipher_key.data == NULL && cipher_xform->key.length > 0) {\n \t\tDPAA_SEC_ERR(\"No Memory for cipher key\");\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \tsession->cipher_key.length = cipher_xform->key.length;\n \tsession->auth_key.data = rte_zmalloc(NULL, auth_xform->key.length,\n@@ -2195,7 +2195,7 @@ dpaa_sec_chain_init(struct rte_cryptodev *dev __rte_unused,\n \tdefault:\n \t\tDPAA_SEC_ERR(\"Crypto: Unsupported Auth specified %u\",\n \t\t\t auth_xform->algo);\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \t}\n \n \tsession->cipher_alg = cipher_xform->algo;\n@@ -2216,7 +2216,7 @@ dpaa_sec_chain_init(struct rte_cryptodev *dev __rte_unused,\n \tdefault:\n \t\tDPAA_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n \t\t\t cipher_xform->algo);\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \t}\n \tsession->dir = (cipher_xform->op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?\n \t\t\t\tDIR_ENC : DIR_DEC;\n@@ -2252,7 +2252,7 @@ dpaa_sec_aead_init(struct rte_cryptodev *dev __rte_unused,\n \t\tbreak;\n \tdefault:\n \t\tDPAA_SEC_ERR(\"unsupported AEAD alg %d\", session->aead_alg);\n-\t\treturn -ENOMEM;\n+\t\treturn -ENOTSUP;\n \t}\n \n \tsession->dir = (xform->aead.op == RTE_CRYPTO_AEAD_OP_ENCRYPT) ?\n@@ -2303,7 +2303,7 @@ dpaa_sec_attach_sess_q(struct dpaa_sec_qp *qp, dpaa_sec_session *sess)\n \tret = dpaa_sec_prep_cdb(sess);\n \tif (ret) {\n \t\tDPAA_SEC_ERR(\"Unable to prepare sec cdb\");\n-\t\treturn -1;\n+\t\treturn ret;\n \t}\n \tif (unlikely(!RTE_PER_LCORE(dpaa_io))) {\n \t\tret = rte_dpaa_portal_init((void *)0);\n@@ -2378,7 +2378,7 @@ dpaa_sec_set_session_parameters(struct rte_cryptodev *dev,\n \t\t\t\tret = dpaa_sec_chain_init(dev, xform, session);\n \t\t} else {\n \t\t\tDPAA_SEC_ERR(\"Not supported: Auth then Cipher\");\n-\t\t\treturn -EINVAL;\n+\t\t\treturn -ENOTSUP;\n \t\t}\n \t/* Authenticate then Cipher */\n \t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n@@ -2394,7 +2394,7 @@ dpaa_sec_set_session_parameters(struct rte_cryptodev *dev,\n \t\t\t\tret = dpaa_sec_chain_init(dev, xform, session);\n \t\t} else {\n \t\t\tDPAA_SEC_ERR(\"Not supported: Auth then Cipher\");\n-\t\t\treturn -EINVAL;\n+\t\t\treturn -ENOTSUP;\n \t\t}\n \n \t/* AEAD operation for AES-GCM kind of Algorithms */\n@@ -2417,6 +2417,7 @@ dpaa_sec_set_session_parameters(struct rte_cryptodev *dev,\n \t\tif (session->inq[i] == NULL) {\n \t\t\tDPAA_SEC_ERR(\"unable to attach sec queue\");\n \t\t\trte_spinlock_unlock(&internals->lock);\n+\t\t\tret = -EBUSY;\n \t\t\tgoto err1;\n \t\t}\n \t}\n@@ -2426,7 +2427,7 @@ dpaa_sec_set_session_parameters(struct rte_cryptodev *dev,\n \n err1:\n \tfree_session_data(session);\n-\treturn -EINVAL;\n+\treturn ret;\n }\n \n static int\n@@ -2506,7 +2507,7 @@ dpaa_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform,\n \t\t\t\t\t RTE_CACHE_LINE_SIZE);\n \tif (session->aead_key.data == NULL && aead_xform->key.length > 0) {\n \t\tDPAA_SEC_ERR(\"No Memory for aead key\");\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \tmemcpy(session->aead_key.data, aead_xform->key.data,\n \t aead_xform->key.length);\n@@ -2529,7 +2530,7 @@ dpaa_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform,\n \t\tdefault:\n \t\t\tDPAA_SEC_ERR(\"Crypto: Undefined GCM digest %d\",\n \t\t\t\t session->digest_length);\n-\t\t\treturn -1;\n+\t\t\treturn -EINVAL;\n \t\t}\n \t\tif (session->dir == DIR_ENC) {\n \t\t\tmemcpy(session->encap_pdb.gcm.salt,\n@@ -2544,7 +2545,7 @@ dpaa_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform,\n \tdefault:\n \t\tDPAA_SEC_ERR(\"Crypto: Undefined AEAD specified %u\",\n \t\t\t aead_xform->algo);\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \t}\n \treturn 0;\n }\n@@ -2641,11 +2642,11 @@ dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform,\n \tcase RTE_CRYPTO_AUTH_ZUC_EIA3:\n \t\tDPAA_SEC_ERR(\"Crypto: Unsupported auth alg %u\",\n \t\t\t session->auth_alg);\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \tdefault:\n \t\tDPAA_SEC_ERR(\"Crypto: Undefined Auth specified %u\",\n \t\t\t session->auth_alg);\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \t}\n \n \tswitch (session->cipher_alg) {\n@@ -2678,11 +2679,11 @@ dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform *cipher_xform,\n \tcase RTE_CRYPTO_CIPHER_KASUMI_F8:\n \t\tDPAA_SEC_ERR(\"Crypto: Unsupported Cipher alg %u\",\n \t\t\t session->cipher_alg);\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \tdefault:\n \t\tDPAA_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n \t\t\t session->cipher_alg);\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \t}\n \n \treturn 0;\n@@ -2857,6 +2858,7 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,\n \tdpaa_sec_session *session = (dpaa_sec_session *)sess;\n \tstruct dpaa_sec_dev_private *dev_priv = dev->data->dev_private;\n \tuint32_t i;\n+\tint ret;\n \n \tPMD_INIT_FUNC_TRACE();\n \n@@ -2896,7 +2898,7 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,\n \t\tdefault:\n \t\t\tDPAA_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n \t\t\t\t session->cipher_alg);\n-\t\t\treturn -1;\n+\t\t\treturn -EINVAL;\n \t\t}\n \n \t\tsession->cipher_key.data = rte_zmalloc(NULL,\n@@ -2925,6 +2927,7 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,\n \t\t pdcp_xform->sn_size != RTE_SECURITY_PDCP_SN_SIZE_12) {\n \t\t\tDPAA_SEC_ERR(\n \t\t\t\t\"PDCP Seq Num size should be 5/12 bits for cmode\");\n+\t\t\tret = -EINVAL;\n \t\t\tgoto out;\n \t\t}\n \t}\n@@ -2947,7 +2950,7 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,\n \t\t\tDPAA_SEC_ERR(\"Crypto: Unsupported auth alg %u\",\n \t\t\t\t session->auth_alg);\n \t\t\trte_free(session->cipher_key.data);\n-\t\t\treturn -1;\n+\t\t\treturn -EINVAL;\n \t\t}\n \t\tsession->auth_key.data = rte_zmalloc(NULL,\n \t\t\t\t\t\t auth_xform->key.length,\n@@ -2982,6 +2985,7 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,\n \t\tif (session->inq[i] == NULL) {\n \t\t\tDPAA_SEC_ERR(\"unable to attach sec queue\");\n \t\t\trte_spinlock_unlock(&dev_priv->lock);\n+\t\t\tret = -EBUSY;\n \t\t\tgoto out;\n \t\t}\n \t}\n@@ -2991,7 +2995,7 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,\n \trte_free(session->auth_key.data);\n \trte_free(session->cipher_key.data);\n \tmemset(session, 0, sizeof(dpaa_sec_session));\n-\treturn -1;\n+\treturn ret;\n }\n \n static int\n@@ -3242,7 +3246,7 @@ dpaa_sec_eventq_attach(const struct rte_cryptodev *dev,\n \t\tbreak;\n \tcase RTE_SCHED_TYPE_ORDERED:\n \t\tDPAA_SEC_ERR(\"Ordered queue schedule type is not supported\\n\");\n-\t\treturn -1;\n+\t\treturn -ENOTSUP;\n \tdefault:\n \t\topts.fqd.fq_ctrl |= QM_FQCTRL_AVOIDBLOCK;\n \t\tqp->outq.cb.dqrr_dpdk_cb = dpaa_sec_process_parallel_event;\n", "prefixes": [ "v3", "2/2" ] }