From mboxrd@z Thu Jan 1 00:00:00 1970 From: Toshi Kani Subject: Re: [PATCH 1/2] x86/mm/pat: Change pat_disable() to emulate PAT table Date: Mon, 14 Mar 2016 21:11:16 -0600 Message-ID: <1458011476.6393.327.camel__36125.3840187148$1458008435$gmane$org@hpe.com> References: <1457671546-13486-1-git-send-email-toshi.kani@hpe.com> <1457671546-13486-2-git-send-email-toshi.kani@hpe.com> <20160311091229.GA4347@pd.tnic> <1457713660.6393.55.camel@hpe.com> <20160311155439.GF4312@pd.tnic> <1457724504.6393.151.camel@hpe.com> <20160312115544.GA23410@pd.tnic> <20160315002921.GG25147@wotan.suse.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-aVNuKP0eyAGslvgQcx/I" Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1afeZO-0004YM-QX for xen-devel@lists.xenproject.org; Tue, 15 Mar 2016 02:18:50 +0000 In-Reply-To: <20160315002921.GG25147@wotan.suse.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: "Luis R. Rodriguez" , Borislav Petkov Cc: "jgross@suse.com" , boris.ostrovsky@oracle.com, "x86@kernel.org" , "linux-kernel@vger.kernel.org" , "paul.gortmaker@windriver.com" , "hpa@zytor.com" , xen-devel@lists.xenproject.org, "tglx@linutronix.de" , "mingo@kernel.org" List-Id: xen-devel@lists.xenproject.org --=-aVNuKP0eyAGslvgQcx/I Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit On Tue, 2016-03-15 at 01:29 +0100, Luis R. Rodriguez wrote: > I like this approach more as it stuff more PAT setup on its own type > of calls, but: > > On Sat, Mar 12, 2016 at 12:55:44PM +0100, Borislav Petkov wrote: > > diff --git a/arch/x86/kernel/cpu/mtrr/main.c > > b/arch/x86/kernel/cpu/mtrr/main.c > > index 10f8d4796240..5c442b4bd52a 100644 > > --- a/arch/x86/kernel/cpu/mtrr/main.c > > +++ b/arch/x86/kernel/cpu/mtrr/main.c > > @@ -759,8 +761,11 @@ void __init mtrr_bp_init(void) > >   } > >   } > >   > > - if (!mtrr_enabled()) > > + if (!__mtrr_enabled) { > >   pr_info("MTRR: Disabled\n"); > > + pat_disable("PAT disabled by MTRR"); > > + pat_setup(); > > + } > >  } > > This hunk would break PAT on Xen. Can you try the attached patches?  They apply on top of my original patch- set.  With this change, PAT code generally supports Xen, and the PAT init code in Xen is now removed.  If they look OK, I will reorganize the patch series. Thanks, -Toshi --=-aVNuKP0eyAGslvgQcx/I Content-Disposition: attachment; filename="03-pat-emu.patch" Content-Type: text/x-patch; name="03-pat-emu.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbTogVG9zaGkgS2FuaSA8dG9zaGkua2FuaUBocGUuY29tPgoKQWRkIHN1cHBvcnQgb2YgUEFU IGVtdWxhdGlvbiB0aGF0IG1hdGNoZXMgd2l0aCB0aGUgUEFUIE1TUi4KCi0tLQogYXJjaC94ODYv bW0vcGF0LmMgfCAgIDczICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYvbW0vcGF0LmMgYi9hcmNoL3g4Ni9tbS9wYXQu YwppbmRleCAxZmY4YWE5Li41NjVhNDc4IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9tbS9wYXQuYwor KysgYi9hcmNoL3g4Ni9tbS9wYXQuYwpAQCAtNDAsNyArNDAsNyBAQAogc3RhdGljIGJvb2wgYm9v dF9jcHVfZG9uZTsKIAogc3RhdGljIGludCBfX3JlYWRfbW9zdGx5IF9fcGF0X2VuYWJsZWQgPSBJ U19FTkFCTEVEKENPTkZJR19YODZfUEFUKTsKLXN0YXRpYyB2b2lkIHBhdF9kaXNhYmxlX2luaXQo dm9pZCk7CitzdGF0aWMgdm9pZCBwYXRfZW11X2luaXQodm9pZCk7CiAKIHZvaWQgcGF0X2Rpc2Fi bGUoY29uc3QgY2hhciAqcmVhc29uKQogewpAQCAtNTIsNyArNTIsNyBAQCB2b2lkIHBhdF9kaXNh YmxlKGNvbnN0IGNoYXIgKnJlYXNvbikKIAlfX3BhdF9lbmFibGVkID0gMDsKIAlwcl9pbmZvKCJ4 ODYvUEFUOiAlc1xuIiwgcmVhc29uKTsKIAotCXBhdF9kaXNhYmxlX2luaXQoKTsKKwlwYXRfZW11 X2luaXQoKTsKIH0KIAogc3RhdGljIGludCBfX2luaXQgbm9wYXQoY2hhciAqc3RyKQpAQCAtMjM5 LDQwICsyMzksNTMgQEAgc3RhdGljIHZvaWQgcGF0X2FwX2luaXQodTY0IHBhdCkKIAl3cm1zcmwo TVNSX0lBMzJfQ1JfUEFULCBwYXQpOwogfQogCi1zdGF0aWMgdm9pZCBwYXRfZGlzYWJsZV9pbml0 KHZvaWQpCitzdGF0aWMgdm9pZCBwYXRfZW11X2luaXQodm9pZCkKIHsKLQl1NjQgcGF0OwotCXN0 YXRpYyBpbnQgZGlzYWJsZV9pbml0X2RvbmU7CisJdTY0IHBhdCA9IDA7CisJc3RhdGljIGludCBl bXVfaW5pdF9kb25lOwogCi0JaWYgKGRpc2FibGVfaW5pdF9kb25lKQorCWlmIChlbXVfaW5pdF9k b25lKQogCQlyZXR1cm47CiAKLQkvKgotCSAqIE5vIFBBVC4gRW11bGF0ZSB0aGUgUEFUIHRhYmxl IHRoYXQgY29ycmVzcG9uZHMgdG8gdGhlIHR3bwotCSAqIGNhY2hlIGJpdHMsIFBXVCAoV3JpdGUg VGhyb3VnaCkgYW5kIFBDRCAoQ2FjaGUgRGlzYWJsZSkuIFRoaXMKLQkgKiBzZXR1cCBpcyB0aGUg c2FtZSBhcyB0aGUgQklPUyBkZWZhdWx0IHNldHVwIHdoZW4gdGhlIHN5c3RlbQotCSAqIGhhcyBQ QVQgYnV0IHRoZSAibm9wYXQiIGJvb3Qgb3B0aW9uIGhhcyBiZWVuIHNwZWNpZmllZC4gVGhpcwot CSAqIGVtdWxhdGVkIFBBVCB0YWJsZSBpcyB1c2VkIHdoZW4gTVNSX0lBMzJfQ1JfUEFUIHJldHVy bnMgMC4KLQkgKgotCSAqIFBURSBlbmNvZGluZzoKLQkgKgotCSAqICAgICAgIFBDRAotCSAqICAg ICAgIHxQV1QgIFBBVAotCSAqICAgICAgIHx8ICAgIHNsb3QKLQkgKiAgICAgICAwMCAgICAwICAg IFdCIDogX1BBR0VfQ0FDSEVfTU9ERV9XQgotCSAqICAgICAgIDAxICAgIDEgICAgV1QgOiBfUEFH RV9DQUNIRV9NT0RFX1dUCi0JICogICAgICAgMTAgICAgMiAgICBVQy06IF9QQUdFX0NBQ0hFX01P REVfVUNfTUlOVVMKLQkgKiAgICAgICAxMSAgICAzICAgIFVDIDogX1BBR0VfQ0FDSEVfTU9ERV9V QwotCSAqCi0JICogTk9URTogV2hlbiBXQyBvciBXUCBpcyB1c2VkLCBpdCBpcyByZWRpcmVjdGVk IHRvIFVDLSBwZXIKLQkgKiB0aGUgZGVmYXVsdCBzZXR1cCBpbiBfX2NhY2hlbW9kZTJwdGVfdGJs W10uCi0JICovCi0JcGF0ID0gUEFUKDAsIFdCKSB8IFBBVCgxLCBXVCkgfCBQQVQoMiwgVUNfTUlO VVMpIHwgUEFUKDMsIFVDKSB8Ci0JICAgICAgUEFUKDQsIFdCKSB8IFBBVCg1LCBXVCkgfCBQQVQo NiwgVUNfTUlOVVMpIHwgUEFUKDcsIFVDKTsKKwlpZiAoY3B1X2hhc19wYXQpIHsKKwkJLyoKKwkJ ICogQ1BVIHN1cHBvcnRzIFBBVC4gSW5pdGlhbGl6ZSB0aGUgUEFUIHRhYmxlIHRvIG1hdGNoIHdp dGgKKwkJICogdGhlIFBBVCBNU1IgdmFsdWUuIFRoaXMgc2V0dXAgaXMgdXNlZCBieSAibm9wYXQi IGJvb3QKKwkJICogb3B0aW9uLCBvciBieSB2aXJ0dWFsIG1hY2hpbmUgZW52aXJvbm1lbnRzIHdo aWNoIGRvIG5vdAorCQkgKiBzdXBwb3J0IE1UUlJzIGJ1dCBzdXBwb3J0IFBBVC4KKwkJICoKKwkJ ICogSWYgdGhlIE1TUiByZXR1cm5zIDAsIGl0IGlzIGNvbnNpZGVyZWQgaW52YWxpZCBhbmQgZW11 bGF0ZQorCQkgKiBhcyBObyBQQVQuCisJCSAqLworCQlyZG1zcmwoTVNSX0lBMzJfQ1JfUEFULCBw YXQpOworCX0KKworCWlmICghcGF0KSB7CisJCS8qCisJCSAqIE5vIFBBVC4gRW11bGF0ZSB0aGUg UEFUIHRhYmxlIHRoYXQgY29ycmVzcG9uZHMgdG8gdGhlIHR3bworCQkgKiBjYWNoZSBiaXRzLCBQ V1QgKFdyaXRlIFRocm91Z2gpIGFuZCBQQ0QgKENhY2hlIERpc2FibGUpLgorCQkgKiBUaGlzIHNl dHVwIGlzIGFsc28gdGhlIHNhbWUgYXMgdGhlIEJJT1MgZGVmYXVsdCBzZXR1cC4KKwkJICoKKwkJ ICogUFRFIGVuY29kaW5nOgorCQkgKgorCQkgKiAgICAgICBQQ0QKKwkJICogICAgICAgfFBXVCAg UEFUCisJCSAqICAgICAgIHx8ICAgIHNsb3QKKwkJICogICAgICAgMDAgICAgMCAgICBXQiA6IF9Q QUdFX0NBQ0hFX01PREVfV0IKKwkJICogICAgICAgMDEgICAgMSAgICBXVCA6IF9QQUdFX0NBQ0hF X01PREVfV1QKKwkJICogICAgICAgMTAgICAgMiAgICBVQy06IF9QQUdFX0NBQ0hFX01PREVfVUNf TUlOVVMKKwkJICogICAgICAgMTEgICAgMyAgICBVQyA6IF9QQUdFX0NBQ0hFX01PREVfVUMKKwkJ ICoKKwkJICogTk9URTogV2hlbiBXQyBvciBXUCBpcyB1c2VkLCBpdCBpcyByZWRpcmVjdGVkIHRv IFVDLSBwZXIKKwkJICogdGhlIGRlZmF1bHQgc2V0dXAgaW4gX19jYWNoZW1vZGUycHRlX3RibFtd LgorCQkgKi8KKwkJcGF0ID0gUEFUKDAsIFdCKSB8IFBBVCgxLCBXVCkgfCBQQVQoMiwgVUNfTUlO VVMpIHwgUEFUKDMsIFVDKSB8CisJCSAgICAgIFBBVCg0LCBXQikgfCBQQVQoNSwgV1QpIHwgUEFU KDYsIFVDX01JTlVTKSB8IFBBVCg3LCBVQyk7CisJfQogCiAJcGF0X2luaXRfY2FjaGVfbW9kZXMo cGF0KTsKIAotCWRpc2FibGVfaW5pdF9kb25lID0gMTsKKwllbXVfaW5pdF9kb25lID0gMTsKIH0K IAogdm9pZCBwYXRfaW5pdCh2b2lkKQpAQCAtMjgxLDcgKzI5NCw3IEBAIHZvaWQgcGF0X2luaXQo dm9pZCkKIAlzdHJ1Y3QgY3B1aW5mb194ODYgKmMgPSAmYm9vdF9jcHVfZGF0YTsKIAogCWlmICgh cGF0X2VuYWJsZWQoKSkgewotCQlwYXRfZGlzYWJsZV9pbml0KCk7CisJCXBhdF9lbXVfaW5pdCgp OwogCQlyZXR1cm47CiAJfQogCg== --=-aVNuKP0eyAGslvgQcx/I Content-Disposition: attachment; filename="04-xen-mtrr.patch" Content-Type: text/x-patch; name="04-xen-mtrr.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbTogVG9zaGkgS2FuaSA8dG9zaGkua2FuaUBocGUuY29tPgoKRGVsZXRlIHRoZSBQQVQgdGFi bGUgaW5pdGlhbGl6YXRpb24gY29kZSBmcm9tIFhlbiBhcyB0aGlzIGNhc2UKaXMgbm93IHN1cHBv cnRlZCBieSBQQVQuCgotLS0KIGFyY2gveDg2L2luY2x1ZGUvYXNtL210cnIuaCAgICAgfCAgICAy ICstCiBhcmNoL3g4Ni9rZXJuZWwvY3B1L210cnIvbWFpbi5jIHwgICAgNCArKy0tCiBhcmNoL3g4 Ni94ZW4vZW5saWdodGVuLmMgICAgICAgIHwgICAgOSAtLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgMyBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL3g4 Ni9pbmNsdWRlL2FzbS9tdHJyLmggYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9tdHJyLmgKaW5kZXgg YTk2NWU3NC4uNzc0MjBjMyAxMDA2NDQKLS0tIGEvYXJjaC94ODYvaW5jbHVkZS9hc20vbXRyci5o CisrKyBiL2FyY2gveDg2L2luY2x1ZGUvYXNtL210cnIuaApAQCAtODYsNyArODYsNyBAQCBzdGF0 aWMgaW5saW5lIHZvaWQgbXRycl9jZW50YXVyX3JlcG9ydF9tY3IoaW50IG1jciwgdTMyIGxvLCB1 MzIgaGkpCiB9CiBzdGF0aWMgaW5saW5lIHZvaWQgbXRycl9icF9pbml0KHZvaWQpCiB7Ci0JcGF0 X2Rpc2FibGUoIlBBVCBkaXNhYmxlZCBieSBNVFJSIik7CisJcGF0X2Rpc2FibGUoIlBBVCBlbXVs YXRpb24iKTsKIH0KIAogI2RlZmluZSBtdHJyX2FwX2luaXQoKSBkbyB7fSB3aGlsZSAoMCkKZGlm ZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9jcHUvbXRyci9tYWluLmMgYi9hcmNoL3g4Ni9rZXJu ZWwvY3B1L210cnIvbWFpbi5jCmluZGV4IGQ5ZTkxZjEuLmUxMGZiYTQgMTAwNjQ0Ci0tLSBhL2Fy Y2gveDg2L2tlcm5lbC9jcHUvbXRyci9tYWluLmMKKysrIGIvYXJjaC94ODYva2VybmVsL2NwdS9t dHJyL21haW4uYwpAQCAtNzY3LDEwICs3NjcsMTAgQEAgdm9pZCBfX2luaXQgbXRycl9icF9pbml0 KHZvaWQpCiAKIAkJLyoKIAkJICogUEFUIGluaXRpYWxpemF0aW9uIHJlbGllcyBvbiBNVFJSJ3Mg cmVuZGV6dm91cyBoYW5kbGVyLgotCQkgKiBEaXNhYmxlIFBBVCB1bnRpbCB0aGUgaGFuZGxlciBj YW4gaW5pdGlhbGl6ZSBib3RoIGZlYXR1cmVzCisJCSAqIEVtdWxhdGUgUEFUIHVudGlsIHRoZSBo YW5kbGVyIGNhbiBpbml0aWFsaXplIGJvdGggZmVhdHVyZXMKIAkJICogaW5kZXBlbmRlbnRseS4K IAkJICovCi0JCXBhdF9kaXNhYmxlKCJQQVQgZGlzYWJsZWQgYnkgTVRSUiIpOworCQlwYXRfZGlz YWJsZSgiUEFUIGVtdWxhdGlvbiIpOwogCX0KIH0KIApkaWZmIC0tZ2l0IGEvYXJjaC94ODYveGVu L2VubGlnaHRlbi5jIGIvYXJjaC94ODYveGVuL2VubGlnaHRlbi5jCmluZGV4IGQwOWU0YzkuLmM4 ODNmMTEgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L3hlbi9lbmxpZ2h0ZW4uYworKysgYi9hcmNoL3g4 Ni94ZW4vZW5saWdodGVuLmMKQEAgLTc0LDcgKzc0LDYgQEAKICNpbmNsdWRlIDxhc20vbWFjaF90 cmFwcy5oPgogI2luY2x1ZGUgPGFzbS9td2FpdC5oPgogI2luY2x1ZGUgPGFzbS9wY2lfeDg2Lmg+ Ci0jaW5jbHVkZSA8YXNtL3BhdC5oPgogI2luY2x1ZGUgPGFzbS9jcHUuaD4KIAogI2lmZGVmIENP TkZJR19BQ1BJCkBAIC0xNTEwLDcgKzE1MDksNiBAQCBhc21saW5rYWdlIF9fdmlzaWJsZSB2b2lk IF9faW5pdCB4ZW5fc3RhcnRfa2VybmVsKHZvaWQpCiB7CiAJc3RydWN0IHBoeXNkZXZfc2V0X2lv cGwgc2V0X2lvcGw7CiAJdW5zaWduZWQgbG9uZyBpbml0cmRfc3RhcnQgPSAwOwotCXU2NCBwYXQ7 CiAJaW50IHJjOwogCiAJaWYgKCF4ZW5fc3RhcnRfaW5mbykKQEAgLTE2MTcsMTMgKzE2MTUsNiBA QCBhc21saW5rYWdlIF9fdmlzaWJsZSB2b2lkIF9faW5pdCB4ZW5fc3RhcnRfa2VybmVsKHZvaWQp CiAJCQkJICAgeGVuX3N0YXJ0X2luZm8tPm5yX3BhZ2VzKTsKIAl4ZW5fcmVzZXJ2ZV9zcGVjaWFs X3BhZ2VzKCk7CiAKLQkvKgotCSAqIE1vZGlmeSB0aGUgY2FjaGUgbW9kZSB0cmFuc2xhdGlvbiB0 YWJsZXMgdG8gbWF0Y2ggWGVuJ3MgUEFUCi0JICogY29uZmlndXJhdGlvbi4KLQkgKi8KLQlyZG1z cmwoTVNSX0lBMzJfQ1JfUEFULCBwYXQpOwotCXBhdF9pbml0X2NhY2hlX21vZGVzKHBhdCk7Ci0K IAkvKiBrZWVwIHVzaW5nIFhlbiBnZHQgZm9yIG5vdzsgbm8gdXJnZW50IG5lZWQgdG8gY2hhbmdl IGl0ICovCiAKICNpZmRlZiBDT05GSUdfWDg2XzMyCg== --=-aVNuKP0eyAGslvgQcx/I Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9y Zy94ZW4tZGV2ZWwK --=-aVNuKP0eyAGslvgQcx/I--