From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.9 15/65] x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend Date: Fri, 9 Mar 2018 16:18:15 -0800 Message-ID: <20180310001826.213960392@linuxfoundation.org> References: <20180310001824.927996722@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1euSG7-00047J-Ke for xen-devel@lists.xenproject.org; Sat, 10 Mar 2018 00:21:11 +0000 In-Reply-To: <20180310001824.927996722@linuxfoundation.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org Cc: Juergen Gross , Greg Kroah-Hartman , stable@vger.kernel.org, Jan Beulich , xen-devel@lists.xenproject.org, Thomas Gleixner , boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org NC45LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IEp1ZXJnZW4gR3Jv c3MgPGpncm9zc0BzdXNlLmNvbT4KCmNvbW1pdCA3MWMyMDhkZDU0YWI5NzEwMzZkODNmZjZkOTgz N2JhZTQ5NzZlNjIzIHVwc3RyZWFtLgoKT2xkZXIgWGVuIHZlcnNpb25zICg0LjUgYW5kIGJlZm9y ZSkgbWlnaHQgaGF2ZSBwcm9ibGVtcyBtaWdyYXRpbmcgcHYKZ3Vlc3RzIHdpdGggTVNSX0lBMzJf U1BFQ19DVFJMIGhhdmluZyBhIG5vbi16ZXJvIHZhbHVlLiBTbyBiZWZvcmUKc3VzcGVuZGluZyB6 ZXJvIHRoYXQgTVNSIGFuZCByZXN0b3JlIGl0IGFmdGVyIGJlaW5nIHJlc3VtZWQuCgpTaWduZWQt b2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+ClNpZ25lZC1vZmYtYnk6IFRo b21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPgpSZXZpZXdlZC1ieTogSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPgpDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwpDYzogeGVu LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCkNjOiBib3Jpcy5vc3Ryb3Zza3lAb3JhY2xlLmNv bQpMaW5rOiBodHRwczovL2xrbWwua2VybmVsLm9yZy9yLzIwMTgwMjI2MTQwODE4LjQ4NDktMS1q Z3Jvc3NAc3VzZS5jb20KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hA bGludXhmb3VuZGF0aW9uLm9yZz4KCi0tLQogYXJjaC94ODYveGVuL3N1c3BlbmQuYyB8ICAgMTYg KysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKykKCi0tLSBh L2FyY2gveDg2L3hlbi9zdXNwZW5kLmMKKysrIGIvYXJjaC94ODYveGVuL3N1c3BlbmQuYwpAQCAt MSwxMSArMSwxNCBAQAogI2luY2x1ZGUgPGxpbnV4L3R5cGVzLmg+CiAjaW5jbHVkZSA8bGludXgv dGljay5oPgorI2luY2x1ZGUgPGxpbnV4L3BlcmNwdS1kZWZzLmg+CiAKICNpbmNsdWRlIDx4ZW4v eGVuLmg+CiAjaW5jbHVkZSA8eGVuL2ludGVyZmFjZS94ZW4uaD4KICNpbmNsdWRlIDx4ZW4vZ3Jh bnRfdGFibGUuaD4KICNpbmNsdWRlIDx4ZW4vZXZlbnRzLmg+CiAKKyNpbmNsdWRlIDxhc20vY3B1 ZmVhdHVyZXMuaD4KKyNpbmNsdWRlIDxhc20vbXNyLWluZGV4Lmg+CiAjaW5jbHVkZSA8YXNtL3hl bi9oeXBlcmNhbGwuaD4KICNpbmNsdWRlIDxhc20veGVuL3BhZ2UuaD4KICNpbmNsdWRlIDxhc20v Zml4bWFwLmg+CkBAIC02OCw2ICs3MSw4IEBAIHN0YXRpYyB2b2lkIHhlbl9wdl9wb3N0X3N1c3Bl bmQoaW50IHN1c3AKIAl4ZW5fbW1fdW5waW5fYWxsKCk7CiB9CiAKK3N0YXRpYyBERUZJTkVfUEVS X0NQVSh1NjQsIHNwZWNfY3RybCk7CisKIHZvaWQgeGVuX2FyY2hfcHJlX3N1c3BlbmQodm9pZCkK IHsKIAlpZiAoeGVuX3B2X2RvbWFpbigpKQpAQCAtODQsNiArODksOSBAQCB2b2lkIHhlbl9hcmNo X3Bvc3Rfc3VzcGVuZChpbnQgY2FuY2VsbGVkCiAKIHN0YXRpYyB2b2lkIHhlbl92Y3B1X25vdGlm eV9yZXN0b3JlKHZvaWQgKmRhdGEpCiB7CisJaWYgKHhlbl9wdl9kb21haW4oKSAmJiBib290X2Nw dV9oYXMoWDg2X0ZFQVRVUkVfU1BFQ19DVFJMKSkKKwkJd3Jtc3JsKE1TUl9JQTMyX1NQRUNfQ1RS TCwgdGhpc19jcHVfcmVhZChzcGVjX2N0cmwpKTsKKwogCS8qIEJvb3QgcHJvY2Vzc29yIG5vdGlm aWVkIHZpYSBnZW5lcmljIHRpbWVrZWVwaW5nX3Jlc3VtZSgpICovCiAJaWYgKHNtcF9wcm9jZXNz b3JfaWQoKSA9PSAwKQogCQlyZXR1cm47CkBAIC05Myw3ICsxMDEsMTUgQEAgc3RhdGljIHZvaWQg eGVuX3ZjcHVfbm90aWZ5X3Jlc3RvcmUodm9pZAogCiBzdGF0aWMgdm9pZCB4ZW5fdmNwdV9ub3Rp Znlfc3VzcGVuZCh2b2lkICpkYXRhKQogeworCXU2NCB0bXA7CisKIAl0aWNrX3N1c3BlbmRfbG9j YWwoKTsKKworCWlmICh4ZW5fcHZfZG9tYWluKCkgJiYgYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJF X1NQRUNfQ1RSTCkpIHsKKwkJcmRtc3JsKE1TUl9JQTMyX1NQRUNfQ1RSTCwgdG1wKTsKKwkJdGhp c19jcHVfd3JpdGUoc3BlY19jdHJsLCB0bXApOworCQl3cm1zcmwoTVNSX0lBMzJfU1BFQ19DVFJM LCAwKTsKKwl9CiB9CiAKIHZvaWQgeGVuX2FyY2hfcmVzdW1lKHZvaWQpCgoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxp c3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVj dC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELtDyRz18mRb8Jx7/7gLnfF1uxq+SmuxnXDwY9UVXWz6PPRUN6N6Tve1GXotcJRLHeAIJ084 ARC-Seal: i=1; a=rsa-sha256; t=1520641270; cv=none; d=google.com; s=arc-20160816; b=ytCZiHrM9lUIkOYASqTOVDPa9TLbBznaHHbxUKal1/wqBpkYR6YocMDGaB/fx2dBp/ 1dJIuQv92awj/CTqJruQDZ3S5jRWuXjA5LIWIGx79sOjQu2oVxCYs8r2SYQpfYZwNF04 BrA9xmwP/B3uNS8IaXZ/BYdTF6FVU/sDG7EVXRbZlC1wPetG1y+MPFRnPK1ZyN5jySAh YiaC8egZkA3jZmV7k3TxQD5O8Z/dcYlbl0u+A8SLD0ZpjgvAvJqZixQkCoEzQwtdCtoz ER8/9NMzRzHV375FFj2DQjP4UwmJce3axlr+UxPb8cS0SqvP2xe8i59MB1Ezd92NBcYj YtlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=1JW0mQw+MgHTV9BFiYz0/oPT/ONbyZ+NA9exJwiwTxU=; b=0+JKolPx1YOEbWcBpnVIScxMskdhaqXGLQpueNXGITZdwHBjJoQvG5VfECCxAQ9vGI NpD8gdT3VAl9OYLIu+h4aGKgW9B9Xp7Uexr/3c0Okn07cZxBtSi0PVFgXnWzJ7v+fglG cVr3PY7Dh/8/lULfWMfafCGM6a7R0wYFzgq2kXV45SfE6rt4rFBP65XO/bMShyJ/LAMx 0ED3KeSyE75meqdzdb0A0KCKb6VdfHCbkBt6HisXCXOqUW8+KE/QRImBj+mVB835+TpJ p+vKJBUccCv7W9xaKpYJ7PXXVXOY0nG3Exago2hUt1p1Q/Sik8XMXlnPt+bfjC73Am8L gF1w== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 185.236.200.248 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 185.236.200.248 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Juergen Gross , Thomas Gleixner , Jan Beulich , xen-devel@lists.xenproject.org, boris.ostrovsky@oracle.com Subject: [PATCH 4.9 15/65] x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend Date: Fri, 9 Mar 2018 16:18:15 -0800 Message-Id: <20180310001826.213960392@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180310001824.927996722@linuxfoundation.org> References: <20180310001824.927996722@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1594507940091175389?= X-GMAIL-MSGID: =?utf-8?q?1594507940091175389?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Juergen Gross commit 71c208dd54ab971036d83ff6d9837bae4976e623 upstream. Older Xen versions (4.5 and before) might have problems migrating pv guests with MSR_IA32_SPEC_CTRL having a non-zero value. So before suspending zero that MSR and restore it after being resumed. Signed-off-by: Juergen Gross Signed-off-by: Thomas Gleixner Reviewed-by: Jan Beulich Cc: stable@vger.kernel.org Cc: xen-devel@lists.xenproject.org Cc: boris.ostrovsky@oracle.com Link: https://lkml.kernel.org/r/20180226140818.4849-1-jgross@suse.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/xen/suspend.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c @@ -1,11 +1,14 @@ #include #include +#include #include #include #include #include +#include +#include #include #include #include @@ -68,6 +71,8 @@ static void xen_pv_post_suspend(int susp xen_mm_unpin_all(); } +static DEFINE_PER_CPU(u64, spec_ctrl); + void xen_arch_pre_suspend(void) { if (xen_pv_domain()) @@ -84,6 +89,9 @@ void xen_arch_post_suspend(int cancelled static void xen_vcpu_notify_restore(void *data) { + if (xen_pv_domain() && boot_cpu_has(X86_FEATURE_SPEC_CTRL)) + wrmsrl(MSR_IA32_SPEC_CTRL, this_cpu_read(spec_ctrl)); + /* Boot processor notified via generic timekeeping_resume() */ if (smp_processor_id() == 0) return; @@ -93,7 +101,15 @@ static void xen_vcpu_notify_restore(void static void xen_vcpu_notify_suspend(void *data) { + u64 tmp; + tick_suspend_local(); + + if (xen_pv_domain() && boot_cpu_has(X86_FEATURE_SPEC_CTRL)) { + rdmsrl(MSR_IA32_SPEC_CTRL, tmp); + this_cpu_write(spec_ctrl, tmp); + wrmsrl(MSR_IA32_SPEC_CTRL, 0); + } } void xen_arch_resume(void)