From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kiper Subject: [GRUB2 PATCH v5 3/4 - FOR COMMIT] multiboot2: Do not pass memory maps to image if EFI boot services are enabled Date: Fri, 18 Mar 2016 18:00:26 +0100 Message-ID: <1458320427-4653-5-git-send-email-daniel.kiper__45547.9392935105$1458320562$gmane$org@oracle.com> References: <1458320427-4653-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 1agxmC-0005aD-9f for xen-devel@lists.xenproject.org; Fri, 18 Mar 2016 17:01:28 +0000 In-Reply-To: <1458320427-4653-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 SWYgaW1hZ2UgcmVxdWVzdGVkIEVGSSBib290IHNlcnZpY2VzIHRoZW4gc2tpcCBtdWx0aWJvb3Qy IG1lbW9yeSBtYXBzLgpNYWluIHJlYXNvbiBmb3Igbm90IHByb3ZpZGluZyBtYXBzIGlzIGJlY2F1 c2UgdGhleSB3aWxsIGxpa2VseSBiZQppbnZhbGlkLiBXZSBkbyBhIGZldyBhbGxvY2F0aW9ucyBh ZnRlciBmaWxsaW5nIHRoZW0sIGUuZy4gZm9yIHJlbG9jYXRvcgpuZWVkcy4gVXN1YWxseSB3ZSBk byBub3QgY2FyZSBhcyB3ZSB3b3VsZCBoYXZlIGZpbmlzaGVkIGJvb3Qgc2VydmljZXMuCklmIHdl IGtlZXAgYm9vdCBzZXJ2aWNlcyB0aGVuIGl0IGlzIGVhc2llci9zYWZlciB0byBub3QgcHJvdmlk ZSBtYXBzLgpIb3dldmVyLCBpZiBpbWFnZSBuZWVkcyBtZW1vcnkgbWFwcyBhbmQgdGhleSBhcmUg bm90IHByb3ZpZGVkIGJ5IGJvb3Rsb2FkZXIKdGhlbiBpdCBzaG91bGQgZ2V0IGl0c2VsZiBqdXN0 IGJlZm9yZSBFeGl0Qm9vdFNlcnZpY2VzKCkgY2FsbC4KClNpZ25lZC1vZmYtYnk6IERhbmllbCBL aXBlciA8ZGFuaWVsLmtpcGVyQG9yYWNsZS5jb20+ClJldmlld2VkLWJ5OiBLb25yYWQgUnplc3p1 dGVrIFdpbGsgPGtvbnJhZC53aWxrQG9yYWNsZS5jb20+Ci0tLQp2NSAtIHN1Z2dlc3Rpb25zL2Zp eGVzOgogICAtIGltcHJvdmUgY29tbWl0IG1lc3NhZ2UKICAgICAoc3VnZ2VzdGVkIGJ5IEtvbnJh ZCBSemVzenV0ZWsgV2lsaykuCgp2MyAtIHN1Z2dlc3Rpb25zL2ZpeGVzOgogICAtIGltcHJvdmUg Y29tbWl0IG1lc3NhZ2UKICAgICAoc3VnZ2VzdGVkIGJ5IEtvbnJhZCBSemVzenV0ZWsgV2lsayBh bmQgVmxhZGltaXIgJ3BoY29kZXInIFNlcmJpbmVua28pLgotLS0KIGdydWItY29yZS9sb2FkZXIv bXVsdGlib290X21iaTIuYyB8ICAgNzEgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2dydWItY29yZS9sb2FkZXIvbXVsdGlib290X21iaTIuYyBiL2dydWItY29y ZS9sb2FkZXIvbXVsdGlib290X21iaTIuYwppbmRleCA2YzA0NDAyLi5hZDE1NTNiIDEwMDY0NAot LS0gYS9ncnViLWNvcmUvbG9hZGVyL211bHRpYm9vdF9tYmkyLmMKKysrIGIvZ3J1Yi1jb3JlL2xv YWRlci9tdWx0aWJvb3RfbWJpMi5jCkBAIC0zOTAsNyArMzkwLDcgQEAgc3RhdGljIGdydWJfc2l6 ZV90CiBncnViX211bHRpYm9vdF9nZXRfbWJpX3NpemUgKHZvaWQpCiB7CiAjaWZkZWYgR1JVQl9N QUNISU5FX0VGSQotICBpZiAoIWVmaV9tbWFwX3NpemUpCisgIGlmICgha2VlcF9icyAmJiAhZWZp X21tYXBfc2l6ZSkKICAgICBmaW5kX2VmaV9tbWFwX3NpemUgKCk7ICAgIAogI2VuZGlmCiAgIHJl dHVybiAyICogc2l6ZW9mIChncnViX3VpbnQzMl90KSArIHNpemVvZiAoc3RydWN0IG11bHRpYm9v dF90YWcpCkBAIC03NTUsMTIgKzc1NSwxMyBAQCBncnViX211bHRpYm9vdF9tYWtlX21iaSAoZ3J1 Yl91aW50MzJfdCAqdGFyZ2V0KQogICAgICAgfQogICB9CiAKLSAgewotICAgIHN0cnVjdCBtdWx0 aWJvb3RfdGFnX21tYXAgKnRhZyA9IChzdHJ1Y3QgbXVsdGlib290X3RhZ19tbWFwICopIHB0cm9y aWc7Ci0gICAgZ3J1Yl9maWxsX211bHRpYm9vdF9tbWFwICh0YWcpOwotICAgIHB0cm9yaWcgKz0g QUxJR05fVVAgKHRhZy0+c2l6ZSwgTVVMVElCT09UX1RBR19BTElHTikKLSAgICAgIC8gc2l6ZW9m IChncnViX3Byb3Blcmx5X2FsaWduZWRfdCk7Ci0gIH0KKyAgaWYgKCFrZWVwX2JzKQorICAgIHsK KyAgICAgIHN0cnVjdCBtdWx0aWJvb3RfdGFnX21tYXAgKnRhZyA9IChzdHJ1Y3QgbXVsdGlib290 X3RhZ19tbWFwICopIHB0cm9yaWc7CisgICAgICBncnViX2ZpbGxfbXVsdGlib290X21tYXAgKHRh Zyk7CisgICAgICBwdHJvcmlnICs9IEFMSUdOX1VQICh0YWctPnNpemUsIE1VTFRJQk9PVF9UQUdf QUxJR04pCisJLyBzaXplb2YgKGdydWJfcHJvcGVybHlfYWxpZ25lZF90KTsKKyAgICB9CiAKICAg ewogICAgIHN0cnVjdCBtdWx0aWJvb3RfdGFnX2VsZl9zZWN0aW9ucyAqdGFnCkBAIC03NzYsMTgg Kzc3NywxOSBAQCBncnViX211bHRpYm9vdF9tYWtlX21iaSAoZ3J1Yl91aW50MzJfdCAqdGFyZ2V0 KQogICAgICAgLyBzaXplb2YgKGdydWJfcHJvcGVybHlfYWxpZ25lZF90KTsKICAgfQogCi0gIHsK LSAgICBzdHJ1Y3QgbXVsdGlib290X3RhZ19iYXNpY19tZW1pbmZvICp0YWcKLSAgICAgID0gKHN0 cnVjdCBtdWx0aWJvb3RfdGFnX2Jhc2ljX21lbWluZm8gKikgcHRyb3JpZzsKLSAgICB0YWctPnR5 cGUgPSBNVUxUSUJPT1RfVEFHX1RZUEVfQkFTSUNfTUVNSU5GTzsKLSAgICB0YWctPnNpemUgPSBz aXplb2YgKHN0cnVjdCBtdWx0aWJvb3RfdGFnX2Jhc2ljX21lbWluZm8pOyAKKyAgaWYgKCFrZWVw X2JzKQorICAgIHsKKyAgICAgIHN0cnVjdCBtdWx0aWJvb3RfdGFnX2Jhc2ljX21lbWluZm8gKnRh ZworCT0gKHN0cnVjdCBtdWx0aWJvb3RfdGFnX2Jhc2ljX21lbWluZm8gKikgcHRyb3JpZzsKKyAg ICAgIHRhZy0+dHlwZSA9IE1VTFRJQk9PVF9UQUdfVFlQRV9CQVNJQ19NRU1JTkZPOworICAgICAg dGFnLT5zaXplID0gc2l6ZW9mIChzdHJ1Y3QgbXVsdGlib290X3RhZ19iYXNpY19tZW1pbmZvKTsK IAotICAgIC8qIENvbnZlcnQgZnJvbSBieXRlcyB0byBraWxvYnl0ZXMuICAqLwotICAgIHRhZy0+ bWVtX2xvd2VyID0gZ3J1Yl9tbWFwX2dldF9sb3dlciAoKSAvIDEwMjQ7Ci0gICAgdGFnLT5tZW1f dXBwZXIgPSBncnViX21tYXBfZ2V0X3VwcGVyICgpIC8gMTAyNDsKLSAgICBwdHJvcmlnICs9IEFM SUdOX1VQICh0YWctPnNpemUsIE1VTFRJQk9PVF9UQUdfQUxJR04pCi0gICAgICAgLyBzaXplb2Yg KGdydWJfcHJvcGVybHlfYWxpZ25lZF90KTsKLSAgfQorICAgICAgLyogQ29udmVydCBmcm9tIGJ5 dGVzIHRvIGtpbG9ieXRlcy4gICovCisgICAgICB0YWctPm1lbV9sb3dlciA9IGdydWJfbW1hcF9n ZXRfbG93ZXIgKCkgLyAxMDI0OworICAgICAgdGFnLT5tZW1fdXBwZXIgPSBncnViX21tYXBfZ2V0 X3VwcGVyICgpIC8gMTAyNDsKKyAgICAgIHB0cm9yaWcgKz0gQUxJR05fVVAgKHRhZy0+c2l6ZSwg TVVMVElCT09UX1RBR19BTElHTikKKwkvIHNpemVvZiAoZ3J1Yl9wcm9wZXJseV9hbGlnbmVkX3Qp OworICAgIH0KIAogICB7CiAgICAgc3RydWN0IGdydWJfbmV0X25ldHdvcmtfbGV2ZWxfaW50ZXJm YWNlICpuZXQ7CkBAIC04ODYsMjcgKzg4OCwyNCBAQCBncnViX211bHRpYm9vdF9tYWtlX21iaSAo Z3J1Yl91aW50MzJfdCAqdGFyZ2V0KQogICAgIGdydWJfZWZpX3VpbnRuX3QgZWZpX2Rlc2Nfc2l6 ZTsKICAgICBncnViX2VmaV91aW50MzJfdCBlZmlfZGVzY192ZXJzaW9uOwogCi0gICAgdGFnLT50 eXBlID0gTVVMVElCT09UX1RBR19UWVBFX0VGSV9NTUFQOwotICAgIHRhZy0+c2l6ZSA9IHNpemVv ZiAoKnRhZykgKyBlZmlfbW1hcF9zaXplOwotCiAgICAgaWYgKCFrZWVwX2JzKQotICAgICAgZXJy ID0gZ3J1Yl9lZmlfZmluaXNoX2Jvb3Rfc2VydmljZXMgKCZlZmlfbW1hcF9zaXplLCB0YWctPmVm aV9tbWFwLCBOVUxMLAotCQkJCQkgICAmZWZpX2Rlc2Nfc2l6ZSwgJmVmaV9kZXNjX3ZlcnNpb24p OwotICAgIGVsc2UKICAgICAgIHsKLQlpZiAoZ3J1Yl9lZmlfZ2V0X21lbW9yeV9tYXAgKCZlZmlf bW1hcF9zaXplLCAodm9pZCAqKSB0YWctPmVmaV9tbWFwLAotCQkJCSAgICAgTlVMTCwKLQkJCQkg ICAgICZlZmlfZGVzY19zaXplLCAmZWZpX2Rlc2NfdmVyc2lvbikgPD0gMCkKLQkgIGVyciA9IGdy dWJfZXJyb3IgKEdSVUJfRVJSX0lPLCAiY291bGRuJ3QgcmV0cmlldmUgbWVtb3J5IG1hcCIpOwor CXRhZy0+dHlwZSA9IE1VTFRJQk9PVF9UQUdfVFlQRV9FRklfTU1BUDsKKwl0YWctPnNpemUgPSBz aXplb2YgKCp0YWcpICsgZWZpX21tYXBfc2l6ZTsKKworCWVyciA9IGdydWJfZWZpX2ZpbmlzaF9i b290X3NlcnZpY2VzICgmZWZpX21tYXBfc2l6ZSwgdGFnLT5lZmlfbW1hcCwgTlVMTCwKKwkJCQkJ ICAgICAmZWZpX2Rlc2Nfc2l6ZSwgJmVmaV9kZXNjX3ZlcnNpb24pOworCisJaWYgKGVycikKKwkg IHJldHVybiBlcnI7CisKKwl0YWctPmRlc2NyX3NpemUgPSBlZmlfZGVzY19zaXplOworCXRhZy0+ ZGVzY3JfdmVycyA9IGVmaV9kZXNjX3ZlcnNpb247CisJdGFnLT5zaXplID0gc2l6ZW9mICgqdGFn KSArIGVmaV9tbWFwX3NpemU7CisKKwlwdHJvcmlnICs9IEFMSUdOX1VQICh0YWctPnNpemUsIE1V TFRJQk9PVF9UQUdfQUxJR04pCisJICAvIHNpemVvZiAoZ3J1Yl9wcm9wZXJseV9hbGlnbmVkX3Qp OwogICAgICAgfQotICAgIGlmIChlcnIpCi0gICAgICByZXR1cm4gZXJyOwotICAgIHRhZy0+ZGVz Y3Jfc2l6ZSA9IGVmaV9kZXNjX3NpemU7Ci0gICAgdGFnLT5kZXNjcl92ZXJzID0gZWZpX2Rlc2Nf dmVyc2lvbjsKLSAgICB0YWctPnNpemUgPSBzaXplb2YgKCp0YWcpICsgZWZpX21tYXBfc2l6ZTsK LQotICAgIHB0cm9yaWcgKz0gQUxJR05fVVAgKHRhZy0+c2l6ZSwgTVVMVElCT09UX1RBR19BTElH TikKLSAgICAgIC8gc2l6ZW9mIChncnViX3Byb3Blcmx5X2FsaWduZWRfdCk7CiAgIH0KIAogICBp ZiAoa2VlcF9icykKLS0gCjEuNy4xMC40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK