From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id F0F80A0096 for ; Wed, 8 May 2019 12:16:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E66982BD5; Wed, 8 May 2019 12:16:36 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 53460378B for ; Wed, 8 May 2019 12:16:35 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BBAFC307D976; Wed, 8 May 2019 10:16:34 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 315F64123; Wed, 8 May 2019 10:16:31 +0000 (UTC) From: Kevin Traynor To: Herakliusz Lipiec Cc: Ferruh Yigit , dpdk stable Date: Wed, 8 May 2019 11:15:07 +0100 Message-Id: <20190508101534.8984-25-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 08 May 2019 10:16:34 +0000 (UTC) Subject: [dpdk-stable] patch 'net/tap: fix multi process reply buffer' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.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 05/13/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/51c1632abb21c9e0f0b8fb8e5282fd3e55c050b7 Thanks. Kevin Traynor --- >From 51c1632abb21c9e0f0b8fb8e5282fd3e55c050b7 Mon Sep 17 00:00:00 2001 From: Herakliusz Lipiec Date: Fri, 19 Apr 2019 11:28:52 +0100 Subject: [PATCH] net/tap: fix multi process reply buffer [ upstream commit 7dccd4e02bcf6eff6480e6ddc8d066b38b3ffc89 ] A successful call to rte_mp_request_sync does not guarantee that there are any messages in the buffer, and this should be checked for before accessing data in the message. Buffer can be empty if IPC is disabled or if we decide to ignore replies. Fixes: c9aa56edec8e ("net/tap: access primary process queues from secondary") Signed-off-by: Herakliusz Lipiec Reviewed-by: Ferruh Yigit --- drivers/net/tap/rte_eth_tap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index d16bc8c7f..551f4d3a2 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -2072,5 +2072,5 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev) /* Send request and receive reply */ ret = rte_mp_request_sync(&request, &replies, &timeout); - if (ret < 0) { + if (ret < 0 || replies.nb_received != 1) { TAP_LOG(ERR, "Failed to request queues from primary: %d", rte_errno); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:07.089298193 +0100 +++ 0025-net-tap-fix-multi-process-reply-buffer.patch 2019-05-08 11:05:05.809933180 +0100 @@ -1 +1 @@ -From 7dccd4e02bcf6eff6480e6ddc8d066b38b3ffc89 Mon Sep 17 00:00:00 2001 +From 51c1632abb21c9e0f0b8fb8e5282fd3e55c050b7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7dccd4e02bcf6eff6480e6ddc8d066b38b3ffc89 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index e9fda8cf6..7f74b5dc9 100644 +index d16bc8c7f..551f4d3a2 100644 @@ -24 +25 @@ -@@ -2102,5 +2102,5 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev) +@@ -2072,5 +2072,5 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)