[dpdk-stable] patch 'examples/l3fwd-power: fix interrupt disable' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.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 02/19/20. 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.

Thanks.

Luca Boccassi

---
>From 7c93d05a5051e04ef7f7ab2d4411613f41ed92ce Mon Sep 17 00:00:00 2001
From: Xiao Wang <xiao.w.wang at intel.com>
Date: Mon, 20 Jan 2020 22:06:57 -0500
Subject: [PATCH] examples/l3fwd-power: fix interrupt disable

[ upstream commit 49dcf7b98e87a5d2880693da4c09af11e58f3447 ]

Since all related queues' interrupts are turned on before epoll, we need
to turn off all the interrupts after wakeup. This patch fixes the issue
of only turning off the interrupted queues.

Fixes: b736d64787fc ("examples/l3fwd-power: disable Rx interrupt when waking up")

Signed-off-by: Xiao Wang <xiao.w.wang at intel.com>
Tested-by: Harman Kalra <hkalra at marvell.com>
Reviewed-by: Liang Ma <liang.j.ma at intel.com>
Tested-by: Liang Ma <liang.j.ma at intel.com>
Acked-by: David Hunt <david.hunt at intel.com>
---
 examples/l3fwd-power/main.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index ffcc7ecf44..e9b2cb5b30 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -880,9 +880,6 @@ sleep_until_rx_interrupt(int num)
 		port_id = ((uintptr_t)data) >> CHAR_BIT;
 		queue_id = ((uintptr_t)data) &
 			RTE_LEN2MASK(CHAR_BIT, uint8_t);
-		rte_spinlock_lock(&(locks[port_id]));
-		rte_eth_dev_rx_intr_disable(port_id, queue_id);
-		rte_spinlock_unlock(&(locks[port_id]));
 		RTE_LOG(INFO, L3FWD_POWER,
 			"lcore %u is waked up from rx interrupt on"
 			" port %d queue %d\n",
@@ -892,7 +889,7 @@ sleep_until_rx_interrupt(int num)
 	return 0;
 }
 
-static void turn_on_intr(struct lcore_conf *qconf)
+static void turn_on_off_intr(struct lcore_conf *qconf, bool on)
 {
 	int i;
 	struct lcore_rx_queue *rx_queue;
@@ -905,7 +902,10 @@ static void turn_on_intr(struct lcore_conf *qconf)
 		queue_id = rx_queue->queue_id;
 
 		rte_spinlock_lock(&(locks[port_id]));
-		rte_eth_dev_rx_intr_enable(port_id, queue_id);
+		if (on)
+			rte_eth_dev_rx_intr_enable(port_id, queue_id);
+		else
+			rte_eth_dev_rx_intr_disable(port_id, queue_id);
 		rte_spinlock_unlock(&(locks[port_id]));
 	}
 }
@@ -1340,9 +1340,10 @@ start_rx:
 			else {
 				/* suspend until rx interrupt triggers */
 				if (intr_en) {
-					turn_on_intr(qconf);
+					turn_on_off_intr(qconf, 1);
 					sleep_until_rx_interrupt(
 						qconf->n_rx_queue);
+					turn_on_off_intr(qconf, 0);
 					/**
 					 * start receiving packets immediately
 					 */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:15.651713311 +0000
+++ 0011-examples-l3fwd-power-fix-interrupt-disable.patch	2020-02-17 17:00:15.279950059 +0000
@@ -1,14 +1,15 @@
-From 49dcf7b98e87a5d2880693da4c09af11e58f3447 Mon Sep 17 00:00:00 2001
+From 7c93d05a5051e04ef7f7ab2d4411613f41ed92ce Mon Sep 17 00:00:00 2001
 From: Xiao Wang <xiao.w.wang at intel.com>
 Date: Mon, 20 Jan 2020 22:06:57 -0500
 Subject: [PATCH] examples/l3fwd-power: fix interrupt disable
 
+[ upstream commit 49dcf7b98e87a5d2880693da4c09af11e58f3447 ]
+
 Since all related queues' interrupts are turned on before epoll, we need
 to turn off all the interrupts after wakeup. This patch fixes the issue
 of only turning off the interrupted queues.
 
 Fixes: b736d64787fc ("examples/l3fwd-power: disable Rx interrupt when waking up")
-Cc: stable at dpdk.org
 
 Signed-off-by: Xiao Wang <xiao.w.wang at intel.com>
 Tested-by: Harman Kalra <hkalra at marvell.com>
@@ -20,10 +21,10 @@
  1 file changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
-index e63abb1da8..c7fe0ec034 100644
+index ffcc7ecf44..e9b2cb5b30 100644
 --- a/examples/l3fwd-power/main.c
 +++ b/examples/l3fwd-power/main.c
-@@ -870,9 +870,6 @@ sleep_until_rx_interrupt(int num)
+@@ -880,9 +880,6 @@ sleep_until_rx_interrupt(int num)
  		port_id = ((uintptr_t)data) >> CHAR_BIT;
  		queue_id = ((uintptr_t)data) &
  			RTE_LEN2MASK(CHAR_BIT, uint8_t);
@@ -33,7 +34,7 @@
  		RTE_LOG(INFO, L3FWD_POWER,
  			"lcore %u is waked up from rx interrupt on"
  			" port %d queue %d\n",
-@@ -882,7 +879,7 @@ sleep_until_rx_interrupt(int num)
+@@ -892,7 +889,7 @@ sleep_until_rx_interrupt(int num)
  	return 0;
  }
  
@@ -42,7 +43,7 @@
  {
  	int i;
  	struct lcore_rx_queue *rx_queue;
-@@ -895,7 +892,10 @@ static void turn_on_intr(struct lcore_conf *qconf)
+@@ -905,7 +902,10 @@ static void turn_on_intr(struct lcore_conf *qconf)
  		queue_id = rx_queue->queue_id;
  
  		rte_spinlock_lock(&(locks[port_id]));
@@ -54,7 +55,7 @@
  		rte_spinlock_unlock(&(locks[port_id]));
  	}
  }
-@@ -1330,9 +1330,10 @@ start_rx:
+@@ -1340,9 +1340,10 @@ start_rx:
  			else {
  				/* suspend until rx interrupt triggers */
  				if (intr_en) {