Skip to contentSkip to conversation

vhost: fix guest physical address to host physical address mapping

PATCH Applied Yuan Wang 3 participants 4 messages Jan 17, 2022 – Feb 8, 2022

lore
Share & tools
lore

Yuan Wang

author
#0 lore raw

PATCH 1/1 vhost: fix guest physical address to host physical address mapping

Async copy fails when looking up hpa in the gpa to hpa mapping table. This happens because the gpa is matched exactly in the merged mapping table, and the merge loses the mapping entries.
A new range comparison method is introduced to solve this issue.

Fixes 6563cf92380 ("vhost: fix async copy on multi-page buffers")
---
 lib/vhost/vhost.h | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
lib/vhost/vhost.h +16 -2
index 9521ae56da..d4586f3341 100644
@@ -588,6 +588,20 @@ static __rte_always_inline int guest_page_addrcmp(const void *p1,
 	return 0;
 }
 
+static __rte_always_inline int guest_page_rangecmp(const void *p1, const void *p2)
+{
+	const struct guest_page *page1 = (const struct guest_page *)p1;
+	const struct guest_page *page2 = (const struct guest_page *)p2;
+
+	if (page1->guest_phys_addr >= page2->guest_phys_addr) {
+		if (page1->guest_phys_addr < page2->guest_phys_addr + page2->size)
+			return 0;
+		else
+			return 1;
+	} else
+		return -1;
+}
+
 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)
@@ -598,9 +612,9 @@ gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa,
 
 	*hpa_size = gpa_size;
 	if (dev->nr_guest_pages >= VHOST_BINARY_SEARCH_THRESH) {
-		key.guest_phys_addr = gpa & ~(dev->guest_pages[0].size - 1);
+		key.guest_phys_addr = gpa;
 		page = bsearch(&key, dev->guest_pages, dev->nr_guest_pages,
-			       sizeof(struct guest_page), guest_page_addrcmp);
+			       sizeof(struct guest_page), guest_page_rangecmp);
 		if (page) {
 			if (gpa + gpa_size <=
 					page->guest_phys_addr + page->size) {
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw

Hi Yuan,

Quoted 5 lines · Yuan Wang

Async copy fails when looking up hpa in the gpa to hpa mapping table. This happens because the gpa is matched exactly in the merged mapping table, and the merge loses the mapping entries.
A new range comparison method is introduced to solve this issue.

Quoted 7 lines
Fixes 6563cf92380 ("vhost: fix async copy on multi-page buffers")
---
  lib/vhost/vhost.h | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)

Thanks,
Maxime

#2 lore raw
In reply to Yuan Wang
Quoted 5 lines · Yuan Wang

Async copy fails when looking up hpa in the gpa to hpa mapping table. This happens because the gpa is matched exactly in the merged mapping table, and the merge loses the mapping entries.
A new range comparison method is introduced to solve this issue.

Quoted 7 lines
Fixes 6563cf92380 ("vhost: fix async copy on multi-page buffers")
---
  lib/vhost/vhost.h | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)

Applied to dpdk-next-virtio/main.

Thanks,
Maxime

#3 lore raw
Quoted 10 lines · Maxime Coquelin
Quoted 7 lines · Yuan Wang

Async copy fails when looking up hpa in the gpa to hpa mapping table. This happens because the gpa is matched exactly in the merged mapping table, and the merge loses the mapping entries.
A new range comparison method is introduced to solve this issue.

Fixes 6563cf92380 ("vhost: fix async copy on multi-page buffers")
Quoted 8 lines
Quoted 5 lines

---
  lib/vhost/vhost.h | 18 ++++++++++++++++--

  1 file changed, 16 insertions(+), 2 deletions(-)

Applied to dpdk-next-virtio/main.

Is it candidate for Cc: [email protected] backport?

adding stable tag in the next-net, please comment if it shouldn't.