From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id C15751B517 for ; Fri, 30 Nov 2018 00:13:15 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:19:06 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW7N032075; Fri, 30 Nov 2018 01:13:10 +0200 From: Yongseok Koh To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Thu, 29 Nov 2018 15:10:17 -0800 Message-Id: <20181129231202.30436-23-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/sfc: fix an Rx queue double release possibility' has been queued to LTS release 17.11.5 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: , X-List-Received-Date: Thu, 29 Nov 2018 23:13:16 -0000 Hi, FYI, your patch has been queued to LTS release 17.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 12/01/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From b77430c4425710cd34910a3509bf12251ec2714d Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Fri, 14 Sep 2018 08:31:35 +0100 Subject: [PATCH] net/sfc: fix an Rx queue double release possibility [ upstream commit 7eb7588c99ab5fd0f31032b29cac74b57e1de2ff ] There are two function that call sfc_rx_qfini(): sfc_rx_fini_queues() and sfc_rx_queue_release(). But only sfc_rx_queue_release() sets rx_queues pointer of the device data to NULL. It may lead to the scenario in which a queue is destroyed by sfc_rx_fini_queues() and after the queue is attempted to be destroyed again by sfc_rx_queue_release(). Move NULL assignment to sfc_rx_qfini(). Fixes: ce35b05c635e ("net/sfc: implement Rx queue setup release operations") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ethdev.c | 2 -- drivers/net/sfc/sfc_rx.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 1b160b5e9..ba08d615a 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -458,8 +458,6 @@ sfc_rx_queue_release(void *queue) sfc_log_init(sa, "RxQ=%u", sw_index); - sa->eth_dev->data->rx_queues[sw_index] = NULL; - sfc_rx_qfini(sa, sw_index); sfc_adapter_unlock(sa); diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 8fc93d682..4497d5f48 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -1028,6 +1028,7 @@ sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index) struct sfc_rxq *rxq; SFC_ASSERT(sw_index < sa->rxq_count); + sa->eth_dev->data->rx_queues[sw_index] = NULL; rxq_info = &sa->rxq_info[sw_index]; -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:46.291784762 -0800 +++ 0023-net-sfc-fix-an-Rx-queue-double-release-possibility.patch 2018-11-29 15:01:45.019966000 -0800 @@ -1,8 +1,10 @@ -From 7eb7588c99ab5fd0f31032b29cac74b57e1de2ff Mon Sep 17 00:00:00 2001 +From b77430c4425710cd34910a3509bf12251ec2714d Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Fri, 14 Sep 2018 08:31:35 +0100 Subject: [PATCH] net/sfc: fix an Rx queue double release possibility +[ upstream commit 7eb7588c99ab5fd0f31032b29cac74b57e1de2ff ] + There are two function that call sfc_rx_qfini(): sfc_rx_fini_queues() and sfc_rx_queue_release(). But only sfc_rx_queue_release() sets rx_queues pointer of the device data to NULL. @@ -13,7 +15,6 @@ Move NULL assignment to sfc_rx_qfini(). Fixes: ce35b05c635e ("net/sfc: implement Rx queue setup release operations") -Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko @@ -23,10 +24,10 @@ 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c -index 435bde67f..23778c9f3 100644 +index 1b160b5e9..ba08d615a 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c -@@ -444,8 +444,6 @@ sfc_rx_queue_release(void *queue) +@@ -458,8 +458,6 @@ sfc_rx_queue_release(void *queue) sfc_log_init(sa, "RxQ=%u", sw_index); @@ -36,10 +37,10 @@ sfc_adapter_unlock(sa); diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c -index 338184dda..58c57acfe 100644 +index 8fc93d682..4497d5f48 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c -@@ -1103,6 +1103,7 @@ sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index) +@@ -1028,6 +1028,7 @@ sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index) struct sfc_rxq *rxq; SFC_ASSERT(sw_index < sa->rxq_count);