From: Jason Wang <jasowang@redhat.com>
To: virtualization@lists.osdl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
mst@redhat.com
Subject: [PATCH] vhost: correctly set bits of dirty pages
Date: Mon, 29 Nov 2010 13:48:20 +0800 [thread overview]
Message-ID: <20101129054819.24923.26439.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com> (raw)
When counting pages we should increase it by 1 instead of VHOST_PAGE_SIZE,
and also make log_write() can correctly process the request across
pages with write_address not start at page boundary.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/vhost/vhost.c | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index a29d91c..576300b 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -884,23 +884,21 @@ static int set_bit_to_user(int nr, void __user *addr)
static int log_write(void __user *log_base,
u64 write_address, u64 write_length)
{
- int r;
- if (!write_length)
- return 0;
- write_address /= VHOST_PAGE_SIZE;
- for (;;) {
+ int r = 0;
+ while (write_length > 0) {
+ u64 l = VHOST_PAGE_SIZE - write_address % VHOST_PAGE_SIZE;
+ u64 write_page = write_address / VHOST_PAGE_SIZE;
u64 base = (u64)(unsigned long)log_base;
- u64 log = base + write_address / 8;
- int bit = write_address % 8;
+ u64 log = base + write_page / 8;
+ int bit = write_page % 8;
if ((u64)(unsigned long)log != log)
return -EFAULT;
r = set_bit_to_user(bit, (void __user *)(unsigned long)log);
if (r < 0)
return r;
- if (write_length <= VHOST_PAGE_SIZE)
- break;
- write_length -= VHOST_PAGE_SIZE;
- write_address += VHOST_PAGE_SIZE;
+ l = min(l, write_length);
+ write_length -= l;
+ write_address += l;
}
return r;
}
next reply other threads:[~2010-11-29 5:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-29 5:48 Jason Wang [this message]
2010-11-29 8:18 ` [PATCH] vhost: correctly set bits of dirty pages Michael S. Tsirkin
2010-11-29 8:25 ` Michael S. Tsirkin
2010-11-29 13:50 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101129054819.24923.26439.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com \
--to=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).