* [PATCH] vhost: fix unsafe vrings addresses modifications
@ 2022-01-27 11:09 Maxime Coquelin
2022-02-17 7:32 ` Xia, Chenbo
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Maxime Coquelin @ 2022-01-27 11:09 UTC (permalink / raw)
To: dev, chenbo.xia, yuanx.wang, david.marchand; +Cc: stable, Maxime Coquelin
This patch adds missing protection around vring_invalidate
and translate_ring_addresses calls in vhost_user_iotlb_msg.
Fixes: eefac9536a90 ("vhost: postpone device creation until rings are mapped")
Cc: stable@dpdk.org
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/vhost/vhost_user.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 5eb1dd6812..ae8513c465 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -2566,8 +2566,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,
vhost_user_iotlb_cache_insert(vq, imsg->iova, vva,
len, imsg->perm);
- if (is_vring_iotlb(dev, vq, imsg))
+ if (is_vring_iotlb(dev, vq, imsg)) {
+ rte_spinlock_lock(&vq->access_lock);
*pdev = dev = translate_ring_addresses(dev, i);
+ rte_spinlock_unlock(&vq->access_lock);
+ }
}
break;
case VHOST_IOTLB_INVALIDATE:
@@ -2580,8 +2583,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,
vhost_user_iotlb_cache_remove(vq, imsg->iova,
imsg->size);
- if (is_vring_iotlb(dev, vq, imsg))
+ if (is_vring_iotlb(dev, vq, imsg)) {
+ rte_spinlock_lock(&vq->access_lock);
vring_invalidate(dev, vq);
+ rte_spinlock_unlock(&vq->access_lock);
+ }
}
break;
default:
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH] vhost: fix unsafe vrings addresses modifications
2022-01-27 11:09 [PATCH] vhost: fix unsafe vrings addresses modifications Maxime Coquelin
@ 2022-02-17 7:32 ` Xia, Chenbo
2022-02-17 8:00 ` David Marchand
2022-02-17 8:55 ` Maxime Coquelin
2 siblings, 0 replies; 4+ messages in thread
From: Xia, Chenbo @ 2022-02-17 7:32 UTC (permalink / raw)
To: Maxime Coquelin, dev, Wang, YuanX, david.marchand; +Cc: stable
> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Thursday, January 27, 2022 7:10 PM
> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>; Wang, YuanX
> <yuanx.wang@intel.com>; david.marchand@redhat.com
> Cc: stable@dpdk.org; Maxime Coquelin <maxime.coquelin@redhat.com>
> Subject: [PATCH] vhost: fix unsafe vrings addresses modifications
>
> This patch adds missing protection around vring_invalidate
> and translate_ring_addresses calls in vhost_user_iotlb_msg.
>
> Fixes: eefac9536a90 ("vhost: postpone device creation until rings are mapped")
> Cc: stable@dpdk.org
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> lib/vhost/vhost_user.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> index 5eb1dd6812..ae8513c465 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -2566,8 +2566,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct
> VhostUserMsg *msg,
> vhost_user_iotlb_cache_insert(vq, imsg->iova, vva,
> len, imsg->perm);
>
> - if (is_vring_iotlb(dev, vq, imsg))
> + if (is_vring_iotlb(dev, vq, imsg)) {
> + rte_spinlock_lock(&vq->access_lock);
> *pdev = dev = translate_ring_addresses(dev, i);
> + rte_spinlock_unlock(&vq->access_lock);
> + }
> }
> break;
> case VHOST_IOTLB_INVALIDATE:
> @@ -2580,8 +2583,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct
> VhostUserMsg *msg,
> vhost_user_iotlb_cache_remove(vq, imsg->iova,
> imsg->size);
>
> - if (is_vring_iotlb(dev, vq, imsg))
> + if (is_vring_iotlb(dev, vq, imsg)) {
> + rte_spinlock_lock(&vq->access_lock);
> vring_invalidate(dev, vq);
> + rte_spinlock_unlock(&vq->access_lock);
> + }
> }
> break;
> default:
> --
> 2.34.1
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] vhost: fix unsafe vrings addresses modifications
2022-01-27 11:09 [PATCH] vhost: fix unsafe vrings addresses modifications Maxime Coquelin
2022-02-17 7:32 ` Xia, Chenbo
@ 2022-02-17 8:00 ` David Marchand
2022-02-17 8:55 ` Maxime Coquelin
2 siblings, 0 replies; 4+ messages in thread
From: David Marchand @ 2022-02-17 8:00 UTC (permalink / raw)
To: Maxime Coquelin; +Cc: dev, Xia, Chenbo, Wang, YuanX, dpdk stable
On Thu, Jan 27, 2022 at 12:10 PM Maxime Coquelin
<maxime.coquelin@redhat.com> wrote:
>
> This patch adds missing protection around vring_invalidate
> and translate_ring_addresses calls in vhost_user_iotlb_msg.
>
> Fixes: eefac9536a90 ("vhost: postpone device creation until rings are mapped")
> Cc: stable@dpdk.org
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
--
David Marchand
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] vhost: fix unsafe vrings addresses modifications
2022-01-27 11:09 [PATCH] vhost: fix unsafe vrings addresses modifications Maxime Coquelin
2022-02-17 7:32 ` Xia, Chenbo
2022-02-17 8:00 ` David Marchand
@ 2022-02-17 8:55 ` Maxime Coquelin
2 siblings, 0 replies; 4+ messages in thread
From: Maxime Coquelin @ 2022-02-17 8:55 UTC (permalink / raw)
To: dev, chenbo.xia, yuanx.wang, david.marchand; +Cc: stable
On 1/27/22 12:09, Maxime Coquelin wrote:
> This patch adds missing protection around vring_invalidate
> and translate_ring_addresses calls in vhost_user_iotlb_msg.
>
> Fixes: eefac9536a90 ("vhost: postpone device creation until rings are mapped")
> Cc: stable@dpdk.org
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> lib/vhost/vhost_user.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> index 5eb1dd6812..ae8513c465 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -2566,8 +2566,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,
> vhost_user_iotlb_cache_insert(vq, imsg->iova, vva,
> len, imsg->perm);
>
> - if (is_vring_iotlb(dev, vq, imsg))
> + if (is_vring_iotlb(dev, vq, imsg)) {
> + rte_spinlock_lock(&vq->access_lock);
> *pdev = dev = translate_ring_addresses(dev, i);
> + rte_spinlock_unlock(&vq->access_lock);
> + }
> }
> break;
> case VHOST_IOTLB_INVALIDATE:
> @@ -2580,8 +2583,11 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,
> vhost_user_iotlb_cache_remove(vq, imsg->iova,
> imsg->size);
>
> - if (is_vring_iotlb(dev, vq, imsg))
> + if (is_vring_iotlb(dev, vq, imsg)) {
> + rte_spinlock_lock(&vq->access_lock);
> vring_invalidate(dev, vq);
> + rte_spinlock_unlock(&vq->access_lock);
> + }
> }
> break;
> default:
Applied to dpdk-next-virtio/main.
Thanks,
Maxime
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-17 8:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-27 11:09 [PATCH] vhost: fix unsafe vrings addresses modifications Maxime Coquelin
2022-02-17 7:32 ` Xia, Chenbo
2022-02-17 8:00 ` David Marchand
2022-02-17 8:55 ` 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).