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 670F342D46 for ; Sun, 25 Jun 2023 08:38:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 611D841143; Sun, 25 Jun 2023 08:38:10 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2054.outbound.protection.outlook.com [40.107.96.54]) by mails.dpdk.org (Postfix) with ESMTP id 9587640ED8 for ; Sun, 25 Jun 2023 08:38:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KGczmbzqW59yF3zR6W7BCJNEbCa8h2VgI+UMF1lejKJk+/1KRJodmLtdIc3gB7pQAAKZ1BWfZ8NmwHSGWKVJ0VeWU/jpHTXDk3gy6UR2agppfrOiaxU8zqd/Z3BJCGWyhfLxPSfLMe/uVB6hzBuZ6PmrOCeZzCpG+oO9S7BZoBjRsl43GldExTZC4hNG7JWuDSyrStDqC8Yv0Ze7SDT/OZQgDXOibLrSa63UcnHHnMMVCqRVsIp3cL5SDDzvwCJRc451IPewRJ0TuNJqnxw6sJQJa7LvDLuHDCjhplnF09oIMHtglOP+g9SgP0/P1galBSj5mPQP5iLwbzyyk7qC8w== 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=B2+/XAhP7zhhL+WmXrzIyTTb2fDHttVkjYURxdGqqto=; b=nCwx9K6KqI0S3FnRsNEjCwi4ZW6jwiVUpDthkYHJDGqNzkLwh80D77oWKAnK29M0jHcEJDTgbHM+DbAjTdruzvcPIwJ8cotoXfAh4+ZqUihrzNCourlcx/KLymdB7Zzx45gVqoUAmN2X//ONZGQmr0LnFVpzVJB9fDaFiLDAMG7eY39l62GAFcA2LHGJdiOyMx5bMYkZ/77eXoV7CTKmyvye8ucTWTvQJRTKASP+v4IhGFBjFnf582Z+6w19jpuryTMPWx/WbD+Igi1mzI/ejUDfLSo3GKdMOWZ+A4c/OngnZVV8CBIq4XoI4JDoQgC8AQ11hZhjKtYOFT7iPKubcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=bytedance.com 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=B2+/XAhP7zhhL+WmXrzIyTTb2fDHttVkjYURxdGqqto=; b=Hk9++pr53hhMbaf4MZIsQjMWx0yeMlVtKZ5lESPh7injvjZht05IRQoJW1ZEFtl/OJE60eXovED4n6XueeuaLlWYLOMv5Kji4aNRaSVB2CtPnnxx/XRVSH4nBlvrTpRF/oRHZzvi0jBElGymVvvXYBx5KDwUgaHQKsHPmC8Q1zhT6Olmc8jJJInOD73Pj0BdQ6DnH09MMWECmBueKmPUcoacXiWxRZIhTjsPOK2ot/GrE0AVAPwSWy5BMJ/Jc7b97iAOZ9AQAALRwWAwjnhSlfHfqhuQmxr1zGRdTQ5pO2Z1BKPQvls3iSHPMw9X2GS1AFBFwSox9xwRh7ZTV3+glQ== Received: from BN9PR03CA0881.namprd03.prod.outlook.com (2603:10b6:408:13c::16) by MW4PR12MB6706.namprd12.prod.outlook.com (2603:10b6:303:1e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:38:06 +0000 Received: from BN8NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13c:cafe::90) by BN9PR03CA0881.outlook.office365.com (2603:10b6:408:13c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:38:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT024.mail.protection.outlook.com (10.13.177.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.45 via Frontend Transport; Sun, 25 Jun 2023 06:38:06 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:37:57 -0700 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.37; Sat, 24 Jun 2023 23:37:55 -0700 From: Xueming Li To: Zhihong Wang CC: Anatoly Burakov , dpdk stable Subject: patch 'eal/linux: fix secondary process crash for mp hotplug' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:02 +0800 Message-ID: <20230625063544.11183-25-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-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-TrafficTypeDiagnostic: BN8NAM11FT024:EE_|MW4PR12MB6706:EE_ X-MS-Office365-Filtering-Correlation-Id: a37c6484-8e52-479b-2f70-08db7546bc03 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JdYP1S8RS6V84y+qkulfOnqpywEsdsuquNctriT4OjqTq94cZOJCUBwiauuW6I1LTj3UUMWJ+si7DMZUZicnJUm+gNIjCPaCRvVuocnOJc7CWmXcWvVRoa6REdECOn1y1/PF1xKxI0oxiZ5fmONIEeWCBaiD8YiYoU/Mc3I1JjG3J/nT7lxOoXYaJCYdR+vVEtEEUrgJZw1uEI2rbV6kOBOm+tlYAsx3W8pFNXMI+I0gDighzWY8TNl+KF5/XW6v/65w6+xm7uwg/b8kMhQ45YiIfoCeSNLxMAKMmZLXa1b3evCsNMcjwCZw/J6MRYdN0DyMkPr3AQG8m8DAkIWkzXMCK126PSKzefEfcdqBeUPtKFJGj3QF6/ynkPBNC0iJvOH4g8aVNaSTQ4BUifXgMJSk98TgczSb0EKGxT+m1F0x7f6O9K3wl3WeypTpg/+GjzAJWN3V+pBi4XMy4nrQSuVvz+ZjOTeZyE8Aan6J5epqn7bUtLQfYFT6hUBXz79m7hucEIsas1jUh8i0vAMVj8nexxqF3uLzipFs544+JrsarEekn3YSUVRaFxvvxcRbtN1BwBiHD2kP4zb9gxzYXJrBZhpGZtD1Nm9tGIUxuCbVAd20TruOkwCZhPz84NxeBm1MSzmn0nk6XqODiIg8WfDv3NiUs7qRPYE1ChAmJ7GFIAMMUkEAPNC3ChXcMumZoZupJuGdVsC/QBR+eRFwlclEbKmfSH2VGj/nO6noKFF+aIA37jZ6/4EIcmdkOSESr24nd5jgNj038mQ7wjhS+g== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199021)(36840700001)(40470700004)(46966006)(40460700003)(2906002)(7696005)(82310400005)(82740400003)(6666004)(356005)(7636003)(2616005)(83380400001)(47076005)(336012)(426003)(1076003)(26005)(186003)(6286002)(16526019)(53546011)(966005)(36860700001)(55016003)(41300700001)(86362001)(54906003)(478600001)(40480700001)(70586007)(70206006)(36756003)(316002)(6916009)(4326008)(8936002)(8676002)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:38:06.3511 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a37c6484-8e52-479b-2f70-08db7546bc03 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6706 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 22.11.3 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/27/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=f4d5f30fe439f2c316f2c51b5cdd9bb081b9639a Thanks. Xueming Li --- >From f4d5f30fe439f2c316f2c51b5cdd9bb081b9639a Mon Sep 17 00:00:00 2001 From: Zhihong Wang Date: Thu, 8 Jun 2023 15:25:53 +0800 Subject: [PATCH] eal/linux: fix secondary process crash for mp hotplug requests Cc: Xueming Li [ upstream commit 66f7ee3f7ab1a7d0295464ab236d4ada08eedee3 ] Secondary would crash if it tries to handle mp requests before memory init, since globals such as eth_dev_shared_data_lock are not accessible to it at this moment. Fixes: 244d5130719c ("eal: enable hotplug on multi-process") Signed-off-by: Zhihong Wang Acked-by: Anatoly Burakov --- lib/eal/linux/eal.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 7b0eafd565..336698379f 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -1056,12 +1056,6 @@ rte_eal_init(int argc, char **argv) } } - /* register multi-process action callbacks for hotplug */ - if (eal_mp_dev_hotplug_init() < 0) { - rte_eal_init_alert("failed to register mp callback for hotplug"); - return -1; - } - if (rte_bus_scan()) { rte_eal_init_alert("Cannot scan the buses for devices"); rte_errno = ENODEV; @@ -1206,6 +1200,12 @@ rte_eal_init(int argc, char **argv) return -1; } + /* register multi-process action callbacks for hotplug after memory init */ + if (eal_mp_dev_hotplug_init() < 0) { + rte_eal_init_alert("failed to register mp callback for hotplug"); + return -1; + } + if (rte_eal_tailqs_init() < 0) { rte_eal_init_alert("Cannot init tail queues for objects"); rte_errno = EFAULT; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:59.181039600 +0800 +++ 0024-eal-linux-fix-secondary-process-crash-for-mp-hotplug.patch 2023-06-25 14:31:58.305773900 +0800 @@ -1 +1 @@ -From 66f7ee3f7ab1a7d0295464ab236d4ada08eedee3 Mon Sep 17 00:00:00 2001 +From f4d5f30fe439f2c316f2c51b5cdd9bb081b9639a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,3 @@ +Cc: Xueming Li + +[ upstream commit 66f7ee3f7ab1a7d0295464ab236d4ada08eedee3 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 90e05fe4de..99b0a59706 100644 +index 7b0eafd565..336698379f 100644 @@ -24 +26 @@ -@@ -1058,12 +1058,6 @@ rte_eal_init(int argc, char **argv) +@@ -1056,12 +1056,6 @@ rte_eal_init(int argc, char **argv) @@ -37 +39 @@ -@@ -1221,6 +1215,12 @@ rte_eal_init(int argc, char **argv) +@@ -1206,6 +1200,12 @@ rte_eal_init(int argc, char **argv)