[dpdk-stable] patch 'net/i40e: fix flow director MSI-X resource allocation' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/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 8d03e02240191a8fe2330c561a2106d096b20598 Mon Sep 17 00:00:00 2001
From: Mao Jiang <maox.jiang at intel.com>
Date: Fri, 24 Jul 2020 00:11:52 +0800
Subject: [PATCH] net/i40e: fix flow director MSI-X resource allocation

[ upstream commit 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 ]

FDIR allocating msix resource is not strictly necessary, if no
resource left, jump the error.

Fixes: 4861cde46116 ("i40e: new poll mode driver")

Signed-off-by: Mao Jiang <maox.jiang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 39c8b847c..5081cab4f 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5722,10 +5722,14 @@ i40e_vsi_setup(struct i40e_pf *pf,
 		ret = i40e_res_pool_alloc(&pf->msix_pool, 1);
 		if (ret < 0) {
 			PMD_DRV_LOG(ERR, "VSI %d get heap failed %d", vsi->seid, ret);
-			goto fail_queue_alloc;
+			if (type != I40E_VSI_FDIR)
+				goto fail_queue_alloc;
+			vsi->msix_intr = 0;
+			vsi->nb_msix = 0;
+		} else {
+			vsi->msix_intr = ret;
+			vsi->nb_msix = 1;
 		}
-		vsi->msix_intr = ret;
-		vsi->nb_msix = 1;
 	} else {
 		vsi->msix_intr = 0;
 		vsi->nb_msix = 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:16.578789098 +0100
+++ 0020-net-i40e-fix-flow-director-MSI-X-resource-allocation.patch	2020-08-06 10:53:15.788597164 +0100
@@ -1,13 +1,14 @@
-From 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 Mon Sep 17 00:00:00 2001
+From 8d03e02240191a8fe2330c561a2106d096b20598 Mon Sep 17 00:00:00 2001
 From: Mao Jiang <maox.jiang at intel.com>
 Date: Fri, 24 Jul 2020 00:11:52 +0800
 Subject: [PATCH] net/i40e: fix flow director MSI-X resource allocation
 
+[ upstream commit 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 ]
+
 FDIR allocating msix resource is not strictly necessary, if no
 resource left, jump the error.
 
 Fixes: 4861cde46116 ("i40e: new poll mode driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Mao Jiang <maox.jiang at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
-index 0c32e451c..f9a8e7132 100644
+index 39c8b847c..5081cab4f 100644
 --- a/drivers/net/i40e/i40e_ethdev.c
 +++ b/drivers/net/i40e/i40e_ethdev.c
-@@ -5839,10 +5839,14 @@ i40e_vsi_setup(struct i40e_pf *pf,
+@@ -5722,10 +5722,14 @@ i40e_vsi_setup(struct i40e_pf *pf,
  		ret = i40e_res_pool_alloc(&pf->msix_pool, 1);
  		if (ret < 0) {
  			PMD_DRV_LOG(ERR, "VSI %d get heap failed %d", vsi->seid, ret);