* [dpdk-stable] [PATCH] net/iavf: fix vector mapping with queue
@ 2021-01-28 2:37 Jingjing Wu
2021-01-28 3:32 ` Xing, Beilei
2021-01-28 15:00 ` [dpdk-stable] [PATCH v2] " Jingjing Wu
0 siblings, 2 replies; 5+ messages in thread
From: Jingjing Wu @ 2021-01-28 2:37 UTC (permalink / raw)
To: dev; +Cc: jingjing.wu, beilei.xing, stable
Fix the vector mapping with queue by changing the recircle when
exceeds RX_VEC_START + nb_msix;
Fixes: d6bde6b5eae9 ("net/avf: enable Rx interrupt")
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
drivers/net/iavf/iavf_ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index cf6ea0b15..eb800771d 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -612,7 +612,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
/* 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,
+ vf->nb_msix = RTE_MIN(vf->vf_res->max_vectors - 1,
intr_handle->nb_efd);
vf->msix_base = IAVF_RX_VEC_START;
vec = IAVF_RX_VEC_START;
@@ -620,7 +620,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
qv_map[i].queue_id = i;
qv_map[i].vector_id = vec;
intr_handle->intr_vec[i] = vec++;
- if (vec >= vf->nb_msix)
+ if (vec >= vf->nb_msix + IAVF_RX_VEC_START)
vec = IAVF_RX_VEC_START;
}
vf->qv_map = qv_map;
--
2.21.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-stable] [PATCH] net/iavf: fix vector mapping with queue
2021-01-28 2:37 [dpdk-stable] [PATCH] net/iavf: fix vector mapping with queue Jingjing Wu
@ 2021-01-28 3:32 ` Xing, Beilei
2021-01-28 14:07 ` Zhang, Qi Z
2021-01-28 15:00 ` [dpdk-stable] [PATCH v2] " Jingjing Wu
1 sibling, 1 reply; 5+ messages in thread
From: Xing, Beilei @ 2021-01-28 3:32 UTC (permalink / raw)
To: Wu, Jingjing, dev; +Cc: stable
> -----Original Message-----
> From: Wu, Jingjing <jingjing.wu@intel.com>
> Sent: Thursday, January 28, 2021 10:37 AM
> To: dev@dpdk.org
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> stable@dpdk.org
> Subject: [PATCH] net/iavf: fix vector mapping with queue
>
> Fix the vector mapping with queue by changing the recircle when exceeds
> RX_VEC_START + nb_msix;
>
> Fixes: d6bde6b5eae9 ("net/avf: enable Rx interrupt")
>
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> drivers/net/iavf/iavf_ethdev.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
> index cf6ea0b15..eb800771d 100644
> --- a/drivers/net/iavf/iavf_ethdev.c
> +++ b/drivers/net/iavf/iavf_ethdev.c
> @@ -612,7 +612,7 @@ static int iavf_config_rx_queues_irqs(struct
> rte_eth_dev *dev,
> /* 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,
> + vf->nb_msix = RTE_MIN(vf->vf_res->max_vectors - 1,
> intr_handle->nb_efd);
> vf->msix_base = IAVF_RX_VEC_START;
> vec = IAVF_RX_VEC_START;
> @@ -620,7 +620,7 @@ static int iavf_config_rx_queues_irqs(struct
> rte_eth_dev *dev,
> qv_map[i].queue_id = i;
> qv_map[i].vector_id = vec;
> intr_handle->intr_vec[i] = vec++;
> - if (vec >= vf->nb_msix)
> + if (vec >= vf->nb_msix + IAVF_RX_VEC_START)
> vec = IAVF_RX_VEC_START;
> }
> vf->qv_map = qv_map;
> --
> 2.21.1
Acked-by: Beilei Xing <beilei.xing@intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-stable] [PATCH] net/iavf: fix vector mapping with queue
2021-01-28 3:32 ` Xing, Beilei
@ 2021-01-28 14:07 ` Zhang, Qi Z
0 siblings, 0 replies; 5+ messages in thread
From: Zhang, Qi Z @ 2021-01-28 14:07 UTC (permalink / raw)
To: Xing, Beilei, Wu, Jingjing, dev; +Cc: stable
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Xing, Beilei
> Sent: Thursday, January 28, 2021 11:32 AM
> To: Wu, Jingjing <jingjing.wu@intel.com>; dev@dpdk.org
> Cc: stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/iavf: fix vector mapping with queue
>
>
>
> > -----Original Message-----
> > From: Wu, Jingjing <jingjing.wu@intel.com>
> > Sent: Thursday, January 28, 2021 10:37 AM
> > To: dev@dpdk.org
> > Cc: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei
> > <beilei.xing@intel.com>; stable@dpdk.org
> > Subject: [PATCH] net/iavf: fix vector mapping with queue
> >
> > Fix the vector mapping with queue by changing the recircle when
> > exceeds RX_VEC_START + nb_msix;
> >
> > Fixes: d6bde6b5eae9 ("net/avf: enable Rx interrupt")
> >
> > Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> > ---
> > drivers/net/iavf/iavf_ethdev.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/iavf/iavf_ethdev.c
> > b/drivers/net/iavf/iavf_ethdev.c index cf6ea0b15..eb800771d 100644
> > --- a/drivers/net/iavf/iavf_ethdev.c
> > +++ b/drivers/net/iavf/iavf_ethdev.c
> > @@ -612,7 +612,7 @@ static int iavf_config_rx_queues_irqs(struct
> > rte_eth_dev *dev,
> > /* 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,
> > + vf->nb_msix = RTE_MIN(vf->vf_res->max_vectors - 1,
> > intr_handle->nb_efd);
> > vf->msix_base = IAVF_RX_VEC_START;
> > vec = IAVF_RX_VEC_START;
> > @@ -620,7 +620,7 @@ static int iavf_config_rx_queues_irqs(struct
> > rte_eth_dev *dev,
> > qv_map[i].queue_id = i;
> > qv_map[i].vector_id = vec;
> > intr_handle->intr_vec[i] = vec++;
> > - if (vec >= vf->nb_msix)
> > + if (vec >= vf->nb_msix + IAVF_RX_VEC_START)
> > vec = IAVF_RX_VEC_START;
> > }
> > vf->qv_map = qv_map;
> > --
> > 2.21.1
>
> Acked-by: Beilei Xing <beilei.xing@intel.com>
The patch has some compile warning need to be fixed.
[1/23] Compiling C object drivers/libtmp_rte_net_iavf.a.p/net_iavf_iavf_ethdev.c.o
In file included from ../lib/librte_eal/x86/include/rte_byteorder.h:13,
from ../drivers/net/iavf/iavf_ethdev.c:13:
../drivers/net/iavf/iavf_ethdev.c: In function 'iavf_config_rx_queues_irqs':
../lib/librte_eal/include/rte_common.h:577:6: warning: comparison of integer expressions of different signedness: 'int' and 'uint32_t' {aka 'unsigned int'} [-Wsign-compare]
577 | _a < _b ? _a : _b; \
| ^
../drivers/net/iavf/iavf_ethdev.c:613:18: note: in expansion of macro 'RTE_MIN'
613 | vf->nb_msix = RTE_MIN(vf->vf_res->max_vectors - 1,
| ^~~~~~~
../lib/librte_eal/include/rte_common.h:577:13: warning: operand of '?:' changes signedness from 'int' to 'uint32_t' {aka 'unsigned int'} due to unsignedness of other operand [-Wsign-compare]
577 | _a < _b ? _a : _b; \
| ^~
../drivers/net/iavf/iavf_ethdev.c:613:18: note: in expansion of macro 'RTE_MIN'
613 | vf->nb_msix = RTE_MIN(vf->vf_res->max_vectors - 1,
| ^~~~~~~
[23/23] Linking target app/dpdk-test-regex
Regards
Qi
^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-stable] [PATCH v2] net/iavf: fix vector mapping with queue
2021-01-28 2:37 [dpdk-stable] [PATCH] net/iavf: fix vector mapping with queue Jingjing Wu
2021-01-28 3:32 ` Xing, Beilei
@ 2021-01-28 15:00 ` Jingjing Wu
2021-01-29 2:24 ` [dpdk-stable] [dpdk-dev] " Zhang, Qi Z
1 sibling, 1 reply; 5+ messages in thread
From: Jingjing Wu @ 2021-01-28 15:00 UTC (permalink / raw)
To: dev; +Cc: jingjing.wu, beilei.xing, stable
Fix the vector mapping with queue by changing the recircle when
exceeds RX_VEC_START + nb_msix;
Fixes: d6bde6b5eae9 ("net/avf: enable Rx interrupt")
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
v2:
- fix compile warning.
drivers/net/iavf/iavf_ethdev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index cf6ea0b15..744904e6e 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -612,15 +612,15 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
/* 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->nb_msix = RTE_MIN(intr_handle->nb_efd,
+ (uint16_t)(vf->vf_res->max_vectors - 1));
vf->msix_base = IAVF_RX_VEC_START;
vec = IAVF_RX_VEC_START;
for (i = 0; i < dev->data->nb_rx_queues; i++) {
qv_map[i].queue_id = i;
qv_map[i].vector_id = vec;
intr_handle->intr_vec[i] = vec++;
- if (vec >= vf->nb_msix)
+ if (vec >= vf->nb_msix + IAVF_RX_VEC_START)
vec = IAVF_RX_VEC_START;
}
vf->qv_map = qv_map;
--
2.21.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH v2] net/iavf: fix vector mapping with queue
2021-01-28 15:00 ` [dpdk-stable] [PATCH v2] " Jingjing Wu
@ 2021-01-29 2:24 ` Zhang, Qi Z
0 siblings, 0 replies; 5+ messages in thread
From: Zhang, Qi Z @ 2021-01-29 2:24 UTC (permalink / raw)
To: Wu, Jingjing, dev; +Cc: Wu, Jingjing, Xing, Beilei, stable
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Jingjing Wu
> Sent: Thursday, January 28, 2021 11:00 PM
> To: dev@dpdk.org
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> stable@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] net/iavf: fix vector mapping with queue
>
> Fix the vector mapping with queue by changing the recircle when exceeds
> RX_VEC_START + nb_msix;
>
> Fixes: d6bde6b5eae9 ("net/avf: enable Rx interrupt")
>
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> v2:
> - fix compile warning.
>
> drivers/net/iavf/iavf_ethdev.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index
> cf6ea0b15..744904e6e 100644
> --- a/drivers/net/iavf/iavf_ethdev.c
> +++ b/drivers/net/iavf/iavf_ethdev.c
> @@ -612,15 +612,15 @@ static int iavf_config_rx_queues_irqs(struct
> rte_eth_dev *dev,
> /* 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->nb_msix = RTE_MIN(intr_handle->nb_efd,
> + (uint16_t)(vf->vf_res->max_vectors - 1));
> vf->msix_base = IAVF_RX_VEC_START;
> vec = IAVF_RX_VEC_START;
> for (i = 0; i < dev->data->nb_rx_queues; i++) {
> qv_map[i].queue_id = i;
> qv_map[i].vector_id = vec;
> intr_handle->intr_vec[i] = vec++;
> - if (vec >= vf->nb_msix)
> + if (vec >= vf->nb_msix + IAVF_RX_VEC_START)
> vec = IAVF_RX_VEC_START;
> }
> vf->qv_map = qv_map;
> --
> 2.21.1
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-29 2:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-28 2:37 [dpdk-stable] [PATCH] net/iavf: fix vector mapping with queue Jingjing Wu
2021-01-28 3:32 ` Xing, Beilei
2021-01-28 14:07 ` Zhang, Qi Z
2021-01-28 15:00 ` [dpdk-stable] [PATCH v2] " Jingjing Wu
2021-01-29 2:24 ` [dpdk-stable] [dpdk-dev] " Zhang, Qi Z
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).