From: Tiejun Chen <tiejun.chen@intel.com>
To: JBeulich@suse.com, ian.jackson@eu.citrix.com,
stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com,
yang.z.zhang@intel.com, kevin.tian@intel.com
Cc: xen-devel@lists.xen.org
Subject: [v4][PATCH 8/9] tools:firmware:hvmloader: check to reserve RMRR mappings in e820
Date: Fri, 22 Aug 2014 18:09:45 +0800 [thread overview]
Message-ID: <1408702186-24432-9-git-send-email-tiejun.chen@intel.com> (raw)
In-Reply-To: <1408702186-24432-1-git-send-email-tiejun.chen@intel.com>
We need to check to reserve all RMRR mappings in e820 to avoid any
potential guest memory conflict.
Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---
tools/firmware/hvmloader/e820.c | 101 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 101 insertions(+)
diff --git a/tools/firmware/hvmloader/e820.c b/tools/firmware/hvmloader/e820.c
index 2e05e93..ae51fa6 100644
--- a/tools/firmware/hvmloader/e820.c
+++ b/tools/firmware/hvmloader/e820.c
@@ -68,12 +68,90 @@ void dump_e820_table(struct e820entry *e820, unsigned int nr)
}
}
+static unsigned int construct_rmrr_e820_maps(unsigned int nr,
+ uint32_t nr_map,
+ struct reserved_device_memory *map,
+ struct e820entry *e820)
+{
+ unsigned int i = 0, j = 0, m = 0, sum_nr = 0;
+ uint64_t start, end, rmrr_start, rmrr_end;
+ unsigned int insert = 0, do_insert = 0;
+
+do_real_construct:
+ sum_nr = nr + nr_map;
+ for ( i = 0; i < nr_map; i++ )
+ {
+ rmrr_start = map[i].pfn << PAGE_SHIFT;
+ rmrr_end = rmrr_start + map[i].count * PAGE_SIZE;
+
+ for ( j = 0; j < nr; j++ )
+ {
+ end = e820[j].addr + e820[j].size;
+ start = e820[j+1].addr;
+
+ /* Between those existing e820 entries. */
+ if ( (rmrr_start > end) && (rmrr_end < start) )
+ {
+ if (do_insert)
+ {
+ /* Move to free this entry. */
+ for ( m = sum_nr - 1; m > j; m-- )
+ {
+ e820[m].addr = e820[m-1].addr;
+ e820[m].size = e820[m-1].size;
+ e820[m].type = e820[m-1].type;
+ }
+
+ /* Then fill RMRR into that entry. */
+ e820[j+1].addr = rmrr_start;
+ e820[j+1].size = rmrr_end - rmrr_start;
+ e820[j+1].type = E820_RESERVED;
+ nr++;
+ }
+ insert++;
+ }
+ /* Already at the end. */
+ else if ( (rmrr_start > end) && !start )
+ {
+ if ( do_insert )
+ {
+ e820[nr].addr = rmrr_start;
+ e820[nr].size = rmrr_end - rmrr_start;
+ e820[nr].type = E820_RESERVED;
+ nr++;
+ }
+ insert++;
+ }
+ }
+ }
+
+ /* Just return if done. */
+ if ( do_insert )
+ return nr;
+
+ /* Fine to construct RMRR mappings into e820. */
+ if ( insert == nr_map)
+ {
+ do_insert = 1;
+ goto do_real_construct;
+ }
+ /* Overlap. */
+ else
+ {
+ printf("RMRR overlap with those existing e820 entries!\n");
+ printf("So we don't construct RMRR mapping in e820!\n");
+ }
+
+ return nr;
+}
/* Create an E820 table based on memory parameters provided in hvm_info. */
int build_e820_table(struct e820entry *e820,
unsigned int lowmem_reserved_base,
unsigned int bios_image_base)
{
unsigned int nr = 0;
+ struct reserved_device_memory *map = NULL;
+ int rc;
if ( !lowmem_reserved_base )
lowmem_reserved_base = 0xA0000;
@@ -169,6 +247,29 @@ int build_e820_table(struct e820entry *e820,
nr++;
}
+ /* We'd better reserve RMRR mapping for each VM to avoid potential
+ * memory conflict.
+ */
+ if ( hvm_info->nr_reserved_device_memory_map )
+ {
+ if ( !map )
+ map = mem_alloc(hvm_info->nr_reserved_device_memory_map * sizeof(struct reserved_device_memory), 0);
+ if ( map )
+ {
+ rc = get_reserved_device_memory_map(map,
+ hvm_info->nr_reserved_device_memory_map);
+ if ( !rc )
+ {
+ nr = construct_rmrr_e820_maps(nr,
+ hvm_info->nr_reserved_device_memory_map,
+ map,
+ e820);
+ }
+ }
+ else
+ printf("No space to get reserved_device_memory_map!\n");
+ }
+
return nr;
}
--
1.9.1
next prev parent reply other threads:[~2014-08-22 10:09 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-22 10:09 [v4][PATCH 0/9] xen: reserve RMRR to avoid conflicting MMIO/RAM Tiejun Chen
2014-08-22 10:09 ` [v4][PATCH 1/9] xen:vtd:rmrr: export acpi_rmrr_units Tiejun Chen
2014-08-22 10:09 ` [v4][PATCH 2/9] xen:x86: define a new hypercall to get RMRR mappings Tiejun Chen
2014-08-22 10:53 ` Andrew Cooper
2014-08-22 11:36 ` Jan Beulich
2014-08-25 11:03 ` Chen, Tiejun
2014-08-25 11:21 ` Chen, Tiejun
2014-08-25 12:07 ` Andrew Cooper
2014-08-26 3:12 ` Chen, Tiejun
2014-08-26 9:25 ` Andrew Cooper
2014-08-22 10:09 ` [v4][PATCH 3/9] tools:libxc: introduce hypercall for xc_reserved_device_memory_map Tiejun Chen
2014-08-22 10:55 ` Andrew Cooper
2014-08-25 11:11 ` Chen, Tiejun
2014-08-25 11:58 ` Andrew Cooper
2014-08-22 10:09 ` [v4][PATCH 4/9] tools:libxc: check if mmio BAR is out of RMRR mappings Tiejun Chen
2014-08-26 20:36 ` Ian Campbell
2014-08-27 1:46 ` Chen, Tiejun
2014-08-27 2:20 ` Ian Campbell
2014-08-27 2:40 ` Chen, Tiejun
2014-08-27 2:47 ` Chen, Tiejun
2014-08-22 10:09 ` [v4][PATCH 5/9] hvm_info_table: introduce nr_reserved_device_memory_map Tiejun Chen
2014-08-26 20:38 ` Ian Campbell
2014-08-27 1:54 ` Chen, Tiejun
2014-08-27 1:57 ` Chen, Tiejun
2014-08-27 2:21 ` Ian Campbell
2014-08-27 2:28 ` Chen, Tiejun
2014-08-22 10:09 ` [v4][PATCH 6/9] xen:x86:: support xc_reserved_device_memory_map in compat case Tiejun Chen
2014-08-22 10:09 ` [v4][PATCH 7/9] tools:firmware:hvmloader: introduce hypercall for xc_reserved_device_memory_map Tiejun Chen
2014-08-22 10:09 ` Tiejun Chen [this message]
2014-08-22 10:09 ` [v4][PATCH 9/9] xen:vtd: make USB RMRR mapping safe Tiejun Chen
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=1408702186-24432-9-git-send-email-tiejun.chen@intel.com \
--to=tiejun.chen@intel.com \
--cc=JBeulich@suse.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=kevin.tian@intel.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=yang.z.zhang@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.