From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id C2143A05FE for ; Tue, 19 Mar 2019 06:58:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 860C5A3; Tue, 19 Mar 2019 06:58:01 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 1D064A3; Tue, 19 Mar 2019 06:57:58 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Mar 2019 22:57:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,496,1544515200"; d="scan'208";a="308391645" Received: from kmsmsx151.gar.corp.intel.com ([172.21.73.86]) by orsmga005.jf.intel.com with ESMTP; 18 Mar 2019 22:57:56 -0700 Received: from pgsmsx103.gar.corp.intel.com ([169.254.2.210]) by KMSMSX151.gar.corp.intel.com ([169.254.10.186]) with mapi id 14.03.0415.000; Tue, 19 Mar 2019 13:57:55 +0800 From: "Zhao1, Wei" To: "Zhang, Qi Z" , "dev@dpdk.org" CC: "stable@dpdk.org" Thread-Topic: [PATCH] net/iavf: fix vertor interrupt number configuration error Thread-Index: AQHU3gR81ubOd0jxQkuWWHgtuYuSSaYRznwAgACmrNA= Date: Tue, 19 Mar 2019 05:57:54 +0000 Message-ID: References: <1552964680-45860-1-git-send-email-wei.zhao1@intel.com> <039ED4275CED7440929022BC67E706115334EC3D@SHSMSX103.ccr.corp.intel.com> In-Reply-To: <039ED4275CED7440929022BC67E706115334EC3D@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [172.30.20.205] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH] net/iavf: fix vertor interrupt number configuration error X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" > -----Original Message----- > From: Zhang, Qi Z > Sent: Tuesday, March 19, 2019 12:01 PM > To: Zhao1, Wei ; dev@dpdk.org > Cc: stable@dpdk.org > Subject: RE: [PATCH] net/iavf: fix vertor interrupt number configuration = error >=20 >=20 >=20 > > -----Original Message----- > > From: Zhao1, Wei > > Sent: Tuesday, March 19, 2019 11:05 AM > > To: dev@dpdk.org > > Cc: stable@dpdk.org; Zhang, Qi Z ; Zhao1, Wei > > > > Subject: [PATCH] net/iavf: fix vertor interrupt number configuration > > error > > > > There is a issue when iavf do vertor interrupt configuration, it will > > miss one interrupt vector which set admin queue interrupt when > > communicate with host pf. > > > > Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") > > Cc: stable@dpdk.org > > > > Signed-off-by: Wei Zhao > > Signed-off-by: Zhao Wei > > --- > > drivers/net/iavf/iavf_ethdev.c | 4 ++-- > > drivers/net/iavf/iavf_vchnl.c | 8 > > +++++++- > > 2 files changed, 9 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/net/iavf/iavf_ethdev.c > > b/drivers/net/iavf/iavf_ethdev.c index > > 846e604..49c9499 100644 > > --- a/drivers/net/iavf/iavf_ethdev.c > > +++ b/drivers/net/iavf/iavf_ethdev.c > > @@ -308,7 +308,7 @@ static int iavf_config_rx_queues_irqs(struct > > rte_eth_dev *dev, > > if (!dev->data->dev_conf.intr_conf.rxq || > > !rte_intr_dp_is_en(intr_handle)) { > > /* Rx interrupt disabled, Map interrupt only for writeback */ > > - vf->nb_msix =3D 1; > > + vf->nb_msix =3D 2; > > if (vf->vf_res->vf_cap_flags & > > VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) { > > /* If WB_ON_ITR supports, enable it */ @@ -338,7 > +338,7 @@ static > > int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, > > vf->rxq_map[vf->msix_base] |=3D 1 << i; > > } else { > > if (!rte_intr_allow_others(intr_handle)) { > > - vf->nb_msix =3D 1; > > + vf->nb_msix =3D 2; > > vf->msix_base =3D IAVF_MISC_VEC_ID; > > for (i =3D 0; i < dev->data->nb_rx_queues; i++) { > > vf->rxq_map[vf->msix_base] |=3D 1 << i; diff -- > git >=20 >=20 > Looks like something missing in below else branch >=20 > } else { > /* If Rx interrupt is reuquired, and we can use > * multi interrupts, then the vec is from 1 > */ > vf->nb_msix =3D RTE_MIN(vf->vf_res->max_vectors, > intr_handle->nb_efd); > vf->msix_base =3D IAVF_RX_VEC_START; > vec =3D IAVF_RX_VEC_START; > for (i =3D 0; i < dev->data->nb_rx_queues; i++) { > vf->rxq_map[vec] |=3D 1 << i; > intr_handle->intr_vec[i] =3D vec++; > if (vec >=3D vf->nb_msix) > vec =3D IAVF_RX_VEC_START; > } > PMD_DRV_LOG(DEBUG, > "%u vectors are mapping to %u Rx queu= es", > vf->nb_msix, dev->data->nb_rx_queues)= ; > } > Should we also reserve 1 vector for admin queue in this case, or looks li= ke > some Rx queue will share the irq vector with admin queue during > iavf_config_irq_map which is not expected? Yes, we should change to " vf->nb_msix =3D RTE_MIN(vf->vf_res->max_vectors, intr_handle->nb_efd) + 1; " in v2=20 >=20 >=20 > > a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index > > 6381fb6..d9a376e 100644 > > --- a/drivers/net/iavf/iavf_vchnl.c > > +++ b/drivers/net/iavf/iavf_vchnl.c > > @@ -609,7 +609,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter) > > return -ENOMEM; > > > > map_info->num_vectors =3D vf->nb_msix; > > - for (i =3D 0; i < vf->nb_msix; i++) { > > + for (i =3D 0; i < vf->nb_msix - 1; i++) { > > vecmap =3D &map_info->vecmap[i]; > > vecmap->vsi_id =3D vf->vsi_res->vsi_id; > > vecmap->rxitr_idx =3D IAVF_ITR_INDEX_DEFAULT; @@ -618,6 > +618,12 > > @@ iavf_config_irq_map(struct iavf_adapter *adapter) > > vecmap->rxq_map =3D vf->rxq_map[vf->msix_base + i]; > > } > > > > + vecmap =3D &map_info->vecmap[i]; > > + vecmap->vsi_id =3D vf->vsi_res->vsi_id; > > + vecmap->vector_id =3D 0; > > + vecmap->txq_map =3D 0; > > + vecmap->rxq_map =3D 0; > > + > > args.ops =3D VIRTCHNL_OP_CONFIG_IRQ_MAP; > > args.in_args =3D (u8 *)map_info; > > args.in_args_size =3D len; > > -- > > 2.7.5