From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kiper Subject: [GRUB2 PATCH v4 3/4 - FOR COMMIT] multiboot2: Do not pass memory maps to image if EFI boot services are enabled Date: Tue, 15 Mar 2016 16:26:01 +0100 Message-ID: <1458055562-24950-5-git-send-email-daniel.kiper@oracle.com> References: <1458055562-24950-1-git-send-email-daniel.kiper@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1afqsb-0000Gj-2o for xen-devel@lists.xenproject.org; Tue, 15 Mar 2016 15:27:29 +0000 In-Reply-To: <1458055562-24950-1-git-send-email-daniel.kiper@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org, grub-devel@gnu.org Cc: jgross@suse.com, eric.snowberg@oracle.com, arvidjaar@gmail.com, andrew.cooper3@citrix.com, stefano.stabellini@eu.citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, roy.franz@linaro.org, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, phcoder@gmail.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org, seth.goldberg@oracle.com List-Id: xen-devel@lists.xenproject.org RG8gbm90IHBhc3MgbWVtb3J5IG1hcHMgdG8gaW1hZ2UgaWYgaXQgYXNrZWQgZm9yIEVGSSBib290 IHNlcnZpY2VzLgpNYWluIHJlYXNvbiBmb3Igbm90IHByb3ZpZGluZyBtYXBzIGlzIGJlY2F1c2Ug dGhleSB3aWxsIGxpa2VseSBiZQppbnZhbGlkLiBXZSBkbyBhIGZldyBhbGxvY2F0aW9ucyBhZnRl ciBmaWxsaW5nIHRoZW0sIGUuZy4gZm9yIHJlbG9jYXRvcgpuZWVkcy4gVXN1YWxseSB3ZSBkbyBu b3QgY2FyZSBhcyB3ZSB3b3VsZCBhbHJlYWR5IGZpbmlzaCBib290IHNlcnZpY2VzLgpJZiB3ZSBr ZWVwIGJvb3Qgc2VydmljZXMgdGhlbiBpdCBpcyBlYXNpZXIgdG8gbm90IHByb3ZpZGUgbWFwcy4g SG93ZXZlciwKaWYgaW1hZ2UgbmVlZHMgbWVtb3J5IG1hcHMgYW5kIHRoZXkgYXJlIG5vdCBwcm92 aWRlZCBieSBib290bG9hZGVyIHRoZW4KaXQgc2hvdWxkIGdldCB0aGVtIGl0c2VsZiBqdXN0IGJl Zm9yZSBFeGl0Qm9vdFNlcnZpY2VzKCkgY2FsbC4KClNpZ25lZC1vZmYtYnk6IERhbmllbCBLaXBl ciA8ZGFuaWVsLmtpcGVyQG9yYWNsZS5jb20+ClJldmlld2VkLWJ5OiBLb25yYWQgUnplc3p1dGVr IFdpbGsgPGtvbnJhZC53aWxrQG9yYWNsZS5jb20+Ci0tLQp2MyAtIHN1Z2dlc3Rpb25zL2ZpeGVz OgogICAtIGltcHJvdmUgY29tbWl0IG1lc3NhZ2UKICAgICAoc3VnZ2VzdGVkIGJ5IEtvbnJhZCBS emVzenV0ZWsgV2lsayBhbmQgVmxhZGltaXIgJ3BoY29kZXInIFNlcmJpbmVua28pLgotLS0KIGdy dWItY29yZS9sb2FkZXIvbXVsdGlib290X21iaTIuYyB8ICAgNzEgKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDM2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dydWItY29yZS9sb2FkZXIvbXVsdGlib290X21i aTIuYyBiL2dydWItY29yZS9sb2FkZXIvbXVsdGlib290X21iaTIuYwppbmRleCA2YzA0NDAyLi5h ZDE1NTNiIDEwMDY0NAotLS0gYS9ncnViLWNvcmUvbG9hZGVyL211bHRpYm9vdF9tYmkyLmMKKysr IGIvZ3J1Yi1jb3JlL2xvYWRlci9tdWx0aWJvb3RfbWJpMi5jCkBAIC0zOTAsNyArMzkwLDcgQEAg c3RhdGljIGdydWJfc2l6ZV90CiBncnViX211bHRpYm9vdF9nZXRfbWJpX3NpemUgKHZvaWQpCiB7 CiAjaWZkZWYgR1JVQl9NQUNISU5FX0VGSQotICBpZiAoIWVmaV9tbWFwX3NpemUpCisgIGlmICgh a2VlcF9icyAmJiAhZWZpX21tYXBfc2l6ZSkKICAgICBmaW5kX2VmaV9tbWFwX3NpemUgKCk7ICAg IAogI2VuZGlmCiAgIHJldHVybiAyICogc2l6ZW9mIChncnViX3VpbnQzMl90KSArIHNpemVvZiAo c3RydWN0IG11bHRpYm9vdF90YWcpCkBAIC03NTUsMTIgKzc1NSwxMyBAQCBncnViX211bHRpYm9v dF9tYWtlX21iaSAoZ3J1Yl91aW50MzJfdCAqdGFyZ2V0KQogICAgICAgfQogICB9CiAKLSAgewot ICAgIHN0cnVjdCBtdWx0aWJvb3RfdGFnX21tYXAgKnRhZyA9IChzdHJ1Y3QgbXVsdGlib290X3Rh Z19tbWFwICopIHB0cm9yaWc7Ci0gICAgZ3J1Yl9maWxsX211bHRpYm9vdF9tbWFwICh0YWcpOwot ICAgIHB0cm9yaWcgKz0gQUxJR05fVVAgKHRhZy0+c2l6ZSwgTVVMVElCT09UX1RBR19BTElHTikK LSAgICAgIC8gc2l6ZW9mIChncnViX3Byb3Blcmx5X2FsaWduZWRfdCk7Ci0gIH0KKyAgaWYgKCFr ZWVwX2JzKQorICAgIHsKKyAgICAgIHN0cnVjdCBtdWx0aWJvb3RfdGFnX21tYXAgKnRhZyA9IChz dHJ1Y3QgbXVsdGlib290X3RhZ19tbWFwICopIHB0cm9yaWc7CisgICAgICBncnViX2ZpbGxfbXVs dGlib290X21tYXAgKHRhZyk7CisgICAgICBwdHJvcmlnICs9IEFMSUdOX1VQICh0YWctPnNpemUs IE1VTFRJQk9PVF9UQUdfQUxJR04pCisJLyBzaXplb2YgKGdydWJfcHJvcGVybHlfYWxpZ25lZF90 KTsKKyAgICB9CiAKICAgewogICAgIHN0cnVjdCBtdWx0aWJvb3RfdGFnX2VsZl9zZWN0aW9ucyAq dGFnCkBAIC03NzYsMTggKzc3NywxOSBAQCBncnViX211bHRpYm9vdF9tYWtlX21iaSAoZ3J1Yl91 aW50MzJfdCAqdGFyZ2V0KQogICAgICAgLyBzaXplb2YgKGdydWJfcHJvcGVybHlfYWxpZ25lZF90 KTsKICAgfQogCi0gIHsKLSAgICBzdHJ1Y3QgbXVsdGlib290X3RhZ19iYXNpY19tZW1pbmZvICp0 YWcKLSAgICAgID0gKHN0cnVjdCBtdWx0aWJvb3RfdGFnX2Jhc2ljX21lbWluZm8gKikgcHRyb3Jp ZzsKLSAgICB0YWctPnR5cGUgPSBNVUxUSUJPT1RfVEFHX1RZUEVfQkFTSUNfTUVNSU5GTzsKLSAg ICB0YWctPnNpemUgPSBzaXplb2YgKHN0cnVjdCBtdWx0aWJvb3RfdGFnX2Jhc2ljX21lbWluZm8p OyAKKyAgaWYgKCFrZWVwX2JzKQorICAgIHsKKyAgICAgIHN0cnVjdCBtdWx0aWJvb3RfdGFnX2Jh c2ljX21lbWluZm8gKnRhZworCT0gKHN0cnVjdCBtdWx0aWJvb3RfdGFnX2Jhc2ljX21lbWluZm8g KikgcHRyb3JpZzsKKyAgICAgIHRhZy0+dHlwZSA9IE1VTFRJQk9PVF9UQUdfVFlQRV9CQVNJQ19N RU1JTkZPOworICAgICAgdGFnLT5zaXplID0gc2l6ZW9mIChzdHJ1Y3QgbXVsdGlib290X3RhZ19i YXNpY19tZW1pbmZvKTsKIAotICAgIC8qIENvbnZlcnQgZnJvbSBieXRlcyB0byBraWxvYnl0ZXMu ICAqLwotICAgIHRhZy0+bWVtX2xvd2VyID0gZ3J1Yl9tbWFwX2dldF9sb3dlciAoKSAvIDEwMjQ7 Ci0gICAgdGFnLT5tZW1fdXBwZXIgPSBncnViX21tYXBfZ2V0X3VwcGVyICgpIC8gMTAyNDsKLSAg ICBwdHJvcmlnICs9IEFMSUdOX1VQICh0YWctPnNpemUsIE1VTFRJQk9PVF9UQUdfQUxJR04pCi0g ICAgICAgLyBzaXplb2YgKGdydWJfcHJvcGVybHlfYWxpZ25lZF90KTsKLSAgfQorICAgICAgLyog Q29udmVydCBmcm9tIGJ5dGVzIHRvIGtpbG9ieXRlcy4gICovCisgICAgICB0YWctPm1lbV9sb3dl ciA9IGdydWJfbW1hcF9nZXRfbG93ZXIgKCkgLyAxMDI0OworICAgICAgdGFnLT5tZW1fdXBwZXIg PSBncnViX21tYXBfZ2V0X3VwcGVyICgpIC8gMTAyNDsKKyAgICAgIHB0cm9yaWcgKz0gQUxJR05f VVAgKHRhZy0+c2l6ZSwgTVVMVElCT09UX1RBR19BTElHTikKKwkvIHNpemVvZiAoZ3J1Yl9wcm9w ZXJseV9hbGlnbmVkX3QpOworICAgIH0KIAogICB7CiAgICAgc3RydWN0IGdydWJfbmV0X25ldHdv cmtfbGV2ZWxfaW50ZXJmYWNlICpuZXQ7CkBAIC04ODYsMjcgKzg4OCwyNCBAQCBncnViX211bHRp Ym9vdF9tYWtlX21iaSAoZ3J1Yl91aW50MzJfdCAqdGFyZ2V0KQogICAgIGdydWJfZWZpX3VpbnRu X3QgZWZpX2Rlc2Nfc2l6ZTsKICAgICBncnViX2VmaV91aW50MzJfdCBlZmlfZGVzY192ZXJzaW9u OwogCi0gICAgdGFnLT50eXBlID0gTVVMVElCT09UX1RBR19UWVBFX0VGSV9NTUFQOwotICAgIHRh Zy0+c2l6ZSA9IHNpemVvZiAoKnRhZykgKyBlZmlfbW1hcF9zaXplOwotCiAgICAgaWYgKCFrZWVw X2JzKQotICAgICAgZXJyID0gZ3J1Yl9lZmlfZmluaXNoX2Jvb3Rfc2VydmljZXMgKCZlZmlfbW1h cF9zaXplLCB0YWctPmVmaV9tbWFwLCBOVUxMLAotCQkJCQkgICAmZWZpX2Rlc2Nfc2l6ZSwgJmVm aV9kZXNjX3ZlcnNpb24pOwotICAgIGVsc2UKICAgICAgIHsKLQlpZiAoZ3J1Yl9lZmlfZ2V0X21l bW9yeV9tYXAgKCZlZmlfbW1hcF9zaXplLCAodm9pZCAqKSB0YWctPmVmaV9tbWFwLAotCQkJCSAg ICAgTlVMTCwKLQkJCQkgICAgICZlZmlfZGVzY19zaXplLCAmZWZpX2Rlc2NfdmVyc2lvbikgPD0g MCkKLQkgIGVyciA9IGdydWJfZXJyb3IgKEdSVUJfRVJSX0lPLCAiY291bGRuJ3QgcmV0cmlldmUg bWVtb3J5IG1hcCIpOworCXRhZy0+dHlwZSA9IE1VTFRJQk9PVF9UQUdfVFlQRV9FRklfTU1BUDsK Kwl0YWctPnNpemUgPSBzaXplb2YgKCp0YWcpICsgZWZpX21tYXBfc2l6ZTsKKworCWVyciA9IGdy dWJfZWZpX2ZpbmlzaF9ib290X3NlcnZpY2VzICgmZWZpX21tYXBfc2l6ZSwgdGFnLT5lZmlfbW1h cCwgTlVMTCwKKwkJCQkJICAgICAmZWZpX2Rlc2Nfc2l6ZSwgJmVmaV9kZXNjX3ZlcnNpb24pOwor CisJaWYgKGVycikKKwkgIHJldHVybiBlcnI7CisKKwl0YWctPmRlc2NyX3NpemUgPSBlZmlfZGVz Y19zaXplOworCXRhZy0+ZGVzY3JfdmVycyA9IGVmaV9kZXNjX3ZlcnNpb247CisJdGFnLT5zaXpl ID0gc2l6ZW9mICgqdGFnKSArIGVmaV9tbWFwX3NpemU7CisKKwlwdHJvcmlnICs9IEFMSUdOX1VQ ICh0YWctPnNpemUsIE1VTFRJQk9PVF9UQUdfQUxJR04pCisJICAvIHNpemVvZiAoZ3J1Yl9wcm9w ZXJseV9hbGlnbmVkX3QpOwogICAgICAgfQotICAgIGlmIChlcnIpCi0gICAgICByZXR1cm4gZXJy OwotICAgIHRhZy0+ZGVzY3Jfc2l6ZSA9IGVmaV9kZXNjX3NpemU7Ci0gICAgdGFnLT5kZXNjcl92 ZXJzID0gZWZpX2Rlc2NfdmVyc2lvbjsKLSAgICB0YWctPnNpemUgPSBzaXplb2YgKCp0YWcpICsg ZWZpX21tYXBfc2l6ZTsKLQotICAgIHB0cm9yaWcgKz0gQUxJR05fVVAgKHRhZy0+c2l6ZSwgTVVM VElCT09UX1RBR19BTElHTikKLSAgICAgIC8gc2l6ZW9mIChncnViX3Byb3Blcmx5X2FsaWduZWRf dCk7CiAgIH0KIAogICBpZiAoa2VlcF9icykKLS0gCjEuNy4xMC40CgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApY ZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK