d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost: use binary search in address conversion

Browse Source 
If Tx zero copy enabled, gpa to hpa mapping table is updated one by
one. This will harm performance when guest memory backend using 2M
hugepages. Now utilize binary search to find the entry in mapping
table, meanwhile set the threshold to 256 entries for linear search.

Signed-off-by: Marvin Liu <yong.liu@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
This commit is contained in:
Marvin Liu 2020-04-29 09:04:22 +08:00 committed by Ferruh Yigit
parent 20fd2f91cf
commit faa9867c4d
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/librte_vhost/vhost.h
View File

@ -546,20 +546,48 @@ extern int vhost_data_log_level;
#define MAX_VHOST_DEVICE 1024
extern struct virtio_net *vhost_devices[MAX_VHOST_DEVICE];
#define VHOST_BINARY_SEARCH_THRESH 256
static __rte_always_inline int guest_page_addrcmp(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)
return 1;
if (page1->guest_phys_addr < page2->guest_phys_addr)
return -1;
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;
for (i = 0; i < dev->nr_guest_pages; i++) {
page = &dev->guest_pages[i];
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;
if (gpa >= page->guest_phys_addr &&
gpa + size < page->guest_phys_addr +
page->size)
return gpa - page->guest_phys_addr +
page->host_phys_addr;
}
}

6
lib/librte_vhost/vhost_user.c
View File

@ -965,6 +965,12 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,
reg_size -= size;
}
/* sort guest page array if over binary search threshold */
if (dev->nr_guest_pages >= VHOST_BINARY_SEARCH_THRESH) {
qsort((void *)dev->guest_pages, dev->nr_guest_pages,
sizeof(struct guest_page), guest_page_addrcmp);
}
return 0;
}