DPDK patches and discussions
 help / color / mirror / Atom feed
From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, tiwei.bie@intel.com, zhihong.wang@intel.com,
	jfreimann@redhat.com, nicknickolaev@gmail.com,
	i.maximets@samsung.com, bruce.richardson@intel.com,
	alejandro.lucero@netronome.com
Cc: dgilbert@redhat.com, stable@dpdk.org,
	Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH v6 05/19] vhost: fix error handling when mem table gets updated
Date: Thu, 11 Oct 2018 11:24:18 +0200	[thread overview]
Message-ID: <20181011092432.22275-6-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20181011092432.22275-1-maxime.coquelin@redhat.com>

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: d5022533c20a ("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>
---
 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 1ef02c943..83d3e6321 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -953,8 +953,10 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg)
 			vring_invalidate(dev, vq);
 
 			dev = translate_ring_addresses(dev, i);
-			if (!dev)
-				return VH_RESULT_ERR;
+			if (!dev) {
+				dev = *pdev;
+				goto err_mmap;
+			}
 
 			*pdev = dev;
 		}
-- 
2.17.1

  parent reply	other threads:[~2018-10-11  9:25 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-11  9:24 [dpdk-dev] [PATCH v6 00/19] vhost: add postcopy live-migration support Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 01/19] vhost: fix messages results handling Maxime Coquelin
2018-10-11 16:18   ` Ilya Maximets
2018-10-12  9:03     ` Maxime Coquelin
2018-10-12  9:55       ` Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 02/19] vhost: fix return code of messages requiring replies Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 03/19] vhost: clarify reply-ack in case a reply was already sent Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 04/19] vhost: fix payload size of reply Maxime Coquelin
2018-10-11  9:24 ` Maxime Coquelin [this message]
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 06/19] vhost: define postcopy protocol flag Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 07/19] vhost: add number of fds to vhost-user messages and use it Maxime Coquelin
2018-10-11 15:59   ` Ilya Maximets
2018-10-12  8:43     ` Maxime Coquelin
2018-10-12  8:45       ` Maxime Coquelin
2018-10-12  8:57         ` Maxime Coquelin
2018-10-12  9:53           ` Ilya Maximets
2018-10-12  9:52             ` Maxime Coquelin
2018-10-12 10:04               ` Ilya Maximets
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 08/19] vhost: pass socket fd to message handling callbacks Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 09/19] vhost: enable fds passing when sending vhost-user messages Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 10/19] vhost: add config flag for postcopy feature Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 11/19] vhost: introduce postcopy's advise message Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 12/19] vhost: add support for postcopy's listen message Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 13/19] vhost: register new regions with userfaultfd Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 14/19] vhost: avoid useless VhostUserMemory copy Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 15/19] vhost: send userfault range addresses back to qemu Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 16/19] vhost: add support to postcopy's end request Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 17/19] vhost: restrict postcopy live-migration enablement Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 18/19] net/vhost: add parameter to enable postcopy support Maxime Coquelin
2018-10-11  9:24 ` [dpdk-dev] [PATCH v6 19/19] vhost: enable postcopy protocol feature Maxime Coquelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181011092432.22275-6-maxime.coquelin@redhat.com \
    --to=maxime.coquelin@redhat.com \
    --cc=alejandro.lucero@netronome.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=dgilbert@redhat.com \
    --cc=i.maximets@samsung.com \
    --cc=jfreimann@redhat.com \
    --cc=nicknickolaev@gmail.com \
    --cc=stable@dpdk.org \
    --cc=tiwei.bie@intel.com \
    --cc=zhihong.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).