From patchwork Thu Jan 11 11:33:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil Goyal X-Patchwork-Id: 33583 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.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 328ADA494; Thu, 11 Jan 2018 12:37:12 +0100 (CET) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0070.outbound.protection.outlook.com [104.47.38.70]) by dpdk.org (Postfix) with ESMTP id 02F9FA494 for ; Thu, 11 Jan 2018 12:37:09 +0100 (CET) Received: from BN6PR03CA0011.namprd03.prod.outlook.com (2603:10b6:404:23::21) by SN2PR03MB2365.namprd03.prod.outlook.com (2603:10b6:804:e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Thu, 11 Jan 2018 11:37:08 +0000 Received: from BY2FFO11FD045.protection.gbl (2a01:111:f400:7c0c::123) by BN6PR03CA0011.outlook.office365.com (2603:10b6:404:23::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.386.5 via Frontend Transport; Thu, 11 Jan 2018 11:37:08 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; NXP1.onmicrosoft.com; dkim=none (message not signed) header.d=none;NXP1.onmicrosoft.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD045.mail.protection.outlook.com (10.1.15.177) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Thu, 11 Jan 2018 11:36:35 +0000 Received: from netperf2.ap.freescale.net ([10.232.133.164]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0BBb0sr031996; Thu, 11 Jan 2018 04:37:05 -0700 From: Akhil Goyal To: CC: , Date: Thu, 11 Jan 2018 17:03:03 +0530 Message-ID: <20180111113304.19709-3-akhil.goyal@nxp.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180111113304.19709-1-akhil.goyal@nxp.com> References: <20171213135659.32648-1-akhil.goyal@nxp.com> <20180111113304.19709-1-akhil.goyal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131601441959598867; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(39380400002)(346002)(39860400002)(376002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(53936002)(59450400001)(50466002)(54906003)(16586007)(50226002)(104016004)(47776003)(305945005)(8936002)(2351001)(5890100001)(77096006)(68736007)(105606002)(296002)(106466001)(8656006)(356003)(2906002)(5660300001)(6916009)(1076002)(81166006)(36756003)(97736004)(4326008)(575784001)(86362001)(316002)(2950100002)(48376002)(76176011)(51416003)(85426001)(8676002)(81156014)(498600001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2365; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD045; 1:GzPfNyaPdYISAFBRKmQRbZdf9bu409+AfS/zA0eLtxnOeSGpMkT0AAavrvRoFfojp0GPM/dMQU95BaqwsnQ8Iwxg5+pzILcCa3DdVZCyGwzSGbsFqMGXfeRQzvU8akZu MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9b385bdb-14f4-406b-5b13-08d558e79265 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020065)(5600026)(4604075)(2017052603307); SRVR:SN2PR03MB2365; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 3:V98osM4L2iLwtmEJ2fvswThKcNtOtZd8CUTLIFRnSJpRuwNcosElW5pxQmkQvMLptgmNmFO5aZ4DyAQC36iJsAcmknYJvKZQPYYRszYP0WRhZ8g0QYbpn1Ktda66UiqHSnVGOb1FztptW/KwRwWWAnCdFJ0WfM7TX/Q5h2Mmx1IxIk7pEyPKGu7oqZ1h/wU5+tJ9LPVa5lWF9Ermos8RZthlBl0do6oSkQUxGlEPKO548o/pmGWls49ZcxyDFks8C/0nae/mI6oLbyp1mV4fhSVhE0AMXuj3Mic/J8Dee+AkZjZHK7UnpX26K287APBUkk0zVn29/3wxp/A8uSgX3WiDzxeeW84xSpm1utiLMeQ=; 25:fTG/IWhIba58TidTB1mw10kVN/GB1STtuQ4Xn5QOBtT6hOjS/TtWnSQewdK7lFPaupdMho9p8oDY22G6fGgkWuPvJz5/aLCpZRqZ4PpC5teih8j+qE6/FMAY9vOC5oN5CFWrf7E/arVP5Fk7+cw0VUxL+Ekdhd8BiCcId0Wz7qbToqtN7rMzYwJ+hB0r6EfNAWqUd+PUe83VD2+bqMpv6bDZFf5KuixOznUxvHra5i5kwD1NS90ljRsGGmqJYXYNCiXSsaWZW2F/uENzcKI86UKOWVuFGP0KveCJ2yq2svMZNmLcmnXPuB5gwtdGK5Dj3J6N4tOrI4H0v7IXdHOCPQ== X-MS-TrafficTypeDiagnostic: SN2PR03MB2365: X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 31:xJFwD8xMwdemepAffP3Ptm/NoLEkUykzWb+6f3wRV0gfW3u/KEC91o2lZerHzUS6TG9hHX4gmEFYXsKHcvjT4h+Bm/2/1IPKJ7h8jfffYqeB2/PgIGMG/rttZ1Zefj9WpamZW7Izrt4CTh0kNZWq1k4hmghQoas8bKYGGgJ5fMn4LIPuADqFPy63tlU7FVmZdXp4+qGfYHPkPTwYSGojP9LPxy4nztwvXB3Q3yAWzJw=; 4:Dm1LL+JrL2B1dS050hPRqpPJsiA+kKqIQIkepyRR6fLDSxf/WXOaDAWFujsLok7WLxwGql5k4HgsCPyFMkax2TyAnKOtyBwQiIQkFb6bZBxq+IQtffVhg1amfyu2lSmQvG1f9il14aTDVM8QfNe6m3AOYt60w5/SQe5Ez5TzSLN22l55q+u1v6oco7qGM6WFTZ6bHUqbHl7vkWPjGjUHrkGZv4elnaIDXRW4C4NSg9hvDljiW6kxR8XCS2kcMwfH0MCRD30BfEAUvPMp3Y5TnGmXLMJyJ7udrgc7yR7+tQcYwtHU7Q69yYbPqLlRszx9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231023)(944501134)(6055026)(6096035)(20161123559100)(20161123565025)(201703131430075)(201703131520075)(201703131433075)(201703131448075)(201703151042153)(20161123556025)(20161123563025)(20161123561025)(201708071742011); SRVR:SN2PR03MB2365; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:SN2PR03MB2365; X-Forefront-PRVS: 0549E6FD50 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2365; 23:SFiZNsiJxzQ6e+vfdI8CLjLuxC5MYyabZegVlu9sT?= F+3kssEh9lnFQ/tYAp8YKS3HeUSc0gwQKWXgDJJhpo3EHyKSLTZ7mwOZm+wlhzNtybT720ncRb8zJzQYB/cInrspX+zGa0secJhYcBl4es9UgrVexy8tDu1hgM3r27R7Cu4oC4KX6NCDaFc08f6xEbNm/fmd38fEjlY2FAkGFIwRsy31IlwkmC2eAkPLa3nDPSrC0x7N5UMFAzpUyRlifhnMFm0TZqQ/tMZLTqvGVmTxUf4u3KBVqn6mH6/b/e+mcaDSviE7eicDlvNUlMNbPsrAvPdbs9F4HxGRsHAYn1hRVEMr3TLGVNcFll2RnV3pDpoUCo2/lgEM4JVwE/dEW8nMGqYgV5JQWpgYNVH0G0f4O5KxSXw2B541K3Oa1rt2/lcwpZGQPrQVA47CVHzrmXdC2rpFr052C/78t93DHyPyGFrXOJvUqY/swq4ssDiTssmbMb0ncHVj4oIbOUEt/Y03ebg2WTJtySQ+fOqcqecCT6CBFopPqfS08Uj/93ezV7IgpV2B4gvUwq6cL7huaozethPrrecwLPvlQsHy8/cwcPpOA4WQmr1SuRdXIvY1FkhPWUW/rU1EAliAY+NEZ3UHVx/FfwPfUmTNpNlL3g3+RgCotGS3DLgJLiq//gDS9cTEAhTrvJm3rOnBhhrJLNwJLz0DIQMmopQyzWw2eMpIivQn4u8dXG602PADzf4jnpAVxNYubVxn443jAKij94it72Nmf9lKeZ+83nCaC0bCV9+2vxX0SmH16bwz4raehGkJ2zBjBMfSzgdSzjMkDbCLfyMyENA4WIMnTIscGBTBJR1elG9qr/uuPWdnht0gdf7aGA8smRYoGeuC2nK9nZ0mo+schQ+UxtCkNfBouRlpMptcZ9LDrif26Jeu16qy9rv8D7JtT9j8qBmGjgvNGw8F6B/LPk9b6jR6dY6CInetkrJrP/soRMzxnQyYeUHaAN6xomWKYsUmo5S15r/hyx9uMloYe7y5ZH+hUFBX4uNxNS2W+664U0m7jAmjiDFgYZw5FE8c5wfDV6Z0V6atZHE8B6mi+69c8VhbIcal289hHQzX4QCaXCvUm+dCLCjhRAAgHLRH/3qEdrPywR9IsDQ9Nkbop2n/mV2o5Rg1o579A== X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 6:0fkwdHvYd97cI0Cr13PcmQzh/AHvkx8bXv2AKgMVud8VnqcSx2K+qovWPTLNEuYlIiYGY3/EvAqOLruKPV/rt/9pjo41HADkFFqw3n/ZIqsbS5kaTZhc0/3AYGZTQJSwYQzbDDDNewoZ81K9dOjgu65/EjujLv/pGesy0ZDD1UDh45FdbKtABa62lxOUQ1CqEXMXuOthRk+BmhhmWAgnU2cAEbyNPBbR2C3N8usWnpISLO2Cz13l9alG8B8Z69Dh/hV7nkVFhuKNiJUE3WLNtWAO5sV+megttYshbe1gqlSxefyIgcqtS2Rl2Leii/k3jzs3UmkB86XdxoHRH9Bh/7L/kHIngqqS6Wzt8Ds+i7A=; 5:e8ta/eHNt4vfxuSlfWl2IUnfa1887ZAlXzkNCpggV6O7M+bS6qQHfTegRH7bWOjZppco2feU5nuDfEQrLr3rpKGQRn2hJmu5a5EZY0RzcJ3DwmRKAy4Z3O6DGRwLjc9EBikKZo6hDaVhk23E3NYju63dBDPvNo/HUCPaCrBGRXU=; 24:BgMQUTIwrNXRO3IqgKRv2X0z50GbQbSPEtgbdgd45U1WZ4DBgJetab31P4hagCc5nd2Nig9GsP1YaxCuxHBINDQ0/zuP+SlkqpBkPX9D5PE=; 7:zuNpsinyygZJaktvJUJSArsmFAIxSG8t4J3Ttd0KK8+/yjJ2zEFFrUI4DBm8PhmMGP7BFVBZ3ayrbkGuvjw5WlJtrdNio2k+EyccIdi/uhL/HNuCTmg3rcUsNRouTn/sXy5Q0AkOOoPxQU7nbUVQ6nNwjZRqsgDgJx99Iuq5/I750nz6YnvHgLZ4YDL5KV/Iw0BDRcCKFpZCLbG24NmlHt1+EI4wVALyWLIviGJfvN2YGSwp5QTwAwSv31/WjZvB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2018 11:36:35.7570 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9b385bdb-14f4-406b-5b13-08d558e79265 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2365 Subject: [dpdk-dev] [PATCH v2 2/3] crypto/dpaa_sec: support multiple sessions per qp 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: Hemant Agrawal Signed-off-by: Hemant Agrawal Acked-by: Akhil Goyal --- drivers/crypto/dpaa_sec/dpaa_sec.c | 154 +++++++++++++++++++++++++------------ drivers/crypto/dpaa_sec/dpaa_sec.h | 74 +++++++++--------- 2 files changed, 145 insertions(+), 83 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 157eace..f433f0a 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -43,6 +43,9 @@ static uint8_t cryptodev_driver_id; static __thread struct rte_crypto_op **dpaa_sec_ops; static __thread int dpaa_sec_op_nb; +static int +dpaa_sec_attach_sess_q(struct dpaa_sec_qp *qp, dpaa_sec_session *sess); + static inline void dpaa_sec_op_ending(struct dpaa_sec_op_ctx *ctx) { @@ -151,15 +154,6 @@ dpaa_sec_init_rx(struct qman_fq *fq_in, rte_iova_t hwdesc, /* Clear FQ options */ memset(&fq_opts, 0x00, sizeof(struct qm_mcc_initfq)); - flags = QMAN_FQ_FLAG_LOCKED | QMAN_FQ_FLAG_DYNAMIC_FQID | - QMAN_FQ_FLAG_TO_DCPORTAL; - - ret = qman_create_fq(0, flags, fq_in); - if (unlikely(ret != 0)) { - PMD_INIT_LOG(ERR, "qman_create_fq failed"); - return ret; - } - flags = QMAN_INITFQ_FLAG_SCHED; fq_opts.we_mask = QM_INITFQ_WE_DESTWQ | QM_INITFQ_WE_CONTEXTA | QM_INITFQ_WE_CONTEXTB; @@ -171,9 +165,11 @@ dpaa_sec_init_rx(struct qman_fq *fq_in, rte_iova_t hwdesc, fq_in->cb.ern = ern_sec_fq_handler; + PMD_INIT_LOG(DEBUG, "in-%x out-%x", fq_in->fqid, fqid_out); + ret = qman_init_fq(fq_in, flags, &fq_opts); if (unlikely(ret != 0)) - PMD_INIT_LOG(ERR, "qman_init_fq failed"); + PMD_INIT_LOG(ERR, "qman_init_fq failed %d", ret); return ret; } @@ -357,7 +353,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) { struct alginfo alginfo_c = {0}, alginfo_a = {0}, alginfo = {0}; uint32_t shared_desc_len = 0; - struct sec_cdb *cdb = &ses->qp->cdb; + struct sec_cdb *cdb = &ses->cdb; int err; #if RTE_BYTE_ORDER == RTE_BIG_ENDIAN int swap = false; @@ -877,12 +873,10 @@ dpaa_sec_enqueue_op(struct rte_crypto_op *op, struct dpaa_sec_qp *qp) ses = (dpaa_sec_session *)get_session_private_data(op->sym->session, cryptodev_driver_id); - if (unlikely(!qp->ses || qp->ses != ses)) { - qp->ses = ses; - ses->qp = qp; - ret = dpaa_sec_prep_cdb(ses); - if (ret) - return ret; + if (unlikely(!ses->qp || ses->qp != qp)) { + PMD_INIT_LOG(DEBUG, "sess->qp - %p qp %p", ses->qp, qp); + if (dpaa_sec_attach_sess_q(qp, ses)) + return -1; } /* @@ -918,7 +912,7 @@ dpaa_sec_enqueue_op(struct rte_crypto_op *op, struct dpaa_sec_qp *qp) if (auth_only_len) fd.cmd = 0x80000000 | auth_only_len; do { - ret = qman_enqueue(&qp->inq, &fd, 0); + ret = qman_enqueue(ses->inq, &fd, 0); } while (ret != 0); return 0; @@ -1134,43 +1128,82 @@ dpaa_sec_aead_init(struct rte_cryptodev *dev __rte_unused, return 0; } -static int -dpaa_sec_qp_attach_sess(struct rte_cryptodev *dev, uint16_t qp_id, void *ses) +static struct qman_fq * +dpaa_sec_attach_rxq(struct dpaa_sec_dev_private *qi) { - dpaa_sec_session *sess = ses; - struct dpaa_sec_qp *qp; + unsigned int i; - PMD_INIT_FUNC_TRACE(); + for (i = 0; i < qi->max_nb_sessions; i++) { + if (qi->inq_attach[i] == 0) { + qi->inq_attach[i] = 1; + return &qi->inq[i]; + } + } + PMD_DRV_LOG(ERR, "All ses session in use %x", qi->max_nb_sessions); + + return NULL; +} - qp = dev->data->queue_pairs[qp_id]; - if (qp->ses != NULL) { - PMD_INIT_LOG(ERR, "qp in-use by another session\n"); - return -EBUSY; +static int +dpaa_sec_detach_rxq(struct dpaa_sec_dev_private *qi, struct qman_fq *fq) +{ + unsigned int i; + + for (i = 0; i < qi->max_nb_sessions; i++) { + if (&qi->inq[i] == fq) { + qi->inq_attach[i] = 0; + return 0; + } } + return -1; +} + +static int +dpaa_sec_attach_sess_q(struct dpaa_sec_qp *qp, dpaa_sec_session *sess) +{ + int ret; - qp->ses = sess; sess->qp = qp; + ret = dpaa_sec_prep_cdb(sess); + if (ret) { + PMD_DRV_LOG(ERR, "Unable to prepare sec cdb"); + return -1; + } - return dpaa_sec_prep_cdb(sess); + ret = dpaa_sec_init_rx(sess->inq, dpaa_mem_vtop(&sess->cdb), + qman_fq_fqid(&qp->outq)); + if (ret) + PMD_DRV_LOG(ERR, "Unable to init sec queue"); + + return ret; +} + +static int +dpaa_sec_qp_attach_sess(struct rte_cryptodev *dev __rte_unused, + uint16_t qp_id __rte_unused, + void *ses __rte_unused) +{ + PMD_INIT_FUNC_TRACE(); + return 0; } static int -dpaa_sec_qp_detach_sess(struct rte_cryptodev *dev, uint16_t qp_id, void *ses) +dpaa_sec_qp_detach_sess(struct rte_cryptodev *dev, + uint16_t qp_id __rte_unused, + void *ses) { dpaa_sec_session *sess = ses; - struct dpaa_sec_qp *qp; + struct dpaa_sec_dev_private *qi = dev->data->dev_private; PMD_INIT_FUNC_TRACE(); - qp = dev->data->queue_pairs[qp_id]; - if (qp->ses != NULL) { - qp->ses = NULL; - sess->qp = NULL; - return 0; - } + if (sess->inq) + dpaa_sec_detach_rxq(qi, sess->inq); + sess->inq = NULL; - PMD_DRV_LOG(ERR, "No session attached to qp"); - return -EINVAL; + sess->qp = NULL; + + return 0; } static int @@ -1233,8 +1266,20 @@ dpaa_sec_set_session_parameters(struct rte_cryptodev *dev, return -EINVAL; } session->ctx_pool = internals->ctx_pool; + session->inq = dpaa_sec_attach_rxq(internals); + if (session->inq == NULL) { + PMD_DRV_LOG(ERR, "unable to attach sec queue"); + goto err1; + } return 0; + +err1: + rte_free(session->cipher_key.data); + rte_free(session->auth_key.data); + memset(session, 0, sizeof(dpaa_sec_session)); + + return -EINVAL; } static int @@ -1267,6 +1312,7 @@ dpaa_sec_session_configure(struct rte_cryptodev *dev, set_session_private_data(sess, dev->driver_id, sess_private_data); + return 0; } @@ -1275,16 +1321,22 @@ static void dpaa_sec_session_clear(struct rte_cryptodev *dev, struct rte_cryptodev_sym_session *sess) { - PMD_INIT_FUNC_TRACE(); + struct dpaa_sec_dev_private *qi = dev->data->dev_private; uint8_t index = dev->driver_id; void *sess_priv = get_session_private_data(sess, index); + + PMD_INIT_FUNC_TRACE(); + dpaa_sec_session *s = (dpaa_sec_session *)sess_priv; if (sess_priv) { + struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv); + + if (s->inq) + dpaa_sec_detach_rxq(qi, s->inq); rte_free(s->cipher_key.data); rte_free(s->auth_key.data); memset(s, 0, sizeof(dpaa_sec_session)); - struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv); set_session_private_data(sess, index, NULL); rte_mempool_put(sess_mp, sess_priv); } @@ -1332,7 +1384,8 @@ dpaa_sec_dev_infos_get(struct rte_cryptodev *dev, info->capabilities = dpaa_sec_capabilities; info->sym.max_nb_sessions = internals->max_nb_sessions; info->sym.max_nb_sessions_per_qp = - RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS / RTE_MAX_NB_SEC_QPS; + RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS / + RTE_DPAA_MAX_NB_SEC_QPS; info->driver_id = cryptodev_driver_id; } } @@ -1377,7 +1430,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) { struct dpaa_sec_dev_private *internals; struct dpaa_sec_qp *qp; - uint32_t i; + uint32_t i, flags; int ret; char str[20]; @@ -1393,7 +1446,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING; internals = cryptodev->data->dev_private; - internals->max_nb_queue_pairs = RTE_MAX_NB_SEC_QPS; + internals->max_nb_queue_pairs = RTE_DPAA_MAX_NB_SEC_QPS; internals->max_nb_sessions = RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS; for (i = 0; i < internals->max_nb_queue_pairs; i++) { @@ -1404,10 +1457,15 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) PMD_INIT_LOG(ERR, "config tx of queue pair %d", i); goto init_error; } - ret = dpaa_sec_init_rx(&qp->inq, dpaa_mem_vtop(&qp->cdb), - qman_fq_fqid(&qp->outq)); - if (ret) { - PMD_INIT_LOG(ERR, "config rx of queue pair %d", i); + } + + flags = QMAN_FQ_FLAG_LOCKED | QMAN_FQ_FLAG_DYNAMIC_FQID | + QMAN_FQ_FLAG_TO_DCPORTAL; + for (i = 0; i < internals->max_nb_sessions; i++) { + /* create rx qman fq for sessions*/ + ret = qman_create_fq(0, flags, &internals->inq[i]); + if (unlikely(ret != 0)) { + PMD_INIT_LOG(ERR, "sec qman_create_fq failed"); goto init_error; } } diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h index e82f4fb..93369e4 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.h +++ b/drivers/crypto/dpaa_sec/dpaa_sec.h @@ -38,36 +38,6 @@ enum dpaa_sec_op_type { DPAA_SEC_MAX }; -typedef struct dpaa_sec_session_entry { - uint8_t dir; /*!< Operation Direction */ - enum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/ - enum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/ - enum rte_crypto_aead_algorithm aead_alg; /*!< Authentication Algorithm*/ - union { - struct { - uint8_t *data; /**< pointer to key data */ - size_t length; /**< key length in bytes */ - } aead_key; - struct { - struct { - uint8_t *data; /**< pointer to key data */ - size_t length; /**< key length in bytes */ - } cipher_key; - struct { - uint8_t *data; /**< pointer to key data */ - size_t length; /**< key length in bytes */ - } auth_key; - }; - }; - struct { - uint16_t length; - uint16_t offset; - } iv; /**< Initialisation vector parameters */ - uint16_t auth_only_len; /*!< Length of data for Auth only */ - uint32_t digest_length; - struct dpaa_sec_qp *qp; - struct rte_mempool *ctx_pool; /* session mempool for dpaa_sec_op_ctx */ -} dpaa_sec_session; #define DPAA_SEC_MAX_DESC_SIZE 64 /* code or cmd block to caam */ @@ -117,11 +87,41 @@ struct sec_cdb { uint32_t sh_desc[DPAA_SEC_MAX_DESC_SIZE]; }; +typedef struct dpaa_sec_session_entry { + uint8_t dir; /*!< Operation Direction */ + enum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/ + enum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/ + enum rte_crypto_aead_algorithm aead_alg; /*!< Authentication Algorithm*/ + union { + struct { + uint8_t *data; /**< pointer to key data */ + size_t length; /**< key length in bytes */ + } aead_key; + struct { + struct { + uint8_t *data; /**< pointer to key data */ + size_t length; /**< key length in bytes */ + } cipher_key; + struct { + uint8_t *data; /**< pointer to key data */ + size_t length; /**< key length in bytes */ + } auth_key; + }; + }; + struct { + uint16_t length; + uint16_t offset; + } iv; /**< Initialisation vector parameters */ + uint16_t auth_only_len; /*!< Length of data for Auth only */ + uint32_t digest_length; + struct dpaa_sec_qp *qp; + struct qman_fq *inq; + struct sec_cdb cdb; /**< cmd block associated with qp */ + struct rte_mempool *ctx_pool; /* session mempool for dpaa_sec_op_ctx */ +} dpaa_sec_session; + struct dpaa_sec_qp { struct dpaa_sec_dev_private *internals; - struct sec_cdb cdb; /* cmd block associated with qp */ - dpaa_sec_session *ses; /* session associated with qp */ - struct qman_fq inq; struct qman_fq outq; int rx_pkts; int rx_errs; @@ -129,12 +129,16 @@ struct dpaa_sec_qp { int tx_errs; }; -#define RTE_MAX_NB_SEC_QPS RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS +#define RTE_DPAA_MAX_NB_SEC_QPS 1 +#define RTE_DPAA_MAX_RX_QUEUE RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS + /* internal sec queue interface */ struct dpaa_sec_dev_private { void *sec_hw; struct rte_mempool *ctx_pool; /* per dev mempool for dpaa_sec_op_ctx */ - struct dpaa_sec_qp qps[RTE_MAX_NB_SEC_QPS]; /* i/o queue for sec */ + struct dpaa_sec_qp qps[RTE_DPAA_MAX_NB_SEC_QPS]; /* i/o queue for sec */ + struct qman_fq inq[RTE_DPAA_MAX_RX_QUEUE]; + unsigned char inq_attach[RTE_DPAA_MAX_RX_QUEUE]; unsigned int max_nb_queue_pairs; unsigned int max_nb_sessions; };