Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/60215/?format=api
{ "id": 60215, "url": "http://patches.dpdk.org/api/patches/60215/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190930144104.12742-9-akhil.goyal@nxp.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": "<20190930144104.12742-9-akhil.goyal@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190930144104.12742-9-akhil.goyal@nxp.com", "date": "2019-09-30T14:40:48", "name": "[v3,08/24] crypto/dpaa_sec: support scatter gather for PDCP", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "476471a47fef82ed7e78ac1d55886510d38a3c8d", "submitter": { "id": 517, "url": "http://patches.dpdk.org/api/people/517/?format=api", "name": "Akhil Goyal", "email": "akhil.goyal@nxp.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190930144104.12742-9-akhil.goyal@nxp.com/mbox/", "series": [ { "id": 6623, "url": "http://patches.dpdk.org/api/series/6623/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6623", "date": "2019-09-30T14:40:40", "name": "crypto/dpaaX_sec: Support Wireless algos", "version": 3, "mbox": "http://patches.dpdk.org/series/6623/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/60215/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/60215/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 47C601BED0;\n\tMon, 30 Sep 2019 16:56:43 +0200 (CEST)", "from inva021.nxp.com (inva021.nxp.com [92.121.34.21])\n\tby dpdk.org (Postfix) with ESMTP id 2A92D1BE92\n\tfor <dev@dpdk.org>; Mon, 30 Sep 2019 16:56:26 +0200 (CEST)", "from inva021.nxp.com (localhost [127.0.0.1])\n\tby inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 0BD2120008A;\n\tMon, 30 Sep 2019 16:56:26 +0200 (CEST)", "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n\t[165.114.16.14])\n\tby inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id A497D200238;\n\tMon, 30 Sep 2019 16:56:23 +0200 (CEST)", "from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179])\n\tby invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id A11BA402C1;\n\tMon, 30 Sep 2019 22:56:20 +0800 (SGT)" ], "From": "Akhil Goyal <akhil.goyal@nxp.com>", "To": "dev@dpdk.org", "Cc": "aconole@redhat.com, anoobj@marvell.com, Akhil Goyal <akhil.goyal@nxp.com>", "Date": "Mon, 30 Sep 2019 20:10:48 +0530", "Message-Id": "<20190930144104.12742-9-akhil.goyal@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20190930144104.12742-1-akhil.goyal@nxp.com>", "References": "<20190930115237.5073-1-akhil.goyal@nxp.com>\n\t<20190930144104.12742-1-akhil.goyal@nxp.com>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Subject": "[dpdk-dev] [PATCH v3 08/24] crypto/dpaa_sec: support scatter gather\n\tfor PDCP", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch add support for chained input or output\nmbufs for PDCP operations.\n\nSigned-off-by: Akhil Goyal <akhil.goyal@nxp.com>\n---\n drivers/crypto/dpaa_sec/dpaa_sec.c | 122 +++++++++++++++++++++++++++--\n 1 file changed, 116 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex 3fc4a606f..291cba28d 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -189,12 +189,18 @@ dqrr_out_fq_cb_rx(struct qman_portal *qm __always_unused,\n \tif (ctx->op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {\n \t\tstruct qm_sg_entry *sg_out;\n \t\tuint32_t len;\n+\t\tstruct rte_mbuf *mbuf = (ctx->op->sym->m_dst == NULL) ?\n+\t\t\t\tctx->op->sym->m_src : ctx->op->sym->m_dst;\n \n \t\tsg_out = &job->sg[0];\n \t\thw_sg_to_cpu(sg_out);\n \t\tlen = sg_out->length;\n-\t\tctx->op->sym->m_src->pkt_len = len;\n-\t\tctx->op->sym->m_src->data_len = len;\n+\t\tmbuf->pkt_len = len;\n+\t\twhile (mbuf->next != NULL) {\n+\t\t\tlen -= mbuf->data_len;\n+\t\t\tmbuf = mbuf->next;\n+\t\t}\n+\t\tmbuf->data_len = len;\n \t}\n \tdpaa_sec_ops[dpaa_sec_op_nb++] = ctx->op;\n \tdpaa_sec_op_ending(ctx);\n@@ -260,6 +266,7 @@ static inline int is_auth_cipher(dpaa_sec_session *ses)\n {\n \treturn ((ses->cipher_alg != RTE_CRYPTO_CIPHER_NULL) &&\n \t\t(ses->auth_alg != RTE_CRYPTO_AUTH_NULL) &&\n+\t\t(ses->proto_alg != RTE_SECURITY_PROTOCOL_PDCP) &&\n \t\t(ses->proto_alg != RTE_SECURITY_PROTOCOL_IPSEC));\n }\n \n@@ -802,12 +809,18 @@ dpaa_sec_deq(struct dpaa_sec_qp *qp, struct rte_crypto_op **ops, int nb_ops)\n \t\tif (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {\n \t\t\tstruct qm_sg_entry *sg_out;\n \t\t\tuint32_t len;\n+\t\t\tstruct rte_mbuf *mbuf = (op->sym->m_dst == NULL) ?\n+\t\t\t\t\t\top->sym->m_src : op->sym->m_dst;\n \n \t\t\tsg_out = &job->sg[0];\n \t\t\thw_sg_to_cpu(sg_out);\n \t\t\tlen = sg_out->length;\n-\t\t\top->sym->m_src->pkt_len = len;\n-\t\t\top->sym->m_src->data_len = len;\n+\t\t\tmbuf->pkt_len = len;\n+\t\t\twhile (mbuf->next != NULL) {\n+\t\t\t\tlen -= mbuf->data_len;\n+\t\t\t\tmbuf = mbuf->next;\n+\t\t\t}\n+\t\t\tmbuf->data_len = len;\n \t\t}\n \t\tif (!ctx->fd_status) {\n \t\t\top->status = RTE_CRYPTO_OP_STATUS_SUCCESS;\n@@ -1636,6 +1649,99 @@ build_proto(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \treturn cf;\n }\n \n+static inline struct dpaa_sec_job *\n+build_proto_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n+{\n+\tstruct rte_crypto_sym_op *sym = op->sym;\n+\tstruct dpaa_sec_job *cf;\n+\tstruct dpaa_sec_op_ctx *ctx;\n+\tstruct qm_sg_entry *sg, *out_sg, *in_sg;\n+\tstruct rte_mbuf *mbuf;\n+\tuint8_t req_segs;\n+\tuint32_t in_len = 0, out_len = 0;\n+\n+\tif (sym->m_dst)\n+\t\tmbuf = sym->m_dst;\n+\telse\n+\t\tmbuf = sym->m_src;\n+\n+\treq_segs = mbuf->nb_segs + sym->m_src->nb_segs + 2;\n+\tif (req_segs > MAX_SG_ENTRIES) {\n+\t\tDPAA_SEC_DP_ERR(\"Proto: Max sec segs supported is %d\",\n+\t\t\t\tMAX_SG_ENTRIES);\n+\t\treturn NULL;\n+\t}\n+\n+\tctx = dpaa_sec_alloc_ctx(ses);\n+\tif (!ctx)\n+\t\treturn NULL;\n+\tcf = &ctx->job;\n+\tctx->op = op;\n+\t/* output */\n+\tout_sg = &cf->sg[0];\n+\tout_sg->extension = 1;\n+\tqm_sg_entry_set64(out_sg, dpaa_mem_vtop(&cf->sg[2]));\n+\n+\t/* 1st seg */\n+\tsg = &cf->sg[2];\n+\tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n+\tsg->offset = 0;\n+\n+\t/* Successive segs */\n+\twhile (mbuf->next) {\n+\t\tsg->length = mbuf->data_len;\n+\t\tout_len += sg->length;\n+\t\tmbuf = mbuf->next;\n+\t\tcpu_to_hw_sg(sg);\n+\t\tsg++;\n+\t\tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n+\t\tsg->offset = 0;\n+\t}\n+\tsg->length = mbuf->buf_len - mbuf->data_off;\n+\tout_len += sg->length;\n+\tsg->final = 1;\n+\tcpu_to_hw_sg(sg);\n+\n+\tout_sg->length = out_len;\n+\tcpu_to_hw_sg(out_sg);\n+\n+\t/* input */\n+\tmbuf = sym->m_src;\n+\tin_sg = &cf->sg[1];\n+\tin_sg->extension = 1;\n+\tin_sg->final = 1;\n+\tin_len = mbuf->data_len;\n+\n+\tsg++;\n+\tqm_sg_entry_set64(in_sg, dpaa_mem_vtop(sg));\n+\n+\t/* 1st seg */\n+\tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n+\tsg->length = mbuf->data_len;\n+\tsg->offset = 0;\n+\n+\t/* Successive segs */\n+\tmbuf = mbuf->next;\n+\twhile (mbuf) {\n+\t\tcpu_to_hw_sg(sg);\n+\t\tsg++;\n+\t\tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n+\t\tsg->length = mbuf->data_len;\n+\t\tsg->offset = 0;\n+\t\tin_len += sg->length;\n+\t\tmbuf = mbuf->next;\n+\t}\n+\tsg->final = 1;\n+\tcpu_to_hw_sg(sg);\n+\n+\tin_sg->length = in_len;\n+\tcpu_to_hw_sg(in_sg);\n+\n+\tsym->m_src->packet_type &= ~RTE_PTYPE_L4_MASK;\n+\n+\treturn cf;\n+}\n+\n static uint16_t\n dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t uint16_t nb_ops)\n@@ -1707,7 +1813,9 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \n \t\t\tauth_only_len = op->sym->auth.data.length -\n \t\t\t\t\t\top->sym->cipher.data.length;\n-\t\t\tif (rte_pktmbuf_is_contiguous(op->sym->m_src)) {\n+\t\t\tif (rte_pktmbuf_is_contiguous(op->sym->m_src) &&\n+\t\t\t\t ((op->sym->m_dst == NULL) ||\n+\t\t\t\t rte_pktmbuf_is_contiguous(op->sym->m_dst))) {\n \t\t\t\tif (is_proto_ipsec(ses)) {\n \t\t\t\t\tcf = build_proto(op, ses);\n \t\t\t\t} else if (is_proto_pdcp(ses)) {\n@@ -1728,7 +1836,9 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t\tgoto send_pkts;\n \t\t\t\t}\n \t\t\t} else {\n-\t\t\t\tif (is_auth_only(ses)) {\n+\t\t\t\tif (is_proto_pdcp(ses) || is_proto_ipsec(ses)) {\n+\t\t\t\t\tcf = build_proto_sg(op, ses);\n+\t\t\t\t} else if (is_auth_only(ses)) {\n \t\t\t\t\tcf = build_auth_only_sg(op, ses);\n \t\t\t\t} else if (is_cipher_only(ses)) {\n \t\t\t\t\tcf = build_cipher_only_sg(op, ses);\n", "prefixes": [ "v3", "08/24" ] }