From: "Bruce Rogers" Subject: [PATCH] Fix loading binary images that support or require PAE Date: Thu, 11 May 2006 10:49:10 -0600 Message-ID: <44631688.092E.0048.1@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part32171816.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --=__Part32171816.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline (This patch supersedes the last patch sent by me, as this one includes fixes for issues encountered beyond the initial fix for passing PAE capabilities from a binary image.) Loading of binary images which include a quasi-Multi-boot Spec record is supported by Xen, but currently there not a way to inform the loader of the PAE requirements/capabilities of the loading image. This patch extends the flags used in the quasi-Multi-boot Spec record to this include information, and to process that information. It also attempts to provide a way to specify that the binary image is a 64 bit kernel, but that was an afterthought in this patch, so there could be things I'm missing there. Comments welcome. If no issues, please apply. - Bruce Rogers Signed-off-by: Bruce Rogers --=__Part32171816.0__= Content-Type: application/octet-stream; name="xen-load-pae-bin-kernel.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="xen-load-pae-bin-kernel.diff" SW5kZXg6IHhlbi0zLjAtdGVzdGluZy90b29scy9saWJ4Yy94Z19wcml2YXRlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0geGVuLTMuMC10ZXN0aW5nLm9yaWcvdG9vbHMvbGlieGMveGdfcHJpdmF0ZS5oCisrKyB4 ZW4tMy4wLXRlc3RpbmcvdG9vbHMvbGlieGMveGdfcHJpdmF0ZS5oCkBAIC0xMjcsNyArMTI3LDcg QEAgZG8geyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgIGVycm5vID0g X19zYXZlZF9lcnJubzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKIH0g d2hpbGUgKDApCiAKLQorZW51bSBwYWVfbW9kZSB7Tk9OX1BBRV9LRVJORUwzMiwgUEFFX0tFUk5F TDMyLCBQQUVfS0VSTkVMNjQsIEJJTU9EQUxfS0VSTkVMMzJ9Owogc3RydWN0IGRvbWFpbl9zZXR1 cF9pbmZvCiB7CiAgICAgdW5zaWduZWQgbG9uZyB2X3N0YXJ0OwpAQCAtMTM3LDcgKzEzNyw3IEBA IHN0cnVjdCBkb21haW5fc2V0dXBfaW5mbwogICAgIHVuc2lnbmVkIGxvbmcgdl9rZXJuZW50cnk7 CiAKICAgICB1bnNpZ25lZCBpbnQgIGxvYWRfc3ltdGFiOwotICAgIHVuc2lnbmVkIGludCAgcGFl X2tlcm5lbDsKKyAgICBlbnVtIHBhZV9tb2RlIGtlcm5lbF9wYWVfbW9kZTsKICAgICB1bnNpZ25l ZCBsb25nIHN5bXRhYl9hZGRyOwogICAgIHVuc2lnbmVkIGxvbmcgc3ltdGFiX2xlbjsKIApJbmRl eDogeGVuLTMuMC10ZXN0aW5nL3Rvb2xzL2xpYnhjL3hjX2xvYWRfZWxmLmMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0geGVuLTMuMC10ZXN0aW5nLm9yaWcvdG9vbHMvbGlieGMveGNfbG9hZF9lbGYuYworKysgeGVu LTMuMC10ZXN0aW5nL3Rvb2xzL2xpYnhjL3hjX2xvYWRfZWxmLmMKQEAgLTEzMiw3ICsxMzIsMTMg QEAgc3RhdGljIGludCBwYXJzZWVsZmltYWdlKGNvbnN0IGNoYXIgKmltYQogICAgICAgICAgICAg cmV0dXJuIC1FSU5WQUw7CiAgICAgICAgIH0KICAgICAgICAgaWYgKCAoc3Ryc3RyKGd1ZXN0aW5m bywgIlBBRT15ZXMiKSAhPSBOVUxMKSApCi0gICAgICAgICAgICBkc2ktPnBhZV9rZXJuZWwgPSAx OworI2lmIGRlZmluZWQoX19pMzg2X18pCisgICAgICAgICAgICBkc2ktPmtlcm5lbF9wYWVfbW9k ZSA9IFBBRV9LRVJORUwzMjsKKyNlbGlmIGRlZmluZWQoX194ODZfNjRfXykKKyAgICAgICAgICAg IGRzaS0+a2VybmVsX3BhZV9tb2RlID0gUEFFX0tFUk5FTDY0OworI2VuZGlmCisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIGRzaS0+a2VybmVsX3BhZV9tb2RlID0gTk9OX1BBRV9LRVJORUwzMjsK IAogICAgICAgICBicmVhazsKICAgICB9CkluZGV4OiB4ZW4tMy4wLXRlc3RpbmcvdG9vbHMvbGli eGMveGNfbG9hZF9iaW4uYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB4ZW4tMy4wLXRlc3Rpbmcub3JpZy90b29s cy9saWJ4Yy94Y19sb2FkX2Jpbi5jCisrKyB4ZW4tMy4wLXRlc3RpbmcvdG9vbHMvbGlieGMveGNf bG9hZF9iaW4uYwpAQCAtMjksNiArMjksOSBAQAogICogICAgICAgICAgdGhhdCBtZW1vcnkgaW5m byBzaG91bGQgYmUgcGFzc2VkIHRvIHRoZSBpbWFnZSkKICAqICAgYml0IDI6IHJlc2VydmVkLCBt dXN0IGJlIDAgKHRoZSBtdWx0aWJvb3Qgc3BlYyB1c2VzIHRoaXMgYml0IHRvIGluZGljYXRlCiAg KiAgICAgICAgICB0aGF0IHRoZSBib290bG9hZGVyIHNob3VsZCBwYXNzIHZpZGVvIG1vZGUgaW5m byB0byB0aGUgaW1hZ2UpCisgKiAgIGJpdHMgMTQtMTU6IGNvbnRhaW5zIHRoZSBwYWdpbmcgYW5k IGNwdSBtb2RlIHJlcXVpcmVtZW50cyBvZiB0aGUgaW1hZ2UKKyAqICAgICAgICAgICAgICAgMCA9 IE5vbi1QQUUgMzIgYml0LCAxID0gUEFFIDMyIGJpdCwgMiA9IFBBRSA2NCBiaXQsIDMgPSBpbWFn ZQorICogICAgICAgICAgICAgICBkZXRlY3RzIGN1cnJlbnQgbW9kZSBhbmQgYWRhcHRzIGFjY29y ZGluZ2x5CiAgKiAgIGJpdCAxNjogcmVzZXJ2ZWQsIG11c3QgYmUgMSAodGhlIG11bHRpYm9vdCBz cGVjIHVzZXMgdGhpcyBiaXQgdG8gaW5kaWNhdGUKICAqICAgICAgICAgICB0aGF0IHRoZSB2YWx1 ZXMgaW4gdGhlIGZpZWxkcyBoZWFkZXJfYWRkciAtIGVudHJ5X2FkZHIgYXJlCiAgKiAgICAgICAg ICAgdmFsaWQpCkBAIC05MiwxMCArOTUsMTQgQEAgc3RydWN0IHhlbl9iaW5faW1hZ2VfdGFibGUK ICNkZWZpbmUgWEVOX1JFQUNUT1NfRkxBR19BTElHTjRLICAgICAweDAwMDAwMDAxCiAjZGVmaW5l IFhFTl9SRUFDVE9TX0ZMQUdfTkVFRE1FTUlORk8gMHgwMDAwMDAwMgogI2RlZmluZSBYRU5fUkVB Q1RPU19GTEFHX05FRURWSURJTkZPIDB4MDAwMDAwMDQKKyNkZWZpbmUgWEVOX1JFQUNUT1NfRkxB R19QQUVfTUFTSyAgICAweDAwMDBDMDAwCiAjZGVmaW5lIFhFTl9SRUFDVE9TX0ZMQUdfQUREUlNW QUxJRCAgMHgwMDAxMDAwMAogCisjZGVmaW5lIFhFTl9SRUFDVE9TX0ZMQUdfUEFFX1NISUZUIDE0 CisKIC8qIEZsYWdzIHdlIHRlc3QgZm9yICovCi0jZGVmaW5lIEZMQUdTX01BU0sgICAgICgofiAw KSAmICh+IFhFTl9SRUFDVE9TX0ZMQUdfQUxJR040SykpCisjZGVmaW5lIEZMQUdTX01BU0sgICAg ICgofiAwKSAmICh+IFhFTl9SRUFDVE9TX0ZMQUdfQUxJR040SykgJiBcCisgICAgICAgICAgICAg ICAgICAgICAgICh+IFhFTl9SRUFDVE9TX0ZMQUdfUEFFX01BU0spKQogI2RlZmluZSBGTEFHU19S RVFVSVJFRCBYRU5fUkVBQ1RPU19GTEFHX0FERFJTVkFMSUQKIAogc3RhdGljIHN0cnVjdCB4ZW5f YmluX2ltYWdlX3RhYmxlICoKQEAgLTIyOCw2ICsyMzUsOCBAQCBzdGF0aWMgaW50IHBhcnNlYmlu aW1hZ2UoY29uc3QgY2hhciAqaW1hCiAgICAgZHNpLT52X2tlcm5lbmQgPSBkc2ktPnZfZW5kOwog ICAgIGRzaS0+dl9rZXJuZW50cnkgPSBpbWFnZV9pbmZvLT5lbnRyeV9hZGRyOwogICAgIGRzaS0+ eGVuX2d1ZXN0X3N0cmluZyA9ICIiOworICAgIGRzaS0+a2VybmVsX3BhZV9tb2RlID0gKGltYWdl X2luZm8tPmZsYWdzICYgWEVOX1JFQUNUT1NfRkxBR19QQUVfTUFTSykgPj4KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgIFhFTl9SRUFDVE9TX0ZMQUdfUEFFX1NISUZUOwogCiAgICAgcmV0dXJu IDA7CiB9CkluZGV4OiB4ZW4tMy4wLXRlc3RpbmcvdG9vbHMvbGlieGMveGNfbGludXhfYnVpbGQu Ywo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSB4ZW4tMy4wLXRlc3Rpbmcub3JpZy90b29scy9saWJ4Yy94Y19saW51 eF9idWlsZC5jCisrKyB4ZW4tMy4wLXRlc3RpbmcvdG9vbHMvbGlieGMveGNfbGludXhfYnVpbGQu YwpAQCAtMzI4LDYgKzMyOCwxMyBAQCBzdGF0aWMgaW50IHNldHVwX3BnX3RhYmxlc19wYWUoaW50 IHhjX2hhCiAgICAgICAgIH0KICAgICAgICAgdmwxZSsrOwogICAgIH0KKworICAgIC8qIFhlbiBy ZXF1aXJlcyBhbiBlbnRyeSBtYXBwaW5nIDB4QzAwMDAwMDAgcmVnaW9uICovCisgICAgaWYgKCh2 bDN0YWJbM10gJiBfUEFHRV9QUkVTRU5UKSA9PSAwKQorICAgIHsKKyAgICAgICAgYWxsb2NfcHQo bDJ0YWIsIHZsMnRhYiwgcGwydGFiKTsKKyAgICAgICAgdmwzdGFiWzNdID0gbDJ0YWIgfCBMM19Q Uk9UOworICAgIH0KICAgICAgCiAgICAgbXVubWFwKHZsMXRhYiwgUEFHRV9TSVpFKTsKICAgICBt dW5tYXAodmwydGFiLCBQQUdFX1NJWkUpOwpAQCAtNTkxLDExICs1OTgsMTUgQEAgc3RhdGljIGlu dCBjb21wYXRfY2hlY2soaW50IHhjX2hhbmRsZSwgcwogICAgIH0KIAogICAgIGlmIChzdHJzdHIo eGVuX2NhcHMsICJ4ZW4tMy4wLXg4Nl8zMnAiKSkgewotICAgICAgICBpZiAoIWRzaS0+cGFlX2tl cm5lbCkgeworICAgICAgICBpZiAoZHNpLT5rZXJuZWxfcGFlX21vZGUgPT0gQklNT0RBTF9LRVJO RUwzMikKKyAgICAgICAgICAgIGRzaS0+a2VybmVsX3BhZV9tb2RlID0gUEFFX0tFUk5FTDMyOwor ICAgICAgICBlbHNlIGlmIChkc2ktPmtlcm5lbF9wYWVfbW9kZSAhPSBQQUVfS0VSTkVMMzIpIHsK ICAgICAgICAgICAgIEVSUk9SKCJOb24gUEFFLWtlcm5lbCBvbiBQQUUgaG9zdC4iKTsKICAgICAg ICAgICAgIHJldHVybiAwOwogICAgICAgICB9Ci0gICAgfSBlbHNlIGlmIChkc2ktPnBhZV9rZXJu ZWwpIHsKKyAgICB9IGVsc2UgaWYgKGRzaS0+a2VybmVsX3BhZV9tb2RlID09IEJJTU9EQUxfS0VS TkVMMzIpCisgICAgICAgIGRzaS0+a2VybmVsX3BhZV9tb2RlID0gTk9OX1BBRV9LRVJORUwzMjsK KyAgICBlbHNlIGlmIChkc2ktPmtlcm5lbF9wYWVfbW9kZSAhPSBOT05fUEFFX0tFUk5FTDMyKSB7 CiAgICAgICAgIEVSUk9SKCJQQUUta2VybmVsIG9uIG5vbi1QQUUgaG9zdC4iKTsKICAgICAgICAg cmV0dXJuIDA7CiAgICAgfQpAQCAtNzI4LDExICs3MzksMTIgQEAgc3RhdGljIGludCBzZXR1cF9n dWVzdChpbnQgeGNfaGFuZGxlLAogICAgICAgICBpZiAoICh2X2VuZCAtIHZzdGFja19lbmQpIDwg KDUxMlVMIDw8IDEwKSApCiAgICAgICAgICAgICB2X2VuZCArPSAxVUwgPDwgMjI7IC8qIEFkZCBl eHRyYSA0TUIgdG8gZ2V0ID49IDUxMmtCIHBhZGRpbmcuICovCiAjaWYgZGVmaW5lZChfX2kzODZf XykKLSAgICAgICAgaWYgKCBkc2kucGFlX2tlcm5lbCApCisgICAgICAgIGlmICggZHNpLmtlcm5l bF9wYWVfbW9kZSA9PSBQQUVfS0VSTkVMMzIgKQogICAgICAgICB7Ci0gICAgICAgICAgICAvKiBG SVhNRTogYXNzdW1lcyBvbmUgTDIgcGd0YWJsZSBAIDB4YzAwMDAwMDAgKi8KKyAgICAgICAgICAg IC8qIEFkZCAxIG1vcmUgcGFnZSBpZiAweEMwMDAwMDAwIHJlZ2lvbiBub3Qgb3RoZXJ3aXNlIHJl YWNoZWQgKi8KICAgICAgICAgICAgIGlmICggKCgodl9lbmQgLSBkc2kudl9zdGFydCArICgoMTw8 TDJfUEFHRVRBQkxFX1NISUZUX1BBRSktMSkpID4+IAotICAgICAgICAgICAgICAgICAgIEwyX1BB R0VUQUJMRV9TSElGVF9QQUUpICsgMikgPD0gbnJfcHRfcGFnZXMgKQorICAgICAgICAgICAgICAg ICAgIEwyX1BBR0VUQUJMRV9TSElGVF9QQUUpICsgMiArICh2X2VuZCA8PSAweEMwMDAwMDAwKSkK KyAgICAgICAgICAgICAgICAgICA8PSBucl9wdF9wYWdlcyApCiAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KICAgICAgICAgZWxzZQpAQCAtODA0LDcgKzgxNiw3IEBAIHN0YXRpYyBp bnQgc2V0dXBfZ3Vlc3QoaW50IHhjX2hhbmRsZSwKIAogICAgIC8qIHNldHVwIHBhZ2UgdGFibGVz ICovCiAjaWYgZGVmaW5lZChfX2kzODZfXykKLSAgICBpZiAoZHNpLnBhZV9rZXJuZWwpCisgICAg aWYgKGRzaS5rZXJuZWxfcGFlX21vZGUgPT0gUEFFX0tFUk5FTDMyKQogICAgICAgICByYyA9IHNl dHVwX3BnX3RhYmxlc19wYWUoeGNfaGFuZGxlLCBkb20sIGN0eHQsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkc2kudl9zdGFydCwgdl9lbmQsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBwYWdlX2FycmF5LCB2cHRfc3RhcnQsIHZwdF9lbmQsCkBAIC04MzEsNyAr ODQzLDcgQEAgc3RhdGljIGludCBzZXR1cF9ndWVzdChpbnQgeGNfaGFuZGxlLAogICAgICAqLwog ICAgIGlmICggIXNoYWRvd19tb2RlX2VuYWJsZWQgKQogICAgIHsKLSAgICAgICAgaWYgKCBkc2ku cGFlX2tlcm5lbCApCisgICAgICAgIGlmICggZHNpLmtlcm5lbF9wYWVfbW9kZSA9PSBQQUVfS0VS TkVMMzIgKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIHBpbl90YWJsZSh4Y19oYW5kbGUs IE1NVUVYVF9QSU5fTDNfVEFCTEUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBjdHh0LT5j dHJscmVnWzNdID4+IFBBR0VfU0hJRlQsIGRvbSkgKQpAQCAtOTY1LDcgKzk3Nyw3IEBAIHN0YXRp YyBpbnQgc2V0dXBfZ3Vlc3QoaW50IHhjX2hhbmRsZSwKICAgICByYyA9IHhjX3ZlcnNpb24oeGNf aGFuZGxlLCBYRU5WRVJfdmVyc2lvbiwgTlVMTCk7CiAgICAgc3ByaW50ZihzdGFydF9pbmZvLT5t YWdpYywgInhlbi0laS4laS14ODZfJWQlcyIsCiAgICAgICAgICAgICByYyA+PiAxNiwgcmMgJiAo MHhGRkZGKSwgKHVuc2lnbmVkIGludClzaXplb2YobG9uZykqOCwKLSAgICAgICAgICAgIGRzaS5w YWVfa2VybmVsID8gInAiIDogIiIpOworICAgICAgICAgICAgZHNpLmtlcm5lbF9wYWVfbW9kZSA9 PSBQQUVfS0VSTkVMMzIgPyAicCIgOiAiIik7CiAgICAgc3RhcnRfaW5mby0+bnJfcGFnZXMgICAg ID0gbnJfcGFnZXM7CiAgICAgc3RhcnRfaW5mby0+c2hhcmVkX2luZm8gID0gZ3Vlc3Rfc2hhcmVk X2luZm9fbWZuIDw8IFBBR0VfU0hJRlQ7CiAgICAgc3RhcnRfaW5mby0+ZmxhZ3MgICAgICAgID0g ZmxhZ3M7Cg== --=__Part32171816.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__Part32171816.0__=--