From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id BCE7B1B49A for ; Thu, 22 Nov 2018 17:53:04 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2BBB92D809; Thu, 22 Nov 2018 16:53:04 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24AF660FD9; Thu, 22 Nov 2018 16:53:02 +0000 (UTC) From: Kevin Traynor To: Xiaolong Ye Cc: Beilei Xing , dpdk stable Date: Thu, 22 Nov 2018 16:49:43 +0000 Message-Id: <20181122164957.13003-51-ktraynor@redhat.com> In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com> References: <20181122164957.13003-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 22 Nov 2018 16:53:04 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: cancel alarm handler at the end of closure' has been queued to stable release 18.08.1 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, 22 Nov 2018 16:53:05 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/28/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. Kevin Traynor --- >>From 1df95a893ca9998c878f878ab31dfd0decb2a27c Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Tue, 23 Oct 2018 08:54:28 +0800 Subject: [PATCH] net/i40e: cancel alarm handler at the end of closure [ upstream commit e0e6a7f2154ee5ecd7c80a876d323118408369b9 ] Some operations in i40evf_dev_close like i40evf_dev_promiscuous_disable still need alarm handler to clear the pending cmd, if alarm handler is canceled in early stage of i40evf_dev_close, i40evf_dev_promiscuous_disable will result in failure. Fixes: 864a800d706d ("net/i40e: remove VF interrupt handler") Signed-off-by: Xiaolong Ye Acked-by: Beilei Xing --- drivers/net/i40e/i40e_ethdev_vf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 001c301b9..28b6543cd 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -2269,5 +2269,4 @@ i40evf_dev_close(struct rte_eth_dev *dev) struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); - rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); i40evf_dev_stop(dev); i40e_dev_free_queues(dev); @@ -2283,4 +2282,5 @@ i40evf_dev_close(struct rte_eth_dev *dev) i40e_shutdown_adminq(hw); i40evf_disable_irq0(hw); + rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-22 16:47:33.606011963 +0000 +++ 0051-net-i40e-cancel-alarm-handler-at-the-end-of-closure.patch 2018-11-22 16:47:32.000000000 +0000 @@ -1,15 +1,16 @@ -From e0e6a7f2154ee5ecd7c80a876d323118408369b9 Mon Sep 17 00:00:00 2001 +From 1df95a893ca9998c878f878ab31dfd0decb2a27c Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Tue, 23 Oct 2018 08:54:28 +0800 Subject: [PATCH] net/i40e: cancel alarm handler at the end of closure +[ upstream commit e0e6a7f2154ee5ecd7c80a876d323118408369b9 ] + Some operations in i40evf_dev_close like i40evf_dev_promiscuous_disable still need alarm handler to clear the pending cmd, if alarm handler is canceled in early stage of i40evf_dev_close, i40evf_dev_promiscuous_disable will result in failure. Fixes: 864a800d706d ("net/i40e: remove VF interrupt handler") -Cc: stable@dpdk.org Signed-off-by: Xiaolong Ye Acked-by: Beilei Xing @@ -18,16 +19,16 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c -index ed2fc1310..ae55b9b18 100644 +index 001c301b9..28b6543cd 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c -@@ -2247,5 +2247,4 @@ i40evf_dev_close(struct rte_eth_dev *dev) +@@ -2269,5 +2269,4 @@ i40evf_dev_close(struct rte_eth_dev *dev) struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); - rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); i40evf_dev_stop(dev); i40e_dev_free_queues(dev); -@@ -2261,4 +2260,5 @@ i40evf_dev_close(struct rte_eth_dev *dev) +@@ -2283,4 +2282,5 @@ i40evf_dev_close(struct rte_eth_dev *dev) i40e_shutdown_adminq(hw); i40evf_disable_irq0(hw); + rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);