45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From c3f4c5bcf0d8d93b5116f3e368c4739abe2dc06d Mon Sep 17 00:00:00 2001
|
|
From: Anthony PERARD <anthony.perard@citrix.com>
|
|
Date: Mon, 14 Mar 2016 17:55:44 +0000
|
|
Subject: [PATCH 09/15] hvmloader: Check modules whereabouts in perform_tests
|
|
|
|
As perform_tests() is going to clear memory past 4MB, we check that the
|
|
memory can be use or we skip the tests.
|
|
|
|
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
---
|
|
tools/firmware/hvmloader/tests.c | 20 ++++++++++++++++++++
|
|
1 file changed, 20 insertions(+)
|
|
|
|
Index: xen-4.7.0-testing/tools/firmware/hvmloader/tests.c
|
|
===================================================================
|
|
--- xen-4.7.0-testing.orig/tools/firmware/hvmloader/tests.c
|
|
+++ xen-4.7.0-testing/tools/firmware/hvmloader/tests.c
|
|
@@ -210,6 +210,26 @@ void perform_tests(void)
|
|
return;
|
|
}
|
|
|
|
+ /* Check that tests does not use memory where modules are stored */
|
|
+ if ( ((uint32_t)hvm_start_info + sizeof(struct hvm_start_info)) > 4 << 20
|
|
+ && (uint32_t)hvm_start_info < 8 << 20 )
|
|
+ {
|
|
+ printf("Skipping tests due to memory used by hvm_start_info\n");
|
|
+ return;
|
|
+ }
|
|
+ for ( unsigned i = 0; i < hvm_start_info->nr_modules; i++ )
|
|
+ {
|
|
+ const struct hvm_modlist_entry *modlist =
|
|
+ (struct hvm_modlist_entry *)((uintptr_t)hvm_start_info->modlist_paddr);
|
|
+ if ( modlist[i].paddr
|
|
+ && modlist[i].paddr + modlist[i].size > 4ul << 20
|
|
+ && modlist[i].paddr < 8ul << 20 )
|
|
+ {
|
|
+ printf("Skipping tests due to memory used by a module\n");
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+
|
|
passed = skipped = 0;
|
|
for ( i = 0; tests[i].test; i++ )
|
|
{
|