From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D4EADA0C3F for ; Sat, 12 Jun 2021 01:13:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC60C40DDB; Sat, 12 Jun 2021 01:13:39 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2070.outbound.protection.outlook.com [40.107.243.70]) by mails.dpdk.org (Postfix) with ESMTP id 1E8EF4003F for ; Sat, 12 Jun 2021 01:13:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yk28KDV+iobieyoTN+UXF3mpLf4g3sPAEYWj/FzfnVKZ0EgTKWYZA056tQcC7v8XqiUKfXG0g9plnYNy0BUvjKRIzxex+1L498+Piazja9QONLibLqWhebybCKPEDryGItB3FyMPMatyuDq+jjoq45pajn3fhjDppRjNexgrE07xcn/ywEU/0qUpWQgd7FQpx63Kask4WzaPV7/2lnptBWCPPPqsb1/SqXPR+XuCooITHGFvFLUkYQwrhW7RjdI5iBDeDa3YImyuoRuak+Ao8DYr9DRT9Dcg2sNZsPJGihztPn/sz9fWaJsjljTvH7EQV69MlwsDjIVZM9U07BAxfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sd9+BHMMXyQNFsesuCxp6ml3Zyebyh78f2kZNe4ZsLQ=; b=kzXm26J4bkJgzfjgSC1oSZE+Xq3Qlq8njCVywrqyMnnPVT2cuRUMSvQ74w7vszR2DIJ0VTzatnHi0teW+h/DXJVkTp8Nz1m8uOEBiSf0tcNP4lAqTOkq2NjhCorD92YV5qRU37cgDKzJrsG0QzBQ6tfFiR1KQL9YTtS6+FmmVXyHkgoznoq+xzW4WU/KjVQbPd9qMKXo31Pgfj6mbK4KbxanGHULs051eEn2+5Gg8CGi2HH6EexC2Yi87gPlidJQ14rQpvV3it5K4EU2KybgdRa6H2GY2DPE0vJ/ZJ+Jnbv4ggAu9NybpQn4CN8Tybdid8cjAXzcpj7kUdO1DISIag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=nxp.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sd9+BHMMXyQNFsesuCxp6ml3Zyebyh78f2kZNe4ZsLQ=; b=c+3bK6fTI8E5raegTf7Y/auBVije4ADb1kTRUL9IfsaIEm38iIFgFBd1W3DnZK/H8pl1PmjEumxz+gubCHvABbbAYsDkG7qz5cJqMup7l/r60ayg8ijB84uT2HK2bf8+7f2v+VF6jgqP2UoUnqTNSUCkFsdos5rVtEGr/Gu46MeKtZ77xoYNQNe3VEworooqTdUmzCFpY7Ry7lqBMQ2uliXWXhs2jfOTt+MThJmXqr+juCiaISegMNKfW0WQYT1AVom1pAamxdrfYc8LpwSmxEJRqOWh7yaxLkqo1q/K3cOzQC+bXkdyG9Gg7uh/Q/4+W9CPBFk803QL454TrPpyiQ== Received: from CO1PR15CA0100.namprd15.prod.outlook.com (2603:10b6:101:21::20) by DM5PR12MB1291.namprd12.prod.outlook.com (2603:10b6:3:75::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20; Fri, 11 Jun 2021 23:13:36 +0000 Received: from CO1NAM11FT004.eop-nam11.prod.protection.outlook.com (2603:10b6:101:21:cafe::8c) by CO1PR15CA0100.outlook.office365.com (2603:10b6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:13:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT004.mail.protection.outlook.com (10.13.175.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:13:36 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:13:34 +0000 From: Xueming Li To: Hemant Agrawal CC: Luca Boccassi , Gagandeep Singh , dpdk stable Date: Sat, 12 Jun 2021 07:03:07 +0800 Message-ID: <20210611230433.8208-93-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a97b1d11-5086-4035-a9ea-08d92d2e8a9a X-MS-TrafficTypeDiagnostic: DM5PR12MB1291: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dzTq0fD7nwyIDNyYBqKlP9D1zPXC2aOA5mlN7nH8wLStXqwnSvP2oq4PW9tx3lXW42arFxH4iFUJd/LhaV/LrDjgLZD7tiCEMqBa7SZcOsa9yuezlh+818zud+S+T4/gYccLjADHLSLiHL9RaHFKUGyPcsjPSQmG6awGKI8aEziJ/vAGoDK9Zpofq9wr6EC3t5I1TKsTPhnPcFW/4NfajBnKBEolP1lWk1Trs2tS/qXNnw2x8AwnORMHVmMX5X5OI0b4tmyqTxOblqj5mV+gOJic9Sgrl9+B3uDnl17tEP1VilPrGD0JaSn7GsFu0vDzNUNFSAjnWjDF58VGhyIrnIqxbD16YbzkxlBEDQJer2iJx/0HjnYU7AtOD3pS4ymYsoQdpYoE9ud3vR09/0EBH9U0mOTzP1F2XwoAUitc9lSKZBPS64G8aw+lEL4e/lCUuww8hn+3KPQAUOJtdSScqt7cpb91ky8elFp2/J1FQC76vJVpeev7g1/nQyvIKocA28VRzQ93b78nrz1wvc/4Y2QPsi5zV790X7kJ2dgMZpoGNdar1KaBGhCspKHouRvdGClBhhzuoSe9bjwLb9ZnjV8cXTYGorhNMTseD0aQdzpUOhtewJWKMT5yl0YeRUR84m6tCGE078aLwwX3vBN9p98+O3HN1YXHUBkI9Z3k2tgIlN36lU/3UuDh3PsBkjTlGNfBtM8VeBTU7MdJHtZ2MdDr3vIDrfxHxNzq7YGWLMBeAygE+MlUdtdYLKobogro6qZCQ5zOibl+FRvb1FGi+ALQlV6oJI/XozoOIiaIdczmXUHWQoO7Y2OJRdWaFkrF X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(136003)(376002)(346002)(396003)(46966006)(36840700001)(70586007)(53546011)(36906005)(336012)(86362001)(6666004)(7636003)(36860700001)(356005)(316002)(478600001)(966005)(2616005)(5660300002)(83380400001)(1076003)(6916009)(55016002)(82740400003)(8676002)(26005)(4326008)(47076005)(186003)(36756003)(6286002)(7696005)(16526019)(2906002)(70206006)(8936002)(54906003)(426003)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:13:36.5693 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a97b1d11-5086-4035-a9ea-08d92d2e8a9a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT004.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1291 Subject: [dpdk-stable] patch 'crypto/dpaa2_sec: fix close and uninit functions' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/e5bf617fa8b68f1f8906157d46138ff3787d77cd Thanks. Xueming Li --- >From e5bf617fa8b68f1f8906157d46138ff3787d77cd Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Wed, 5 May 2021 17:46:52 +0530 Subject: [PATCH] crypto/dpaa2_sec: fix close and uninit functions Cc: Luca Boccassi [ upstream commit 394b4e118e503e80ba86388d5f59f89331cf53c5 ] The init function was calling the dpseci_open while dpseci_close was called by the open function. This is a mismatch un-init shall clean the init configurations and close shall clear the configure function settings. This was causing issue with recent changes in test framework, where the close was being called and causing DPAA2 SEC to fail in configure Fixes: e5cbdfc53765 ("crypto/dpaa2_sec: add basic operations") Signed-off-by: Gagandeep Singh Signed-off-by: Hemant Agrawal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 50 ++++++++++----------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 5d91bf910e..9f189dd890 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -3534,32 +3534,10 @@ dpaa2_sec_dev_stop(struct rte_cryptodev *dev) } static int -dpaa2_sec_dev_close(struct rte_cryptodev *dev) +dpaa2_sec_dev_close(struct rte_cryptodev *dev __rte_unused) { - struct dpaa2_sec_dev_private *priv = dev->data->dev_private; - struct fsl_mc_io *dpseci = (struct fsl_mc_io *)priv->hw; - int ret; - PMD_INIT_FUNC_TRACE(); - /* Function is reverse of dpaa2_sec_dev_init. - * It does the following: - * 1. Detach a DPSECI from attached resources i.e. buffer pools, dpbp_id - * 2. Close the DPSECI device - * 3. Free the allocated resources. - */ - - /*Close the device at underlying layer*/ - ret = dpseci_close(dpseci, CMD_PRI_LOW, priv->token); - if (ret) { - DPAA2_SEC_ERR("Failure closing dpseci device: err(%d)", ret); - return -1; - } - - /*Free the allocated memory for ethernet private data and dpseci*/ - priv->hw = NULL; - rte_free(dpseci); - return 0; } @@ -3819,11 +3797,31 @@ static const struct rte_security_ops dpaa2_sec_security_ops = { static int dpaa2_sec_uninit(const struct rte_cryptodev *dev) { - struct dpaa2_sec_dev_private *internals = dev->data->dev_private; + struct dpaa2_sec_dev_private *priv = dev->data->dev_private; + struct fsl_mc_io *dpseci = (struct fsl_mc_io *)priv->hw; + int ret; - rte_free(dev->security_ctx); + PMD_INIT_FUNC_TRACE(); + + /* Function is reverse of dpaa2_sec_dev_init. + * It does the following: + * 1. Detach a DPSECI from attached resources i.e. buffer pools, dpbp_id + * 2. Close the DPSECI device + * 3. Free the allocated resources. + */ - rte_mempool_free(internals->fle_pool); + /*Close the device at underlying layer*/ + ret = dpseci_close(dpseci, CMD_PRI_LOW, priv->token); + if (ret) { + DPAA2_SEC_ERR("Failure closing dpseci device: err(%d)", ret); + return -1; + } + + /*Free the allocated memory for ethernet private data and dpseci*/ + priv->hw = NULL; + rte_free(dpseci); + rte_free(dev->security_ctx); + rte_mempool_free(priv->fle_pool); DPAA2_SEC_INFO("Closing DPAA2_SEC device %s on numa socket %u", dev->data->name, rte_socket_id()); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.014694400 +0800 +++ 0093-crypto-dpaa2_sec-fix-close-and-uninit-functions.patch 2021-06-12 06:53:56.430000000 +0800 @@ -1 +1 @@ -From 394b4e118e503e80ba86388d5f59f89331cf53c5 Mon Sep 17 00:00:00 2001 +From e5bf617fa8b68f1f8906157d46138ff3787d77cd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 394b4e118e503e80ba86388d5f59f89331cf53c5 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 05b194ccff..1ccead3641 100644 +index 5d91bf910e..9f189dd890 100644 @@ -27 +29 @@ -@@ -3564,32 +3564,10 @@ dpaa2_sec_dev_stop(struct rte_cryptodev *dev) +@@ -3534,32 +3534,10 @@ dpaa2_sec_dev_stop(struct rte_cryptodev *dev) @@ -61 +63 @@ -@@ -3849,11 +3827,31 @@ static const struct rte_security_ops dpaa2_sec_security_ops = { +@@ -3819,11 +3797,31 @@ static const struct rte_security_ops dpaa2_sec_security_ops = {