net/iavf: fix vertor interrupt number configuration error
PATCH 1/1 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.
--- drivers/net/iavf/iavf_ethdev.c | 4 ++-- drivers/net/iavf/iavf_vchnl.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/iavf/iavf_ethdev.c +2 -2
@@ -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 =1 ; + vf->nb_msix =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] |=1 << i; }else {if (!rte_intr_allow_others (intr_handle)) { - vf->nb_msix =1 ; + vf->nb_msix =2 ; vf->msix_base =IAVF_MISC_VEC_ID ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { vf->rxq_map[vf->msix_base] |=1 << i;
drivers/net/iavf/iavf_vchnl.c +7 -1
@@ -609,7 +609,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter)return -ENOMEM ; map_info->num_vectors = vf->nb_msix; -for (i =0 ; i < vf->nb_msix; i++) { +for (i =0 ; i < vf->nb_msix -1 ; i++) { vecmap = &map_info->vecmap[i]; vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx =IAVF_ITR_INDEX_DEFAULT ;
@@ -618,6 +618,12 @@ iavf_config_irq_map(struct iavf_adapter *adapter) vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; } + vecmap = &map_info->vecmap[i]; + vecmap->vsi_id = vf->vsi_res->vsi_id; + vecmap->vector_id =0 ; + vecmap->txq_map =0 ; + vecmap->rxq_map =0 ; + args.ops =VIRTCHNL_OP_CONFIG_IRQ_MAP ; args.in_args = (u8 *)map_info; args.in_args_size = len;
Signature · 1 line
2.7.5
Quoted 39 lines
-----Original Message-----
From: Zhao1, Wei
Sent: Tuesday, March 19, 2019 11:05 AM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH] net/iavf: fix vertor interrupt number configuration errorThere 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")Signed-off-by Wei Zhao <[email protected]>Signed-off-by Zhao Wei <[email protected]>--- drivers/net/iavf/iavf_ethdev.c | 4 ++-- drivers/net/iavf/iavf_vchnl.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-)drivers/net/iavf/iavf_ethdev.c index renamed from drivers/net/iavf/iavf_ethdev.c +0
-0846e604..49c9499 100644
drivers/net/iavf/iavf_ethdev.c +1
-1@@ -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 =1 ; + vf->nb_msix =2 ;if (vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_WB_ON_ITR ) {/* If
WB_ON_ITRsupports, enable it */ @@ -338,7 +338,7 @@
static int iavf_config_rx_queues_irqs(structrte_eth_dev*dev,
drivers/net/iavf/iavf_ethdev.c static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
Quoted 8 lines
drivers/net/iavf/iavf_ethdev.c +1
-1vf->rxq_map[vf->msix_base] |=1 << i; }else {if (!rte_intr_allow_others (intr_handle)) { - vf->nb_msix =1 ; + vf->nb_msix =2 ; vf->msix_base =IAVF_MISC_VEC_ID ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { vf->rxq_map[vf->msix_base] |= 1 << i; diff --git
Looks like something missing in below else branch
} else {
/* If Rx interrupt is reuquired, and we can use
* multi interrupts, then the vec is from 1
*/
vf->nb_msix = RTE_MIN(vf->vf_res->max_vectors,
intr_handle->nb_efd);
vf->msix_base = IAVF_RX_VEC_START;
vec = IAVF_RX_VEC_START;
for (i = 0; i < dev->data->nb_rx_queues; i++) {
vf->rxq_map[vec] |= 1 << i;
intr_handle->intr_vec[i] = vec++;
if (vec >= vf->nb_msix)
vec = IAVF_RX_VEC_START;
}
PMD_DRV_LOG(DEBUG,
"%u vectors are mapping to %u Rx queues",
vf->nb_msix, dev->data->nb_rx_queues);
}Should we also reserve 1 vector for admin queue in this case,
or looks like some Rx queue will share the irq vector with admin queue during iavf_config_irq_map which is not expected?
Quoted 28 lines
a/drivers/net/iavf/iavf_vchnl.cb/drivers/net/iavf/iavf_vchnl.cindex 6381fb6..d9a376e 100644drivers/net/iavf/iavf_vchnl.c +1
-1@@ -609,7 +609,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter)return -ENOMEM ; map_info->num_vectors = vf->nb_msix; -for (i =0 ; i < vf->nb_msix; i++) { +for (i =0 ; i < vf->nb_msix -1 ; i++) { vecmap = &map_info->vecmap[i]; vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx = IAVF_ITR_INDEX_DEFAULT; @@ -618,6 +618,12@@
iavf_config_irq_map(struct iavf_adapter *adapter)drivers/net/iavf/iavf_vchnl.c +6
-1vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; } + vecmap = &map_info->vecmap[i]; + vecmap->vsi_id = vf->vsi_res->vsi_id; + vecmap->vector_id =0 ; + vecmap->txq_map =0 ; + vecmap->rxq_map =0 ; + args.ops =VIRTCHNL_OP_CONFIG_IRQ_MAP ; args.in_args = (u8 *)map_info; args.in_args_size = len; --2.7.5
Quoted 83 lines
-----Original Message-----
From: Zhang, Qi Z
Sent: Tuesday, March 19, 2019 12:01 PM
To: Zhao1, Wei <[email protected]>; [email protected]
Cc: [email protected]
Subject: RE: [PATCH] net/iavf: fix vertor interrupt number configuration errorQuoted 38 lines
-----Original Message-----
From: Zhao1, Wei
Sent: Tuesday, March 19, 2019 11:05 AM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH] net/iavf: fix vertor interrupt number configuration errorThere 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")Signed-off-by Wei Zhao <[email protected]>Signed-off-by Zhao Wei <[email protected]>--- drivers/net/iavf/iavf_ethdev.c | 4 ++-- drivers/net/iavf/iavf_vchnl.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-)(quoted diff) +0
-0
b/drivers/net/iavf/iavf_ethdev.cindex
846e604..49c9499 100644drivers/net/iavf/iavf_ethdev.c +1
-1@@ -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 =1 ; + vf->nb_msix =2 ;if (vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_WB_ON_ITR ) {Quoted 1 line
/* If
WB_ON_ITRsupports, enable it */ @@ -338,7+338,7 @@ static
drivers/net/iavf/iavf_ethdev.c static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
Quoted 9 lines
int iavf_config_rx_queues_irqs(struct
rte_eth_dev*dev,drivers/net/iavf/iavf_ethdev.c +1
-1vf->rxq_map[vf->msix_base] |=1 << i; }else {if (!rte_intr_allow_others (intr_handle)) { - vf->nb_msix =1 ; + vf->nb_msix =2 ; vf->msix_base =IAVF_MISC_VEC_ID ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { vf->rxq_map[vf->msix_base] |=1 << i; diff --git
Looks like something missing in below else branch
} else { /* If Rx interrupt is reuquired, and we can use * multi interrupts, then the vec is from 1 */ vf->nb_msix = RTE_MIN(vf->vf_res->max_vectors, intr_handle->nb_efd); vf->msix_base = IAVF_RX_VEC_START; vec = IAVF_RX_VEC_START; for (i = 0; i < dev->data->nb_rx_queues; i++) { vf->rxq_map[vec] |= 1 << i; intr_handle->intr_vec[i] = vec++; if (vec >= vf->nb_msix) vec = IAVF_RX_VEC_START; } PMD_DRV_LOG(DEBUG, "%u vectors are mapping to %u Rx queues", vf->nb_msix, dev->data->nb_rx_queues); }
Quoted 3 lines
Should we also reserve 1 vector for admin queue in this case, or looks like some Rx queue will share the irq vector with admin queue during
iavf_config_irq_mapwhich is not expected?
Yes, we should change to
"
vf->nb_msix = RTE_MIN(vf->vf_res->max_vectors, intr_handle->nb_efd) + 1;
"
in v2
Quoted 31 lines
Quoted 7 lines
a/drivers/net/iavf/iavf_vchnl.cb/drivers/net/iavf/iavf_vchnl.cindex 6381fb6..d9a376e 100644drivers/net/iavf/iavf_vchnl.c iavf_config_irq_map(struct iavf_adapter *adapter) · line 615
Quoted 8 lines
drivers/net/iavf/iavf_vchnl.c +1
-1@@ -609,7 +609,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter)return -ENOMEM ; map_info->num_vectors = vf->nb_msix; -for (i =0 ; i < vf->nb_msix; i++) { +for (i =0 ; i < vf->nb_msix -1 ; i++) { vecmap = &map_info->vecmap[i]; vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx = IAVF_ITR_INDEX_DEFAULT; @@ -618,6+618,12
Quoted 15 lines
@@
iavf_config_irq_map(struct iavf_adapter *adapter)drivers/net/iavf/iavf_vchnl.c +6
-1vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; } + vecmap = &map_info->vecmap[i]; + vecmap->vsi_id = vf->vsi_res->vsi_id; + vecmap->vector_id =0 ; + vecmap->txq_map =0 ; + vecmap->rxq_map =0 ; + args.ops =VIRTCHNL_OP_CONFIG_IRQ_MAP ; args.in_args = (u8 *)map_info; args.in_args_size = len; --2.7.5
Quoted 10 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Wei Zhao
Sent: Monday, March 18, 2019 8:05 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [dpdk-dev] [PATCH] net/iavf: fix vertor interrupt number configuration error
Should the patch name be net/avf?
Quoted 4 lines
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.
I would reword this to be clearer, something like:
The AVF driver needs to send an extra vector number to the Linux PF to Work around an issue with interrupt vector mapping. The admin queue needs to be added to the number of queues sent to the PF.
Quoted 61 lines
Fixes 69dd4c3d0898 ("net/avf: enable queue and device")Signed-off-by Wei Zhao <[email protected]>Signed-off-by Zhao Wei <[email protected]>--- drivers/net/iavf/iavf_ethdev.c | 4 ++-- drivers/net/iavf/iavf_vchnl.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-)drivers/net/iavf/iavf_ethdev.c +1
-1@@ -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 =1 ; + vf->nb_msix =2 ;if (vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_WB_ON_ITR ) {drivers/net/iavf/iavf_ethdev.c +2
-1/* 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] |= 1 << i; }else {if (!rte_intr_allow_others (intr_handle)) { - vf->nb_msix =1 ; + vf->nb_msix =2 ; vf->msix_base =IAVF_MISC_VEC_ID ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { vf->rxq_map[vf->msix_base] |=1 << i; diff --git
a/drivers/net/iavf/iavf_vchnl.cb/drivers/net/iavf/iavf_vchnl.cindex 6381fb6..d9a376e 100644drivers/net/iavf/iavf_vchnl.c +8
-2@@ -609,7 +609,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter)return -ENOMEM ; map_info->num_vectors = vf->nb_msix; -for (i =0 ; i < vf->nb_msix; i++) { +for (i =0 ; i < vf->nb_msix -1 ; i++) { vecmap = &map_info->vecmap[i]; vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx = IAVF_ITR_INDEX_DEFAULT; @@ -618,6 +618,12 @@ iavf_config_irq_map(struct iavf_adapter *adapter) vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; } + vecmap = &map_info->vecmap[i]; + vecmap->vsi_id = vf->vsi_res->vsi_id; + vecmap->vector_id =0 ; + vecmap->txq_map =0 ; + vecmap->rxq_map =0 ; + args.ops =VIRTCHNL_OP_CONFIG_IRQ_MAP ; args.in_args = (u8 *)map_info; args.in_args_size = len; --2.7.5
Quoted 22 lines
-----Original Message-----
From: Stillwell Jr, Paul M
Sent: Tuesday, March 19, 2019 12:17 PM
To: Zhao1, Wei <[email protected]>; [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: RE: [dpdk-dev] [PATCH] net/iavf: fix vertor interrupt number configuration errorQuoted 9 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Wei Zhao
Sent: Monday, March 18, 2019 8:05 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [dpdk-dev] [PATCH] net/iavf: fix vertor interrupt number configuration error
Quoted 1 line
Should the patch name be net/avf?
No, DPDK has change name to iavf in recent days.
Quoted 11 lines
Quoted 5 lines
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.
I would reword this to be clearer, something like:
The AVF driver needs to send an extra vector number to the Linux PF to Work around an issue with interrupt vector mapping. The admin queue needs to be added to the number of queues sent to the PF.
Good, add in v2 later
Quoted 65 lines
Quoted 26 lines
Fixes 69dd4c3d0898 ("net/avf: enable queue and device")Signed-off-by Wei Zhao <[email protected]>Signed-off-by Zhao Wei <[email protected]>--- drivers/net/iavf/iavf_ethdev.c | 4 ++-- drivers/net/iavf/iavf_vchnl.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-)(quoted diff) +0
-0
b/drivers/net/iavf/iavf_ethdev.cindex 846e604..49c9499 100644drivers/net/iavf/iavf_ethdev.c +1
-1@@ -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 =1 ; + vf->nb_msix =2 ;if (vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_WB_ON_ITR ) {drivers/net/iavf/iavf_ethdev.c +0
-0/* If WB_ON_ITR supports, enable it */ @@ -338,7drivers/net/iavf/iavf_ethdev.c static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
Quoted 10 lines
drivers/net/iavf/iavf_ethdev.c +3
-1+338,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev +*dev, vf->rxq_map[vf->msix_base] |= 1 << i; }else {if (!rte_intr_allow_others (intr_handle)) { - vf->nb_msix =1 ; + vf->nb_msix =2 ; vf->msix_base =IAVF_MISC_VEC_ID ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { vf->rxq_map[vf->msix_base] |=1 << i; diff --git
Quoted 28 lines
a/drivers/net/iavf/iavf_vchnl.cb/drivers/net/iavf/iavf_vchnl.cindex 6381fb6..d9a376e 100644drivers/net/iavf/iavf_vchnl.c +8
-2@@ -609,7 +609,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter)return -ENOMEM ; map_info->num_vectors = vf->nb_msix; -for (i =0 ; i < vf->nb_msix; i++) { +for (i =0 ; i < vf->nb_msix -1 ; i++) { vecmap = &map_info->vecmap[i]; vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx = IAVF_ITR_INDEX_DEFAULT; @@ -618,6 +618,12 @@ iavf_config_irq_map(struct iavf_adapter *adapter) vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; } + vecmap = &map_info->vecmap[i]; + vecmap->vsi_id = vf->vsi_res->vsi_id; + vecmap->vector_id =0 ; + vecmap->txq_map =0 ; + vecmap->rxq_map =0 ; + args.ops =VIRTCHNL_OP_CONFIG_IRQ_MAP ; args.in_args = (u8 *)map_info; args.in_args_size = len; --2.7.5
PATCH v2 1/1 net/iavf: fix vertor interrupt number configuration error
In reply to Wei ZhaoThere 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. The AVF driver needs to send an extra vector number to the Linux PF to work around an issue with interrupt vector mapping. The admin queue needs to be added to the number of queues sent to the PF. This patch also set tx queue interrupt vector as a work around, but it maybe cause tx function receive interrupt in some scenario.
---
v2:
update git log and add new work around
--- drivers/net/iavf/iavf_ethdev.c | 6 +++--- drivers/net/iavf/iavf_vchnl.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-)
drivers/net/iavf/iavf_ethdev.c +3 -3
@@ -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 =1 ; + vf->nb_msix =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] |=1 << i; }else {if (!rte_intr_allow_others (intr_handle)) { - vf->nb_msix =1 ; + vf->nb_msix =2 ; vf->msix_base =IAVF_MISC_VEC_ID ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { vf->rxq_map[vf->msix_base] |=1 << i;
@@ -352,7 +352,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,* multi interrupts, then the vec is from 1 */ vf->nb_msix =RTE_MIN (vf->vf_res->max_vectors, - intr_handle->nb_efd); + intr_handle->nb_efd +1 ); vf->msix_base =IAVF_RX_VEC_START ; vec =IAVF_RX_VEC_START ;for (i =0 ; i < dev->data->nb_rx_queues; i++) {
drivers/net/iavf/iavf_vchnl.c +8 -2
@@ -609,15 +609,21 @@ iavf_config_irq_map(struct iavf_adapter *adapter)return -ENOMEM ; map_info->num_vectors = vf->nb_msix; -for (i =0 ; i < vf->nb_msix; i++) { +for (i =0 ; i < vf->nb_msix -1 ; i++) { vecmap = &map_info->vecmap[i]; vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx =IAVF_ITR_INDEX_DEFAULT ; vecmap->vector_id = vf->msix_base + i; - vecmap->txq_map =0 ; vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; + vecmap->txq_map = vecmap->rxq_map; } + vecmap = &map_info->vecmap[i]; + vecmap->vsi_id = vf->vsi_res->vsi_id; + vecmap->vector_id =0 ; + vecmap->txq_map =0 ; + vecmap->rxq_map =0 ; + args.ops =VIRTCHNL_OP_CONFIG_IRQ_MAP ; args.in_args = (u8 *)map_info; args.in_args_size = len;
Signature · 1 line
2.7.5
PATCH v3 1/1 net/iavf: fix Tx interrupt vertor configuration error
There is need to align to kernel iavf code when setting Tx queue interrupt vector in messge VIRTCHNL_OP_CONFIG_IRQ_MAP, if not it maybe cause restart iavf port error in some scenario.
---
v2:
update git log and add new work around
v3:
update git comment and change fix code as suggestion
--- drivers/net/iavf/iavf_vchnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/iavf/iavf_vchnl.c +1 -1
@@ -614,8 +614,8 @@ iavf_config_irq_map(struct iavf_adapter *adapter) vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx =IAVF_ITR_INDEX_DEFAULT ; vecmap->vector_id = vf->msix_base + i; - vecmap->txq_map =0 ; vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; + vecmap->txq_map = vecmap->rxq_map; } args.ops =VIRTCHNL_OP_CONFIG_IRQ_MAP ;
Signature · 1 line
2.7.5
PATCH v4 1/1 net/iavf: fix Tx interrupt vertor configuration error
There is need to align to kernel iavf code when setting Tx queue interrupt vector in messge VIRTCHNL_OP_CONFIG_IRQ_MAP, if not it maybe cause restart iavf port error in some scenario.
---
v2:
update git log and add new work around
v3:
update git comment and change fix code as suggestion
v4:
add txq_map in struct avf_info to keep vector mapping info
--- drivers/net/iavf/iavf.h | 1 + drivers/net/iavf/iavf_ethdev.c | 9 +++++++++ drivers/net/iavf/iavf_vchnl.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-)
drivers/net/iavf/iavf.h +1 -0
@@ -107,6 +107,7 @@ struct iavf_info {uint16_t msix_base;/* msix vector base from */ /* queue bitmask for each vector */ uint16_t rxq_map[IAVF_MAX_MSIX_VECTORS ]; +uint16_t txq_map[IAVF_MAX_MSIX_VECTORS ]; };#define IAVF_MAX_PKT_TYPE 256
drivers/net/iavf/iavf_ethdev.c +9 -0
@@ -336,6 +336,8 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,/* map all queues to the same interrupt */ for (i =0 ; i < dev->data->nb_rx_queues; i++) vf->rxq_map[vf->msix_base] |=1 << i; +for (i =0 ; i < dev->data->nb_tx_queues; i++) + vf->txq_map[vf->msix_base] |=1 << i; }else {if (!rte_intr_allow_others (intr_handle)) { vf->nb_msix =1 ;
@@ -344,6 +346,8 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, vf->rxq_map[vf->msix_base] |=1 << i; intr_handle->intr_vec[i] =IAVF_MISC_VEC_ID ; } +for (i =0 ; i < dev->data->nb_tx_queues; i++) + vf->txq_map[vf->msix_base] |=1 << i;PMD_DRV_LOG (DEBUG ,"vector %u are mapping to all Rx queues" , vf->msix_base);
@@ -361,6 +365,11 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,if (vec >= vf->nb_msix) vec =IAVF_RX_VEC_START ; } +for (i =0 ; i < dev->data->nb_tx_queues; i++) { + vf->txq_map[vec++] |=1 << i; +if (vec >= vf->nb_msix) + vec =IAVF_RX_VEC_START ; + }PMD_DRV_LOG (DEBUG ,"%u vectors are mapping to %u Rx queues" , vf->nb_msix, dev->data->nb_rx_queues);
drivers/net/iavf/iavf_vchnl.c +1 -1
@@ -614,7 +614,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter) vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx =IAVF_ITR_INDEX_DEFAULT ; vecmap->vector_id = vf->msix_base + i; - vecmap->txq_map =0 ; + vecmap->txq_map = vf->txq_map[vf->msix_base + i]; vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; }
Signature · 1 line
2.7.5
Re: [PATCH v4] net/iavf: fix Tx interrupt vertor configuration error
Quoted 10 lines
-----Original Message-----
From: Zhao1, Wei
Sent: Tuesday, March 26, 2019 1:08 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v4] net/iavf: fix Tx interrupt vertor configuration error
Quoted 3 lines
There is need to align to kernel iavf code when setting Tx queue interrupt vector in messge
VIRTCHNL_OP_CONFIG_IRQ_MAP, if not it maybe cause restart iavf port error in some scenario.
Actually , we are not aligned with kernel iavf's implementation which assume rxq = txq
Reword the commit log as below:
According to latest AVF virtual channel spec, interrupt vector is
required to be configured for each Tx queue.
The patch implemented the mechanism by assign interrupt vector to each Tx queue with round robin (same method for Rx queue). This also fixed the unexpected Tx queue config error when hosted by ice kernel driver.
Quoted 6 lines
Fixes 69dd4c3d0898 ("net/avf: enable queue and device")Signed-off-by Wei Zhao <[email protected]>
Applied to dpdk-next-net-intel with above change.
Thanks
Qi
Quoted 80 lines
---
v2:
update git log and add new work aroundv3:
update git comment and change fix code as suggestionv4:
addtxq_mapin structavf_infoto keep vector mapping info--- drivers/net/iavf/iavf.h | 1 + drivers/net/iavf/iavf_ethdev.c | 9 +++++++++ drivers/net/iavf/iavf_vchnl.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-)drivers/net/iavf/iavf.h index renamed from drivers/net/iavf/iavf.h +0
-0e6e3e8d..81d0054 100644
drivers/net/iavf/iavf.h +1
-0@@ -107,6 +107,7 @@ struct iavf_info {uint16_t msix_base;/* msix vector base from */ /* queue bitmask for each vector */ uint16_t rxq_map[IAVF_MAX_MSIX_VECTORS ]; +uint16_t txq_map[IAVF_MAX_MSIX_VECTORS ]; };#define IAVF_MAX_PKT_TYPE 256drivers/net/iavf/iavf_ethdev.c index renamed from drivers/net/iavf/iavf_ethdev.c +0
-0846e604..187a31c 100644
drivers/net/iavf/iavf_ethdev.c +2
-0@@ -336,6 +336,8 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,/* map all queues to the same interrupt */ for (i = 0; i < dev->data->nb_rx_queues; i++) vf->rxq_map[vf->msix_base] |=1 << i; +for (i =0 ; i < dev->data->nb_tx_queues; i++) + vf->txq_map[vf->msix_base] |=1 << i; }else {if (!rte_intr_allow_others (intr_handle)) {drivers/net/iavf/iavf_ethdev.c +2
-0vf->nb_msix =1 ;@@ -344,6 +346,8 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, vf->rxq_map[vf->msix_base] |=1 << i; intr_handle->intr_vec[i] =IAVF_MISC_VEC_ID ; } +for (i =0 ; i < dev->data->nb_tx_queues; i++) + vf->txq_map[vf->msix_base] |=1 << i; PMD_DRV_LOG(DEBUG, "vector %u are mapping to all Rx queues",drivers/net/iavf/iavf_ethdev.c +5
-0vf->msix_base);@@ -361,6 +365,11 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, if (vec >= vf->nb_msix) vec = IAVF_RX_VEC_START; } +for (i =0 ; i < dev->data->nb_tx_queues; i++) { + vf->txq_map[vec++] |=1 << i; +if (vec >= vf->nb_msix) + vec =IAVF_RX_VEC_START ; + } PMD_DRV_LOG(DEBUG, "%u vectors are mapping to %u Rx queues",
vf->nb_msix,dev->data->nb_rx_queues); diff --gita/drivers/net/iavf/iavf_vchnl.cb/drivers/net/iavf/iavf_vchnl.cindex 6381fb6..620e011 100644drivers/net/iavf/iavf_vchnl.c +1
-2@@ -614,7 +614,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter) vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx =IAVF_ITR_INDEX_DEFAULT ; vecmap->vector_id = vf->msix_base + i; - vecmap->txq_map =0 ; + vecmap->txq_map = vf->txq_map[vf->msix_base + i]; vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; } --2.7.5
Re: [PATCH v4] net/iavf: fix Tx interrupt vertor configuration error
Quoted 41 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Zhang, Qi Z
Sent: Tuesday, March 26, 2019 3:03 PM
To: Zhao1, Wei <[email protected]>; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v4] net/iavf: fix Tx interrupt vertor configuration errorQuoted 9 lines
-----Original Message-----
From: Zhao1, Wei
Sent: Tuesday, March 26, 2019 1:08 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v4] net/iavf: fix Tx interrupt vertor configuration errorQuoted 3 lines
There is need to align to kernel iavf code when setting Tx queue interrupt vector in messge
VIRTCHNL_OP_CONFIG_IRQ_MAP, if not it maybe cause restart iavf port error in some scenario.Actually , we are not aligned with kernel iavf's implementation which assume rxq = txq
Reword the commit log as below:
According to latest AVF virtual channel spec, interrupt vector is
required to be configured for each Tx queue.
The patch implemented the mechanism by assign interrupt vector to each Tx queue with round robin (same method for Rx queue). This also fixed the unexpected Tx queue config error when hosted by ice kernel driver.Quoted 4 lines
Fixes 69dd4c3d0898 ("net/avf: enable queue and device")
Quoted 6 lines
Quoted 2 lines
Signed-off-by Wei Zhao <[email protected]>Acked-by Qi Zhang <[email protected]>Applied to dpdk-next-net-intel with above change.
The patch is dropped due to the limitation is removed from virtual channel, no need to worry about Tx interrupt vector in vf side.
Quoted 85 lines
Thanks
QiQuoted 81 lines
---
v2:
update git log and add new work aroundv3:
update git comment and change fix code as suggestionv4:
addtxq_mapin structavf_infoto keep vector mapping info--- drivers/net/iavf/iavf.h | 1 + drivers/net/iavf/iavf_ethdev.c | 9 +++++++++ drivers/net/iavf/iavf_vchnl.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-)drivers/net/iavf/iavf.h index renamed from drivers/net/iavf/iavf.h +0
-0e6e3e8d..81d0054 100644
drivers/net/iavf/iavf.h +1
-0@@ -107,6 +107,7 @@ struct iavf_info {uint16_t msix_base;/* msix vector base from */ /* queue bitmask for each vector */ uint16_t rxq_map[IAVF_MAX_MSIX_VECTORS ]; +uint16_t txq_map[IAVF_MAX_MSIX_VECTORS ]; };#define IAVF_MAX_PKT_TYPE 256(quoted diff) +0
-0
b/drivers/net/iavf/iavf_ethdev.cindex 846e604..187a31c 100644drivers/net/iavf/iavf_ethdev.c +2
-0@@ -336,6 +336,8 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,/* map all queues to the same interrupt */ for (i = 0; i < dev->data->nb_rx_queues; i++) vf->rxq_map[vf->msix_base] |=1 << i; +for (i =0 ; i < dev->data->nb_tx_queues; i++) + vf->txq_map[vf->msix_base] |=1 << i; }else {if (!rte_intr_allow_others (intr_handle)) {drivers/net/iavf/iavf_ethdev.c +2
-0vf->nb_msix =1 ;@@ -344,6 +346,8 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, vf->rxq_map[vf->msix_base] |=1 << i; intr_handle->intr_vec[i] =IAVF_MISC_VEC_ID ; } +for (i =0 ; i < dev->data->nb_tx_queues; i++) + vf->txq_map[vf->msix_base] |=1 << i; PMD_DRV_LOG(DEBUG, "vector %u are mapping to all Rx queues",drivers/net/iavf/iavf_ethdev.c +5
-0vf->msix_base);@@ -361,6 +365,11 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, if (vec >= vf->nb_msix) vec = IAVF_RX_VEC_START; } +for (i =0 ; i < dev->data->nb_tx_queues; i++) { + vf->txq_map[vec++] |=1 << i; +if (vec >= vf->nb_msix) + vec =IAVF_RX_VEC_START ; + } PMD_DRV_LOG(DEBUG, "%u vectors are mapping to %u Rx queues",
vf->nb_msix,dev->data->nb_rx_queues); diff --gita/drivers/net/iavf/iavf_vchnl.cb/drivers/net/iavf/iavf_vchnl.cindex 6381fb6..620e011 100644drivers/net/iavf/iavf_vchnl.c +1
-2@@ -614,7 +614,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter) vecmap->vsi_id = vf->vsi_res->vsi_id; vecmap->rxitr_idx =IAVF_ITR_INDEX_DEFAULT ; vecmap->vector_id = vf->msix_base + i; - vecmap->txq_map =0 ; + vecmap->txq_map = vf->txq_map[vf->msix_base + i]; vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; } --2.7.5