From: Yuanhan Liu <yliu@fridaylinux.org>
To: Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: Tiwei Bie <tiwei.bie@intel.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'vhost: remove pending IOTLB entry if miss request failed' has been queued to LTS release 17.11.1
Date: Wed, 7 Feb 2018 16:57:03 +0800 [thread overview]
Message-ID: <1517993838-26692-9-git-send-email-yliu@fridaylinux.org> (raw)
In-Reply-To: <1517993838-26692-1-git-send-email-yliu@fridaylinux.org>
Hi,
FYI, your patch has been queued to LTS release 17.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/09/18. So please
shout if anyone has objections.
Thanks.
--yliu
---
>From 55811badd15743cb2f12fe248bec64ae4b401753 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Mon, 5 Feb 2018 16:04:57 +0100
Subject: [PATCH] vhost: remove pending IOTLB entry if miss request failed
[ upstream commit 82b9c1540348b6be7996203065e10421e953cea9 ]
In case vhost_user_iotlb_miss returns an error, the pending IOTLB
entry has to be removed from the list as no IOTLB update will be
received.
Fixes: fed67a20ac94 ("vhost: introduce guest IOVA to backend VA helper")
Suggested-by: Tiwei Bie <tiwei.bie@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_vhost/iotlb.c | 2 +-
lib/librte_vhost/iotlb.h | 3 +++
lib/librte_vhost/vhost.c | 13 ++++++++++---
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index 72cd27d..c11ebca 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -120,7 +120,7 @@ vhost_user_iotlb_pending_insert(struct vhost_virtqueue *vq,
rte_rwlock_write_unlock(&vq->iotlb_pending_lock);
}
-static void
+void
vhost_user_iotlb_pending_remove(struct vhost_virtqueue *vq,
uint64_t iova, uint64_t size, uint8_t perm)
{
diff --git a/lib/librte_vhost/iotlb.h b/lib/librte_vhost/iotlb.h
index f1a050e..e7083e3 100644
--- a/lib/librte_vhost/iotlb.h
+++ b/lib/librte_vhost/iotlb.h
@@ -71,6 +71,9 @@ bool vhost_user_iotlb_pending_miss(struct vhost_virtqueue *vq, uint64_t iova,
uint8_t perm);
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);
+
int vhost_user_iotlb_init(struct virtio_net *dev, int vq_index);
#endif /* _VHOST_IOTLB_H_ */
diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index dcc42fc..51ea720 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -71,7 +71,9 @@ __vhost_iova_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
if (tmp_size == size)
return vva;
- if (!vhost_user_iotlb_pending_miss(vq, iova + tmp_size, perm)) {
+ iova += tmp_size;
+
+ if (!vhost_user_iotlb_pending_miss(vq, iova, perm)) {
/*
* iotlb_lock is read-locked for a full burst,
* but it only protects the iotlb cache.
@@ -81,8 +83,13 @@ __vhost_iova_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
*/
vhost_user_iotlb_rd_unlock(vq);
- vhost_user_iotlb_pending_insert(vq, iova + tmp_size, perm);
- vhost_user_iotlb_miss(dev, iova + tmp_size, perm);
+ vhost_user_iotlb_pending_insert(vq, iova, perm);
+ if (vhost_user_iotlb_miss(dev, iova, perm)) {
+ RTE_LOG(ERR, VHOST_CONFIG,
+ "IOTLB miss req failed for IOVA 0x%" PRIx64 "\n",
+ iova);
+ vhost_user_iotlb_pending_remove(vq, iova, 1, perm);
+ }
vhost_user_iotlb_rd_lock(vq);
}
--
2.7.4
next prev parent reply other threads:[~2018-02-07 8:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-07 8:56 [dpdk-stable] patch 'mk: fix external build' " Yuanhan Liu
2018-02-07 8:56 ` [dpdk-stable] patch 'bus/vdev: continue probing after a device failure' " Yuanhan Liu
2018-02-07 8:56 ` [dpdk-stable] patch 'mempool: fix physical contiguous check' " Yuanhan Liu
2018-02-07 8:56 ` [dpdk-stable] patch 'usertools/devbind: fix kernel module reporting' " Yuanhan Liu
2018-02-07 8:56 ` [dpdk-stable] patch 'net/mlx4: fix drop flow resources leak' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'net/bonding: check error of MAC address setting' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'net/qede: fix few log messages' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'vhost: fix IOTLB pool out-of-memory handling' " Yuanhan Liu
2018-02-07 8:57 ` Yuanhan Liu [this message]
2018-02-07 8:57 ` [dpdk-stable] patch 'net/mlx4: fix Rx offload non-fragmented indication' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'net/mlx5: fix flow RSS configuration' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'net/mlx5: fix UAR remapping on non configured queues' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'app/testpmd: fix port index in RSS forward config' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'app/testpmd: fix port topology " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'bus/fslmc: fix build with latest glibc' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'bus/dpaa: fix default IOVA mode' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'examples/ip_pipeline: fix timer period unit' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'test/bitmap: fix memory leak' " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'test/reorder: " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'test/ring: " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'test/ring_perf: " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'test/table: " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'test/timer_perf: " Yuanhan Liu
2018-02-07 8:57 ` [dpdk-stable] patch 'net/i40e: fix multiple DDP packages conflict' " Yuanhan Liu
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=1517993838-26692-9-git-send-email-yliu@fridaylinux.org \
--to=yliu@fridaylinux.org \
--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).