Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

vhost: use binary search instead of linear in find_region()

For default region layouts performance stays the same
as linear search i.e. it takes around 210ns average for
translate_desc() that inlines find_region().

But it scales better with larger amount of regions,
235ns BS vs 300ns LS with 55 memory regions
and it will be about the same values when allowed number
of slots is increased to 509 like it has been done in kvm.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

authored by

Igor Mammedov and committed by
Michael S. Tsirkin
bcfeacab 8b0a9d42

+28 -10
+28 -10
drivers/vhost/vhost.c
··· 25 25 #include <linux/kthread.h> 26 26 #include <linux/cgroup.h> 27 27 #include <linux/module.h> 28 + #include <linux/sort.h> 28 29 29 30 #include "vhost.h" 30 31 ··· 664 663 } 665 664 EXPORT_SYMBOL_GPL(vhost_vq_access_ok); 666 665 666 + static int vhost_memory_reg_sort_cmp(const void *p1, const void *p2) 667 + { 668 + const struct vhost_memory_region *r1 = p1, *r2 = p2; 669 + if (r1->guest_phys_addr < r2->guest_phys_addr) 670 + return 1; 671 + if (r1->guest_phys_addr > r2->guest_phys_addr) 672 + return -1; 673 + return 0; 674 + } 675 + 667 676 static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m) 668 677 { 669 678 struct vhost_memory mem, *newmem, *oldmem; ··· 693 682 memcpy(newmem, &mem, size); 694 683 if (copy_from_user(newmem->regions, m->regions, 695 684 mem.nregions * sizeof *m->regions)) { 696 - kfree(newmem); 685 + kvfree(newmem); 697 686 return -EFAULT; 698 687 } 688 + sort(newmem->regions, newmem->nregions, sizeof(*newmem->regions), 689 + vhost_memory_reg_sort_cmp, NULL); 699 690 700 691 if (!memory_access_ok(d, newmem, 0)) { 701 692 kfree(newmem); ··· 1005 992 static const struct vhost_memory_region *find_region(struct vhost_memory *mem, 1006 993 __u64 addr, __u32 len) 1007 994 { 1008 - struct vhost_memory_region *reg; 1009 - int i; 995 + const struct vhost_memory_region *reg; 996 + int start = 0, end = mem->nregions; 1010 997 1011 - /* linear search is not brilliant, but we really have on the order of 6 1012 - * regions in practice */ 1013 - for (i = 0; i < mem->nregions; ++i) { 1014 - reg = mem->regions + i; 1015 - if (reg->guest_phys_addr <= addr && 1016 - reg->guest_phys_addr + reg->memory_size - 1 >= addr) 1017 - return reg; 998 + while (start < end) { 999 + int slot = start + (end - start) / 2; 1000 + reg = mem->regions + slot; 1001 + if (addr >= reg->guest_phys_addr) 1002 + end = slot; 1003 + else 1004 + start = slot + 1; 1018 1005 } 1006 + 1007 + reg = mem->regions + start; 1008 + if (addr >= reg->guest_phys_addr && 1009 + reg->guest_phys_addr + reg->memory_size > addr) 1010 + return reg; 1019 1011 return NULL; 1020 1012 } 1021 1013