From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v4 14/19] xen: init memory regions for PVH Date: Fri, 2 Nov 2018 13:37:33 +0100 Message-ID: <20181102123738.16395-15-jgross@suse.com> References: <20181102123738.16395-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181102123738.16395-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 bmQgYWRkIHRoZQpuZWVkZWQgbW1hcCBpdGVyYXRlIGNvZGUsIHdoaWNoIHdpbGwgYmUgdXNlZCBi eSBncnViIGNvcmUgKGUuZy4KZ3J1Yi1jb3JlL2xpYi9yZWxvY2F0b3IuYyBvciBncnViLWNvcmUv bW1hcC9tbWFwLmMpLgoKQXMgd2UgYXJlIHJ1bm5pbmcgaW4gMzItYml0IG1vZGUgZG9uJ3QgYWRk IG1lbW9yeSBhYm92ZSA0R0IuCgpTaWduZWQtb2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NA c3VzZS5jb20+Ci0tLQogZ3J1Yi1jb3JlL2tlcm4vaTM4Ni94ZW4vcHZoLmMgfCAzNSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2VydGlv bnMoKykKCmRpZmYgLS1naXQgYS9ncnViLWNvcmUva2Vybi9pMzg2L3hlbi9wdmguYyBiL2dydWIt Y29yZS9rZXJuL2kzODYveGVuL3B2aC5jCmluZGV4IGQ3NDMwMWY5Mi4uNjc5NTJlYTkxIDEwMDY0 NAotLS0gYS9ncnViLWNvcmUva2Vybi9pMzg2L3hlbi9wdmguYworKysgYi9ncnViLWNvcmUva2Vy bi9pMzg2L3hlbi9wdmguYwpAQCAtMjk5LDYgKzI5OSwzMCBAQCBncnViX3hlbl9zZXRfbW1hcCAo dm9pZCkKIAkJICAgICAgKGdydWJfdWludDMyX3QpICgmbWVtbWFwKSwgMCwgMCwgMCwgMCk7CiB9 CiAKK3N0YXRpYyB2b2lkCitncnViX3hlbl9tbV9pbml0X3JlZ2lvbnMgKHZvaWQpCit7CisgIGdy dWJfdWludDY0X3QgbW9kZW5kLCBmcm9tLCB0bzsKKyAgdW5zaWduZWQgaW50IGk7CisKKyAgbW9k ZW5kID0gZ3J1Yl9tb2R1bGVzX2dldF9lbmQgKCk7CisKKyAgZm9yIChpID0gMDsgaSA8IG5yX21h cF9lbnRyaWVzOyBpKyspCisgICAgeworICAgICAgaWYgKG1hcFtpXS50eXBlICE9IEdSVUJfTUVN T1JZX0FWQUlMQUJMRSkKKyAgICAgICAgY29udGludWU7CisgICAgICBmcm9tID0gbWFwW2ldLmFk ZHI7CisgICAgICB0byA9IGZyb20gKyBtYXBbaV0ubGVuOworICAgICAgaWYgKGZyb20gPCBtb2Rl bmQpCisgICAgICAgIGZyb20gPSBtb2RlbmQ7CisgICAgICBpZiAoZnJvbSA+PSB0byB8fCBmcm9t ID49IDB4MTAwMDAwMDAwVUxMKQorICAgICAgICBjb250aW51ZTsKKyAgICAgIGlmICh0byA+IDB4 MTAwMDAwMDAwVUxMKQorICAgICAgICB0byA9IDB4MTAwMDAwMDAwVUxMOworICAgICAgZ3J1Yl9t bV9pbml0X3JlZ2lvbiAoKHZvaWQgKikgKGdydWJfYWRkcl90KSBmcm9tLCB0byAtIGZyb20pOwor ICAgIH0KK30KKwogc3RhdGljIGdydWJfdWludDY0X3QKIGdydWJfeGVuX2ZpbmRfcGFnZSAoZ3J1 Yl91aW50NjRfdCBzdGFydCkKIHsKQEAgLTM3OSwxMCArNDAzLDIxIEBAIGdydWJfeGVuX3NldHVw X3B2aCAodm9pZCkKIAkJCQkJICAgICAgICh2b2lkICopIHBhcik7CiAgIGdydWJfeGVuX3NldF9t bWFwICgpOwogCisgIGdydWJfeGVuX21tX2luaXRfcmVnaW9ucyAoKTsKKwogICBncnViX3JzZHBf YWRkciA9IHB2aF9zdGFydF9pbmZvLT5yc2RwX3BhZGRyOwogfQogCiBncnViX2Vycl90CiBncnVi X21hY2hpbmVfbW1hcF9pdGVyYXRlIChncnViX21lbW9yeV9ob29rX3QgaG9vaywgdm9pZCAqaG9v a19kYXRhKQogeworICB1bnNpZ25lZCBpbnQgaTsKKworICBmb3IgKGkgPSAwOyBpIDwgbnJfbWFw X2VudHJpZXM7IGkrKykKKyAgICB7CisgICAgICBpZiAobWFwW2ldLmxlbiAmJiBob29rIChtYXBb aV0uYWRkciwgbWFwW2ldLmxlbiwgbWFwW2ldLnR5cGUsIGhvb2tfZGF0YSkpCisgICAgICAgIGJy ZWFrOworICAgIH0KKworICByZXR1cm4gR1JVQl9FUlJfTk9ORTsKIH0KLS0gCjIuMTYuNAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMu eGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gIYwO-0006Qv-Dv for mharc-grub-devel@gnu.org; Fri, 02 Nov 2018 08:52:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIYwL-0005NV-Ir for grub-devel@gnu.org; Fri, 02 Nov 2018 08:52:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIYiA-00058h-EU for grub-devel@gnu.org; Fri, 02 Nov 2018 08:38:05 -0400 Received: from mx2.suse.de ([195.135.220.15]:50248 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 1gIYiA-00052e-2k for grub-devel@gnu.org; Fri, 02 Nov 2018 08:38:02 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id F297CAF79; Fri, 2 Nov 2018 12:37:43 +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 v4 14/19] xen: init memory regions for PVH Date: Fri, 2 Nov 2018 13:37:33 +0100 Message-Id: <20181102123738.16395-15-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181102123738.16395-1-jgross@suse.com> References: <20181102123738.16395-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: Fri, 02 Nov 2018 12:52:42 -0000 Add all usable memory regions to grub memory management and add the needed mmap iterate code, which will be used by grub core (e.g. grub-core/lib/relocator.c or grub-core/mmap/mmap.c). 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 d74301f92..67952ea91 100644 --- a/grub-core/kern/i386/xen/pvh.c +++ b/grub-core/kern/i386/xen/pvh.c @@ -299,6 +299,30 @@ grub_xen_set_mmap (void) (grub_uint32_t) (&memmap), 0, 0, 0, 0); } +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) { @@ -379,10 +403,21 @@ grub_xen_setup_pvh (void) (void *) par); grub_xen_set_mmap (); + 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