patches for DPDK stable branches
 help / color / mirror / Atom feed
* [PATCH] net/virtio-user: restore callfds index for Rx interrupts
@ 2022-07-04  7:04 Yuan Wang
  2022-07-04  7:42 ` David Marchand
  2022-07-04  8:31 ` Maxime Coquelin
  0 siblings, 2 replies; 4+ messages in thread
From: Yuan Wang @ 2022-07-04  7:04 UTC (permalink / raw)
  To: maxime.coquelin, chenbo.xia, dev
  Cc: jiayu.hu, xingguang.he, cheng1.jiang, hkalra, david.marchand,
	Yuan Wang, stable

The callfds[] array stores eventfds sequentially for Rx and Tx vq.

Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")
Cc: stable@dpdk.org

Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 35aa76b1ff..f9cada05e4 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -417,7 +417,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
 
 	for (i = 0; i < dev->max_queue_pairs; ++i) {
 		if (rte_intr_efds_index_set(eth_dev->intr_handle, i,
-				dev->callfds[i]))
+				dev->callfds[2 * i + VTNET_SQ_RQ_QUEUE_IDX]))
 			return -rte_errno;
 	}
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] net/virtio-user: restore callfds index for Rx interrupts
  2022-07-04  7:04 [PATCH] net/virtio-user: restore callfds index for Rx interrupts Yuan Wang
@ 2022-07-04  7:42 ` David Marchand
  2022-07-05 10:53   ` Thomas Monjalon
  2022-07-04  8:31 ` Maxime Coquelin
  1 sibling, 1 reply; 4+ messages in thread
From: David Marchand @ 2022-07-04  7:42 UTC (permalink / raw)
  To: Yuan Wang
  Cc: Maxime Coquelin, Xia, Chenbo, dev, Jiayu Hu, He, Xingguang,
	Cheng Jiang, Harman Kalra, dpdk stable

On Mon, Jul 4, 2022 at 9:11 AM Yuan Wang <yuanx.wang@intel.com> wrote:
>
> The callfds[] array stores eventfds sequentially for Rx and Tx vq.
>
> Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")
> Cc: stable@dpdk.org
>
> Signed-off-by: Yuan Wang <yuanx.wang@intel.com>

Good catch...

This is what I had fixed in 848e93d9001e ("net/virtio-user: fix Rx
interrupts with multi-queue").
I suppose the issue has been reintroduced when rebasing Harman series.


> ---
>  drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index 35aa76b1ff..f9cada05e4 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -417,7 +417,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
>
>         for (i = 0; i < dev->max_queue_pairs; ++i) {
>                 if (rte_intr_efds_index_set(eth_dev->intr_handle, i,
> -                               dev->callfds[i]))
> +                               dev->callfds[2 * i + VTNET_SQ_RQ_QUEUE_IDX]))
>                         return -rte_errno;
>         }

Reviewed-by: David Marchand <david.marchand@redhat.com>


-- 
David Marchand


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] net/virtio-user: restore callfds index for Rx interrupts
  2022-07-04  7:04 [PATCH] net/virtio-user: restore callfds index for Rx interrupts Yuan Wang
  2022-07-04  7:42 ` David Marchand
@ 2022-07-04  8:31 ` Maxime Coquelin
  1 sibling, 0 replies; 4+ messages in thread
From: Maxime Coquelin @ 2022-07-04  8:31 UTC (permalink / raw)
  To: Yuan Wang, chenbo.xia, dev
  Cc: jiayu.hu, xingguang.he, cheng1.jiang, hkalra, david.marchand, stable



On 7/4/22 09:04, Yuan Wang wrote:
> The callfds[] array stores eventfds sequentially for Rx and Tx vq.
> 
> Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
> ---
>   drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index 35aa76b1ff..f9cada05e4 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -417,7 +417,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
>   
>   	for (i = 0; i < dev->max_queue_pairs; ++i) {
>   		if (rte_intr_efds_index_set(eth_dev->intr_handle, i,
> -				dev->callfds[i]))
> +				dev->callfds[2 * i + VTNET_SQ_RQ_QUEUE_IDX]))
>   			return -rte_errno;
>   	}
>   

Thanks Yuan, good catch!
Applied to dpdk-next-virtio/main.

Maxime


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] net/virtio-user: restore callfds index for Rx interrupts
  2022-07-04  7:42 ` David Marchand
@ 2022-07-05 10:53   ` Thomas Monjalon
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Monjalon @ 2022-07-05 10:53 UTC (permalink / raw)
  To: Yuan Wang, David Marchand
  Cc: stable, Maxime Coquelin, Xia, Chenbo, dev, Jiayu Hu, He,
	Xingguang, Cheng Jiang, Harman Kalra, dpdk stable

04/07/2022 09:42, David Marchand:
> On Mon, Jul 4, 2022 at 9:11 AM Yuan Wang <yuanx.wang@intel.com> wrote:
> >
> > The callfds[] array stores eventfds sequentially for Rx and Tx vq.
> >
> > Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
> 
> Good catch...
> 
> This is what I had fixed in 848e93d9001e ("net/virtio-user: fix Rx
> interrupts with multi-queue").
> I suppose the issue has been reintroduced when rebasing Harman series.

Then we can re-use your commit title which better convey what is fixed
from a user perspective:
	net/virtio-user: fix Rx interrupts with multi-queue




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-07-05 10:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-04  7:04 [PATCH] net/virtio-user: restore callfds index for Rx interrupts Yuan Wang
2022-07-04  7:42 ` David Marchand
2022-07-05 10:53   ` Thomas Monjalon
2022-07-04  8:31 ` Maxime Coquelin

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).