[dpdk-stable] patch 'net/iavf: fix queue pairs configuration' has been queued to stable release 20.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.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/07/21. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/f8779d9a362955e703963487356e264528740091

Thanks.

Luca Boccassi

---
>From f8779d9a362955e703963487356e264528740091 Mon Sep 17 00:00:00 2001
From: Alvin Zhang <alvinx.zhang at intel.com>
Date: Wed, 23 Dec 2020 13:29:36 +0800
Subject: [PATCH] net/iavf: fix queue pairs configuration

[ upstream commit 403aebc44c04952f98fc7501e26eb77098d74bc8 ]

Check if there are enough queue pairs currently allocated, and if not,
request PF to allocate them.

Fixes: e436cd43835b ("net/iavf: negotiate large VF and request more queues")

Signed-off-by: Alvin Zhang <alvinx.zhang at intel.com>
Tested-by: Zhimin Huang <zhiminx.huang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 7e3c26a94e..f0151215e6 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -372,8 +372,10 @@ iavf_dev_configure(struct rte_eth_dev *dev)
 	} else {
 		/* Check if large VF is already enabled. If so, disable and
 		 * release redundant queue resource.
+		 * Or check if enough queue pairs. If not, request them from PF.
 		 */
-		if (vf->lv_enabled) {
+		if (vf->lv_enabled ||
+		    num_queue_pairs > vf->vsi_res->num_queue_pairs) {
 			ret = iavf_queues_req_reset(dev, num_queue_pairs);
 			if (ret)
 				return ret;
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:32.236339725 +0000
+++ 0066-net-iavf-fix-queue-pairs-configuration.patch	2021-02-05 11:18:28.826691493 +0000
@@ -1 +1 @@
-From 403aebc44c04952f98fc7501e26eb77098d74bc8 Mon Sep 17 00:00:00 2001
+From f8779d9a362955e703963487356e264528740091 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 403aebc44c04952f98fc7501e26eb77098d74bc8 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index d2fa168256..7bf31d4f4e 100644
+index 7e3c26a94e..f0151215e6 100644
@@ -23 +24 @@
-@@ -375,8 +375,10 @@ iavf_dev_configure(struct rte_eth_dev *dev)
+@@ -372,8 +372,10 @@ iavf_dev_configure(struct rte_eth_dev *dev)