From: "Chen, Tiejun" <tiejun.chen@intel.com>
To: Jan Beulich <JBeulich@suse.com>
Cc: Wei Liu <wei.liu2@citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
xen-devel@lists.xen.org, Keir Fraser <keir@xen.org>
Subject: Re: [v10][PATCH 07/16] hvmloader/e820: construct guest e820 table
Date: Mon, 20 Jul 2015 22:35:04 +0800 [thread overview]
Message-ID: <55AD0718.4080507@intel.com> (raw)
In-Reply-To: <55ACFDF902000078000930C9@mail.emea.novell.com>
Looks just a little bit should be changed so I also paste this new
online to try winning your Acked here,
hvmloader/e820: construct guest e820 table
Now use the hypervisor-supplied memory map to build our final e820 table:
* Add regions for BIOS ranges and other special mappings not in the
hypervisor map
* Add in the hypervisor supplied regions
* Adjust the lowmem and highmem regions if we've had to relocate
memory (adding a highmem region if necessary)
* Sort all the ranges so that they appear in memory order.
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: George Dunlap <george.dunlap@eu.citrix.com>
Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---
tools/firmware/hvmloader/e820.c | 109
+++++++++++++++++++++++++++++++++++-----
1 file changed, 96 insertions(+), 13 deletions(-)
diff --git a/tools/firmware/hvmloader/e820.c
b/tools/firmware/hvmloader/e820.c
index 7a414ab..a6cacdf 100644
--- a/tools/firmware/hvmloader/e820.c
+++ b/tools/firmware/hvmloader/e820.c
@@ -105,7 +105,11 @@ int build_e820_table(struct e820entry *e820,
unsigned int lowmem_reserved_base,
unsigned int bios_image_base)
{
- unsigned int nr = 0;
+ unsigned int nr = 0, i, j;
+ uint32_t low_mem_end = hvm_info->low_mem_pgend << PAGE_SHIFT;
+ uint32_t add_high_mem = 0;
+ uint64_t high_mem_end = (uint64_t)hvm_info->high_mem_pgend <<
PAGE_SHIFT;
+ uint64_t map_start, map_size, map_end;
if ( !lowmem_reserved_base )
lowmem_reserved_base = 0xA0000;
@@ -149,13 +153,6 @@ int build_e820_table(struct e820entry *e820,
e820[nr].type = E820_RESERVED;
nr++;
- /* Low RAM goes here. Reserve space for special pages. */
- BUG_ON((hvm_info->low_mem_pgend << PAGE_SHIFT) < (2u << 20));
- e820[nr].addr = 0x100000;
- e820[nr].size = (hvm_info->low_mem_pgend << PAGE_SHIFT) -
e820[nr].addr;
- e820[nr].type = E820_RAM;
- nr++;
-
/*
* Explicitly reserve space for special pages.
* This space starts at RESERVED_MEMBASE an extends to cover various
@@ -191,16 +188,102 @@ int build_e820_table(struct e820entry *e820,
nr++;
}
+ /* Low RAM goes here. Reserve space for special pages. */
+ BUG_ON(low_mem_end < (2u << 20));
- if ( hvm_info->high_mem_pgend )
+ /*
+ * Construct E820 table according to recorded memory map.
+ *
+ * The memory map created by toolstack may include,
+ *
+ * #1. Low memory region
+ *
+ * Low RAM starts at least from 1M to make sure all standard regions
+ * of the PC memory map, like BIOS, VGA memory-mapped I/O and vgabios,
+ * have enough space.
+ *
+ * #2. Reserved regions if they exist
+ *
+ * #3. High memory region if it exists
+ *
+ * Note we just have one low memory entry and one high mmeory entry if
+ * exists.
+ *
+ * But we may have relocated RAM to allocate sufficient MMIO previously
+ * so low_mem_pgend would be changed over there. And here memory_map[]
+ * records the original low/high memory, so if low_mem_end is less than
+ * the original we need to revise low/high memory range firstly.
+ */
+ for ( i = 0; i < memory_map.nr_map; i++ )
{
- e820[nr].addr = ((uint64_t)1 << 32);
- e820[nr].size =
- ((uint64_t)hvm_info->high_mem_pgend << PAGE_SHIFT) -
e820[nr].addr;
- e820[nr].type = E820_RAM;
+ map_start = memory_map.map[i].addr;
+ map_size = memory_map.map[i].size;
+ map_end = map_start + map_size;
+
+ /* If we need to adjust lowmem. */
+ if ( memory_map.map[i].type == E820_RAM &&
+ low_mem_end > map_start && low_mem_end < map_end )
+ {
+ add_high_mem = map_end - low_mem_end;
+ memory_map.map[i].size = low_mem_end - map_start;
+ break;
+ }
+ }
+
+ /* If we need to adjust highmem. */
+ if ( add_high_mem )
+ {
+ /* Modify the existing highmem region if it exists. */
+ for ( i = 0; i < memory_map.nr_map; i++ )
+ {
+ map_start = memory_map.map[i].addr;
+ map_size = memory_map.map[i].size;
+ map_end = map_start + map_size;
+
+ if ( memory_map.map[i].type == E820_RAM &&
+ map_start == ((uint64_t)1 << 32))
+ {
+ memory_map.map[i].size += add_high_mem;
+ break;
+ }
+ }
+
+ /* If there was no highmem region, just create one. */
+ if ( i == memory_map.nr_map )
+ {
+ memory_map.map[i].addr = ((uint64_t)1 << 32);
+ memory_map.map[i].size = add_high_mem;
+ memory_map.map[i].type = E820_RAM;
+ memory_map.nr_map++;
+ }
+
+ /* A sanity check if high memory is broken. */
+ BUG_ON( high_mem_end !=
+ memory_map.map[i].addr + memory_map.map[i].size);
+ }
+
+ /* Now fill e820. */
+ for ( i = 0; i < memory_map.nr_map; i++ )
+ {
+ e820[nr] = memory_map.map[i];
nr++;
}
+ /* Finally we need to sort all e820 entries. */
+ for ( j = 0; j < nr - 1; j++ )
+ {
+ for ( i = j + 1; i < nr; i++ )
+ {
+ if ( e820[j].addr > e820[i].addr )
+ {
+ struct e820entry tmp = e820[j];
+
+ e820[j] = e820[i];
+ e820[i] = tmp;
+ }
+ }
+ }
+
return nr;
}
--
1.9.1
Thanks
Tiejun
On 2015/7/20 19:56, Jan Beulich wrote:
>>>> On 20.07.15 at 08:16, <tiejun.chen@intel.com> wrote:
>> + /* If there was no highmem region, just create one. */
>> + if ( i == memory_map.nr_map )
>> + {
>> + memory_map.map[i].addr = ((uint64_t)1 << 32);
>> + memory_map.map[i].size = add_high_mem;
>> + memory_map.map[i].type = E820_RAM;
>
> Don't you need to increment memory_map.nr_map here?
>
>> + }
>> +
>> + /* A sanity check if high memory is broken. */
>> + BUG_ON( high_mem_end !=
>> + memory_map.map[i].addr + memory_map.map[i].size);
>> + }
>> +
>> + /* Now fulfill e820. */
>
> s/fulfill/fill/.
>
>> + /* Finally we need to sort all e820 entries. */
>> + for ( j = 0; j < nr-1; j++ )
>> + {
>> + for ( i = j+1; i < nr; i++ )
>
> Blanks around binary operators please.
>
> Jan
>
>
next prev parent reply other threads:[~2015-07-20 14:35 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-20 6:16 [v10][PATCH 00/16] Fix RMRR Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 01/16] xen: introduce XENMEM_reserved_device_memory_map Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 02/16] xen/vtd: create RMRR mapping Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 03/16] xen/passthrough: extend hypercall to support rdm reservation policy Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 04/16] xen: enable XENMEM_memory_map in hvm Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 05/16] hvmloader: get guest memory map into memory_map[] Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 06/16] hvmloader/pci: Try to avoid placing BARs in RMRRs Tiejun Chen
2015-07-20 11:00 ` George Dunlap
2015-07-20 11:30 ` Jan Beulich
2015-07-20 12:52 ` George Dunlap
2015-07-20 14:06 ` Chen, Tiejun
2015-07-20 14:10 ` George Dunlap
2015-07-20 14:16 ` Jan Beulich
2015-07-20 14:32 ` Chen, Tiejun
2015-07-20 15:00 ` Jan Beulich
2015-07-21 0:53 ` Chen, Tiejun
2015-07-21 6:18 ` Jan Beulich
2015-07-21 9:42 ` George Dunlap
2015-07-20 6:16 ` [v10][PATCH 07/16] hvmloader/e820: construct guest e820 table Tiejun Chen
2015-07-20 11:56 ` Jan Beulich
2015-07-20 14:35 ` Chen, Tiejun [this message]
2015-07-20 15:03 ` Jan Beulich
2015-07-20 13:00 ` George Dunlap
2015-07-20 13:23 ` Chen, Tiejun
2015-07-20 13:50 ` George Dunlap
2015-07-20 13:57 ` Chen, Tiejun
2015-07-20 6:16 ` [v10][PATCH 08/16] tools/libxc: Expose new hypercall xc_reserved_device_memory_map Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 09/16] tools: extend xc_assign_device() to support rdm reservation policy Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 10/16] tools: introduce some new parameters to set rdm policy Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 11/16] tools/libxl: detect and avoid conflicts with RDM Tiejun Chen
2015-07-20 13:32 ` Ian Jackson
2015-07-20 14:40 ` Chen, Tiejun
2015-07-20 14:53 ` Ian Jackson
2015-07-20 15:08 ` Chen, Tiejun
2015-07-20 15:24 ` Ian Jackson
2015-07-20 15:38 ` Ian Campbell
2015-07-21 6:44 ` Chen, Tiejun
2015-07-21 6:45 ` Chen, Tiejun
2015-07-21 6:38 ` Chen, Tiejun
2015-07-21 10:48 ` Ian Jackson
2015-07-21 11:12 ` Chen, Tiejun
2015-07-21 10:41 ` Ian Jackson
2015-07-21 11:04 ` Chen, Tiejun
2015-07-21 11:11 ` Ian Jackson
2015-07-21 11:23 ` Chen, Tiejun
2015-07-21 11:27 ` Ian Jackson
2015-07-21 11:45 ` Chen, Tiejun
2015-07-21 12:33 ` Ian Jackson
2015-07-21 13:29 ` Chen, Tiejun
2015-07-21 15:09 ` Ian Jackson
2015-07-21 15:42 ` Chen, Tiejun
2015-07-21 15:57 ` Ian Jackson
2015-07-21 15:57 ` Ian Jackson
2015-07-22 0:33 ` Chen, Tiejun
2015-07-22 8:43 ` Ian Campbell
2015-07-22 9:18 ` Chen, Tiejun
2015-07-22 10:28 ` Ian Jackson
2015-07-22 10:51 ` Ian Campbell
2015-07-21 13:41 ` Chen, Tiejun
2015-07-21 15:10 ` Ian Jackson
2015-07-21 15:22 ` Chen, Tiejun
2015-07-21 15:31 ` Ian Jackson
2015-07-21 12:04 ` Chen, Tiejun
2015-07-21 12:34 ` Ian Jackson
2015-07-20 6:16 ` [v10][PATCH 12/16] tools: introduce a new parameter to set a predefined rdm boundary Tiejun Chen
2015-07-20 6:17 ` [v10][PATCH 13/16] libxl: construct e820 map with RDM information for HVM guest Tiejun Chen
2015-07-20 13:34 ` Ian Jackson
2015-07-20 6:17 ` [v10][PATCH 14/16] xen/vtd: enable USB device assignment Tiejun Chen
2015-07-20 6:17 ` [v10][PATCH 15/16] xen/vtd: prevent from assign the device with shared rmrr Tiejun Chen
2015-07-20 6:17 ` [v10][PATCH 16/16] tools: parse to enable new rdm policy parameters Tiejun Chen
2015-07-20 13:43 ` Ian Jackson
2015-07-20 13:53 ` Chen, Tiejun
2015-07-20 10:37 ` [v10][PATCH 00/16] Fix RMRR George Dunlap
2015-07-20 12:39 ` Chen, Tiejun
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=55AD0718.4080507@intel.com \
--to=tiejun.chen@intel.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=keir@xen.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.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).