Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vhost: Fix mmap size calculation
[vpp.git]
/
src
/
vnet
/
devices
/
virtio
/
vhost-user.c
diff --git
a/src/vnet/devices/virtio/vhost-user.c
b/src/vnet/devices/virtio/vhost-user.c
index
bcfef9f
..
3ac7697
100644
(file)
--- a/
src/vnet/devices/virtio/vhost-user.c
+++ b/
src/vnet/devices/virtio/vhost-user.c
@@
-303,7
+303,7
@@
unmap_all_mem_regions (vhost_user_intf_t * vui)
ssize_t map_sz = (vui->regions[i].memory_size +
vui->regions[i].mmap_offset +
ssize_t map_sz = (vui->regions[i].memory_size +
vui->regions[i].mmap_offset +
- page_sz) & ~(page_sz - 1);
+ page_sz
- 1
) & ~(page_sz - 1);
r =
munmap (vui->region_mmap_addr[i] - vui->regions[i].mmap_offset,
r =
munmap (vui->region_mmap_addr[i] - vui->regions[i].mmap_offset,
@@
-917,7
+917,7
@@
vhost_user_socket_read (unix_file_t * uf)
/* align size to 2M page */
ssize_t map_sz = (vui->regions[i].memory_size +
vui->regions[i].mmap_offset +
/* align size to 2M page */
ssize_t map_sz = (vui->regions[i].memory_size +
vui->regions[i].mmap_offset +
- page_sz) & ~(page_sz - 1);
+ page_sz
- 1
) & ~(page_sz - 1);
vui->region_mmap_addr[i] = mmap (0, map_sz, PROT_READ | PROT_WRITE,
MAP_SHARED, fds[i], 0);
vui->region_mmap_addr[i] = mmap (0, map_sz, PROT_READ | PROT_WRITE,
MAP_SHARED, fds[i], 0);
@@
-1168,7
+1168,7
@@
vhost_user_socket_read (unix_file_t * uf)
/* align size to 2M page */
long page_sz = get_huge_page_size (fd);
ssize_t map_sz =
/* align size to 2M page */
long page_sz = get_huge_page_size (fd);
ssize_t map_sz =
- (msg.log.size + msg.log.offset + page_sz) & ~(page_sz - 1);
+ (msg.log.size + msg.log.offset + page_sz
- 1
) & ~(page_sz - 1);
vui->log_base_addr = mmap (0, map_sz, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, 0);
vui->log_base_addr = mmap (0, map_sz, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, 0);