From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v5 12/20] xen: get memory map from hypervisor for PVH Date: Wed, 21 Nov 2018 15:28:47 +0100 Message-ID: <20181121142855.13537-13-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 UmV0cmlldmUgdGhlIG1lbW9yeSBtYXAgZnJvbSB0aGUgaHlwZXJ2aXNvciBhbmQgbm9ybWFsaXpl IGl0IHRvIGNvbnRhaW4Kbm8gb3ZlcmxhcHBpbmcgZW50cmllcyBhbmQgdG8gYmUgc29ydGVkIGJ5 IGFkZHJlc3MuCgpTaWduZWQtb2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+ ClJldmlld2VkLWJ5OiBEYW5pZWwgS2lwZXIgPGRhbmllbC5raXBlckBvcmFjbGUuY29tPgotLS0K VjM6IHVzZSBncnViX2U4MjBfbW1hcF9lbnRyeSBpbnN0ZWFkIG9mIG93biBzdHJ1Y3QgKERhbmll bCBLaXBlcikKLS0tCiBncnViLWNvcmUva2Vybi9pMzg2L3hlbi9wdmguYyB8IDk0ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA5NCBp bnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ3J1Yi1jb3JlL2tlcm4vaTM4Ni94ZW4vcHZoLmMg Yi9ncnViLWNvcmUva2Vybi9pMzg2L3hlbi9wdmguYwppbmRleCA0NzhjZWYwZDEuLmJiOTA4NzRi MyAxMDA2NDQKLS0tIGEvZ3J1Yi1jb3JlL2tlcm4vaTM4Ni94ZW4vcHZoLmMKKysrIGIvZ3J1Yi1j b3JlL2tlcm4vaTM4Ni94ZW4vcHZoLmMKQEAgLTI0LDcgKzI0LDEyIEBACiAjaW5jbHVkZSA8Z3J1 Yi9pMzg2L2lvLmg+CiAjaW5jbHVkZSA8Z3J1Yi94ZW4uaD4KICNpbmNsdWRlIDx4ZW4vaHZtL3N0 YXJ0X2luZm8uaD4KKyNpbmNsdWRlIDxncnViL2kzODYvbGludXguaD4KICNpbmNsdWRlIDxncnVi L21hY2hpbmUva2VybmVsLmg+CisjaW5jbHVkZSA8Z3J1Yi9tYWNoaW5lL21lbW9yeS5oPgorI2lu Y2x1ZGUgPHhlbi9tZW1vcnkuaD4KKworI2RlZmluZSBYRU5fTUVNT1JZX01BUF9TSVpFICAgMTI4 CiAKIGdydWJfdWludDY0X3QgZ3J1Yl9yc2RwX2FkZHI7CiAKQEAgLTMyLDYgKzM3LDggQEAgc3Rh dGljIGNoYXIgaHlwZXJjYWxsX3BhZ2VbR1JVQl9YRU5fUEFHRV9TSVpFXQogICBfX2F0dHJpYnV0 ZV9fICgoYWxpZ25lZCAoR1JVQl9YRU5fUEFHRV9TSVpFKSkpOwogCiBzdGF0aWMgZ3J1Yl91aW50 MzJfdCB4ZW5fY3B1aWRfYmFzZTsKK3N0YXRpYyBzdHJ1Y3QgZ3J1Yl9lODIwX21tYXBfZW50cnkg bWFwW1hFTl9NRU1PUllfTUFQX1NJWkVdOworc3RhdGljIHVuc2lnbmVkIGludCBucl9tYXBfZW50 cmllczsKIAogc3RhdGljIHZvaWQKIGdydWJfeGVuX2NvbnNfbXNnIChjb25zdCBjaGFyICptc2cp CkBAIC0xMDMsMTEgKzExMCw5OCBAQCBncnViX3hlbl9oeXBlcmNhbGwgKGdydWJfdWludDMyX3Qg Y2FsbG5vLCBncnViX3VpbnQzMl90IGEwLAogICByZXR1cm4gX19yZXM7CiB9CiAKK3N0YXRpYyB2 b2lkCitncnViX3hlbl9zb3J0X21tYXAgKHZvaWQpCit7CisgIGdydWJfdWludDY0X3QgZnJvbSwg dG87CisgIHVuc2lnbmVkIGludCBpOworICBzdHJ1Y3QgZ3J1Yl9lODIwX21tYXBfZW50cnkgdG1w OworCisgIC8qIEFsaWduIG1hcCBlbnRyaWVzIHRvIHBhZ2UgYm91bmRhcmllcy4gKi8KKyAgZm9y IChpID0gMDsgaSA8IG5yX21hcF9lbnRyaWVzOyBpKyspCisgICAgeworICAgICAgZnJvbSA9IG1h cFtpXS5hZGRyOworICAgICAgdG8gPSBmcm9tICsgbWFwW2ldLmxlbjsKKyAgICAgIGlmIChtYXBb aV0udHlwZSA9PSBHUlVCX01FTU9SWV9BVkFJTEFCTEUpCisJeworCSAgZnJvbSA9IEFMSUdOX1VQ IChmcm9tLCBHUlVCX1hFTl9QQUdFX1NJWkUpOworCSAgdG8gPSBBTElHTl9ET1dOICh0bywgR1JV Ql9YRU5fUEFHRV9TSVpFKTsKKwl9CisgICAgICBlbHNlCisJeworCSAgZnJvbSA9IEFMSUdOX0RP V04gKGZyb20sIEdSVUJfWEVOX1BBR0VfU0laRSk7CisJICB0byA9IEFMSUdOX1VQICh0bywgR1JV Ql9YRU5fUEFHRV9TSVpFKTsKKwl9CisgICAgICBtYXBbaV0uYWRkciA9IGZyb207CisgICAgICBt YXBbaV0ubGVuID0gdG8gLSBmcm9tOworICAgIH0KKworIGFnYWluOgorICAvKiBTb3J0IGVudHJp ZXMgYnkgc3RhcnQgYWRkcmVzcy4gKi8KKyAgZm9yIChpID0gMTsgaSA8IG5yX21hcF9lbnRyaWVz OyBpKyspCisgICAgeworICAgICAgaWYgKG1hcFtpXS5hZGRyID49IG1hcFtpIC0gMV0uYWRkcikK Kwljb250aW51ZTsKKyAgICAgIHRtcCA9IG1hcFtpXTsKKyAgICAgIG1hcFtpXSA9IG1hcFtpIC0g MV07CisgICAgICBtYXBbaSAtIDFdID0gdG1wOworICAgICAgaSA9IDA7CisgICAgfQorCisgIC8q IERldGVjdCBvdmVybGFwcGluZyBhcmVhcy4gKi8KKyAgZm9yIChpID0gMTsgaSA8IG5yX21hcF9l bnRyaWVzOyBpKyspCisgICAgeworICAgICAgaWYgKG1hcFtpXS5hZGRyID49IG1hcFtpIC0gMV0u YWRkciArIG1hcFtpIC0gMV0ubGVuKQorCWNvbnRpbnVlOworICAgICAgdG1wID0gbWFwW2kgLSAx XTsKKyAgICAgIG1hcFtpIC0gMV0ubGVuID0gbWFwW2ldLmFkZHIgLSBtYXBbaSAtIDFdLmFkZHI7 CisgICAgICBpZiAobWFwW2ldLmFkZHIgKyBtYXBbaV0ubGVuID49IHRtcC5hZGRyICsgdG1wLmxl bikKKwljb250aW51ZTsKKyAgICAgIGlmIChucl9tYXBfZW50cmllcyA8IEFSUkFZX1NJWkUgKG1h cCkpCisJeworCSAgbWFwW25yX21hcF9lbnRyaWVzXS5hZGRyID0gbWFwW2ldLmFkZHIgKyBtYXBb aV0ubGVuOworCSAgbWFwW25yX21hcF9lbnRyaWVzXS5sZW4gPSB0bXAuYWRkciArIHRtcC5sZW4g LSBtYXBbbnJfbWFwX2VudHJpZXNdLmFkZHI7CisJICBtYXBbbnJfbWFwX2VudHJpZXNdLnR5cGUg PSB0bXAudHlwZTsKKwkgIG5yX21hcF9lbnRyaWVzKys7CisJICBnb3RvIGFnYWluOworCX0KKyAg ICB9CisKKyAgLyogTWVyZ2UgYWRqYWNlbnQgZW50cmllcy4gKi8KKyAgZm9yIChpID0gMTsgaSA8 IG5yX21hcF9lbnRyaWVzOyBpKyspCisgICAgeworICAgICAgaWYgKG1hcFtpXS50eXBlID09IG1h cFtpIC0gMV0udHlwZSAmJgorCSAgbWFwW2ldLmFkZHIgPT0gbWFwW2kgLSAxXS5hZGRyICsgbWFw W2kgLSAxXS5sZW4pCisJeworCSAgbWFwW2kgLSAxXS5sZW4gKz0gbWFwW2ldLmxlbjsKKwkgIG1h cFtpXSA9IG1hcFtucl9tYXBfZW50cmllcyAtIDFdOworCSAgbnJfbWFwX2VudHJpZXMtLTsKKwkg IGdvdG8gYWdhaW47CisJfQorICAgIH0KK30KKworc3RhdGljIHZvaWQKK2dydWJfeGVuX2dldF9t bWFwICh2b2lkKQoreworICBzdHJ1Y3QgeGVuX21lbW9yeV9tYXAgbWVtbWFwOworCisgIG1lbW1h cC5ucl9lbnRyaWVzID0gQVJSQVlfU0laRSAobWFwKTsKKyAgc2V0X3hlbl9ndWVzdF9oYW5kbGUg KG1lbW1hcC5idWZmZXIsIG1hcCk7CisgIGlmIChncnViX3hlbl9oeXBlcmNhbGwgKF9fSFlQRVJW SVNPUl9tZW1vcnlfb3AsIFhFTk1FTV9tZW1vcnlfbWFwLAorCQkJICAoZ3J1Yl91aW50MzJfdCkg KCZtZW1tYXApLCAwLCAwLCAwLCAwKSkKKyAgICBncnViX3hlbl9wYW5pYyAoIkNvdWxkIG5vdCBn ZXQgbWVtb3J5IG1hcCBmcm9tIFhlbiFcbiIpOworICBucl9tYXBfZW50cmllcyA9IG1lbW1hcC5u cl9lbnRyaWVzOworCisgIGdydWJfeGVuX3NvcnRfbW1hcCAoKTsKK30KKwogdm9pZAogZ3J1Yl94 ZW5fc2V0dXBfcHZoICh2b2lkKQogewogICBncnViX3hlbl9jcHVpZF9iYXNlICgpOwogICBncnVi X3hlbl9zZXR1cF9oeXBlcmNhbGxfcGFnZSAoKTsKKyAgZ3J1Yl94ZW5fZ2V0X21tYXAgKCk7CiB9 CiAKIGdydWJfZXJyX3QKLS0gCjIuMTYuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3Rz LnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0 aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gPTVN-0006sp-4V for mharc-grub-devel@gnu.org; Wed, 21 Nov 2018 09:29:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPTVF-0006kq-3F 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-0004N8-6i for grub-devel@gnu.org; Wed, 21 Nov 2018 09:29:17 -0500 Received: from mx2.suse.de ([195.135.220.15]:51158 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 1gPTV9-0004Ia-UG 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 E8904B00B; Wed, 21 Nov 2018 14:29:00 +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 12/20] xen: get memory map from hypervisor for PVH Date: Wed, 21 Nov 2018 15:28:47 +0100 Message-Id: <20181121142855.13537-13-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> 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 Retrieve the memory map from the hypervisor and normalize it to contain no overlapping entries and to be sorted by address. Signed-off-by: Juergen Gross Reviewed-by: Daniel Kiper --- V3: use grub_e820_mmap_entry instead of own struct (Daniel Kiper) --- grub-core/kern/i386/xen/pvh.c | 94 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/grub-core/kern/i386/xen/pvh.c b/grub-core/kern/i386/xen/pvh.c index 478cef0d1..bb90874b3 100644 --- a/grub-core/kern/i386/xen/pvh.c +++ b/grub-core/kern/i386/xen/pvh.c @@ -24,7 +24,12 @@ #include #include #include +#include #include +#include +#include + +#define XEN_MEMORY_MAP_SIZE 128 grub_uint64_t grub_rsdp_addr; @@ -32,6 +37,8 @@ static char hypercall_page[GRUB_XEN_PAGE_SIZE] __attribute__ ((aligned (GRUB_XEN_PAGE_SIZE))); static grub_uint32_t xen_cpuid_base; +static struct grub_e820_mmap_entry map[XEN_MEMORY_MAP_SIZE]; +static unsigned int nr_map_entries; static void grub_xen_cons_msg (const char *msg) @@ -103,11 +110,98 @@ grub_xen_hypercall (grub_uint32_t callno, grub_uint32_t a0, return __res; } +static void +grub_xen_sort_mmap (void) +{ + grub_uint64_t from, to; + unsigned int i; + struct grub_e820_mmap_entry tmp; + + /* Align map entries to page boundaries. */ + for (i = 0; i < nr_map_entries; i++) + { + from = map[i].addr; + to = from + map[i].len; + if (map[i].type == GRUB_MEMORY_AVAILABLE) + { + from = ALIGN_UP (from, GRUB_XEN_PAGE_SIZE); + to = ALIGN_DOWN (to, GRUB_XEN_PAGE_SIZE); + } + else + { + from = ALIGN_DOWN (from, GRUB_XEN_PAGE_SIZE); + to = ALIGN_UP (to, GRUB_XEN_PAGE_SIZE); + } + map[i].addr = from; + map[i].len = to - from; + } + + again: + /* Sort entries by start address. */ + for (i = 1; i < nr_map_entries; i++) + { + if (map[i].addr >= map[i - 1].addr) + continue; + tmp = map[i]; + map[i] = map[i - 1]; + map[i - 1] = tmp; + i = 0; + } + + /* Detect overlapping areas. */ + for (i = 1; i < nr_map_entries; i++) + { + if (map[i].addr >= map[i - 1].addr + map[i - 1].len) + continue; + tmp = map[i - 1]; + map[i - 1].len = map[i].addr - map[i - 1].addr; + if (map[i].addr + map[i].len >= tmp.addr + tmp.len) + continue; + if (nr_map_entries < ARRAY_SIZE (map)) + { + map[nr_map_entries].addr = map[i].addr + map[i].len; + map[nr_map_entries].len = tmp.addr + tmp.len - map[nr_map_entries].addr; + map[nr_map_entries].type = tmp.type; + nr_map_entries++; + goto again; + } + } + + /* Merge adjacent entries. */ + for (i = 1; i < nr_map_entries; i++) + { + if (map[i].type == map[i - 1].type && + map[i].addr == map[i - 1].addr + map[i - 1].len) + { + map[i - 1].len += map[i].len; + map[i] = map[nr_map_entries - 1]; + nr_map_entries--; + goto again; + } + } +} + +static void +grub_xen_get_mmap (void) +{ + struct xen_memory_map memmap; + + memmap.nr_entries = ARRAY_SIZE (map); + set_xen_guest_handle (memmap.buffer, map); + if (grub_xen_hypercall (__HYPERVISOR_memory_op, XENMEM_memory_map, + (grub_uint32_t) (&memmap), 0, 0, 0, 0)) + grub_xen_panic ("Could not get memory map from Xen!\n"); + nr_map_entries = memmap.nr_entries; + + grub_xen_sort_mmap (); +} + void grub_xen_setup_pvh (void) { grub_xen_cpuid_base (); grub_xen_setup_hypercall_page (); + grub_xen_get_mmap (); } grub_err_t -- 2.16.4