From: Jiang Mao <maox.jiang@intel.com>
To: qi.z.zhang@intel.com
Cc: dev@dpdk.org, stable@dpdk.org, Jiang Mao <maox.jiang@intel.com>
Subject: [dpdk-stable] [PATCH v4 1/2] net/i40e: fix binding interrupt without msix vectors
Date: Thu, 23 Jul 2020 23:27:10 +0800 [thread overview]
Message-ID: <20200723152711.7591-1-maox.jiang@intel.com> (raw)
In-Reply-To: <20200722175738.32490-1-maox.jiang@intel.com>
The value of vsi->nb_msix shouldn`t be zero, otherwise, all of
interrupts will be bind to vector 0.
Fixes: 4861cde461 (i40e: new poll mode driver)
Cc: stable@dpdk.org
Signed-off-by: Jiang Mao <maox.jiang@intel.com>
---
V3: Fix format issue.
V4: Rebase this patch.
---
drivers/net/i40e/i40e_ethdev.c | 25 +++++++++++++++++++------
drivers/net/i40e/i40e_ethdev.h | 2 +-
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 05d5f28615..0c32e451c5 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2117,7 +2117,7 @@ __vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t msix_vect,
I40E_WRITE_FLUSH(hw);
}
-void
+int
i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
{
struct rte_eth_dev *dev = vsi->adapter->eth_dev;
@@ -2137,10 +2137,14 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
/* VF bind interrupt */
if (vsi->type == I40E_VSI_SRIOV) {
+ if (vsi->nb_msix == 0) {
+ PMD_DRV_LOG(ERR, "No msix resource");
+ return -EINVAL;
+ }
__vsi_queues_bind_intr(vsi, msix_vect,
vsi->base_queue, vsi->nb_qps,
itr_idx);
- return;
+ return 0;
}
/* PF & VMDq bind interrupt */
@@ -2157,7 +2161,10 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
}
for (i = 0; i < vsi->nb_used_qps; i++) {
- if (nb_msix <= 1) {
+ if (vsi->nb_msix == 0) {
+ PMD_DRV_LOG(ERR, "No msix resource");
+ return -EINVAL;
+ } else if (nb_msix <= 1) {
if (!rte_intr_allow_others(intr_handle))
/* allow to share MISC_VEC_ID */
msix_vect = I40E_MISC_VEC_ID;
@@ -2182,6 +2189,8 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
msix_vect++;
nb_msix--;
}
+
+ return 0;
}
void
@@ -2422,14 +2431,18 @@ i40e_dev_start(struct rte_eth_dev *dev)
/* Map queues with MSIX interrupt */
main_vsi->nb_used_qps = dev->data->nb_rx_queues -
pf->nb_cfg_vmdq_vsi * RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM;
- i40e_vsi_queues_bind_intr(main_vsi, I40E_ITR_INDEX_DEFAULT);
+ ret = i40e_vsi_queues_bind_intr(main_vsi, I40E_ITR_INDEX_DEFAULT);
+ if (ret < 0)
+ return ret;
i40e_vsi_enable_queues_intr(main_vsi);
/* Map VMDQ VSI queues with MSIX interrupt */
for (i = 0; i < pf->nb_cfg_vmdq_vsi; i++) {
pf->vmdq[i].vsi->nb_used_qps = RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM;
- i40e_vsi_queues_bind_intr(pf->vmdq[i].vsi,
- I40E_ITR_INDEX_DEFAULT);
+ ret = i40e_vsi_queues_bind_intr(pf->vmdq[i].vsi,
+ I40E_ITR_INDEX_DEFAULT);
+ if (ret < 0)
+ return ret;
i40e_vsi_enable_queues_intr(pf->vmdq[i].vsi);
}
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index aef88abed0..19f821829a 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -1319,7 +1319,7 @@ void i40e_update_vsi_stats(struct i40e_vsi *vsi);
void i40e_pf_disable_irq0(struct i40e_hw *hw);
void i40e_pf_enable_irq0(struct i40e_hw *hw);
int i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);
-void i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx);
+int i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx);
void i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi);
void i40e_vsi_disable_queues_intr(struct i40e_vsi *vsi);
int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi,
--
2.17.1
next prev parent reply other threads:[~2020-07-23 3:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 2:25 [dpdk-stable] [PATCH " Jiang Mao
2020-06-09 2:25 ` [dpdk-stable] [PATCH 2/2] net/i40e: fix fdir allocating msix resource error Jiang Mao
2020-06-17 5:43 ` [dpdk-stable] [dpdk-dev] " Huang, ZhiminX
2020-07-08 19:52 ` [dpdk-stable] " Jiang Mao
2020-07-20 10:31 ` [dpdk-stable] [dpdk-dev] " Zhang, Qi Z
2020-07-21 19:51 ` [dpdk-stable] [PATCH] " Jiang Mao
2020-06-17 5:42 ` [dpdk-stable] [dpdk-dev] [PATCH 1/2] net/i40e: fix binding interrupt without msix vectors Huang, ZhiminX
2020-07-08 19:50 ` [dpdk-stable] " Jiang Mao
2020-07-21 3:57 ` [dpdk-stable] [dpdk-dev] " Jeff Guo
2020-07-21 6:50 ` Jiang, MaoX
2020-07-22 17:57 ` [dpdk-stable] [PATCH v3 " Jiang Mao
2020-07-22 17:57 ` [dpdk-stable] [PATCH v3 2/2] net/i40e: fix fdir allocating msix resource error Jiang Mao
2020-07-23 16:11 ` [dpdk-stable] [PATCH v4 " Jiang Mao
2020-07-23 12:40 ` Zhang, Qi Z
2020-07-23 15:27 ` Jiang Mao [this message]
2020-07-23 12:40 ` [dpdk-stable] [PATCH v4 1/2] net/i40e: fix binding interrupt without msix vectors Zhang, Qi Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200723152711.7591-1-maox.jiang@intel.com \
--to=maox.jiang@intel.com \
--cc=dev@dpdk.org \
--cc=qi.z.zhang@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).