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

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b136a5c1488b398d75742cbf11ce2dac2f58c64d

Thanks.

Kevin.

---
From b136a5c1488b398d75742cbf11ce2dac2f58c64d Mon Sep 17 00:00:00 2001
From: Mao Jiang <maox.jiang@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@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@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 80410e89ea..9aacb12293 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5607,8 +5607,12 @@ i40e_vsi_setup(struct i40e_pf *pf,
 		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;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.669203273 +0100
+++ 0031-net-i40e-fix-flow-director-MSI-X-resource-allocation.patch	2020-08-28 11:03:25.982955905 +0100
@@ -1 +1 @@
-From 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 Mon Sep 17 00:00:00 2001
+From b136a5c1488b398d75742cbf11ce2dac2f58c64d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 0c32e451c5..f9a8e7132f 100644
+index 80410e89ea..9aacb12293 100644
@@ -22 +23 @@
-@@ -5840,8 +5840,12 @@ i40e_vsi_setup(struct i40e_pf *pf,
+@@ -5607,8 +5607,12 @@ i40e_vsi_setup(struct i40e_pf *pf,