From patchwork Fri Sep 14 11:48:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil Goyal X-Patchwork-Id: 44718 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 093485B38; Fri, 14 Sep 2018 13:52:08 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70053.outbound.protection.outlook.com [40.107.7.53]) by dpdk.org (Postfix) with ESMTP id 2DD255B2E for ; Fri, 14 Sep 2018 13:52:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hDij1l/dmREeedEv8WAn/C4r/TepUz8+ko66n55i+Bs=; b=EL7MEjM+baLlXdqxCqnNZBjnny8r2UyxnOPGcanD4UgPuHOhC8wE0tWIVFmRAi9WS6otCqls+i9dnEJvsszDmBAMYp/LJvO/yay4XFjOzRrs17zRrzSTS1ZHSEc0rNFiRLByeSsd91XZAjEbgHwHhx7cSa2uEK7WxeMXKShD46s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=akhil.goyal@nxp.com; Received: from GDB1.ap.freescale.net (14.143.30.134) by VI1PR04MB4893.eurprd04.prod.outlook.com (2603:10a6:803:56::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.18; Fri, 14 Sep 2018 11:52:02 +0000 From: akhil.goyal@nxp.com To: dev@dpdk.org Cc: hemant.agrawal@nxp.com, pablo.de.lara.guarch@intel.com, Akhil Goyal Date: Fri, 14 Sep 2018 17:18:08 +0530 Message-Id: <20180914114810.14960-2-akhil.goyal@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180914114810.14960-1-akhil.goyal@nxp.com> References: <20180914114810.14960-1-akhil.goyal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR06CA0045.apcprd06.prod.outlook.com (2603:1096:404:2e::33) To VI1PR04MB4893.eurprd04.prod.outlook.com (2603:10a6:803:56::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c36e81ee-d2f2-454b-042f-08d61a387dc9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4893; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4893; 3:fTpJjSqugvhf/AXCaaNPgcjyOo9UmjcPmf+TlZa2kk/2/h2aqsUanJbIjHD5MFiHG+SAOEqLlqR20b0sVZg/fjZ3tgo1iPN/xdUaRvcMQ6JDuaUsB3I+9KunzFn594M/vhuIq1rODQRysStZaYN4Fx1Bi/wJP8mcAleF/hfeYtu8/vazIdSd6qbliAb1Z27Q0OScK+9R2h7ISjSqxtc/QMkE/lwNb8HgGl4yuC5oNT6UsYaJxjraoEKrZoR2PIrt; 25:EQnYYvjiuIIB8YSewsE/jyjlX6ugH0ICfEw7Tt5nm61ROttKk82gVZ9zq/bDkdGDGQQuJslir5JZx+nCdh9QwDBvlO9j4kQUY+oCiPRRizbHFd7A+Jap5HSr2IAvnUoW2QzyR3crJiFBCuGKN8i7tHTZhSFus/oCwfpVTPWOx/57tqU9noJW9QWyY0lxaAcKqnRuymeAXplmXnYv/FltckSi5tRgInpiwwKAthxIhUj+KvgwoJKbuFBv4JMYdDr7UW7wJpcynOJowlFJ2+4xgyrNFpt0PLUz/iBS9XgiBSCVqyBrdy4r7d2joHJZ69n0g4E3lyoYRCp3qye9PjcTWA==; 31:mlyR6JaAktK1yHMFkLZobCW3ya4H1ocIzTRJ6mUxPEE0XWVf5psucx5YwFqwk9AcNh81wDD5DL/GfHQWeqdBahwJJM1cAb2m7RlFiN6GASRTG46HPss7ebtwfZAAanCtq4ucEa568f/h5fhaW18u/41NWsurDLClilrcw3ld1324gGJyMqMKA2harvZ/aoRY9tcK7uDuRItCCkK6ul21mFQGxHHVixzOIMT0PGCODDw= X-MS-TrafficTypeDiagnostic: VI1PR04MB4893: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4893; 20:lG8NrsRgfPziUphULKHiiQV1fz8HLdp27I83GDOw/oe9wFS8PFTHnYgM8QoPft0UN/v4Yxstb+6TWoOIwLzi2b5u7xCPKN7o6Pm8hvPhuU0ZqE/WPlpCxY7AUYI2EjkNRdY4snpUcEIN2LYDlaWAvBzzuoeZHKwL9LTbxEU8qbqKYS8Zl0U131x+iK1YdY1Eq3Ag8fo209qsQXgY6tFg1sJwxnyK5bqo77b47yBvpps+vCjnXkmmEdK/0rnvqU95/om+Ewqj00aKXnJFykcF5ZeC4QS/0QEsU3LvU9M/It2DlvkfmFS+h+Y3VbIBEP19M+VDGsUaLlSbnBZuaiGuH88nFHgpnCR89cz5+IETjcs8v0khsARqN28+Rbrz8TA0sRgaH0EGBT7iv14rzVRPR8D+hjIwfJnFYt7GLgRtMKkEajqSD+EqgNYXPfgXo7H3G3oTScjyTZzpCP3SQYKsWSCOp0XURcyMG1ZVPdVxFsog3N2rmHDHQk+2ORdWjgFM; 4:Ik4EiLIC3+gcrwumG07sbT3cj9uqOsoIpMG0qxBYbSMLw4LvO1gz9GzAYKISJFpDwbP4y7ZsfZ7xZRJHWrTu4OiMDFQYazeYmjIYVlScpU44yYE0DBA76LzNmbRbsCn6/yYLpJ0d5mRsNVFWVkzGAez4BFX6sIAWUHVnrHj4FPuA7Y8dooQ7kLs1HHywT5X3PglubdLWgk7jxWxZ0xo67u7tu7dLRR0LARc2lZ6Kwyxt/GJ/XVKKEyQk6GT4Xbwks5cFGrYKlggn/5o+KZmz2WeM9wNH+uPkbP0C0bARtvwxJt+25Q1rXD+9F1kaAYQp X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(3002001)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699050); SRVR:VI1PR04MB4893; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB4893; X-Forefront-PRVS: 07954CC105 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(396003)(136003)(346002)(366004)(39860400002)(51234002)(199004)(189003)(86362001)(575784001)(7736002)(105586002)(25786009)(6486002)(1076002)(5660300001)(6116002)(3846002)(47776003)(5024004)(53936002)(66066001)(2351001)(2361001)(106356001)(305945005)(14444005)(50466002)(36756003)(6916009)(2906002)(6512007)(9686003)(4326008)(85782001)(48376002)(316002)(16586007)(186003)(16526019)(8936002)(486006)(81166006)(8676002)(50226002)(81156014)(5009440100003)(478600001)(68736007)(476003)(2616005)(51416003)(52116002)(11346002)(446003)(76176011)(26005)(956004)(386003)(33896004)(97736004)(6506007)(110426005)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4893; H:GDB1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB4893; 23:aBibScPA54PNdmpcNhHMigCK1VL3UzzWVn/2zfa4L?= YsS2KeSE9FNOyxUriJcfE3sityWl7A7edWBhFMhs9FFW+fXi61YUkkkC6zFpSAxsp26qkg4559xH95rbhYaKUCJEGMFLgpvMqnYaco3IrfEjA4h1YJ9znN3IRUh+jmcV76nmHGQGjnjlKXjOeaI6wYWzjQmOW7y3rhzT0Hxy7MA2g+Q+lsOlErXcdPut0x8xZLgyrxpyDu/SIOjrIBjctTa8hSwBWx+js8Crq/tYVh/A4QzG9xIHZ36LTQZLuymMovJNeNO+s+BwQVusZeD/o0LE3ybsYQFBb93cdOiSVNeVYQLwcP7gcE8aWf/Dc4ZWRoAJonpOZRmKUNEg03oib8bL4RlRBxpkpFacCX/2n8Fd1UZrgqR6OKsRLwupSgA2ma4A12a/J+fg/zFuTZnXrPuoI7XoKPmdFAHQkMd9sXRLQr64hyoPcaE8XlmThAGfRqegRWHICYJ1g0yZNCDFwOrro7tdsMKn17cGTJRK8mFy6ZiqI7YpRglusNJ2pOGE9uQANkukWcZYlgoQCcF9ffUlNLpR0Z/MQXcgi47/12yBlY0ANBCLCgvx08pCjH8L09QH36NHUcWHGatjG9c5Y066mhSX2eOXwIsNy/rm6e6KflLibQt4P18wSP05XYxhmJTBmdTDFu2cbWL50xageAZzJ+lbQJMI0LuGNaLAoXl4lehGmp2L81rUDqdc1WhzWt/yrPOC9kUjMvIaK20qXB0/tBxZcev3SOEspNQJ16kw/KLR+2fRI1XXWpKB3VVImeTfbw5C+ba7XTiWXQRoZNd3gbbnpPH5USYW3TsR8XyTsDrSt+Mur3sWpdXw9yPTfFiHWeKkpb40eD2dKpOgRowqq7WDVdkwwyTH/XnncjyHMcHjsZBSBKx9oAW4z2BjAkv33bbyDGxk+Z8ntEKXyz2/QXfKTvS9j/zL9A5EnxnIUtYLJBd53IHUkfDlJm4bsbdrt9nTpliQ2W7pjvRCouTFAv/ES9pdjdfdW6s0LNOMxgmNqAPziutQ21JZfgjf3uTJrWRlqVyIypsBFgguuqGHxu16gwL3Dcdwa8Mf45xRfxLxJ9KTtRQrVK8pKMQeV3ce81ZpA7FlZw9IgxzaqtPAX+zxY58qJ/JQ76r/ruY9mIZb1ulvQ48TxP24gPObx8VwoGNM+/WHEtBi6aCGgtu65rkmn2lg7WwNIjB5tMFwBGEitUDO/1aNG3k8BlpluIWHxc8HbXRdRvN3DPFux64fQJbQm3MKuwUpJtt7333uVE9qkoId2eUUODI6irZzvPMb6ECy/QXpjhxBr/ijj4V+G0ZvKJf7v8CVNIyiuLD1GkMsSxuxGSo5UfcazVSz045awVTcjmt+moTJg+hxX1hlfDVTe+OXTiCfTlM374QoA== X-Microsoft-Antispam-Message-Info: ITYl3ky8zTG75AoDNVPKNB5PFr3y2+/cfPB7uJ4GDho9Q/+uQ8EhFZApPI3estLYK7RyGkYdZTvm8K5H6H+xdPnzKBzbX9bFqKfqpE6ypEAKy9HD3nwOozHnjCGzdVH5MxIFyUm1AP9NZ8dztvytVScM0R9myYtev35ap60EKMjLNmE4pMPO9pCcql6CVG4d9oK/Yp4QMJJaVvTAZdQ6T9I26+JqGGwpvXSc7Swo6lstYbrJQlCWOLmaATi/EcKXVxRxiKf9mkJixwRiIGAwMmvyhw9J60PkPC0PyGsscWeJGOXk/z0+04Z9OAtyaBMzitARLBIgCTOP/DW/ymY6ZlajvVllpIRcXTlE4QClFhw= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4893; 6:msYQV7KYJonbwUd0jl3lbOODugNi3EEU+QUF5sjkmPc6pHrbLIumHIVrxR1hepF0L0yAtfqegvzgpmkCPzh8XSCtwnaBMpLevYk617diPFSVG5pGaym02aFqelHoz+ySmBRYhwK80/+TkceMFo3115z737aQYI7vU4TnxuGc12k4Mg135yrSd+mEUmiOHop9FCIEPqGJEm2FhVoaUxt1blhXd36dyEfR1vsVNbcPanxTycmAD6tVLAdEH2WHek70PQ8cN9KE5ISimchroR3Gb0/NkvRJr1E+ByFol8kEJFhtBn3mX3iVH2sxOTwNqQnEDMZc4NaxSlMTrL+XphfSV8PCe8WLmG0+ubw+LTWvMYrO+k75W9qGqq0e7oGW2ulZuiZnlKozfznXtKLE5qs9tbxu0AqMdGdciwQq45v6KqqHFlZxH+S+7UEqOIOX6L0ke1/rH+5giN56zCFCHsY62A==; 5:EB7sdHcT3NM++G+77zYwhHwpQhDi3tGkC0zbVzA2Y+vRyGsKUjDPyjco3is/ncz9ygpDgTksWnqrON4JlrnGqrnZq4FOAcxNC4keLdQt9XVVLn+AcSmRkg9z1GzHeF9xc7RNYCywr4tX4s/eBQC+JvtOrWz3tNUXH0o/45XY1KE=; 7:DrWYT/agy2B24K3kNFNXFqmzmaBIC+9ow1kWk4b2M6A3gPSkfw7+q+imKNxTz4ujJkGO/QpyDwMiNjE4cThZgV46KjCu4MM0lZHf1BYP7R1xHZ9PVlLU1U9ejhpPuBTzJlYsC872+RIcP2bnlUMwYm3xJBysAbMNvbJoTMMEO+vAHJQfaP23WTo9N/r7i3TLHtB5hXWKOspyCzpC+S30TzeoxeaLINfGvwryjxLCa7vWj3zlH3IMVsth/wvu9B1+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2018 11:52:02.6882 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c36e81ee-d2f2-454b-042f-08d61a387dc9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4893 Subject: [dpdk-dev] [PATCH 1/3] crypto/dpaa2_sec: support for event crypto adapter X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Akhil Goyal Signed-off-by: Akhil Goyal Signed-off-by: Ashish Jain --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 90 ++++++++++++++++++- drivers/crypto/dpaa2_sec/dpaa2_sec_event.h | 18 ++++ drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h | 2 + .../dpaa2_sec/rte_pmd_dpaa2_sec_version.map | 8 ++ 4 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 drivers/crypto/dpaa2_sec/dpaa2_sec_event.h diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 53e493457..ae38f507b 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. - * Copyright 2016 NXP + * Copyright 2016-2018 NXP * */ @@ -10,7 +10,6 @@ #include #include -#include #include #include #include @@ -28,6 +27,7 @@ #include #include "dpaa2_sec_priv.h" +#include "dpaa2_sec_event.h" #include "dpaa2_sec_logs.h" /* Required types */ @@ -2853,6 +2853,92 @@ void dpaa2_sec_stats_reset(struct rte_cryptodev *dev) } } +static void __attribute__((hot)) +dpaa2_sec_process_parallel_event(struct qbman_swp *swp, + const struct qbman_fd *fd, + const struct qbman_result *dq, + struct dpaa2_queue *rxq, + struct rte_event *ev) +{ + /* Prefetching mbuf */ + rte_prefetch0((void *)(size_t)(DPAA2_GET_FD_ADDR(fd)- + rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size)); + + /* Prefetching ipsec crypto_op stored in priv data of mbuf */ + rte_prefetch0((void *)(size_t)(DPAA2_GET_FD_ADDR(fd)-64)); + + ev->flow_id = rxq->ev.flow_id; + ev->sub_event_type = rxq->ev.sub_event_type; + ev->event_type = RTE_EVENT_TYPE_CRYPTODEV; + ev->op = RTE_EVENT_OP_NEW; + ev->sched_type = rxq->ev.sched_type; + ev->queue_id = rxq->ev.queue_id; + ev->priority = rxq->ev.priority; + ev->event_ptr = sec_fd_to_mbuf(fd, ((struct rte_cryptodev *) + (rxq->dev))->driver_id); + + qbman_swp_dqrr_consume(swp, dq); +} + +int +dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, + int qp_id, + uint16_t dpcon_id, + const struct rte_event *event) +{ + struct dpaa2_sec_dev_private *priv = dev->data->dev_private; + struct fsl_mc_io *dpseci = (struct fsl_mc_io *)priv->hw; + struct dpaa2_sec_qp *qp = dev->data->queue_pairs[qp_id]; + struct dpseci_rx_queue_cfg cfg; + int ret; + + if (event->sched_type == RTE_SCHED_TYPE_PARALLEL) + qp->rx_vq.cb = dpaa2_sec_process_parallel_event; + else + return -EINVAL; + + memset(&cfg, 0, sizeof(struct dpseci_rx_queue_cfg)); + cfg.options = DPSECI_QUEUE_OPT_DEST; + cfg.dest_cfg.dest_type = DPSECI_DEST_DPCON; + cfg.dest_cfg.dest_id = dpcon_id; + cfg.dest_cfg.priority = event->priority; + + cfg.options |= DPSECI_QUEUE_OPT_USER_CTX; + cfg.user_ctx = (size_t)(qp); + + ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, + qp_id, &cfg); + if (ret) { + RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + return ret; + } + + memcpy(&qp->rx_vq.ev, event, sizeof(struct rte_event)); + + return 0; +} + +int +dpaa2_sec_eventq_detach(const struct rte_cryptodev *dev, + int qp_id) +{ + struct dpaa2_sec_dev_private *priv = dev->data->dev_private; + struct fsl_mc_io *dpseci = (struct fsl_mc_io *)priv->hw; + struct dpseci_rx_queue_cfg cfg; + int ret; + + memset(&cfg, 0, sizeof(struct dpseci_rx_queue_cfg)); + cfg.options = DPSECI_QUEUE_OPT_DEST; + cfg.dest_cfg.dest_type = DPSECI_DEST_NONE; + + ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, + qp_id, &cfg); + if (ret) + RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + + return ret; +} + static struct rte_cryptodev_ops crypto_ops = { .dev_configure = dpaa2_sec_dev_configure, .dev_start = dpaa2_sec_dev_start, diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_event.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_event.h new file mode 100644 index 000000000..977099429 --- /dev/null +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_event.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + * + */ + +#ifndef _DPAA2_SEC_EVENT_H_ +#define _DPAA2_SEC_EVENT_H_ + +int +dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, + int qp_id, + uint16_t dpcon_id, + const struct rte_event *event); + +int dpaa2_sec_eventq_detach(const struct rte_cryptodev *dev, + int qp_id); + +#endif /* _DPAA2_SEC_EVENT_H_ */ diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h index d015be1e9..bce9633c0 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h @@ -8,6 +8,8 @@ #ifndef _RTE_DPAA2_SEC_PMD_PRIVATE_H_ #define _RTE_DPAA2_SEC_PMD_PRIVATE_H_ +#include + #define CRYPTODEV_NAME_DPAA2_SEC_PMD crypto_dpaa2_sec /**< NXP DPAA2 - SEC PMD device name */ diff --git a/drivers/crypto/dpaa2_sec/rte_pmd_dpaa2_sec_version.map b/drivers/crypto/dpaa2_sec/rte_pmd_dpaa2_sec_version.map index 8591cc0b1..0bfb986d0 100644 --- a/drivers/crypto/dpaa2_sec/rte_pmd_dpaa2_sec_version.map +++ b/drivers/crypto/dpaa2_sec/rte_pmd_dpaa2_sec_version.map @@ -2,3 +2,11 @@ DPDK_17.05 { local: *; }; + +DPDK_18.11 { + global: + + dpaa2_sec_eventq_attach; + dpaa2_sec_eventq_detach; + +} DPDK_17.05;