From: Yongseok Koh <yskoh@mellanox.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: Tiwei Bie <tiwei.bie@intel.com>,
Jens Freimann <jfreimann@redhat.com>,
dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'vhost: flush IOTLB cache on new mem table handling' has been queued to LTS release 17.11.4
Date: Mon, 13 Aug 2018 13:42:08 -0700 [thread overview]
Message-ID: <20180813204213.25436-5-yskoh@mellanox.com> (raw)
In-Reply-To: <20180813204213.25436-1-yskoh@mellanox.com>
Hi,
FYI, your patch has been queued to LTS release 17.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/15/18. So please
shout if anyone has objections.
Thanks.
Yongseok
---
>From bae2e496c2701404140ebd9e676d5c43295fabda Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Thu, 2 Aug 2018 19:21:22 +0200
Subject: [PATCH] vhost: flush IOTLB cache on new mem table handling
[ upstream commit af53db486792f3d864c9a30dc13ee12402994640 ]
IOTLB entries contain the host virtual address of the guest
pages. When receiving a new VHOST_USER_SET_MEM_TABLE request,
the previous regions get unmapped, so the IOTLB entries, if any,
will be invalid. It does cause the vhost-user process to
segfault.
This patch introduces a new function to flush the IOTLB cache,
and call it as soon as the backend handles a VHOST_USER_SET_MEM
request.
Fixes: 69c90e98f483 ("vhost: enable IOMMU support")
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Jens Freimann <jfreimann@redhat.com>
---
lib/librte_vhost/iotlb.c | 10 ++++++++--
lib/librte_vhost/iotlb.h | 2 +-
lib/librte_vhost/vhost_user.c | 5 +++++
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index c11ebcaac..c6354fef7 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -303,6 +303,13 @@ out:
return vva;
}
+void
+vhost_user_iotlb_flush_all(struct vhost_virtqueue *vq)
+{
+ vhost_user_iotlb_cache_remove_all(vq);
+ vhost_user_iotlb_pending_remove_all(vq);
+}
+
int
vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
{
@@ -315,8 +322,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
* The cache has already been initialized,
* just drop all cached and pending entries.
*/
- vhost_user_iotlb_cache_remove_all(vq);
- vhost_user_iotlb_pending_remove_all(vq);
+ vhost_user_iotlb_flush_all(vq);
}
#ifdef RTE_LIBRTE_VHOST_NUMA
diff --git a/lib/librte_vhost/iotlb.h b/lib/librte_vhost/iotlb.h
index e7083e37b..60b9e4c57 100644
--- a/lib/librte_vhost/iotlb.h
+++ b/lib/librte_vhost/iotlb.h
@@ -73,7 +73,7 @@ void vhost_user_iotlb_pending_insert(struct vhost_virtqueue *vq, uint64_t iova,
uint8_t perm);
void vhost_user_iotlb_pending_remove(struct vhost_virtqueue *vq, uint64_t iova,
uint64_t size, uint8_t perm);
-
+void vhost_user_iotlb_flush_all(struct vhost_virtqueue *vq);
int vhost_user_iotlb_init(struct virtio_net *dev, int vq_index);
#endif /* _VHOST_IOTLB_H_ */
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index c0efb3109..07c848c7c 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -650,6 +650,11 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct VhostUserMsg *pmsg)
dev->mem = NULL;
}
+ /* Flush IOTLB cache as previous HVAs are now invalid */
+ if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))
+ for (i = 0; i < dev->nr_vring; i++)
+ vhost_user_iotlb_flush_all(dev->virtqueue[i]);
+
dev->nr_guest_pages = 0;
if (!dev->guest_pages) {
dev->max_guest_pages = 8;
--
2.11.0
next prev parent reply other threads:[~2018-08-13 20:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-13 20:42 [dpdk-stable] patch 'net/bnx2x: fix poll link status' " Yongseok Koh
2018-08-13 20:42 ` [dpdk-stable] patch 'net/dpaa2: remove loop for unused pool entries' " Yongseok Koh
2018-08-13 20:42 ` [dpdk-stable] patch 'net/mlx5: fix secondary process resource leakage' " Yongseok Koh
2018-08-13 20:42 ` [dpdk-stable] patch 'net/i40e: revert fix of flow director check' " Yongseok Koh
2018-08-13 20:42 ` Yongseok Koh [this message]
2018-08-13 20:42 ` [dpdk-stable] patch 'net/bonding: fix race condition' " Yongseok Koh
2018-08-13 20:42 ` [dpdk-stable] patch 'event: fix ring init failure handling' " Yongseok Koh
2018-08-13 20:42 ` [dpdk-stable] patch 'app/crypto-perf: fix auth IV offset' " Yongseok Koh
2018-08-13 20:42 ` [dpdk-stable] patch 'eal: fix bitmap documentation' " Yongseok Koh
2018-08-13 20:42 ` [dpdk-stable] patch 'examples/flow_filtering: add flow director config for i40e' " Yongseok Koh
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=20180813204213.25436-5-yskoh@mellanox.com \
--to=yskoh@mellanox.com \
--cc=jfreimann@redhat.com \
--cc=maxime.coquelin@redhat.com \
--cc=stable@dpdk.org \
--cc=tiwei.bie@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).