From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Subject: [PATCH v2 26/27] x86/relocs: Add option to generate 64-bit relocations Date: Tue, 13 Mar 2018 13:59:44 -0700 Message-ID: <20180313205945.245105-27-thgarnie@google.com> References: <20180313205945.245105-1-thgarnie@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Greg Kroah-Hartman , Kate Stewart , Thomas Garnier , Arnd Bergmann , Philippe Ombredanne , Arnaldo Carvalho de Melo , Andrey Ryabinin , Matthias Kaehlcke , Kees Cook , Tom Lendacky , "Kirill A . Shutemov" , Andy Lutomirski , Dominik Brodowski , Borislav Petkov , Borislav Petkov , "Raf Return-path: In-Reply-To: <20180313205945.245105-1-thgarnie@google.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" List-Id: linux-crypto.vger.kernel.org VGhlIHg4NiByZWxvY2F0aW9uIHRvb2wgZ2VuZXJhdGVzIGEgbGlzdCBvZiAzMi1iaXQgc2lnbmVk IGludGVnZXJzLiBUaGVyZQp3YXMgbm8gbmVlZCB0byB1c2UgNjQtYml0IGludGVnZXJzIGJlY2F1 c2UgYWxsIGFkZHJlc3NlcyB3aGVyZSBhYm92ZSB0aGUgMkcKdG9wIG9mIHRoZSBtZW1vcnkuCgpU aGlzIGNoYW5nZSBhZGQgYSBsYXJnZS1yZWxvYyBvcHRpb24gdG8gZ2VuZXJhdGUgNjQtYml0IHVu c2lnbmVkIGludGVnZXJzLgpJdCBjYW4gYmUgdXNlZCB3aGVuIHRoZSBrZXJuZWwgcGxhbiB0byBn byBiZWxvdyB0aGUgdG9wIDJHIGFuZCAzMi1iaXQKaW50ZWdlcnMgYXJlIG5vdCBlbm91Z2guCgpT aWduZWQtb2ZmLWJ5OiBUaG9tYXMgR2FybmllciA8dGhnYXJuaWVAZ29vZ2xlLmNvbT4KLS0tCiBh cmNoL3g4Ni90b29scy9yZWxvY3MuYyAgICAgICAgfCA2MCArKysrKysrKysrKysrKysrKysrKysr KysrKystLS0tLS0tCiBhcmNoL3g4Ni90b29scy9yZWxvY3MuaCAgICAgICAgfCAgNCArLS0KIGFy Y2gveDg2L3Rvb2xzL3JlbG9jc19jb21tb24uYyB8IDE1ICsrKysrKy0tLQogMyBmaWxlcyBjaGFu Z2VkLCA2MCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNo L3g4Ni90b29scy9yZWxvY3MuYyBiL2FyY2gveDg2L3Rvb2xzL3JlbG9jcy5jCmluZGV4IDI5Mjgz YWQzOTUwZi4uYTI5Y2NjY2VhYWM2IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni90b29scy9yZWxvY3Mu YworKysgYi9hcmNoL3g4Ni90b29scy9yZWxvY3MuYwpAQCAtMTMsOCArMTMsMTQgQEAKIAogc3Rh dGljIEVsZl9FaGRyIGVoZHI7CiAKKyNpZiBFTEZfQklUUyA9PSA2NAordHlwZWRlZiB1aW50NjRf dCByZWxfb2ZmX3Q7CisjZWxzZQordHlwZWRlZiB1aW50MzJfdCByZWxfb2ZmX3Q7CisjZW5kaWYK Kwogc3RydWN0IHJlbG9jcyB7Ci0JdWludDMyX3QJKm9mZnNldDsKKwlyZWxfb2ZmX3QJKm9mZnNl dDsKIAl1bnNpZ25lZCBsb25nCWNvdW50OwogCXVuc2lnbmVkIGxvbmcJc2l6ZTsKIH07CkBAIC02 ODUsNyArNjkxLDcgQEAgc3RhdGljIHZvaWQgcHJpbnRfYWJzb2x1dGVfcmVsb2NzKHZvaWQpCiAJ CXByaW50ZigiXG4iKTsKIH0KIAotc3RhdGljIHZvaWQgYWRkX3JlbG9jKHN0cnVjdCByZWxvY3Mg KnIsIHVpbnQzMl90IG9mZnNldCkKK3N0YXRpYyB2b2lkIGFkZF9yZWxvYyhzdHJ1Y3QgcmVsb2Nz ICpyLCByZWxfb2ZmX3Qgb2Zmc2V0KQogewogCWlmIChyLT5jb3VudCA9PSByLT5zaXplKSB7CiAJ CXVuc2lnbmVkIGxvbmcgbmV3c2l6ZSA9IHItPnNpemUgKyA1MDAwMDsKQEAgLTEwNjEsMjYgKzEw NjcsNDggQEAgc3RhdGljIHZvaWQgc29ydF9yZWxvY3Moc3RydWN0IHJlbG9jcyAqcikKIAlxc29y dChyLT5vZmZzZXQsIHItPmNvdW50LCBzaXplb2Yoci0+b2Zmc2V0WzBdKSwgY21wX3JlbG9jcyk7 CiB9CiAKLXN0YXRpYyBpbnQgd3JpdGUzMih1aW50MzJfdCB2LCBGSUxFICpmKQorc3RhdGljIGlu dCB3cml0ZTMyKHJlbF9vZmZfdCByZWwsIEZJTEUgKmYpCiB7Ci0JdW5zaWduZWQgY2hhciBidWZb NF07CisJdW5zaWduZWQgY2hhciBidWZbc2l6ZW9mKHVpbnQzMl90KV07CisJdWludDMyX3QgdiA9 ICh1aW50MzJfdClyZWw7CiAKIAlwdXRfdW5hbGlnbmVkX2xlMzIodiwgYnVmKTsKLQlyZXR1cm4g ZndyaXRlKGJ1ZiwgMSwgNCwgZikgPT0gNCA/IDAgOiAtMTsKKwlyZXR1cm4gZndyaXRlKGJ1Ziwg MSwgc2l6ZW9mKGJ1ZiksIGYpID09IHNpemVvZihidWYpID8gMCA6IC0xOwogfQogCi1zdGF0aWMg aW50IHdyaXRlMzJfYXNfdGV4dCh1aW50MzJfdCB2LCBGSUxFICpmKQorc3RhdGljIGludCB3cml0 ZTMyX2FzX3RleHQocmVsX29mZl90IHJlbCwgRklMRSAqZikKIHsKKwl1aW50MzJfdCB2ID0gKHVp bnQzMl90KXJlbDsKIAlyZXR1cm4gZnByaW50ZihmLCAiXHQubG9uZyAweCUwOCJQUkl4MzIiXG4i LCB2KSA+IDAgPyAwIDogLTE7CiB9CiAKLXN0YXRpYyB2b2lkIGVtaXRfcmVsb2NzKGludCBhc190 ZXh0LCBpbnQgdXNlX3JlYWxfbW9kZSkKK3N0YXRpYyBpbnQgd3JpdGU2NChyZWxfb2ZmX3QgcmVs LCBGSUxFICpmKQoreworCXVuc2lnbmVkIGNoYXIgYnVmW3NpemVvZih1aW50NjRfdCldOworCXVp bnQ2NF90IHYgPSAodWludDY0X3QpcmVsOworCisJcHV0X3VuYWxpZ25lZF9sZTY0KHYsIGJ1Zik7 CisJcmV0dXJuIGZ3cml0ZShidWYsIDEsIHNpemVvZihidWYpLCBmKSA9PSBzaXplb2YoYnVmKSA/ IDAgOiAtMTsKK30KKworc3RhdGljIGludCB3cml0ZTY0X2FzX3RleHQocmVsX29mZl90IHJlbCwg RklMRSAqZikKK3sKKwl1aW50NjRfdCB2ID0gKHVpbnQ2NF90KXJlbDsKKwlyZXR1cm4gZnByaW50 ZihmLCAiXHQucXVhZCAweCUwMTYiUFJJeDY0IlxuIiwgdikgPiAwID8gMCA6IC0xOworfQorCitz dGF0aWMgdm9pZCBlbWl0X3JlbG9jcyhpbnQgYXNfdGV4dCwgaW50IHVzZV9yZWFsX21vZGUsIGlu dCB1c2VfbGFyZ2VfcmVsb2MpCiB7CiAJaW50IGk7Ci0JaW50ICgqd3JpdGVfcmVsb2MpKHVpbnQz Ml90LCBGSUxFICopID0gd3JpdGUzMjsKKwlpbnQgKCp3cml0ZV9yZWxvYykocmVsX29mZl90LCBG SUxFICopOwogCWludCAoKmRvX3JlbG9jKShzdHJ1Y3Qgc2VjdGlvbiAqc2VjLCBFbGZfUmVsICpy ZWwsIEVsZl9TeW0gKnN5bSwKIAkJCWNvbnN0IGNoYXIgKnN5bW5hbWUpOwogCisJaWYgKHVzZV9s YXJnZV9yZWxvYykKKwkJd3JpdGVfcmVsb2MgPSB3cml0ZTY0OworCWVsc2UKKwkJd3JpdGVfcmVs b2MgPSB3cml0ZTMyOworCiAjaWYgRUxGX0JJVFMgPT0gNjQKIAlpZiAoIXVzZV9yZWFsX21vZGUp CiAJCWRvX3JlbG9jID0gZG9fcmVsb2M2NDsKQEAgLTEwOTEsNiArMTExOSw5IEBAIHN0YXRpYyB2 b2lkIGVtaXRfcmVsb2NzKGludCBhc190ZXh0LCBpbnQgdXNlX3JlYWxfbW9kZSkKIAkJZG9fcmVs b2MgPSBkb19yZWxvYzMyOwogCWVsc2UKIAkJZG9fcmVsb2MgPSBkb19yZWxvY19yZWFsOworCisJ LyogTGFyZ2UgcmVsb2NhdGlvbnMgb25seSBmb3IgNjQtYml0ICovCisJdXNlX2xhcmdlX3JlbG9j ID0gMDsKICNlbmRpZgogCiAJLyogQ29sbGVjdCB1cCB0aGUgcmVsb2NhdGlvbnMgKi8KQEAgLTEx MTQsOCArMTE0NSwxMyBAQCBzdGF0aWMgdm9pZCBlbWl0X3JlbG9jcyhpbnQgYXNfdGV4dCwgaW50 IHVzZV9yZWFsX21vZGUpCiAJCSAqIGdhcyB3aWxsIGxpa2UuCiAJCSAqLwogCQlwcmludGYoIi5z ZWN0aW9uIFwiLmRhdGEucmVsb2NcIixcImFcIlxuIik7Ci0JCXByaW50ZigiLmJhbGlnbiA0XG4i KTsKLQkJd3JpdGVfcmVsb2MgPSB3cml0ZTMyX2FzX3RleHQ7CisJCWlmICh1c2VfbGFyZ2VfcmVs b2MpIHsKKwkJCXByaW50ZigiLmJhbGlnbiA4XG4iKTsKKwkJCXdyaXRlX3JlbG9jID0gd3JpdGU2 NF9hc190ZXh0OworCQl9IGVsc2UgeworCQkJcHJpbnRmKCIuYmFsaWduIDRcbiIpOworCQkJd3Jp dGVfcmVsb2MgPSB3cml0ZTMyX2FzX3RleHQ7CisJCX0KIAl9CiAKIAlpZiAodXNlX3JlYWxfbW9k ZSkgewpAQCAtMTE4Myw3ICsxMjE5LDcgQEAgc3RhdGljIHZvaWQgcHJpbnRfcmVsb2NfaW5mbyh2 b2lkKQogCiB2b2lkIHByb2Nlc3MoRklMRSAqZnAsIGludCB1c2VfcmVhbF9tb2RlLCBpbnQgYXNf dGV4dCwKIAkgICAgIGludCBzaG93X2Fic29sdXRlX3N5bXMsIGludCBzaG93X2Fic29sdXRlX3Jl bG9jcywKLQkgICAgIGludCBzaG93X3JlbG9jX2luZm8pCisJICAgICBpbnQgc2hvd19yZWxvY19p bmZvLCBpbnQgdXNlX2xhcmdlX3JlbG9jKQogewogCXJlZ2V4X2luaXQodXNlX3JlYWxfbW9kZSk7 CiAJcmVhZF9laGRyKGZwKTsKQEAgLTEyMDYsNSArMTI0Miw1IEBAIHZvaWQgcHJvY2VzcyhGSUxF ICpmcCwgaW50IHVzZV9yZWFsX21vZGUsIGludCBhc190ZXh0LAogCQlwcmludF9yZWxvY19pbmZv KCk7CiAJCXJldHVybjsKIAl9Ci0JZW1pdF9yZWxvY3MoYXNfdGV4dCwgdXNlX3JlYWxfbW9kZSk7 CisJZW1pdF9yZWxvY3MoYXNfdGV4dCwgdXNlX3JlYWxfbW9kZSwgdXNlX2xhcmdlX3JlbG9jKTsK IH0KZGlmZiAtLWdpdCBhL2FyY2gveDg2L3Rvb2xzL3JlbG9jcy5oIGIvYXJjaC94ODYvdG9vbHMv cmVsb2NzLmgKaW5kZXggNDNjODNjMGZkMjJjLi4zZDQwMWRhNTlkZjcgMTAwNjQ0Ci0tLSBhL2Fy Y2gveDg2L3Rvb2xzL3JlbG9jcy5oCisrKyBiL2FyY2gveDg2L3Rvb2xzL3JlbG9jcy5oCkBAIC0z MSw4ICszMSw4IEBAIGVudW0gc3ltdHlwZSB7CiAKIHZvaWQgcHJvY2Vzc18zMihGSUxFICpmcCwg aW50IHVzZV9yZWFsX21vZGUsIGludCBhc190ZXh0LAogCQlpbnQgc2hvd19hYnNvbHV0ZV9zeW1z LCBpbnQgc2hvd19hYnNvbHV0ZV9yZWxvY3MsCi0JCWludCBzaG93X3JlbG9jX2luZm8pOworCQlp bnQgc2hvd19yZWxvY19pbmZvLCBpbnQgdXNlX2xhcmdlX3JlbG9jKTsKIHZvaWQgcHJvY2Vzc182 NChGSUxFICpmcCwgaW50IHVzZV9yZWFsX21vZGUsIGludCBhc190ZXh0LAogCQlpbnQgc2hvd19h YnNvbHV0ZV9zeW1zLCBpbnQgc2hvd19hYnNvbHV0ZV9yZWxvY3MsCi0JCWludCBzaG93X3JlbG9j X2luZm8pOworCQlpbnQgc2hvd19yZWxvY19pbmZvLCBpbnQgdXNlX2xhcmdlX3JlbG9jKTsKICNl bmRpZiAvKiBSRUxPQ1NfSCAqLwpkaWZmIC0tZ2l0IGEvYXJjaC94ODYvdG9vbHMvcmVsb2NzX2Nv bW1vbi5jIGIvYXJjaC94ODYvdG9vbHMvcmVsb2NzX2NvbW1vbi5jCmluZGV4IDY2MzQzNTJhMjBi Yy4uMTFmNDlhZGYxYzA2IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni90b29scy9yZWxvY3NfY29tbW9u LmMKKysrIGIvYXJjaC94ODYvdG9vbHMvcmVsb2NzX2NvbW1vbi5jCkBAIC0xMiwxNCArMTIsMTQg QEAgdm9pZCBkaWUoY2hhciAqZm10LCAuLi4pCiAKIHN0YXRpYyB2b2lkIHVzYWdlKHZvaWQpCiB7 Ci0JZGllKCJyZWxvY3MgWy0tYWJzLXN5bXN8LS1hYnMtcmVsb2NzfC0tcmVsb2MtaW5mb3wtLXRl eHR8LS1yZWFsbW9kZV0iIFwKLQkgICAgIiB2bWxpbnV4XG4iKTsKKwlkaWUoInJlbG9jcyBbLS1h YnMtc3ltc3wtLWFicy1yZWxvY3N8LS1yZWxvYy1pbmZvfC0tdGV4dHwtLXJlYWxtb2RlfCIgXAor CSAgICAiLS1sYXJnZS1yZWxvY10gIHZtbGludXhcbiIpOwogfQogCiBpbnQgbWFpbihpbnQgYXJn YywgY2hhciAqKmFyZ3YpCiB7CiAJaW50IHNob3dfYWJzb2x1dGVfc3ltcywgc2hvd19hYnNvbHV0 ZV9yZWxvY3MsIHNob3dfcmVsb2NfaW5mbzsKLQlpbnQgYXNfdGV4dCwgdXNlX3JlYWxfbW9kZTsK KwlpbnQgYXNfdGV4dCwgdXNlX3JlYWxfbW9kZSwgdXNlX2xhcmdlX3JlbG9jOwogCWNvbnN0IGNo YXIgKmZuYW1lOwogCUZJTEUgKmZwOwogCWludCBpOwpAQCAtMzAsNiArMzAsNyBAQCBpbnQgbWFp bihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJc2hvd19yZWxvY19pbmZvID0gMDsKIAlhc190ZXh0 ID0gMDsKIAl1c2VfcmVhbF9tb2RlID0gMDsKKwl1c2VfbGFyZ2VfcmVsb2MgPSAwOwogCWZuYW1l ID0gTlVMTDsKIAlmb3IgKGkgPSAxOyBpIDwgYXJnYzsgaSsrKSB7CiAJCWNoYXIgKmFyZyA9IGFy Z3ZbaV07CkBAIC01NCw2ICs1NSwxMCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3Yp CiAJCQkJdXNlX3JlYWxfbW9kZSA9IDE7CiAJCQkJY29udGludWU7CiAJCQl9CisJCQlpZiAoc3Ry Y21wKGFyZywgIi0tbGFyZ2UtcmVsb2MiKSA9PSAwKSB7CisJCQkJdXNlX2xhcmdlX3JlbG9jID0g MTsKKwkJCQljb250aW51ZTsKKwkJCX0KIAkJfQogCQllbHNlIGlmICghZm5hbWUpIHsKIAkJCWZu YW1lID0gYXJnOwpAQCAtNzUsMTEgKzgwLDExIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoq YXJndikKIAlpZiAoZV9pZGVudFtFSV9DTEFTU10gPT0gRUxGQ0xBU1M2NCkKIAkJcHJvY2Vzc182 NChmcCwgdXNlX3JlYWxfbW9kZSwgYXNfdGV4dCwKIAkJCSAgIHNob3dfYWJzb2x1dGVfc3ltcywg c2hvd19hYnNvbHV0ZV9yZWxvY3MsCi0JCQkgICBzaG93X3JlbG9jX2luZm8pOworCQkJICAgc2hv d19yZWxvY19pbmZvLCB1c2VfbGFyZ2VfcmVsb2MpOwogCWVsc2UKIAkJcHJvY2Vzc18zMihmcCwg dXNlX3JlYWxfbW9kZSwgYXNfdGV4dCwKIAkJCSAgIHNob3dfYWJzb2x1dGVfc3ltcywgc2hvd19h YnNvbHV0ZV9yZWxvY3MsCi0JCQkgICBzaG93X3JlbG9jX2luZm8pOworCQkJICAgc2hvd19yZWxv Y19pbmZvLCB1c2VfbGFyZ2VfcmVsb2MpOwogCWZjbG9zZShmcCk7CiAJcmV0dXJuIDA7CiB9Ci0t IAoyLjE2LjIuNjYwLmc3MDk4ODc5NzFiLWdvb2cKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4v bGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1520974875; cv=none; d=google.com; s=arc-20160816; b=G+OgK3B5K76mCKDB7xRDHPLt0f2AS4OwOV9x9xsJUWmDC0Fp5r5Dn1KjI+0M3tzB0s EeEhpDbEMwV0vurJ7Y4Y4psyfm1snK/UMSuSCrXxuPk7W7/k3x2NKVxcFMCbdfPcLPha 9U/0er27KH/pVOHRDR2oqt2QBwCFGLQzfgbR4ta5ziaBk5MCDi6zVWpf4Tm9F4L2dkBN TjYkJoemva3KBeW71Ybg1BztzapkJAl9JRDc5NIK4bQWzgpFs3gDmNBMoBXjqXNLlYIJ 91wagooSBBLG8aG/UnXasIU+DpXOzGZ0Acg4XPQL7Fc/g38Qg7pTytY6LBB4oTg//bnr N7rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=CPp5g9wKkJ/W4DxQoLTrNpQdjagAKQxc7ge2KA7psiY=; b=FbYzXJYR2+P3CxhvWLbf3w432LsAEPwjt/dNfCEaw7V7IYBqBjfpUTh357xKIvf5lJ MBHAFOjmFbUUZqxkgmltz95c5L/VEZx+h5gJmIGoRHAAfJutec1flnci5QtjznNvctGZ nsNpIjemhZ78yPZ3ZO5kMX9pz9XE1sXMhmCBO5+I9QvYVKnnDdJzye1B0KFbdcWZCb1K A64ixU43gJsJygeKpLJXL+kgwvD1lgUriGUObtpC6hKOnXVCDT+1j53NMFVdmY2uAziC usxgJWKJdXVBhIbH+JV1QpyUAQ8MQbmOYLnxg4ipp1ra5u+liwY3YQvNwS5fZSrnUzo6 M5Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Zj88S9nf; spf=pass (google.com: domain of thgarnie@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=thgarnie@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Zj88S9nf; spf=pass (google.com: domain of thgarnie@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=thgarnie@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Google-Smtp-Source: AG47ELsbzcxKMnaWAJD8DREk+UJw4pg7c26D+V3NcHCyJHorczb405qQJD1rzuDL+ZfZHdykOZFwmQ== From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Greg Kroah-Hartman , Kate Stewart , Thomas Garnier , Arnd Bergmann , Philippe Ombredanne , Arnaldo Carvalho de Melo , Andrey Ryabinin , Matthias Kaehlcke , Kees Cook , Tom Lendacky , "Kirill A . Shutemov" , Andy Lutomirski , Dominik Brodowski , Borislav Petkov , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Alok Kataria , Steven Rostedt , Tejun Heo , Christoph Lameter , Dennis Zhou , Boris Ostrovsky , David Woodhouse , Alexey Dobriyan , "Paul E . McKenney" , Andrew Morton , Nicolas Pitre , Randy Dunlap , "Luis R . Rodriguez" , Christopher Li , Jason Baron , Ashish Kalra , Kyle McMartin , Dou Liyang , Lukas Wunner , Petr Mladek , Sergey Senozhatsky , Masahiro Yamada , Ingo Molnar , Nicholas Piggin , Cao jin , "H . J . Lu" , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Dave Hansen , Rik van Riel , Jia Zhang , Jiri Slaby , Kyle Huey , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Rob Landley , Baoquan He , Daniel Micay , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= Cc: x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-arch@vger.kernel.org, linux-sparse@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: [PATCH v2 26/27] x86/relocs: Add option to generate 64-bit relocations Date: Tue, 13 Mar 2018 13:59:44 -0700 Message-Id: <20180313205945.245105-27-thgarnie@google.com> X-Mailer: git-send-email 2.16.2.660.g709887971b-goog In-Reply-To: <20180313205945.245105-1-thgarnie@google.com> References: <20180313205945.245105-1-thgarnie@google.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594857750448541621?= X-GMAIL-MSGID: =?utf-8?q?1594857750448541621?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: The x86 relocation tool generates a list of 32-bit signed integers. There was no need to use 64-bit integers because all addresses where above the 2G top of the memory. This change add a large-reloc option to generate 64-bit unsigned integers. It can be used when the kernel plan to go below the top 2G and 32-bit integers are not enough. Signed-off-by: Thomas Garnier --- arch/x86/tools/relocs.c | 60 +++++++++++++++++++++++++++------- arch/x86/tools/relocs.h | 4 +-- arch/x86/tools/relocs_common.c | 15 ++++++--- 3 files changed, 60 insertions(+), 19 deletions(-) diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 29283ad3950f..a29cccceaac6 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -13,8 +13,14 @@ static Elf_Ehdr ehdr; +#if ELF_BITS == 64 +typedef uint64_t rel_off_t; +#else +typedef uint32_t rel_off_t; +#endif + struct relocs { - uint32_t *offset; + rel_off_t *offset; unsigned long count; unsigned long size; }; @@ -685,7 +691,7 @@ static void print_absolute_relocs(void) printf("\n"); } -static void add_reloc(struct relocs *r, uint32_t offset) +static void add_reloc(struct relocs *r, rel_off_t offset) { if (r->count == r->size) { unsigned long newsize = r->size + 50000; @@ -1061,26 +1067,48 @@ static void sort_relocs(struct relocs *r) qsort(r->offset, r->count, sizeof(r->offset[0]), cmp_relocs); } -static int write32(uint32_t v, FILE *f) +static int write32(rel_off_t rel, FILE *f) { - unsigned char buf[4]; + unsigned char buf[sizeof(uint32_t)]; + uint32_t v = (uint32_t)rel; put_unaligned_le32(v, buf); - return fwrite(buf, 1, 4, f) == 4 ? 0 : -1; + return fwrite(buf, 1, sizeof(buf), f) == sizeof(buf) ? 0 : -1; } -static int write32_as_text(uint32_t v, FILE *f) +static int write32_as_text(rel_off_t rel, FILE *f) { + uint32_t v = (uint32_t)rel; return fprintf(f, "\t.long 0x%08"PRIx32"\n", v) > 0 ? 0 : -1; } -static void emit_relocs(int as_text, int use_real_mode) +static int write64(rel_off_t rel, FILE *f) +{ + unsigned char buf[sizeof(uint64_t)]; + uint64_t v = (uint64_t)rel; + + put_unaligned_le64(v, buf); + return fwrite(buf, 1, sizeof(buf), f) == sizeof(buf) ? 0 : -1; +} + +static int write64_as_text(rel_off_t rel, FILE *f) +{ + uint64_t v = (uint64_t)rel; + return fprintf(f, "\t.quad 0x%016"PRIx64"\n", v) > 0 ? 0 : -1; +} + +static void emit_relocs(int as_text, int use_real_mode, int use_large_reloc) { int i; - int (*write_reloc)(uint32_t, FILE *) = write32; + int (*write_reloc)(rel_off_t, FILE *); int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym, const char *symname); + if (use_large_reloc) + write_reloc = write64; + else + write_reloc = write32; + #if ELF_BITS == 64 if (!use_real_mode) do_reloc = do_reloc64; @@ -1091,6 +1119,9 @@ static void emit_relocs(int as_text, int use_real_mode) do_reloc = do_reloc32; else do_reloc = do_reloc_real; + + /* Large relocations only for 64-bit */ + use_large_reloc = 0; #endif /* Collect up the relocations */ @@ -1114,8 +1145,13 @@ static void emit_relocs(int as_text, int use_real_mode) * gas will like. */ printf(".section \".data.reloc\",\"a\"\n"); - printf(".balign 4\n"); - write_reloc = write32_as_text; + if (use_large_reloc) { + printf(".balign 8\n"); + write_reloc = write64_as_text; + } else { + printf(".balign 4\n"); + write_reloc = write32_as_text; + } } if (use_real_mode) { @@ -1183,7 +1219,7 @@ static void print_reloc_info(void) void process(FILE *fp, int use_real_mode, int as_text, int show_absolute_syms, int show_absolute_relocs, - int show_reloc_info) + int show_reloc_info, int use_large_reloc) { regex_init(use_real_mode); read_ehdr(fp); @@ -1206,5 +1242,5 @@ void process(FILE *fp, int use_real_mode, int as_text, print_reloc_info(); return; } - emit_relocs(as_text, use_real_mode); + emit_relocs(as_text, use_real_mode, use_large_reloc); } diff --git a/arch/x86/tools/relocs.h b/arch/x86/tools/relocs.h index 43c83c0fd22c..3d401da59df7 100644 --- a/arch/x86/tools/relocs.h +++ b/arch/x86/tools/relocs.h @@ -31,8 +31,8 @@ enum symtype { void process_32(FILE *fp, int use_real_mode, int as_text, int show_absolute_syms, int show_absolute_relocs, - int show_reloc_info); + int show_reloc_info, int use_large_reloc); void process_64(FILE *fp, int use_real_mode, int as_text, int show_absolute_syms, int show_absolute_relocs, - int show_reloc_info); + int show_reloc_info, int use_large_reloc); #endif /* RELOCS_H */ diff --git a/arch/x86/tools/relocs_common.c b/arch/x86/tools/relocs_common.c index 6634352a20bc..11f49adf1c06 100644 --- a/arch/x86/tools/relocs_common.c +++ b/arch/x86/tools/relocs_common.c @@ -12,14 +12,14 @@ void die(char *fmt, ...) static void usage(void) { - die("relocs [--abs-syms|--abs-relocs|--reloc-info|--text|--realmode]" \ - " vmlinux\n"); + die("relocs [--abs-syms|--abs-relocs|--reloc-info|--text|--realmode|" \ + "--large-reloc] vmlinux\n"); } int main(int argc, char **argv) { int show_absolute_syms, show_absolute_relocs, show_reloc_info; - int as_text, use_real_mode; + int as_text, use_real_mode, use_large_reloc; const char *fname; FILE *fp; int i; @@ -30,6 +30,7 @@ int main(int argc, char **argv) show_reloc_info = 0; as_text = 0; use_real_mode = 0; + use_large_reloc = 0; fname = NULL; for (i = 1; i < argc; i++) { char *arg = argv[i]; @@ -54,6 +55,10 @@ int main(int argc, char **argv) use_real_mode = 1; continue; } + if (strcmp(arg, "--large-reloc") == 0) { + use_large_reloc = 1; + continue; + } } else if (!fname) { fname = arg; @@ -75,11 +80,11 @@ int main(int argc, char **argv) if (e_ident[EI_CLASS] == ELFCLASS64) process_64(fp, use_real_mode, as_text, show_absolute_syms, show_absolute_relocs, - show_reloc_info); + show_reloc_info, use_large_reloc); else process_32(fp, use_real_mode, as_text, show_absolute_syms, show_absolute_relocs, - show_reloc_info); + show_reloc_info, use_large_reloc); fclose(fp); return 0; } -- 2.16.2.660.g709887971b-goog