* [dpdk-stable] [PATCH v17.11 LTS] vhost: fix error handling when mem table gets updated
@ 2019-02-26 10:20 Maxime Coquelin
2019-03-04 19:19 ` Yongseok Koh
0 siblings, 1 reply; 2+ messages in thread
From: Maxime Coquelin @ 2019-02-26 10:20 UTC (permalink / raw)
To: stable, yskoh; +Cc: Maxime Coquelin, Ilya Maximets
[ upstream commit 74ee315e4f1bcbcabae054d310b730be13e49ad4 ]
When the memory table gets updated, the rings addresses need
to be translated again. If it fails, we need to exit cleanly
by unmapping memory regions.
Fixes: 96935c61631f ("vhost: retranslate vring addr when memory table changes")
Cc: stable@dpdk.org
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: Ilya Maximets <i.maximets@samsung.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_vhost/vhost_user.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 9ab37ae5e..d70778b22 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -761,8 +761,10 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *pmsg)
vring_invalidate(dev, vq);
dev = translate_ring_addresses(dev, i);
- if (!dev)
- return -1;
+ if (!dev) {
+ dev = *pdev;
+ goto err_mmap;
+ }
*pdev = dev;
}
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-stable] [PATCH v17.11 LTS] vhost: fix error handling when mem table gets updated
2019-02-26 10:20 [dpdk-stable] [PATCH v17.11 LTS] vhost: fix error handling when mem table gets updated Maxime Coquelin
@ 2019-03-04 19:19 ` Yongseok Koh
0 siblings, 0 replies; 2+ messages in thread
From: Yongseok Koh @ 2019-03-04 19:19 UTC (permalink / raw)
To: Maxime Coquelin; +Cc: stable, Ilya Maximets
> On Feb 26, 2019, at 2:20 AM, Maxime Coquelin <maxime.coquelin@redhat.com> wrote:
>
> [ upstream commit 74ee315e4f1bcbcabae054d310b730be13e49ad4 ]
>
> When the memory table gets updated, the rings addresses need
> to be translated again. If it fails, we need to exit cleanly
> by unmapping memory regions.
>
> Fixes: 96935c61631f ("vhost: retranslate vring addr when memory table changes")
> Cc: stable@dpdk.org
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> Acked-by: Ilya Maximets <i.maximets@samsung.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
Applied to stable/17.11
Thanks,
Yongseok
> lib/librte_vhost/vhost_user.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 9ab37ae5e..d70778b22 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -761,8 +761,10 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *pmsg)
> vring_invalidate(dev, vq);
>
> dev = translate_ring_addresses(dev, i);
> - if (!dev)
> - return -1;
> + if (!dev) {
> + dev = *pdev;
> + goto err_mmap;
> + }
>
> *pdev = dev;
> }
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-04 19:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-26 10:20 [dpdk-stable] [PATCH v17.11 LTS] vhost: fix error handling when mem table gets updated Maxime Coquelin
2019-03-04 19:19 ` Yongseok Koh
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).