|
 |
37e7a1 |
From 026e3aa58780db72c38618e576f4c6029e3b029a Mon Sep 17 00:00:00 2001
|
|
|
37e7a1 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
37e7a1 |
Date: Thu, 8 Mar 2018 15:58:17 +0100
|
|
|
37e7a1 |
Subject: [PATCH 04/17] address_space_access_valid: address_space_to_flatview
|
|
|
37e7a1 |
needs RCU lock
|
|
|
37e7a1 |
|
|
|
37e7a1 |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
37e7a1 |
Message-id: <20180308155819.20598-5-pbonzini@redhat.com>
|
|
|
37e7a1 |
Patchwork-id: 79195
|
|
|
37e7a1 |
O-Subject: [RHEL7.5 qemu-kvm-rhev PATCH 4/6] address_space_access_valid: address_space_to_flatview needs RCU lock
|
|
|
37e7a1 |
Bugzilla: 1554930
|
|
|
37e7a1 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
37e7a1 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
37e7a1 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
37e7a1 |
|
|
|
37e7a1 |
address_space_access_valid is calling address_space_to_flatview but it can
|
|
|
37e7a1 |
be called outside the RCU lock. To fix it, push the rcu_read_lock/unlock
|
|
|
37e7a1 |
pair up from flatview_access_valid to address_space_access_valid.
|
|
|
37e7a1 |
|
|
|
37e7a1 |
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
|
37e7a1 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
37e7a1 |
(cherry pick from commit 11e732a5ed46903f997985bed4c3767ca28a7eb6)
|
|
|
37e7a1 |
|
|
|
37e7a1 |
[squashed fix for rcu_read_unlock() that should have been removed,
|
|
|
37e7a1 |
for which I'll send a pull request upstream tomorrow]
|
|
|
37e7a1 |
|
|
|
37e7a1 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
37e7a1 |
---
|
|
|
37e7a1 |
exec.c | 13 ++++++++-----
|
|
|
37e7a1 |
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
37e7a1 |
|
|
|
37e7a1 |
diff --git a/exec.c b/exec.c
|
|
|
37e7a1 |
index 43c66da..431b85b 100644
|
|
|
37e7a1 |
--- a/exec.c
|
|
|
37e7a1 |
+++ b/exec.c
|
|
|
37e7a1 |
@@ -3259,14 +3259,12 @@ static bool flatview_access_valid(FlatView *fv, hwaddr addr, int len,
|
|
|
37e7a1 |
MemoryRegion *mr;
|
|
|
37e7a1 |
hwaddr l, xlat;
|
|
|
37e7a1 |
|
|
|
37e7a1 |
- rcu_read_lock();
|
|
|
37e7a1 |
while (len > 0) {
|
|
|
37e7a1 |
l = len;
|
|
|
37e7a1 |
mr = flatview_translate(fv, addr, &xlat, &l, is_write);
|
|
|
37e7a1 |
if (!memory_access_is_direct(mr, is_write)) {
|
|
|
37e7a1 |
l = memory_access_size(mr, l, addr);
|
|
|
37e7a1 |
if (!memory_region_access_valid(mr, xlat, l, is_write)) {
|
|
|
37e7a1 |
- rcu_read_unlock();
|
|
|
37e7a1 |
return false;
|
|
|
37e7a1 |
}
|
|
|
37e7a1 |
}
|
|
|
37e7a1 |
@@ -3274,15 +3272,20 @@ static bool flatview_access_valid(FlatView *fv, hwaddr addr, int len,
|
|
|
37e7a1 |
len -= l;
|
|
|
37e7a1 |
addr += l;
|
|
|
37e7a1 |
}
|
|
|
37e7a1 |
- rcu_read_unlock();
|
|
|
37e7a1 |
return true;
|
|
|
37e7a1 |
}
|
|
|
37e7a1 |
|
|
|
37e7a1 |
bool address_space_access_valid(AddressSpace *as, hwaddr addr,
|
|
|
37e7a1 |
int len, bool is_write)
|
|
|
37e7a1 |
{
|
|
|
37e7a1 |
- return flatview_access_valid(address_space_to_flatview(as),
|
|
|
37e7a1 |
- addr, len, is_write);
|
|
|
37e7a1 |
+ FlatView *fv;
|
|
|
37e7a1 |
+ bool result;
|
|
|
37e7a1 |
+
|
|
|
37e7a1 |
+ rcu_read_lock();
|
|
|
37e7a1 |
+ fv = address_space_to_flatview(as);
|
|
|
37e7a1 |
+ result = flatview_access_valid(fv, addr, len, is_write);
|
|
|
37e7a1 |
+ rcu_read_unlock();
|
|
|
37e7a1 |
+ return result;
|
|
|
37e7a1 |
}
|
|
|
37e7a1 |
|
|
|
37e7a1 |
static hwaddr
|
|
|
37e7a1 |
--
|
|
|
37e7a1 |
1.8.3.1
|
|
|
37e7a1 |
|