diff mbox series

[v1] vhost: fix guest/host physical address conversion

Message ID 20201027020608.4103145-1-patrick.fu@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Maxime Coquelin
Headers
Series [v1] vhost: fix guest/host physical address conversion |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/travis-robot success Travis build: passed
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

Patrick Fu Oct. 27, 2020, 2:06 a.m. UTC 
  gpa_to_hpa() function almost always fails due to the wrong setup of
the binary tree search key. Since there has already been a similar
function gpa_to_first_hpa() available in the vhost, instead of fixing
the issue in its original logic, gpa_to_hpa() function is rewritten to
be a wrapper of the gpa_to_first_hpa() to avoid code redundancy.

Fixes: e246896178e6 ("vhost: get guest/host physical address mappings")
Fixes: faa9867c4da2 ("vhost: use binary search in address conversion")

Signed-off-by: Patrick Fu <patrick.fu@intel.com>
---
 v2:
   - minor rewordings on commit message & title

 lib/librte_vhost/vhost.h | 43 ++++++++++------------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

Comments

Maxime Coquelin Oct. 28, 2020, 11:16 a.m. UTC | #1 
On 10/27/20 3:06 AM, Patrick Fu wrote:
> gpa_to_hpa() function almost always fails due to the wrong setup of
> the binary tree search key. Since there has already been a similar
> function gpa_to_first_hpa() available in the vhost, instead of fixing
> the issue in its original logic, gpa_to_hpa() function is rewritten to
> be a wrapper of the gpa_to_first_hpa() to avoid code redundancy.
> 
> Fixes: e246896178e6 ("vhost: get guest/host physical address mappings")
> Fixes: faa9867c4da2 ("vhost: use binary search in address conversion")
> 
> Signed-off-by: Patrick Fu <patrick.fu@intel.com>
> ---
>  v2:
>    - minor rewordings on commit message & title
> 
>  lib/librte_vhost/vhost.h | 43 ++++++++++------------------------------
>  1 file changed, 11 insertions(+), 32 deletions(-)
> 

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime
Maxime Coquelin Oct. 29, 2020, 8:28 a.m. UTC | #2 
On 10/27/20 3:06 AM, Patrick Fu wrote:
> gpa_to_hpa() function almost always fails due to the wrong setup of
> the binary tree search key. Since there has already been a similar
> function gpa_to_first_hpa() available in the vhost, instead of fixing
> the issue in its original logic, gpa_to_hpa() function is rewritten to
> be a wrapper of the gpa_to_first_hpa() to avoid code redundancy.
> 
> Fixes: e246896178e6 ("vhost: get guest/host physical address mappings")
> Fixes: faa9867c4da2 ("vhost: use binary search in address conversion")
> 
> Signed-off-by: Patrick Fu <patrick.fu@intel.com>
> ---
>  v2:
>    - minor rewordings on commit message & title
> 

Applied to dpdk-next-virtio/main.

Thanks!
Maxime
diff mbox series

Patch

diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 75d79f80a..361c9f79b 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -563,38 +563,6 @@  static __rte_always_inline int guest_page_addrcmp(const void *p1,
 	return 0;
 }
 
-/* Convert guest physical address to host physical address */
-static __rte_always_inline rte_iova_t
-gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t size)
-{
-	uint32_t i;
-	struct guest_page *page;
-	struct guest_page key;
-
-	if (dev->nr_guest_pages >= VHOST_BINARY_SEARCH_THRESH) {
-		key.guest_phys_addr = gpa;
-		page = bsearch(&key, dev->guest_pages, dev->nr_guest_pages,
-			       sizeof(struct guest_page), guest_page_addrcmp);
-		if (page) {
-			if (gpa + size < page->guest_phys_addr + page->size)
-				return gpa - page->guest_phys_addr +
-					page->host_phys_addr;
-		}
-	} else {
-		for (i = 0; i < dev->nr_guest_pages; i++) {
-			page = &dev->guest_pages[i];
-
-			if (gpa >= page->guest_phys_addr &&
-			    gpa + size < page->guest_phys_addr +
-			    page->size)
-				return gpa - page->guest_phys_addr +
-				       page->host_phys_addr;
-		}
-	}
-
-	return 0;
-}
-
 static __rte_always_inline rte_iova_t
 gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa,
 	uint64_t gpa_size, uint64_t *hpa_size)
@@ -645,6 +613,17 @@  gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa,
 	return 0;
 }
 
+/* Convert guest physical address to host physical address */
+static __rte_always_inline rte_iova_t
+gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t size)
+{
+	rte_iova_t hpa;
+	uint64_t hpa_size;
+
+	hpa = gpa_to_first_hpa(dev, gpa, size, &hpa_size);
+	return hpa_size == size ? hpa : 0;
+}
+
 static __rte_always_inline uint64_t
 hva_to_gpa(struct virtio_net *dev, uint64_t vva, uint64_t len)
 {