|
 |
9bac43 |
From f11d0111c641b1ea0c961f1faee7f9682c4f272c Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
Date: Thu, 16 Nov 2017 03:07:20 +0100
|
|
|
9bac43 |
Subject: [PATCH 16/30] memory: Cleanup after switching to FlatView
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
Message-id: <20171116030732.8560-11-dgibson@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77701
|
|
|
9bac43 |
O-Subject: [PATCH 10/22] memory: Cleanup after switching to FlatView
|
|
|
9bac43 |
Bugzilla: 1481593
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
|
9bac43 |
|
|
|
9bac43 |
We store AddressSpaceDispatch* in FlatView anyway so there is no need
|
|
|
9bac43 |
to carry it from mem_add() to register_subpage/register_multipage.
|
|
|
9bac43 |
|
|
|
9bac43 |
This should cause no behavioural change.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
|
9bac43 |
Message-Id: <20170921085110.25598-8-aik@ozlabs.ru>
|
|
|
9bac43 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9bac43 |
(cherry picked from commit 9950322a593ff900a860fb52938159461798a831)
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
exec.c | 16 ++++++++--------
|
|
|
9bac43 |
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/exec.c b/exec.c
|
|
|
9bac43 |
index 0eedeb2..d1d8486 100644
|
|
|
9bac43 |
--- a/exec.c
|
|
|
9bac43 |
+++ b/exec.c
|
|
|
9bac43 |
@@ -1314,9 +1314,9 @@ static void phys_sections_free(PhysPageMap *map)
|
|
|
9bac43 |
g_free(map->nodes);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
-static void register_subpage(FlatView *fv, AddressSpaceDispatch *d,
|
|
|
9bac43 |
- MemoryRegionSection *section)
|
|
|
9bac43 |
+static void register_subpage(FlatView *fv, MemoryRegionSection *section)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
+ AddressSpaceDispatch *d = flatview_to_dispatch(fv);
|
|
|
9bac43 |
subpage_t *subpage;
|
|
|
9bac43 |
hwaddr base = section->offset_within_address_space
|
|
|
9bac43 |
& TARGET_PAGE_MASK;
|
|
|
9bac43 |
@@ -1345,9 +1345,10 @@ static void register_subpage(FlatView *fv, AddressSpaceDispatch *d,
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
|
|
|
9bac43 |
-static void register_multipage(AddressSpaceDispatch *d,
|
|
|
9bac43 |
+static void register_multipage(FlatView *fv,
|
|
|
9bac43 |
MemoryRegionSection *section)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
+ AddressSpaceDispatch *d = flatview_to_dispatch(fv);
|
|
|
9bac43 |
hwaddr start_addr = section->offset_within_address_space;
|
|
|
9bac43 |
uint16_t section_index = phys_section_add(&d->map, section);
|
|
|
9bac43 |
uint64_t num_pages = int128_get64(int128_rshift(section->size,
|
|
|
9bac43 |
@@ -1359,7 +1360,6 @@ static void register_multipage(AddressSpaceDispatch *d,
|
|
|
9bac43 |
|
|
|
9bac43 |
void mem_add(FlatView *fv, MemoryRegionSection *section)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
- AddressSpaceDispatch *d = flatview_to_dispatch(fv);
|
|
|
9bac43 |
MemoryRegionSection now = *section, remain = *section;
|
|
|
9bac43 |
Int128 page_size = int128_make64(TARGET_PAGE_SIZE);
|
|
|
9bac43 |
|
|
|
9bac43 |
@@ -1368,7 +1368,7 @@ void mem_add(FlatView *fv, MemoryRegionSection *section)
|
|
|
9bac43 |
- now.offset_within_address_space;
|
|
|
9bac43 |
|
|
|
9bac43 |
now.size = int128_min(int128_make64(left), now.size);
|
|
|
9bac43 |
- register_subpage(fv, d, &now;;
|
|
|
9bac43 |
+ register_subpage(fv, &now;;
|
|
|
9bac43 |
} else {
|
|
|
9bac43 |
now.size = int128_zero();
|
|
|
9bac43 |
}
|
|
|
9bac43 |
@@ -1378,13 +1378,13 @@ void mem_add(FlatView *fv, MemoryRegionSection *section)
|
|
|
9bac43 |
remain.offset_within_region += int128_get64(now.size);
|
|
|
9bac43 |
now = remain;
|
|
|
9bac43 |
if (int128_lt(remain.size, page_size)) {
|
|
|
9bac43 |
- register_subpage(fv, d, &now;;
|
|
|
9bac43 |
+ register_subpage(fv, &now;;
|
|
|
9bac43 |
} else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) {
|
|
|
9bac43 |
now.size = page_size;
|
|
|
9bac43 |
- register_subpage(fv, d, &now;;
|
|
|
9bac43 |
+ register_subpage(fv, &now;;
|
|
|
9bac43 |
} else {
|
|
|
9bac43 |
now.size = int128_and(now.size, int128_neg(page_size));
|
|
|
9bac43 |
- register_multipage(d, &now;;
|
|
|
9bac43 |
+ register_multipage(fv, &now;;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
}
|
|
|
9bac43 |
}
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|