vhost: fix virtqueue initialization
Checks
Commit Message
This patches fixes virtqueue initialization issue causing
segfault or file descriptor being closed unexpectedly.
The wrong index was passed to init_vring_queue() by
alloc_vring_queue() when a hole in the virtqueue array was
met.
Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")
Cc: stable@dpdk.org
Reported-by: Yu Jiang <yux.jiang@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_vhost/vhost.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Fri, Nov 6, 2020 at 3:48 PM Maxime Coquelin
<maxime.coquelin@redhat.com> wrote:
>
> This patches fixes virtqueue initialization issue causing
> segfault or file descriptor being closed unexpectedly.
>
> The wrong index was passed to init_vring_queue() by
> alloc_vring_queue() when a hole in the virtqueue array was
> met.
>
> Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")
> Cc: stable@dpdk.org
>
> Reported-by: Yu Jiang <yux.jiang@intel.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> lib/librte_vhost/vhost.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
> index 8a151a9c1d..b83cf639eb 100644
> --- a/lib/librte_vhost/vhost.c
> +++ b/lib/librte_vhost/vhost.c
> @@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
> }
>
> dev->virtqueue[i] = vq;
> - init_vring_queue(dev, vring_idx);
> + init_vring_queue(dev, i);
> rte_spinlock_init(&vq->access_lock);
> vq->avail_wrap_counter = 1;
> vq->used_wrap_counter = 1;
> --
> 2.26.2
>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Tested-by: JiangYuX <yux.jiang@intel.com>
Best Regards
Jiang yu
> -----Original Message-----
> From: Maxime Coquelin [mailto:maxime.coquelin@redhat.com]
> Sent: Friday, November 6, 2020 10:48 PM
> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>;
> amorenoz@redhat.com
> Cc: stable@dpdk.org; Maxime Coquelin <maxime.coquelin@redhat.com>;
> Jiang, YuX <yux.jiang@intel.com>
> Subject: [PATCH] vhost: fix virtqueue initialization
>
> This patches fixes virtqueue initialization issue causing segfault or file
> descriptor being closed unexpectedly.
>
> The wrong index was passed to init_vring_queue() by
> alloc_vring_queue() when a hole in the virtqueue array was met.
>
> Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")
> Cc: stable@dpdk.org
>
> Reported-by: Yu Jiang <yux.jiang@intel.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> lib/librte_vhost/vhost.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index
> 8a151a9c1d..b83cf639eb 100644
> --- a/lib/librte_vhost/vhost.c
> +++ b/lib/librte_vhost/vhost.c
> @@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t
> vring_idx)
> }
>
> dev->virtqueue[i] = vq;
> - init_vring_queue(dev, vring_idx);
> + init_vring_queue(dev, i);
> rte_spinlock_init(&vq->access_lock);
> vq->avail_wrap_counter = 1;
> vq->used_wrap_counter = 1;
> --
> 2.26.2
On 11/6/20 3:47 PM, Maxime Coquelin wrote:
> This patches fixes virtqueue initialization issue causing
> segfault or file descriptor being closed unexpectedly.
>
> The wrong index was passed to init_vring_queue() by
> alloc_vring_queue() when a hole in the virtqueue array was
> met.
>
> Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")
> Cc: stable@dpdk.org
>
> Reported-by: Yu Jiang <yux.jiang@intel.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> lib/librte_vhost/vhost.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
> index 8a151a9c1d..b83cf639eb 100644
> --- a/lib/librte_vhost/vhost.c
> +++ b/lib/librte_vhost/vhost.c
> @@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
> }
>
> dev->virtqueue[i] = vq;
> - init_vring_queue(dev, vring_idx);
> + init_vring_queue(dev, i);
> rte_spinlock_init(&vq->access_lock);
> vq->avail_wrap_counter = 1;
> vq->used_wrap_counter = 1;
>
Applied to dpdk-next-virtio/main.
Thanks,
Maxime
On 11/6/2020 2:47 PM, Maxime Coquelin wrote:
> This patches fixes virtqueue initialization issue causing
> segfault or file descriptor being closed unexpectedly.
>
> The wrong index was passed to init_vring_queue() by
> alloc_vring_queue() when a hole in the virtqueue array was
> met.
>
> Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")
> Cc: stable@dpdk.org
>
Since the issue is introduced in this release, there is nothing to backport and
stable tag is not required, removing it in next-net.
> Reported-by: Yu Jiang <yux.jiang@intel.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> lib/librte_vhost/vhost.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
> index 8a151a9c1d..b83cf639eb 100644
> --- a/lib/librte_vhost/vhost.c
> +++ b/lib/librte_vhost/vhost.c
> @@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
> }
>
> dev->virtqueue[i] = vq;
> - init_vring_queue(dev, vring_idx);
> + init_vring_queue(dev, i);
> rte_spinlock_init(&vq->access_lock);
> vq->avail_wrap_counter = 1;
> vq->used_wrap_counter = 1;
>
On 11/9/2020 5:09 AM, Jiang, YuX wrote:
> Tested-by: JiangYuX <yux.jiang@intel.com>
>
Please don't top post.
Also tag should be: "Tested-by: Yu Jiang <yux.jiang@intel.com>"
>
>> -----Original Message-----
>> From: Maxime Coquelin [mailto:maxime.coquelin@redhat.com]
>> Sent: Friday, November 6, 2020 10:48 PM
>> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>;
>> amorenoz@redhat.com
>> Cc: stable@dpdk.org; Maxime Coquelin <maxime.coquelin@redhat.com>;
>> Jiang, YuX <yux.jiang@intel.com>
>> Subject: [PATCH] vhost: fix virtqueue initialization
>>
>> This patches fixes virtqueue initialization issue causing segfault or file
>> descriptor being closed unexpectedly.
>>
>> The wrong index was passed to init_vring_queue() by
>> alloc_vring_queue() when a hole in the virtqueue array was met.
>>
>> Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")
>> Cc: stable@dpdk.org
>>
>> Reported-by: Yu Jiang <yux.jiang@intel.com>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>> lib/librte_vhost/vhost.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index
>> 8a151a9c1d..b83cf639eb 100644
>> --- a/lib/librte_vhost/vhost.c
>> +++ b/lib/librte_vhost/vhost.c
>> @@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t
>> vring_idx)
>> }
>>
>> dev->virtqueue[i] = vq;
>> - init_vring_queue(dev, vring_idx);
>> + init_vring_queue(dev, i);
>> rte_spinlock_init(&vq->access_lock);
>> vq->avail_wrap_counter = 1;
>> vq->used_wrap_counter = 1;
>> --
>> 2.26.2
>
On 11/9/20 7:37 PM, Ferruh Yigit wrote:
> On 11/6/2020 2:47 PM, Maxime Coquelin wrote:
>> This patches fixes virtqueue initialization issue causing
>> segfault or file descriptor being closed unexpectedly.
>>
>> The wrong index was passed to init_vring_queue() by
>> alloc_vring_queue() when a hole in the virtqueue array was
>> met.
>>
>> Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")
>> Cc: stable@dpdk.org
>>
>
> Since the issue is introduced in this release, there is nothing to
> backport and stable tag is not required, removing it in next-net.
I cc'ed stable because it is fixing a fix that was stable candidate.
>> Reported-by: Yu Jiang <yux.jiang@intel.com>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>> lib/librte_vhost/vhost.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
>> index 8a151a9c1d..b83cf639eb 100644
>> --- a/lib/librte_vhost/vhost.c
>> +++ b/lib/librte_vhost/vhost.c
>> @@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t
>> vring_idx)
>> }
>> dev->virtqueue[i] = vq;
>> - init_vring_queue(dev, vring_idx);
>> + init_vring_queue(dev, i);
>> rte_spinlock_init(&vq->access_lock);
>> vq->avail_wrap_counter = 1;
>> vq->used_wrap_counter = 1;
>>
>
On 11/9/2020 6:37 PM, Ferruh Yigit wrote:
> On 11/6/2020 2:47 PM, Maxime Coquelin wrote:
>> This patches fixes virtqueue initialization issue causing
>> segfault or file descriptor being closed unexpectedly.
>>
>> The wrong index was passed to init_vring_queue() by
>> alloc_vring_queue() when a hole in the virtqueue array was
>> met.
>>
>> Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")
>> Cc: stable@dpdk.org
>>
>
> Since the issue is introduced in this release, there is nothing to backport and
> stable tag is not required, removing it in next-net.
>
But it is fixing a fix, there is a chain, so adding it back, sorry for noise ...
>> Reported-by: Yu Jiang <yux.jiang@intel.com>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>> lib/librte_vhost/vhost.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
>> index 8a151a9c1d..b83cf639eb 100644
>> --- a/lib/librte_vhost/vhost.c
>> +++ b/lib/librte_vhost/vhost.c
>> @@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
>> }
>> dev->virtqueue[i] = vq;
>> - init_vring_queue(dev, vring_idx);
>> + init_vring_queue(dev, i);
>> rte_spinlock_init(&vq->access_lock);
>> vq->avail_wrap_counter = 1;
>> vq->used_wrap_counter = 1;
>>
>
@@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
}
dev->virtqueue[i] = vq;
- init_vring_queue(dev, vring_idx);
+ init_vring_queue(dev, i);
rte_spinlock_init(&vq->access_lock);
vq->avail_wrap_counter = 1;
vq->used_wrap_counter = 1;