[dpdk-stable] patch 'net/i40e: cancel alarm handler at the end of closure' has been queued to stable release 18.08.1

[Kevin Traynor]

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 <xiaolong.ye at intel.com>
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 <xiaolong.ye at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 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 <xiaolong.ye at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Xiaolong Ye <xiaolong.ye at intel.com>
 Acked-by: Beilei Xing <beilei.xing at intel.com>
@@ -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);