From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 913FAA04F2; Tue, 9 Jun 2020 04:10:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D10D12B93; Tue, 9 Jun 2020 04:10:41 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 622262B91 for ; Tue, 9 Jun 2020 04:10:40 +0200 (CEST) IronPort-SDR: TUqQT/cbl1pR52X046TfmJ4MaoBbB5tJVSEzP0DFN0iwB3cvSCAN4ieGBCnUSXOh6qDob+sYBJ k5lQSwA9adgg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2020 19:10:39 -0700 IronPort-SDR: mdavCsHS9WX7LqkcKTjCvakK1ACRLP/sqmtu2j0KVFMtqQmXIsGqUZi47XFE86T548FJ4ZXYbC L39Kn+7Vgz/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,490,1583222400"; d="scan'208";a="314065506" Received: from yexl-server.sh.intel.com (HELO localhost) ([10.67.116.183]) by FMSMGA003.fm.intel.com with ESMTP; 08 Jun 2020 19:10:38 -0700 Date: Tue, 9 Jun 2020 10:02:19 +0800 From: Ye Xiaolong To: Jiang Mao Cc: dev@dpdk.org Message-ID: <20200609020219.GA7842@intel.com> References: <20200609013712.27026-1-maox.jiang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200609013712.27026-1-maox.jiang@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-dev] [PATCH 1/2] net/i40e: fix binding interrupt without msix vectors X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 06/09, Jiang Mao wrote: >The value of vsi->nb_msix shouldn`t be zero, otherwise, all of interrupts will be bind to vector 0. > >Signed-off-by: Jiang Mao > >Fixes: 4861cde461 (i40e: new poll mode driver) Fixes tag should be put before SOB line and please cc stable@dpdk.org. >--- > drivers/net/i40e/i40e_ethdev.c | 41 +++++++++++++++++++++++----------- > drivers/net/i40e/i40e_ethdev.h | 2 +- > 2 files changed, 29 insertions(+), 14 deletions(-) > >diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c >index 970a31cb2..33ed556c8 100644 >--- a/drivers/net/i40e/i40e_ethdev.c >+++ b/drivers/net/i40e/i40e_ethdev.c >@@ -2013,7 +2013,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; >@@ -2033,10 +2033,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; >+ vsi->base_queue, vsi->nb_qps, >+ itr_idx); The indentation seems weird, please keep it as before, and same for other occurrences in this patch. >+ return 0; > } > > /* PF & VMDq bind interrupt */ >@@ -2053,16 +2057,19 @@ 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; > > /* no enough msix_vect, map all to one */ > __vsi_queues_bind_intr(vsi, msix_vect, >- vsi->base_queue + i, >- vsi->nb_used_qps - i, >- itr_idx); >+ vsi->base_queue + i, >+ vsi->nb_used_qps - i, >+ itr_idx); > for (; !!record && i < vsi->nb_used_qps; i++) > intr_handle->intr_vec[queue_idx + i] = > msix_vect; >@@ -2078,6 +2085,8 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx) > msix_vect++; > nb_msix--; > } >+ >+ return 0; > } > > static void >@@ -2318,21 +2327,27 @@ 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); > } > > /* enable FDIR MSIX interrupt */ > if (pf->fdir.fdir_vsi) { >- i40e_vsi_queues_bind_intr(pf->fdir.fdir_vsi, >- I40E_ITR_INDEX_NONE); >+ ret = i40e_vsi_queues_bind_intr(pf->fdir.fdir_vsi, >+ I40E_ITR_INDEX_NONE); >+ if (ret < 0) >+ return ret; > i40e_vsi_enable_queues_intr(pf->fdir.fdir_vsi); > } > >diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h >index e5d0ce53f..33fbe776b 100644 >--- a/drivers/net/i40e/i40e_ethdev.h >+++ b/drivers/net/i40e/i40e_ethdev.h >@@ -1248,7 +1248,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); > int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi, > struct i40e_vsi_vlan_pvid_info *info); >-- >2.17.1 >