vhost: correctly set bits of dirty pages
Fix two bugs in dirty page logging: When counting pages we should increase address by 1 instead of VHOST_PAGE_SIZE. Make log_write() correctly process requests that cross pages with write_address not starting at page boundary. Reported-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
11cd1a8b8c
commit
e4dde731ae
1 changed files with 2 additions and 1 deletions
|
@ -884,6 +884,7 @@ static int log_write(void __user *log_base,
|
||||||
int r;
|
int r;
|
||||||
if (!write_length)
|
if (!write_length)
|
||||||
return 0;
|
return 0;
|
||||||
|
write_length += write_address % VHOST_PAGE_SIZE;
|
||||||
write_address /= VHOST_PAGE_SIZE;
|
write_address /= VHOST_PAGE_SIZE;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
u64 base = (u64)(unsigned long)log_base;
|
u64 base = (u64)(unsigned long)log_base;
|
||||||
|
@ -897,7 +898,7 @@ static int log_write(void __user *log_base,
|
||||||
if (write_length <= VHOST_PAGE_SIZE)
|
if (write_length <= VHOST_PAGE_SIZE)
|
||||||
break;
|
break;
|
||||||
write_length -= VHOST_PAGE_SIZE;
|
write_length -= VHOST_PAGE_SIZE;
|
||||||
write_address += VHOST_PAGE_SIZE;
|
write_address += 1;
|
||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue