diff mbox

[dpdk-dev] i40e: fix the issue of trying more VSIs for VMDq than available

Message ID 1447312143-12215-1-git-send-email-helin.zhang@intel.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Helin Zhang Nov. 12, 2015, 7:09 a.m. UTC
It fixes the issue of trying to allocate more VSIs for VMDq than
hardware remaining. It adds a check of the hardware remaining
before allocating VSIs for VMDq.

Fixes: c80707a0fd9c ("i40e: fix VMDq pool limit")

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Thomas Monjalon Nov. 12, 2015, 11:15 a.m. UTC | #1
2015-11-12 15:09, Helin Zhang:
> It fixes the issue of trying to allocate more VSIs for VMDq than
> hardware remaining. It adds a check of the hardware remaining
> before allocating VSIs for VMDq.
> 
> Fixes: c80707a0fd9c ("i40e: fix VMDq pool limit")
> 
> Signed-off-by: Helin Zhang <helin.zhang@intel.com>

Applied, thanks
diff mbox

Patch

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index e4684d3..323b1ff 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -3118,7 +3118,8 @@  i40e_pf_parameter_init(struct rte_eth_dev *dev)
 	pf->vmdq_nb_qps = 0;
 	pf->max_nb_vmdq_vsi = 0;
 	if (hw->func_caps.vmdq) {
-		if (qp_count < hw->func_caps.num_tx_qp) {
+		if (qp_count < hw->func_caps.num_tx_qp &&
+			vsi_count < hw->func_caps.num_vsis) {
 			pf->max_nb_vmdq_vsi = (hw->func_caps.num_tx_qp -
 				qp_count) / pf->vmdq_nb_qp_max;
 
@@ -3126,6 +3127,8 @@  i40e_pf_parameter_init(struct rte_eth_dev *dev)
 			 * ethdev can support
 			 */
 			pf->max_nb_vmdq_vsi = RTE_MIN(pf->max_nb_vmdq_vsi,
+				hw->func_caps.num_vsis - vsi_count);
+			pf->max_nb_vmdq_vsi = RTE_MIN(pf->max_nb_vmdq_vsi,
 				ETH_64_POOLS);
 			if (pf->max_nb_vmdq_vsi) {
 				pf->flags |= I40E_FLAG_VMDQ;
@@ -3140,7 +3143,7 @@  i40e_pf_parameter_init(struct rte_eth_dev *dev)
 					    "VMDq");
 			}
 		} else {
-			PMD_DRV_LOG(INFO, "No queue left for VMDq");
+			PMD_DRV_LOG(INFO, "No queue or VSI left for VMDq");
 		}
 	}
 	qp_count += pf->vmdq_nb_qps * pf->max_nb_vmdq_vsi;