From: Sheng Yang <sheng@linux.intel.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, Sheng Yang <sheng@linux.intel.com>
Subject: [PATCH] KVM: Add reading critical region for kvm_io_bus_read/write
Date: Mon, 6 Dec 2010 16:44:59 +0800 [thread overview]
Message-ID: <1291625099-29152-1-git-send-email-sheng@linux.intel.com> (raw)
Seems we missed it.
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
---
Do we need this, or slot_lock covered this?
virt/kvm/kvm_main.c | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index c4ee364..3e71b91 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2228,28 +2228,36 @@ static void kvm_io_bus_destroy(struct kvm_io_bus *bus)
int kvm_io_bus_write(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
int len, const void *val)
{
- int i;
+ int i, idx, r = -EOPNOTSUPP;
struct kvm_io_bus *bus;
+ idx = srcu_read_lock(&kvm->srcu);
bus = srcu_dereference(kvm->buses[bus_idx], &kvm->srcu);
for (i = 0; i < bus->dev_count; i++)
- if (!kvm_iodevice_write(bus->devs[i], addr, len, val))
- return 0;
- return -EOPNOTSUPP;
+ if (!kvm_iodevice_write(bus->devs[i], addr, len, val)) {
+ r = 0;
+ break;
+ }
+ srcu_read_unlock(&kvm->srcu, idx);
+ return r;
}
/* kvm_io_bus_read - called under kvm->slots_lock */
int kvm_io_bus_read(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
int len, void *val)
{
- int i;
+ int i, idx, r = -EOPNOTSUPP;
struct kvm_io_bus *bus;
+ idx = srcu_read_lock(&kvm->srcu);
bus = srcu_dereference(kvm->buses[bus_idx], &kvm->srcu);
for (i = 0; i < bus->dev_count; i++)
- if (!kvm_iodevice_read(bus->devs[i], addr, len, val))
- return 0;
- return -EOPNOTSUPP;
+ if (!kvm_iodevice_read(bus->devs[i], addr, len, val)) {
+ r = 0;
+ break;
+ }
+ srcu_read_unlock(&kvm->srcu, idx);
+ return r;
}
/* Caller must hold slots_lock. */
--
1.7.0.1
next reply other threads:[~2010-12-06 8:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-06 8:44 Sheng Yang [this message]
2010-12-06 12:58 ` [PATCH] KVM: Add reading critical region for kvm_io_bus_read/write Avi Kivity
2010-12-07 2:35 ` Sheng Yang
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=1291625099-29152-1-git-send-email-sheng@linux.intel.com \
--to=sheng@linux.intel.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
/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