Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/105176/?format=api
{ "id": 105176, "url": "http://patches.dpdk.org/api/patches/105176/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1639676975-1316-12-git-send-email-anoobj@marvell.com/", "project": { "id": 1, "url": "http://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": "<1639676975-1316-12-git-send-email-anoobj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1639676975-1316-12-git-send-email-anoobj@marvell.com", "date": "2021-12-16T17:49:17", "name": "[v2,11/29] crypto/cnxk: write CPT CTX through microcode op", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "bd655772a345a4dd63e2b012428c70dfa83e8e5c", "submitter": { "id": 1205, "url": "http://patches.dpdk.org/api/people/1205/?format=api", "name": "Anoob Joseph", "email": "anoobj@marvell.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1639676975-1316-12-git-send-email-anoobj@marvell.com/mbox/", "series": [ { "id": 20957, "url": "http://patches.dpdk.org/api/series/20957/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=20957", "date": "2021-12-16T17:49:06", "name": "New features and improvements in cnxk crypto PMD", "version": 2, "mbox": "http://patches.dpdk.org/series/20957/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/105176/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/105176/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 29737A0032;\n\tThu, 16 Dec 2021 18:53:35 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9815D40DF7;\n\tThu, 16 Dec 2021 18:53:33 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id E060A40143\n for <dev@dpdk.org>; Thu, 16 Dec 2021 18:53:31 +0100 (CET)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id\n 1BGEeeLE008299\n for <dev@dpdk.org>; Thu, 16 Dec 2021 09:53:31 -0800", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3d02p0aeva-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Thu, 16 Dec 2021 09:53:31 -0800", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Thu, 16 Dec 2021 09:53:29 -0800", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Thu, 16 Dec 2021 09:53:29 -0800", "from HY-LT1002.marvell.com (HY-LT1002.marvell.com [10.28.176.218])\n by maili.marvell.com (Postfix) with ESMTP id 54B9F3F7048;\n Thu, 16 Dec 2021 09:53:27 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=kKaB6OMKvg9cFqmC9F5DoBHQdf2n+P3uJafzh2364Xc=;\n b=cblWwZmdbnYFVCls+v4dXRM4TkZX1/06C9rllbHrTAgxs2FQfPpFqouh00kGqFpybiWx\n /MfiRCvGHPiEAwFeTT8B9HM8F22fJU0SFYtzxoQjcKE9Klf8LeEYQb34x17Q4xHNnWUh\n GjC9nCrXVOKjo1F723oPkfUgSDQy5PQpZH9Gko6J9vlfKkMs2PTnoaONmzslT3Mdq+Wf\n svjD7X9b54VBJKtoTOufrAg0dBPCEcSvUcJUyjJ/nES3tBsSvcua0yuI5ostZ91SqlOS\n Tcz6xZ1ddduLmffEqS+GRjS7lvea4xOXUc3CORPhbRb2zT6VwBYpRxpGssCCq86Cytre yA==", "From": "Anoob Joseph <anoobj@marvell.com>", "To": "Akhil Goyal <gakhil@marvell.com>, Jerin Jacob <jerinj@marvell.com>", "CC": "Tejasree Kondoj <ktejasree@marvell.com>, Archana Muniganti\n <marchana@marvell.com>, <dev@dpdk.org>", "Subject": "[PATCH v2 11/29] crypto/cnxk: write CPT CTX through microcode op", "Date": "Thu, 16 Dec 2021 23:19:17 +0530", "Message-ID": "<1639676975-1316-12-git-send-email-anoobj@marvell.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1639676975-1316-1-git-send-email-anoobj@marvell.com>", "References": "<1638859858-734-1-git-send-email-anoobj@marvell.com>\n <1639676975-1316-1-git-send-email-anoobj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "Wm7muK-IoDSYJJ9D4xBvJRoKRYBZJRPa", "X-Proofpoint-ORIG-GUID": "Wm7muK-IoDSYJJ9D4xBvJRoKRYBZJRPa", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513\n definitions=2021-12-16_06,2021-12-16_01,2021-12-02_01", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "From: Tejasree Kondoj <ktejasree@marvell.com>\n\nAdding support to write CPT CTX through microcode op(SET_CTX) for\ncn10k lookaside PMD.\n\nSigned-off-by: Tejasree Kondoj <ktejasree@marvell.com>\n---\n drivers/crypto/cnxk/cn10k_ipsec.c | 121 ++++++++++++++++++++++++++++----------\n 1 file changed, 89 insertions(+), 32 deletions(-)", "diff": "diff --git a/drivers/crypto/cnxk/cn10k_ipsec.c b/drivers/crypto/cnxk/cn10k_ipsec.c\nindex 1bd127e..a11a6b7 100644\n--- a/drivers/crypto/cnxk/cn10k_ipsec.c\n+++ b/drivers/crypto/cnxk/cn10k_ipsec.c\n@@ -2,18 +2,19 @@\n * Copyright(C) 2021 Marvell.\n */\n \n-#include <rte_malloc.h>\n #include <cryptodev_pmd.h>\n #include <rte_esp.h>\n #include <rte_ip.h>\n+#include <rte_malloc.h>\n #include <rte_security.h>\n #include <rte_security_driver.h>\n #include <rte_udp.h>\n \n+#include \"cn10k_ipsec.h\"\n #include \"cnxk_cryptodev.h\"\n+#include \"cnxk_cryptodev_ops.h\"\n #include \"cnxk_ipsec.h\"\n #include \"cnxk_security.h\"\n-#include \"cn10k_ipsec.h\"\n \n #include \"roc_api.h\"\n \n@@ -32,36 +33,46 @@ ipsec_cpt_inst_w7_get(struct roc_cpt *roc_cpt, void *sa)\n }\n \n static int\n-cn10k_ipsec_outb_sa_create(struct roc_cpt *roc_cpt,\n+cn10k_ipsec_outb_sa_create(struct roc_cpt *roc_cpt, struct roc_cpt_lf *lf,\n \t\t\t struct rte_security_ipsec_xform *ipsec_xfrm,\n \t\t\t struct rte_crypto_sym_xform *crypto_xfrm,\n \t\t\t struct rte_security_session *sec_sess)\n {\n \tunion roc_ot_ipsec_outb_param1 param1;\n-\tstruct roc_ot_ipsec_outb_sa *out_sa;\n+\tstruct roc_ot_ipsec_outb_sa *sa_dptr;\n \tstruct cnxk_ipsec_outb_rlens rlens;\n \tstruct cn10k_sec_session *sess;\n \tstruct cn10k_ipsec_sa *sa;\n \tunion cpt_inst_w4 inst_w4;\n-\tint ret;\n+\tvoid *out_sa;\n+\tint ret = 0;\n \n \tsess = get_sec_session_private_data(sec_sess);\n \tsa = &sess->sa;\n \tout_sa = &sa->out_sa;\n \n-\tmemset(out_sa, 0, sizeof(struct roc_ot_ipsec_outb_sa));\n+\t/* Allocate memory to be used as dptr for CPT ucode WRITE_SA op */\n+\tsa_dptr = plt_zmalloc(ROC_NIX_INL_OT_IPSEC_OUTB_HW_SZ, 0);\n+\tif (sa_dptr == NULL) {\n+\t\tplt_err(\"Couldn't allocate memory for SA dptr\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tmemset(sa_dptr, 0, sizeof(struct roc_ot_ipsec_outb_sa));\n \n \t/* Translate security parameters to SA */\n-\tret = cnxk_ot_ipsec_outb_sa_fill(out_sa, ipsec_xfrm, crypto_xfrm);\n-\tif (ret)\n-\t\treturn ret;\n+\tret = cnxk_ot_ipsec_outb_sa_fill(sa_dptr, ipsec_xfrm, crypto_xfrm);\n+\tif (ret) {\n+\t\tplt_err(\"Could not fill outbound session parameters\");\n+\t\tgoto sa_dptr_free;\n+\t}\n \n \tsa->inst.w7 = ipsec_cpt_inst_w7_get(roc_cpt, sa);\n \n #ifdef LA_IPSEC_DEBUG\n \t/* Use IV from application in debug mode */\n \tif (ipsec_xfrm->options.iv_gen_disable == 1) {\n-\t\tout_sa->w2.s.iv_src = ROC_IE_OT_SA_IV_SRC_FROM_SA;\n+\t\tsa_dptr->w2.s.iv_src = ROC_IE_OT_SA_IV_SRC_FROM_SA;\n \t\tif (crypto_xfrm->type == RTE_CRYPTO_SYM_XFORM_AEAD) {\n \t\t\tsa->iv_offset = crypto_xfrm->aead.iv.offset;\n \t\t\tsa->iv_length = crypto_xfrm->aead.iv.length;\n@@ -73,14 +84,15 @@ cn10k_ipsec_outb_sa_create(struct roc_cpt *roc_cpt,\n #else\n \tif (ipsec_xfrm->options.iv_gen_disable != 0) {\n \t\tplt_err(\"Application provided IV not supported\");\n-\t\treturn -ENOTSUP;\n+\t\tret = -ENOTSUP;\n+\t\tgoto sa_dptr_free;\n \t}\n #endif\n \n \t/* Get Rlen calculation data */\n \tret = cnxk_ipsec_outb_rlens_get(&rlens, ipsec_xfrm, crypto_xfrm);\n \tif (ret)\n-\t\treturn ret;\n+\t\tgoto sa_dptr_free;\n \n \tsa->max_extended_len = rlens.max_extended_len;\n \n@@ -110,37 +122,61 @@ cn10k_ipsec_outb_sa_create(struct roc_cpt *roc_cpt,\n \n \tsa->inst.w4 = inst_w4.u64;\n \n-\treturn 0;\n+\tmemset(out_sa, 0, sizeof(struct roc_ot_ipsec_outb_sa));\n+\n+\t/* Copy word0 from sa_dptr to populate ctx_push_sz ctx_size fields */\n+\tmemcpy(out_sa, sa_dptr, 8);\n+\n+\t/* Write session using microcode opcode */\n+\tret = roc_cpt_ctx_write(lf, sa_dptr, out_sa,\n+\t\t\t\tROC_NIX_INL_OT_IPSEC_OUTB_HW_SZ);\n+\tif (ret) {\n+\t\tplt_err(\"Could not write outbound session to hardware\");\n+\t\tgoto sa_dptr_free;\n+\t}\n+\n+\t/* Trigger CTX flush to write dirty data back to DRAM */\n+\troc_cpt_lf_ctx_flush(lf, out_sa, false);\n+\n+sa_dptr_free:\n+\tplt_free(sa_dptr);\n+\n+\treturn ret;\n }\n \n static int\n-cn10k_ipsec_inb_sa_create(struct roc_cpt *roc_cpt,\n+cn10k_ipsec_inb_sa_create(struct roc_cpt *roc_cpt, struct roc_cpt_lf *lf,\n \t\t\t struct rte_security_ipsec_xform *ipsec_xfrm,\n \t\t\t struct rte_crypto_sym_xform *crypto_xfrm,\n \t\t\t struct rte_security_session *sec_sess)\n {\n \tunion roc_ot_ipsec_inb_param1 param1;\n-\tstruct roc_ot_ipsec_inb_sa *in_sa;\n+\tstruct roc_ot_ipsec_inb_sa *sa_dptr;\n \tstruct cn10k_sec_session *sess;\n \tstruct cn10k_ipsec_sa *sa;\n \tunion cpt_inst_w4 inst_w4;\n-\tint ret;\n+\tvoid *in_sa;\n+\tint ret = 0;\n \n \tsess = get_sec_session_private_data(sec_sess);\n \tsa = &sess->sa;\n \tin_sa = &sa->in_sa;\n \n-\tmemset(in_sa, 0, sizeof(struct roc_ot_ipsec_inb_sa));\n-\n-\t/* Translate security parameters to SA */\n-\tret = cnxk_ot_ipsec_inb_sa_fill(in_sa, ipsec_xfrm, crypto_xfrm);\n-\tif (ret)\n-\t\treturn ret;\n+\t/* Allocate memory to be used as dptr for CPT ucode WRITE_SA op */\n+\tsa_dptr = plt_zmalloc(ROC_NIX_INL_OT_IPSEC_INB_HW_SZ, 0);\n+\tif (sa_dptr == NULL) {\n+\t\tplt_err(\"Couldn't allocate memory for SA dptr\");\n+\t\treturn -ENOMEM;\n+\t}\n \n-\t/* TODO add support for antireplay */\n-\tsa->in_sa.w0.s.ar_win = 0;\n+\tmemset(sa_dptr, 0, sizeof(struct roc_ot_ipsec_inb_sa));\n \n-\t/* TODO add support for udp encap */\n+\t/* Translate security parameters to SA */\n+\tret = cnxk_ot_ipsec_inb_sa_fill(sa_dptr, ipsec_xfrm, crypto_xfrm);\n+\tif (ret) {\n+\t\tplt_err(\"Could not fill inbound session parameters\");\n+\t\tgoto sa_dptr_free;\n+\t}\n \n \tsa->inst.w7 = ipsec_cpt_inst_w7_get(roc_cpt, sa);\n \n@@ -173,7 +209,26 @@ cn10k_ipsec_inb_sa_create(struct roc_cpt *roc_cpt,\n \n \tsa->inst.w4 = inst_w4.u64;\n \n-\treturn 0;\n+\tmemset(in_sa, 0, sizeof(struct roc_ot_ipsec_inb_sa));\n+\n+\t/* Copy word0 from sa_dptr to populate ctx_push_sz ctx_size fields */\n+\tmemcpy(in_sa, sa_dptr, 8);\n+\n+\t/* Write session using microcode opcode */\n+\tret = roc_cpt_ctx_write(lf, sa_dptr, in_sa,\n+\t\t\t\tROC_NIX_INL_OT_IPSEC_INB_HW_SZ);\n+\tif (ret) {\n+\t\tplt_err(\"Could not write inbound session to hardware\");\n+\t\tgoto sa_dptr_free;\n+\t}\n+\n+\t/* Trigger CTX flush to write dirty data back to DRAM */\n+\troc_cpt_lf_ctx_flush(lf, in_sa, false);\n+\n+sa_dptr_free:\n+\tplt_free(sa_dptr);\n+\n+\treturn ret;\n }\n \n static int\n@@ -185,12 +240,11 @@ cn10k_ipsec_session_create(void *dev,\n \tstruct rte_cryptodev *crypto_dev = dev;\n \tstruct roc_cpt *roc_cpt;\n \tstruct cnxk_cpt_vf *vf;\n+\tstruct cnxk_cpt_qp *qp;\n \tint ret;\n \n-\tvf = crypto_dev->data->dev_private;\n-\troc_cpt = &vf->cpt;\n-\n-\tif (crypto_dev->data->queue_pairs[0] == NULL) {\n+\tqp = crypto_dev->data->queue_pairs[0];\n+\tif (qp == NULL) {\n \t\tplt_err(\"Setup cpt queue pair before creating security session\");\n \t\treturn -EPERM;\n \t}\n@@ -199,11 +253,14 @@ cn10k_ipsec_session_create(void *dev,\n \tif (ret)\n \t\treturn ret;\n \n+\tvf = crypto_dev->data->dev_private;\n+\troc_cpt = &vf->cpt;\n+\n \tif (ipsec_xfrm->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS)\n-\t\treturn cn10k_ipsec_inb_sa_create(roc_cpt, ipsec_xfrm,\n+\t\treturn cn10k_ipsec_inb_sa_create(roc_cpt, &qp->lf, ipsec_xfrm,\n \t\t\t\t\t\t crypto_xfrm, sess);\n \telse\n-\t\treturn cn10k_ipsec_outb_sa_create(roc_cpt, ipsec_xfrm,\n+\t\treturn cn10k_ipsec_outb_sa_create(roc_cpt, &qp->lf, ipsec_xfrm,\n \t\t\t\t\t\t crypto_xfrm, sess);\n }\n \n", "prefixes": [ "v2", "11/29" ] }