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 D33C242ECF for ; Thu, 20 Jul 2023 17:21:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF46242D1A; Thu, 20 Jul 2023 17:21:55 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id E266542C54 for ; Thu, 20 Jul 2023 17:21:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HAC6rV0SZUB2gYBwEcYZqiddZz61YHH7mEFUNJ2bp7g=; b=im0YWZlIhx9vAXQci0k2A+4a7ozxWNCwJkctfBq7HtN0LSSiXBzDLxVAjt+o7SaAgF+GXv 4gImZqFSUOvqwepnHvkQZX7IMv3vcoyv8oSAx0xbPSQa37IQ5raxj64NhbPwxXDRco+AUJ 3LdIAsR45j1IHS8lGQUWtoKX41zF3Tk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-182-KYXe298nN6yOXZgG72vLnA-1; Thu, 20 Jul 2023 11:21:02 -0400 X-MC-Unique: KYXe298nN6yOXZgG72vLnA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 33F29936D45; Thu, 20 Jul 2023 15:20:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41D4F492C13; Thu, 20 Jul 2023 15:20:23 +0000 (UTC) From: Kevin Traynor 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 21.11.5 Date: Thu, 20 Jul 2023 16:17:31 +0100 Message-ID: <20230720151942.262154-20-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/3ca06320cd8beed7b91d7b950a774bc891509e92 Thanks. Kevin --- >From 3ca06320cd8beed7b91d7b950a774bc891509e92 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 [ 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 862d526658..6f7e8641d3 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -1062,10 +1062,4 @@ 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"); @@ -1206,4 +1200,10 @@ rte_eal_init(int argc, char **argv) } + /* 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"); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:57.562922481 +0100 +++ 0020-eal-linux-fix-secondary-process-crash-for-mp-hotplug.patch 2023-07-20 16:17:54.469749723 +0100 @@ -1 +1 @@ -From 66f7ee3f7ab1a7d0295464ab236d4ada08eedee3 Mon Sep 17 00:00:00 2001 +From 3ca06320cd8beed7b91d7b950a774bc891509e92 Mon Sep 17 00:00:00 2001 @@ -6,0 +7,2 @@ +[ upstream commit 66f7ee3f7ab1a7d0295464ab236d4ada08eedee3 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 90e05fe4de..99b0a59706 100644 +index 862d526658..6f7e8641d3 100644 @@ -24 +25 @@ -@@ -1059,10 +1059,4 @@ rte_eal_init(int argc, char **argv) +@@ -1062,10 +1062,4 @@ rte_eal_init(int argc, char **argv) @@ -35 +36 @@ -@@ -1222,4 +1216,10 @@ rte_eal_init(int argc, char **argv) +@@ -1206,4 +1200,10 @@ rte_eal_init(int argc, char **argv)