diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-11-29 10:19:07 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-12-09 15:39:17 +0200 |
| commit | 3bf9be40ff76b6df136f14a497167c116b2b3c53 (patch) | |
| tree | 27b8f715ea2de959bb0c06ff9b99e408a0942182 /drivers/vhost | |
| parent | a290aec88a9c4747353ea7aa9b2569bd61297c3c (diff) | |
| download | linux-stable-3bf9be40ff76b6df136f14a497167c116b2b3c53.tar.gz linux-stable-3bf9be40ff76b6df136f14a497167c116b2b3c53.tar.bz2 linux-stable-3bf9be40ff76b6df136f14a497167c116b2b3c53.zip | |
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>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vhost.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 916cdbc279e0..4c256d15c249 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -885,6 +885,7 @@ static int log_write(void __user *log_base, int r; if (!write_length) return 0; + write_length += write_address % VHOST_PAGE_SIZE; write_address /= VHOST_PAGE_SIZE; for (;;) { u64 base = (u64)(unsigned long)log_base; @@ -898,7 +899,7 @@ static int log_write(void __user *log_base, if (write_length <= VHOST_PAGE_SIZE) break; write_length -= VHOST_PAGE_SIZE; - write_address += VHOST_PAGE_SIZE; + write_address += 1; } return r; } |