diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-11-29 10:19:07 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-11-29 10:26:55 +0200 |
| commit | e4dde731ae70072338352c6f8fb75fd04a42cf8d (patch) | |
| tree | e278b13b3abd0f31b10a8f8d6f0343e74836b563 | |
| parent | 11cd1a8b8cad1acfc140d9acce93762a9c140b20 (diff) | |
| download | linux-3.10-e4dde731ae70072338352c6f8fb75fd04a42cf8d.tar.gz linux-3.10-e4dde731ae70072338352c6f8fb75fd04a42cf8d.tar.bz2 linux-3.10-e4dde731ae70072338352c6f8fb75fd04a42cf8d.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>
| -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 94701ff3a23..159c77a5746 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -884,6 +884,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; @@ -897,7 +898,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; } |