|
|
4a2fec |
From 9695c6db4ca09b6bebcffcccfd37aae5c1845021 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
Date: Thu, 16 Nov 2017 03:07:28 +0100
|
|
|
4a2fec |
Subject: [PATCH 24/30] memory: Get rid of address_space_init_shareable
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
Message-id: <20171116030732.8560-19-dgibson@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77710
|
|
|
4a2fec |
O-Subject: [PATCH 18/22] memory: Get rid of address_space_init_shareable
|
|
|
4a2fec |
Bugzilla: 1481593
|
|
|
4a2fec |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
|
4a2fec |
|
|
|
4a2fec |
Since FlatViews are shared now and ASes not, this gets rid of
|
|
|
4a2fec |
address_space_init_shareable().
|
|
|
4a2fec |
|
|
|
4a2fec |
This should cause no behavioural change.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
|
4a2fec |
Message-Id: <20170921085110.25598-17-aik@ozlabs.ru>
|
|
|
4a2fec |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit b516572f31c0ea0937cd9d11d9bd72dd83809886)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Conflicts:
|
|
|
4a2fec |
target/arm/cpu.c
|
|
|
4a2fec |
|
|
|
4a2fec |
Conflicts because we don't have 1d2091bc75a "target/arm: Register
|
|
|
4a2fec |
second AddressSpace for secure v8M CPUs" downstream.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
cpus.c | 5 +++--
|
|
|
4a2fec |
hw/arm/armv7m.c | 9 ++++-----
|
|
|
4a2fec |
include/exec/memory.h | 19 -------------------
|
|
|
4a2fec |
include/hw/arm/armv7m.h | 2 +-
|
|
|
4a2fec |
memory.c | 21 ---------------------
|
|
|
4a2fec |
target/arm/cpu.c | 15 ++++++++-------
|
|
|
4a2fec |
target/i386/cpu.c | 5 +++--
|
|
|
4a2fec |
7 files changed, 19 insertions(+), 57 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/cpus.c b/cpus.c
|
|
|
4a2fec |
index 9bed61e..c9a6240 100644
|
|
|
4a2fec |
--- a/cpus.c
|
|
|
4a2fec |
+++ b/cpus.c
|
|
|
4a2fec |
@@ -1764,8 +1764,9 @@ void qemu_init_vcpu(CPUState *cpu)
|
|
|
4a2fec |
/* If the target cpu hasn't set up any address spaces itself,
|
|
|
4a2fec |
* give it the default one.
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
- AddressSpace *as = address_space_init_shareable(cpu->memory,
|
|
|
4a2fec |
- "cpu-memory");
|
|
|
4a2fec |
+ AddressSpace *as = g_new0(AddressSpace, 1);
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+ address_space_init(as, cpu->memory, "cpu-memory");
|
|
|
4a2fec |
cpu->num_ases = 1;
|
|
|
4a2fec |
cpu_address_space_init(cpu, as, 0);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
|
|
|
4a2fec |
index c8a11f2..475a88f 100644
|
|
|
4a2fec |
--- a/hw/arm/armv7m.c
|
|
|
4a2fec |
+++ b/hw/arm/armv7m.c
|
|
|
4a2fec |
@@ -41,7 +41,7 @@ static MemTxResult bitband_read(void *opaque, hwaddr offset,
|
|
|
4a2fec |
|
|
|
4a2fec |
/* Find address in underlying memory and round down to multiple of size */
|
|
|
4a2fec |
addr = bitband_addr(s, offset) & (-size);
|
|
|
4a2fec |
- res = address_space_read(s->source_as, addr, attrs, buf, size);
|
|
|
4a2fec |
+ res = address_space_read(&s->source_as, addr, attrs, buf, size);
|
|
|
4a2fec |
if (res) {
|
|
|
4a2fec |
return res;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
@@ -66,7 +66,7 @@ static MemTxResult bitband_write(void *opaque, hwaddr offset, uint64_t value,
|
|
|
4a2fec |
|
|
|
4a2fec |
/* Find address in underlying memory and round down to multiple of size */
|
|
|
4a2fec |
addr = bitband_addr(s, offset) & (-size);
|
|
|
4a2fec |
- res = address_space_read(s->source_as, addr, attrs, buf, size);
|
|
|
4a2fec |
+ res = address_space_read(&s->source_as, addr, attrs, buf, size);
|
|
|
4a2fec |
if (res) {
|
|
|
4a2fec |
return res;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
@@ -79,7 +79,7 @@ static MemTxResult bitband_write(void *opaque, hwaddr offset, uint64_t value,
|
|
|
4a2fec |
} else {
|
|
|
4a2fec |
buf[bitpos >> 3] &= ~bit;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
- return address_space_write(s->source_as, addr, attrs, buf, size);
|
|
|
4a2fec |
+ return address_space_write(&s->source_as, addr, attrs, buf, size);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const MemoryRegionOps bitband_ops = {
|
|
|
4a2fec |
@@ -117,8 +117,7 @@ static void bitband_realize(DeviceState *dev, Error **errp)
|
|
|
4a2fec |
return;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
- s->source_as = address_space_init_shareable(s->source_memory,
|
|
|
4a2fec |
- "bitband-source");
|
|
|
4a2fec |
+ address_space_init(&s->source_as, s->source_memory, "bitband-source");
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
/* Board init. */
|
|
|
4a2fec |
diff --git a/include/exec/memory.h b/include/exec/memory.h
|
|
|
4a2fec |
index 157eae6..8d772b9 100644
|
|
|
4a2fec |
--- a/include/exec/memory.h
|
|
|
4a2fec |
+++ b/include/exec/memory.h
|
|
|
4a2fec |
@@ -319,8 +319,6 @@ struct AddressSpace {
|
|
|
4a2fec |
struct rcu_head rcu;
|
|
|
4a2fec |
char *name;
|
|
|
4a2fec |
MemoryRegion *root;
|
|
|
4a2fec |
- int ref_count;
|
|
|
4a2fec |
- bool malloced;
|
|
|
4a2fec |
|
|
|
4a2fec |
/* Accessed via RCU. */
|
|
|
4a2fec |
struct FlatView *current_map;
|
|
|
4a2fec |
@@ -1596,23 +1594,6 @@ MemTxResult memory_region_dispatch_write(MemoryRegion *mr,
|
|
|
4a2fec |
void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name);
|
|
|
4a2fec |
|
|
|
4a2fec |
/**
|
|
|
4a2fec |
- * address_space_init_shareable: return an address space for a memory region,
|
|
|
4a2fec |
- * creating it if it does not already exist
|
|
|
4a2fec |
- *
|
|
|
4a2fec |
- * @root: a #MemoryRegion that routes addresses for the address space
|
|
|
4a2fec |
- * @name: an address space name. The name is only used for debugging
|
|
|
4a2fec |
- * output.
|
|
|
4a2fec |
- *
|
|
|
4a2fec |
- * This function will return a pointer to an existing AddressSpace
|
|
|
4a2fec |
- * which was initialized with the specified MemoryRegion, or it will
|
|
|
4a2fec |
- * create and initialize one if it does not already exist. The ASes
|
|
|
4a2fec |
- * are reference-counted, so the memory will be freed automatically
|
|
|
4a2fec |
- * when the AddressSpace is destroyed via address_space_destroy.
|
|
|
4a2fec |
- */
|
|
|
4a2fec |
-AddressSpace *address_space_init_shareable(MemoryRegion *root,
|
|
|
4a2fec |
- const char *name);
|
|
|
4a2fec |
-
|
|
|
4a2fec |
-/**
|
|
|
4a2fec |
* address_space_destroy: destroy an address space
|
|
|
4a2fec |
*
|
|
|
4a2fec |
* Releases all resources associated with an address space. After an address space
|
|
|
4a2fec |
diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h
|
|
|
4a2fec |
index a9b3f2a..dba77df 100644
|
|
|
4a2fec |
--- a/include/hw/arm/armv7m.h
|
|
|
4a2fec |
+++ b/include/hw/arm/armv7m.h
|
|
|
4a2fec |
@@ -21,7 +21,7 @@ typedef struct {
|
|
|
4a2fec |
SysBusDevice parent_obj;
|
|
|
4a2fec |
/*< public >*/
|
|
|
4a2fec |
|
|
|
4a2fec |
- AddressSpace *source_as;
|
|
|
4a2fec |
+ AddressSpace source_as;
|
|
|
4a2fec |
MemoryRegion iomem;
|
|
|
4a2fec |
uint32_t base;
|
|
|
4a2fec |
MemoryRegion *source_memory;
|
|
|
4a2fec |
diff --git a/memory.c b/memory.c
|
|
|
4a2fec |
index 25a8bf2..00d5788 100644
|
|
|
4a2fec |
--- a/memory.c
|
|
|
4a2fec |
+++ b/memory.c
|
|
|
4a2fec |
@@ -2721,9 +2721,7 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
memory_region_ref(root);
|
|
|
4a2fec |
memory_region_transaction_begin();
|
|
|
4a2fec |
- as->ref_count = 1;
|
|
|
4a2fec |
as->root = root;
|
|
|
4a2fec |
- as->malloced = false;
|
|
|
4a2fec |
as->current_map = NULL;
|
|
|
4a2fec |
as->ioeventfd_nb = 0;
|
|
|
4a2fec |
as->ioeventfds = NULL;
|
|
|
4a2fec |
@@ -2736,37 +2734,18 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)
|
|
|
4a2fec |
|
|
|
4a2fec |
static void do_address_space_destroy(AddressSpace *as)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
- bool do_free = as->malloced;
|
|
|
4a2fec |
-
|
|
|
4a2fec |
assert(QTAILQ_EMPTY(&as->listeners));
|
|
|
4a2fec |
|
|
|
4a2fec |
flatview_unref(as->current_map);
|
|
|
4a2fec |
g_free(as->name);
|
|
|
4a2fec |
g_free(as->ioeventfds);
|
|
|
4a2fec |
memory_region_unref(as->root);
|
|
|
4a2fec |
- if (do_free) {
|
|
|
4a2fec |
- g_free(as);
|
|
|
4a2fec |
- }
|
|
|
4a2fec |
-}
|
|
|
4a2fec |
-
|
|
|
4a2fec |
-AddressSpace *address_space_init_shareable(MemoryRegion *root, const char *name)
|
|
|
4a2fec |
-{
|
|
|
4a2fec |
- AddressSpace *as;
|
|
|
4a2fec |
-
|
|
|
4a2fec |
- as = g_malloc0(sizeof *as);
|
|
|
4a2fec |
- address_space_init(as, root, name);
|
|
|
4a2fec |
- as->malloced = true;
|
|
|
4a2fec |
- return as;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
void address_space_destroy(AddressSpace *as)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
MemoryRegion *root = as->root;
|
|
|
4a2fec |
|
|
|
4a2fec |
- as->ref_count--;
|
|
|
4a2fec |
- if (as->ref_count) {
|
|
|
4a2fec |
- return;
|
|
|
4a2fec |
- }
|
|
|
4a2fec |
/* Flush out anything from MemoryListeners listening in on this */
|
|
|
4a2fec |
memory_region_transaction_begin();
|
|
|
4a2fec |
as->root = NULL;
|
|
|
4a2fec |
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
|
|
|
4a2fec |
index 3f90b7e..b6c8d93 100644
|
|
|
4a2fec |
--- a/target/arm/cpu.c
|
|
|
4a2fec |
+++ b/target/arm/cpu.c
|
|
|
4a2fec |
@@ -650,6 +650,9 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
4a2fec |
CPUARMState *env = &cpu->env;
|
|
|
4a2fec |
int pagebits;
|
|
|
4a2fec |
Error *local_err = NULL;
|
|
|
4a2fec |
+#ifndef CONFIG_USER_ONLY
|
|
|
4a2fec |
+ AddressSpace *as;
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
cpu_exec_realizefn(cs, &local_err);
|
|
|
4a2fec |
if (local_err != NULL) {
|
|
|
4a2fec |
@@ -835,19 +838,17 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
if (cpu->has_el3) {
|
|
|
4a2fec |
- AddressSpace *as;
|
|
|
4a2fec |
+ as = g_new0(AddressSpace, 1);
|
|
|
4a2fec |
|
|
|
4a2fec |
if (!cpu->secure_memory) {
|
|
|
4a2fec |
cpu->secure_memory = cs->memory;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
- as = address_space_init_shareable(cpu->secure_memory,
|
|
|
4a2fec |
- "cpu-secure-memory");
|
|
|
4a2fec |
+ address_space_init(as, cpu->secure_memory, "cpu-secure-memory");
|
|
|
4a2fec |
cpu_address_space_init(cs, as, ARMASIdx_S);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
- cpu_address_space_init(cs,
|
|
|
4a2fec |
- address_space_init_shareable(cs->memory,
|
|
|
4a2fec |
- "cpu-memory"),
|
|
|
4a2fec |
- ARMASIdx_NS);
|
|
|
4a2fec |
+ as = g_new0(AddressSpace, 1);
|
|
|
4a2fec |
+ address_space_init(as, cs->memory, "cpu-memory");
|
|
|
4a2fec |
+ cpu_address_space_init(cs, as, ARMASIdx_NS);
|
|
|
4a2fec |
#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
qemu_init_vcpu(cs);
|
|
|
4a2fec |
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
|
4a2fec |
index 1cae8fe..ca95336 100644
|
|
|
4a2fec |
--- a/target/i386/cpu.c
|
|
|
4a2fec |
+++ b/target/i386/cpu.c
|
|
|
4a2fec |
@@ -3772,10 +3772,11 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
4a2fec |
|
|
|
4a2fec |
#ifndef CONFIG_USER_ONLY
|
|
|
4a2fec |
if (tcg_enabled()) {
|
|
|
4a2fec |
- AddressSpace *as_normal = address_space_init_shareable(cs->memory,
|
|
|
4a2fec |
- "cpu-memory");
|
|
|
4a2fec |
+ AddressSpace *as_normal = g_new0(AddressSpace, 1);
|
|
|
4a2fec |
AddressSpace *as_smm = g_new(AddressSpace, 1);
|
|
|
4a2fec |
|
|
|
4a2fec |
+ address_space_init(as_normal, cs->memory, "cpu-memory");
|
|
|
4a2fec |
+
|
|
|
4a2fec |
cpu->cpu_as_mem = g_new(MemoryRegion, 1);
|
|
|
4a2fec |
cpu->cpu_as_root = g_new(MemoryRegion, 1);
|
|
|
4a2fec |
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|