From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v5 14/20] xen: init memory regions for PVH Date: Wed, 21 Nov 2018 15:28:49 +0100 Message-ID: <20181121142855.13537-15-jgross@suse.com> References: <20181121142855.13537-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181121142855.13537-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: Juergen Gross , phcoder@gmail.com, daniel.kiper@oracle.com, xen-devel@lists.xen.org, hans@knorrie.org, roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org QWRkIGFsbCB1c2FibGUgbWVtb3J5IHJlZ2lvbnMgdG8gZ3J1YiBtZW1vcnkgbWFuYWdlbWVudCBh bmQgYWRkIHRoZQpuZWVkZWQgbW1hcCBpdGVyYXRlIGNvZGUsIHdoaWNoIHdpbGwgYmUgdXNlZCBi eSBncnViIGNvcmUgKGUuZy4KZ3J1Yi1jb3JlL2xpYi9yZWxvY2F0b3IuYyBvciBncnViLWNvcmUv bW1hcC9tbWFwLmMpLgoKQXMgd2UgYXJlIHJ1bm5pbmcgaW4gMzItYml0IG1vZGUgZG9uJ3QgYWRk IG1lbW9yeSBhYm92ZSA0R0IuCgpTaWduZWQtb2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NA c3VzZS5jb20+ClJldmlld2VkLWJ5OiBEYW5pZWwgS2lwZXIgPGRhbmllbC5raXBlckBvcmFjbGUu Y29tPgotLS0KVjU6IDB4MTAwMDAwMDAwVUxMIC0+IDFVTEwgPDwgMzIgKFJvZ2VyIFBhdSBNb25u w6kpCi0tLQogZ3J1Yi1jb3JlL2tlcm4vaTM4Ni94ZW4vcHZoLmMgfCAzNSArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKykK CmRpZmYgLS1naXQgYS9ncnViLWNvcmUva2Vybi9pMzg2L3hlbi9wdmguYyBiL2dydWItY29yZS9r ZXJuL2kzODYveGVuL3B2aC5jCmluZGV4IDZkZTg0ZWI4ZS4uMWJkNTAzYzRhIDEwMDY0NAotLS0g YS9ncnViLWNvcmUva2Vybi9pMzg2L3hlbi9wdmguYworKysgYi9ncnViLWNvcmUva2Vybi9pMzg2 L3hlbi9wdmguYwpAQCAtMjQwLDYgKzI0MCwzMCBAQCBncnViX3hlbl9zZXRfbW1hcCAodm9pZCkK IAkJICAgICAgKGdydWJfdWludDMyX3QpICgmbWVtbWFwKSwgMCwgMCwgMCwgMCk7CiB9CiAKK3N0 YXRpYyB2b2lkCitncnViX3hlbl9tbV9pbml0X3JlZ2lvbnMgKHZvaWQpCit7CisgIGdydWJfdWlu dDY0X3QgbW9kZW5kLCBmcm9tLCB0bzsKKyAgdW5zaWduZWQgaW50IGk7CisKKyAgbW9kZW5kID0g Z3J1Yl9tb2R1bGVzX2dldF9lbmQgKCk7CisKKyAgZm9yIChpID0gMDsgaSA8IG5yX21hcF9lbnRy aWVzOyBpKyspCisgICAgeworICAgICAgaWYgKG1hcFtpXS50eXBlICE9IEdSVUJfTUVNT1JZX0FW QUlMQUJMRSkKKyAgICAgICAgY29udGludWU7CisgICAgICBmcm9tID0gbWFwW2ldLmFkZHI7Cisg ICAgICB0byA9IGZyb20gKyBtYXBbaV0ubGVuOworICAgICAgaWYgKGZyb20gPCBtb2RlbmQpCisg ICAgICAgIGZyb20gPSBtb2RlbmQ7CisgICAgICBpZiAoZnJvbSA+PSB0byB8fCBmcm9tID49ICgx VUxMIDw8IDMyKSkKKyAgICAgICAgY29udGludWU7CisgICAgICBpZiAodG8gPiAoMVVMTCA8PCAz MikpCisgICAgICAgIHRvID0gMVVMTCA8PCAzMjsKKyAgICAgIGdydWJfbW1faW5pdF9yZWdpb24g KCh2b2lkICopIChncnViX2FkZHJfdCkgZnJvbSwgdG8gLSBmcm9tKTsKKyAgICB9Cit9CisKIHN0 YXRpYyBncnViX3VpbnQ2NF90CiBncnViX3hlbl9maW5kX3BhZ2UgKGdydWJfdWludDY0X3Qgc3Rh cnQpCiB7CkBAIC0zMjEsMTAgKzM0NSwyMSBAQCBncnViX3hlbl9zZXR1cF9wdmggKHZvaWQpCiAJ CQkJCSAgICAgICAodm9pZCAqKSBwYXIpOwogICBncnViX3hlbl9zZXRfbW1hcCAoKTsKIAorICBn cnViX3hlbl9tbV9pbml0X3JlZ2lvbnMgKCk7CisKICAgZ3J1Yl9yc2RwX2FkZHIgPSBwdmhfc3Rh cnRfaW5mby0+cnNkcF9wYWRkcjsKIH0KIAogZ3J1Yl9lcnJfdAogZ3J1Yl9tYWNoaW5lX21tYXBf aXRlcmF0ZSAoZ3J1Yl9tZW1vcnlfaG9va190IGhvb2ssIHZvaWQgKmhvb2tfZGF0YSkKIHsKKyAg dW5zaWduZWQgaW50IGk7CisKKyAgZm9yIChpID0gMDsgaSA8IG5yX21hcF9lbnRyaWVzOyBpKysp CisgICAgeworICAgICAgaWYgKG1hcFtpXS5sZW4gJiYgaG9vayAobWFwW2ldLmFkZHIsIG1hcFtp XS5sZW4sIG1hcFtpXS50eXBlLCBob29rX2RhdGEpKQorICAgICAgICBicmVhazsKKyAgICB9CisK KyAgcmV0dXJuIEdSVUJfRVJSX05PTkU7CiB9Ci0tIAoyLjE2LjQKCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhl bi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3Jn L21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gPTVN-0006ti-W0 for mharc-grub-devel@gnu.org; Wed, 21 Nov 2018 09:29:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPTVF-0006kv-4K for grub-devel@gnu.org; Wed, 21 Nov 2018 09:29:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPTVA-0004NY-Gr for grub-devel@gnu.org; Wed, 21 Nov 2018 09:29:17 -0500 Received: from mx2.suse.de ([195.135.220.15]:51198 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 1gPTVA-0004Ir-AW for grub-devel@gnu.org; Wed, 21 Nov 2018 09:29:12 -0500 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 57FA4B007; Wed, 21 Nov 2018 14:29:01 +0000 (UTC) From: Juergen Gross To: grub-devel@gnu.org Cc: xen-devel@lists.xen.org, phcoder@gmail.com, daniel.kiper@oracle.com, roger.pau@citrix.com, hans@knorrie.org, Juergen Gross Subject: [PATCH v5 14/20] xen: init memory regions for PVH Date: Wed, 21 Nov 2018 15:28:49 +0100 Message-Id: <20181121142855.13537-15-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181121142855.13537-1-jgross@suse.com> References: <20181121142855.13537-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: Wed, 21 Nov 2018 14:29:18 -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 Reviewed-by: Daniel Kiper --- V5: 0x100000000ULL -> 1ULL << 32 (Roger Pau Monn=C3=A9) --- 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 6de84eb8e..1bd503c4a 100644 --- a/grub-core/kern/i386/xen/pvh.c +++ b/grub-core/kern/i386/xen/pvh.c @@ -240,6 +240,30 @@ grub_xen_set_mmap (void) (grub_uint32_t) (&memmap), 0, 0, 0, 0); } =20 +static void +grub_xen_mm_init_regions (void) +{ + grub_uint64_t modend, from, to; + unsigned int i; + + modend =3D grub_modules_get_end (); + + for (i =3D 0; i < nr_map_entries; i++) + { + if (map[i].type !=3D GRUB_MEMORY_AVAILABLE) + continue; + from =3D map[i].addr; + to =3D from + map[i].len; + if (from < modend) + from =3D modend; + if (from >=3D to || from >=3D (1ULL << 32)) + continue; + if (to > (1ULL << 32)) + to =3D 1ULL << 32; + grub_mm_init_region ((void *) (grub_addr_t) from, to - from); + } +} + static grub_uint64_t grub_xen_find_page (grub_uint64_t start) { @@ -321,10 +345,21 @@ grub_xen_setup_pvh (void) (void *) par); grub_xen_set_mmap (); =20 + grub_xen_mm_init_regions (); + grub_rsdp_addr =3D pvh_start_info->rsdp_paddr; } =20 grub_err_t grub_machine_mmap_iterate (grub_memory_hook_t hook, void *hook_data) { + unsigned int i; + + for (i =3D 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; } --=20 2.16.4