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 3632AA0543 for ; Tue, 21 Jun 2022 10:04:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 30B3140151; Tue, 21 Jun 2022 10:04:44 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2051.outbound.protection.outlook.com [40.107.95.51]) by mails.dpdk.org (Postfix) with ESMTP id 997EF4280E for ; Tue, 21 Jun 2022 10:04:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jREq3IMtOJHr4S3HyK6qwAU+W4AfnVBq007Yn7SioS7f8vC+QUy7JeKNaUwGxoaaiWakAe5TknzZaKiMwdpkYzl7ZxUtehF796CX5yat7/+llpyr/rrzGlt/DkCifK0VqUYsw+5Fg2Gp2vFP36CraD9vrjsuJhfUHdCEedIDZNLsGO4D8IKfNG0E6DEJDTi1GvVTpBlEG5nQZSd/erUWonbNiKi9r+W7CN5K9aiM12cmuwHjbAtbErzvpfrwWuXraBtaUnRkrSanI09HmlcbPIvEvevT7N+IzL1uuSFrMrncncFWMEYaGal8JhSBm+jw5r9QfcHJvvRiUmrvN+Os3A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=d4klvBvvvmWAaybQeiqlANeiUrC4xaSjXm8+xkMbAp0=; b=OfDHfthfkwmBpnuZZHwmTRBqBua9eDsAbtaorCyUTZqxhRV1FxiKewWI3ZnnDDNHOoPLJ1RYnWT+w7QFLkokgTYNj8paac3jXu02hP6/cDCQBluayuO9rkUAXAj9+OM3g6UnV3P5SKoDovekoL0ZR0eYBY9YFwuMgEcIv1G4XKcYwFDRBHD4HsRNYw+jzlk3/HMFmKs0re06ZGxW6JYm6T05LDUGH0zMDBz87ukHE06F7K83jSDS8mTaLdk8jIVkVAtC9IN6PZ/rQqTltC/cEELaTG2pEU6JN8DAfzImZkt5Z9p8xXNIfABysSn0OZ+USE/rBC9ih+fNGztid0sa8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=d4klvBvvvmWAaybQeiqlANeiUrC4xaSjXm8+xkMbAp0=; b=aQr3m+5JTfbvR4EwXYO91AbbiH/pqJC+jNS4iamBBYry0ux2N0GH5B1gBuisLTSFqhrvdlT9GrR3w7dNva9ZONs7TjayMTmccZKuwCrvQEsjkIsNQLl1OkW7AVV2PGkXCMCmWxa1YyV9AsG2uoII1i9MAcBSmRvpo01cxrHuu9XKyWduMtom4D/dxnTLrlrH9ibz0l+6G2AKYg5CVcUtX5YHCS0pq4dIHghF/VKUThVpk6POPm7rBkDNm+PAEQFGc/omv9uq0A7HrnrWosPF3jmswCHqOdG4LUAH+yOGpBM1Vki31L+Tezd1TSIpT2wKzCnXtrXUcq/su9AMU4FlXA== Received: from DM6PR12CA0004.namprd12.prod.outlook.com (2603:10b6:5:1c0::17) by MN0PR12MB5953.namprd12.prod.outlook.com (2603:10b6:208:37c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 21 Jun 2022 08:04:40 +0000 Received: from DM6NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1c0:cafe::a8) by DM6PR12CA0004.outlook.office365.com (2603:10b6:5:1c0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15 via Frontend Transport; Tue, 21 Jun 2022 08:04:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by DM6NAM11FT032.mail.protection.outlook.com (10.13.173.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:04:40 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:04:39 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:04:38 -0700 From: Xueming Li To: Vanshika Shukla CC: Akhil Goyal , dpdk stable Subject: patch 'crypto/dpaa_sec: fix secondary process probing' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:24 +0300 Message-ID: <20220621080301.2315720-19-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 70842b14-7874-4948-6448-08da535cb174 X-MS-TrafficTypeDiagnostic: MN0PR12MB5953:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GN0vq36DD8qONHKFodxiEob3xIgiOsa+Lj7F/AD2CTrTzSrkX2jq7YxI5ydhMTgxr14ic3EzkZKSAgEtb0FrH/ygpg3j0RWsYlJEY/CYW31fRl79K1Vf04jm213zYjgAqCOymxP3MthVLcXxV7cX0RcDkrjv236Ks1snBxyVKCCt6NUjV+J6JLDzs9iwdYjeV2rc5p09j+gtJc5qd3nyeex/hLJb8MbKUtTV+BpmjaiopTebVYHA4YuVWlr/npu+16jbKfIXxjhjmw4QyBZjRkwozsqehnzDkTeXPamRxXIEv5DAPrk5H6rNEzwSc1Pc4dqxugDWDMxOW1Nxm00EvfphZMFoLL3cJJvITvms9CtKf9uoMgrfREuyn3er37m7Rql+BkcSTPoYkZ7lCKSbKG9vDVhmkXu4X4nJ0F8zt39y/G4xzZ/aOkzvhrSDGr7fbqmXCfoNpB2nPiFmH3ObOsAvsEe1fUX7rUQGg4l/BIdGw9xiFdjRuBStuBRXMe0iYtcFVRGg8somc/YZ6UwGhwy86w9j/6dq0126Z/VhCM/aOMO1WNwA781IEju+R2VsaYG9c1B43B05fFTM1GqzNtwqs9g9EKI+Pq04Qcx8yUjr7lqmhjtZ+q8+tlEqZN6WDn2q4sVsZoYXMa56gBHmNyRCs24xksvnEwE9HqELJ3nWHOz4saH+Jg9kiyUBPGjiXXTVgxToK4DpNaRxI5pFw5HMhHnkQ4+f8yk40BRYaD9FzLAMj9N97PUEZQLCwZbyN/PpsNAei/gMMfe2uiCXEPfHPAjqSONbXvXix4M7/s48bj5eeviBPX1P0SD9fjZrP4x41/9tnNl4LF7uUKKMdxzuhVV1Ls8uv7dHQbuZHmo= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(396003)(136003)(39860400002)(376002)(346002)(40470700004)(46966006)(36840700001)(86362001)(478600001)(8936002)(966005)(6286002)(26005)(40460700003)(53546011)(5660300002)(7696005)(2906002)(6666004)(36860700001)(356005)(55016003)(82740400003)(81166007)(82310400005)(40480700001)(426003)(336012)(41300700001)(1076003)(16526019)(186003)(2616005)(47076005)(83380400001)(8676002)(4326008)(54906003)(70586007)(36756003)(316002)(70206006)(6916009)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:04:40.4544 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 70842b14-7874-4948-6448-08da535cb174 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5953 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 Hi, FYI, your patch has been queued to stable release 20.11.6 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/23/22. 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/45650937b46a7218fdd113942ef628dc91a0d8a3 Thanks. Xueming Li --- >From 45650937b46a7218fdd113942ef628dc91a0d8a3 Mon Sep 17 00:00:00 2001 From: Vanshika Shukla Date: Thu, 28 Apr 2022 17:17:27 +0530 Subject: [PATCH] crypto/dpaa_sec: fix secondary process probing Cc: Xueming Li [ upstream commit 96ec64f12db163b47c4a69613c7e7347919ff54f ] DPAA hardware supports non-i/o performing secondary applications only. So we do not have to probe crypto devices in secondary applications. Fixes: c3e85bdcc6e6 ("crypto/dpaa_sec: add crypto driver for NXP DPAA platform") Signed-off-by: Vanshika Shukla Acked-by: Akhil Goyal --- drivers/crypto/dpaa_sec/dpaa_sec.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 9179cccf83..0ce99eecc7 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -3445,23 +3445,24 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, int retval; + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + snprintf(cryptodev_name, sizeof(cryptodev_name), "%s", dpaa_dev->name); cryptodev = rte_cryptodev_pmd_allocate(cryptodev_name, rte_socket_id()); if (cryptodev == NULL) return -ENOMEM; - if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - cryptodev->data->dev_private = rte_zmalloc_socket( - "cryptodev private structure", - sizeof(struct dpaa_sec_dev_private), - RTE_CACHE_LINE_SIZE, - rte_socket_id()); + cryptodev->data->dev_private = rte_zmalloc_socket( + "cryptodev private structure", + sizeof(struct dpaa_sec_dev_private), + RTE_CACHE_LINE_SIZE, + rte_socket_id()); - if (cryptodev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private " - "device data"); - } + if (cryptodev->data->dev_private == NULL) + rte_panic("Cannot allocate memzone for private " + "device data"); dpaa_dev->crypto_dev = cryptodev; cryptodev->device = &dpaa_dev->device; @@ -3501,8 +3502,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, retval = -ENXIO; out: /* In case of error, cleanup is done */ - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - rte_free(cryptodev->data->dev_private); + rte_free(cryptodev->data->dev_private); rte_cryptodev_pmd_release_device(cryptodev); -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:50.114169075 +0800 +++ 0018-crypto-dpaa_sec-fix-secondary-process-probing.patch 2022-06-21 15:37:48.987784408 +0800 @@ -1 +1 @@ -From 96ec64f12db163b47c4a69613c7e7347919ff54f Mon Sep 17 00:00:00 2001 +From 45650937b46a7218fdd113942ef628dc91a0d8a3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 96ec64f12db163b47c4a69613c7e7347919ff54f ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 23a94d7e41..6f2b4baf57 100644 +index 9179cccf83..0ce99eecc7 100644 @@ -23 +25 @@ -@@ -3766,23 +3766,24 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, +@@ -3445,23 +3445,24 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, @@ -58 +60 @@ -@@ -3824,8 +3825,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, +@@ -3501,8 +3502,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused,