From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v2 13/18] xen: init memory regions for PVH Date: Tue, 9 Oct 2018 13:03:12 +0200 Message-ID: <20181009110317.6022-14-jgross@suse.com> References: <20181009110317.6022-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181009110317.6022-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: grub-devel@gnu.org Cc: hans@knorrie.org, phcoder@gmail.com, daniel.kiper@oracle.com, Juergen Gross , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org QWRkIGFsbCB1c2FibGUgbWVtb3J5IHJlZ2lvbnMgdG8gZ3J1YiBtZW1vcnkgbWFuYWdlbWVudCBh bmQgYWRkIHRoZQpuZWVkZWQgbW1hcCBpdGVyYXRlIGNvZGUuCgpBcyB3ZSBhcmUgcnVubmluZyBp biAzMi1iaXQgbW9kZSBkb24ndCBhZGQgbWVtb3J5IGFib3ZlIDRHQi4KClNpZ25lZC1vZmYtYnk6 IEp1ZXJnZW4gR3Jvc3MgPGpncm9zc0BzdXNlLmNvbT4KLS0tCiBncnViLWNvcmUva2Vybi9pMzg2 L3hlbi9wdmguYyB8IDM1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZp bGUgY2hhbmdlZCwgMzUgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2dydWItY29yZS9rZXJu L2kzODYveGVuL3B2aC5jIGIvZ3J1Yi1jb3JlL2tlcm4vaTM4Ni94ZW4vcHZoLmMKaW5kZXggOTNl ZDY4MjQ1Li5jNGE4YmNjZjQgMTAwNjQ0Ci0tLSBhL2dydWItY29yZS9rZXJuL2kzODYveGVuL3B2 aC5jCisrKyBiL2dydWItY29yZS9rZXJuL2kzODYveGVuL3B2aC5jCkBAIC0yMjIsNiArMjIyLDMw IEBAIGdydWJfeGVuX2dldF9tbWFwICh2b2lkKQogICBncnViX3hlbl9zb3J0X21tYXAgKCk7CiB9 CiAKK3N0YXRpYyB2b2lkCitncnViX3hlbl9tbV9pbml0X3JlZ2lvbnMgKHZvaWQpCit7CisgIGdy dWJfdWludDY0X3QgbW9kZW5kLCBmcm9tLCB0bzsKKyAgdW5zaWduZWQgaW50IGk7CisKKyAgbW9k ZW5kID0gZ3J1Yl9tb2R1bGVzX2dldF9lbmQgKCk7CisKKyAgZm9yIChpID0gMDsgaSA8IG5yX21h cF9lbnRyaWVzOyBpKyspCisgICAgeworICAgICAgaWYgKG1hcFtpXS50eXBlICE9IEdSVUJfTUVN T1JZX0FWQUlMQUJMRSkKKyAgICAgICAgY29udGludWU7CisgICAgICBmcm9tID0gbWFwW2ldLmFk ZHI7CisgICAgICB0byA9IGZyb20gKyBtYXBbaV0ubGVuOworICAgICAgaWYgKGZyb20gPCBtb2Rl bmQpCisgICAgICAgIGZyb20gPSBtb2RlbmQ7CisgICAgICBpZiAoZnJvbSA+PSB0byB8fCBmcm9t ID49IDB4MTAwMDAwMDAwVUxMKQorICAgICAgICBjb250aW51ZTsKKyAgICAgIGlmICh0byA+IDB4 MTAwMDAwMDAwVUxMKQorICAgICAgICB0byA9IDB4MTAwMDAwMDAwVUxMOworICAgICAgZ3J1Yl9t bV9pbml0X3JlZ2lvbiAoKHZvaWQgKikgKGdydWJfYWRkcl90KSBmcm9tLCB0byAtIGZyb20pOwor ICAgIH0KK30KKwogc3RhdGljIGdydWJfdWludDY0X3QKIGdydWJfeGVuX2ZpbmRfcGFnZSAoZ3J1 Yl91aW50NjRfdCBzdGFydCkKIHsKQEAgLTMwMiwxMCArMzI2LDIxIEBAIGdydWJfeGVuX3NldHVw X3B2aCAodm9pZCkKICAgZ3J1Yl94ZW5fc2hhcmVkX2luZm8gPSBncnViX3hlbl9hZGRfcGh5c21h cCAoWEVOTUFQU1BBQ0Vfc2hhcmVkX2luZm8sCiAJCQkJCSAgICAgICAodm9pZCAqKSBwYXIpOwog CisgIGdydWJfeGVuX21tX2luaXRfcmVnaW9ucyAoKTsKKwogICBncnViX3JzZHBfYWRkciA9IHB2 aF9zdGFydF9pbmZvLT5yc2RwX3BhZGRyOwogfQogCiBncnViX2Vycl90CiBncnViX21hY2hpbmVf bW1hcF9pdGVyYXRlIChncnViX21lbW9yeV9ob29rX3QgaG9vaywgdm9pZCAqaG9va19kYXRhKQog eworICB1bnNpZ25lZCBpbnQgaTsKKworICBmb3IgKGkgPSAwOyBpIDwgbnJfbWFwX2VudHJpZXM7 IGkrKykKKyAgICB7CisgICAgICBpZiAobWFwW2ldLmxlbiAmJiBob29rIChtYXBbaV0uYWRkciwg bWFwW2ldLmxlbiwgbWFwW2ldLnR5cGUsIGhvb2tfZGF0YSkpCisgICAgICAgIGJyZWFrOworICAg IH0KKworICByZXR1cm4gR1JVQl9FUlJfTk9ORTsKIH0KLS0gCjIuMTYuNAoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxp c3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVj dC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1g9pnp-0001aI-9Q for mharc-grub-devel@gnu.org; Tue, 09 Oct 2018 07:03:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9pni-0001Sn-2A for grub-devel@gnu.org; Tue, 09 Oct 2018 07:03:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9pne-0005Wu-E9 for grub-devel@gnu.org; Tue, 09 Oct 2018 07:03:41 -0400 Received: from mx2.suse.de ([195.135.220.15]:55294 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g9pnd-0005M2-VR for grub-devel@gnu.org; Tue, 09 Oct 2018 07:03:38 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id AA326AFF6; Tue, 9 Oct 2018 11:03:22 +0000 (UTC) From: Juergen Gross To: grub-devel@gnu.org Cc: xen-devel@lists.xen.org, phcoder@gmail.com, daniel.kiper@oracle.com, hans@knorrie.org, Juergen Gross Subject: [PATCH v2 13/18] xen: init memory regions for PVH Date: Tue, 9 Oct 2018 13:03:12 +0200 Message-Id: <20181009110317.6022-14-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181009110317.6022-1-jgross@suse.com> References: <20181009110317.6022-1-jgross@suse.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2018 11:03:46 -0000 Add all usable memory regions to grub memory management and add the needed mmap iterate code. As we are running in 32-bit mode don't add memory above 4GB. Signed-off-by: Juergen Gross --- grub-core/kern/i386/xen/pvh.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/grub-core/kern/i386/xen/pvh.c b/grub-core/kern/i386/xen/pvh.c index 93ed68245..c4a8bccf4 100644 --- a/grub-core/kern/i386/xen/pvh.c +++ b/grub-core/kern/i386/xen/pvh.c @@ -222,6 +222,30 @@ grub_xen_get_mmap (void) grub_xen_sort_mmap (); } +static void +grub_xen_mm_init_regions (void) +{ + grub_uint64_t modend, from, to; + unsigned int i; + + modend = grub_modules_get_end (); + + for (i = 0; i < nr_map_entries; i++) + { + if (map[i].type != GRUB_MEMORY_AVAILABLE) + continue; + from = map[i].addr; + to = from + map[i].len; + if (from < modend) + from = modend; + if (from >= to || from >= 0x100000000ULL) + continue; + if (to > 0x100000000ULL) + to = 0x100000000ULL; + grub_mm_init_region ((void *) (grub_addr_t) from, to - from); + } +} + static grub_uint64_t grub_xen_find_page (grub_uint64_t start) { @@ -302,10 +326,21 @@ grub_xen_setup_pvh (void) grub_xen_shared_info = grub_xen_add_physmap (XENMAPSPACE_shared_info, (void *) par); + grub_xen_mm_init_regions (); + grub_rsdp_addr = pvh_start_info->rsdp_paddr; } grub_err_t grub_machine_mmap_iterate (grub_memory_hook_t hook, void *hook_data) { + unsigned int i; + + for (i = 0; i < nr_map_entries; i++) + { + if (map[i].len && hook (map[i].addr, map[i].len, map[i].type, hook_data)) + break; + } + + return GRUB_ERR_NONE; } -- 2.16.4