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 0F974A0A02 for ; Mon, 17 May 2021 18:21:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 072CB40041; Mon, 17 May 2021 18:21:55 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D544140041 for ; Mon, 17 May 2021 18:21:53 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lig09-0000R5-Mq; Mon, 17 May 2021 16:21:53 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , dpdk stable Date: Mon, 17 May 2021 18:21:16 +0200 Message-Id: <20210517162125.3178901-12-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> References: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ipc: check malloc sync reply result' has been queued to stable release 19.11.9 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 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/1ffdb5c35ebd1675a971a1ff159cd9791754d9a5 Thanks. Christian Ehrhardt --- >From 1ffdb5c35ebd1675a971a1ff159cd9791754d9a5 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 5 May 2021 12:10:06 +0800 Subject: [PATCH] ipc: check malloc sync reply result [ upstream commit 76b49dcbd2cd2b7436fd196e01c04576c4feaa99 ] This patch adds checking for mp reply result in handle_sync(). Fixes: 07dcbfe0101f ("malloc: support multiprocess memory hotplug") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- lib/librte_eal/common/malloc_mp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/librte_eal/common/malloc_mp.c index 1f212f8349..dd814ef53a 100644 --- a/lib/librte_eal/common/malloc_mp.c +++ b/lib/librte_eal/common/malloc_mp.c @@ -170,9 +170,7 @@ handle_sync(const struct rte_mp_msg *msg, const void *peer) resp->id = req->id; resp->result = ret == 0 ? REQ_RESULT_SUCCESS : REQ_RESULT_FAIL; - rte_mp_reply(&reply, peer); - - return 0; + return rte_mp_reply(&reply, peer); } static int -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:37.235230276 +0200 +++ 0201-ipc-check-malloc-sync-reply-result.patch 2021-05-17 17:40:29.579812690 +0200 @@ -1 +1 @@ -From 76b49dcbd2cd2b7436fd196e01c04576c4feaa99 Mon Sep 17 00:00:00 2001 +From 1ffdb5c35ebd1675a971a1ff159cd9791754d9a5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 76b49dcbd2cd2b7436fd196e01c04576c4feaa99 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - lib/eal/common/malloc_mp.c | 4 +--- + lib/librte_eal/common/malloc_mp.c | 4 +--- @@ -17,5 +18,5 @@ -diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c -index c7101b32d3..2e597a17a2 100644 ---- a/lib/eal/common/malloc_mp.c -+++ b/lib/eal/common/malloc_mp.c -@@ -171,9 +171,7 @@ handle_sync(const struct rte_mp_msg *msg, const void *peer) +diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/librte_eal/common/malloc_mp.c +index 1f212f8349..dd814ef53a 100644 +--- a/lib/librte_eal/common/malloc_mp.c ++++ b/lib/librte_eal/common/malloc_mp.c +@@ -170,9 +170,7 @@ handle_sync(const struct rte_mp_msg *msg, const void *peer)