From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.15 036/122] x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend Date: Wed, 7 Mar 2018 11:37:28 -0800 Message-ID: <20180307191734.376131923@linuxfoundation.org> References: <20180307191729.190879024@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1etex3-0002uN-RG for xen-devel@lists.xenproject.org; Wed, 07 Mar 2018 19:42:13 +0000 In-Reply-To: <20180307191729.190879024@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 NC4xNS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBKdWVyZ2VuIEdy b3NzIDxqZ3Jvc3NAc3VzZS5jb20+Cgpjb21taXQgNzFjMjA4ZGQ1NGFiOTcxMDM2ZDgzZmY2ZDk4 MzdiYWU0OTc2ZTYyMyB1cHN0cmVhbS4KCk9sZGVyIFhlbiB2ZXJzaW9ucyAoNC41IGFuZCBiZWZv cmUpIG1pZ2h0IGhhdmUgcHJvYmxlbXMgbWlncmF0aW5nIHB2Cmd1ZXN0cyB3aXRoIE1TUl9JQTMy X1NQRUNfQ1RSTCBoYXZpbmcgYSBub24temVybyB2YWx1ZS4gU28gYmVmb3JlCnN1c3BlbmRpbmcg emVybyB0aGF0IE1TUiBhbmQgcmVzdG9yZSBpdCBhZnRlciBiZWluZyByZXN1bWVkLgoKU2lnbmVk LW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29tPgpTaWduZWQtb2ZmLWJ5OiBU aG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5kZT4KUmV2aWV3ZWQtYnk6IEphbiBCZXVs aWNoIDxqYmV1bGljaEBzdXNlLmNvbT4KQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKQ2M6IHhl bi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpDYzogYm9yaXMub3N0cm92c2t5QG9yYWNsZS5j b20KTGluazogaHR0cHM6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE4MDIyNjE0MDgxOC40ODQ5LTEt amdyb3NzQHN1c2UuY29tClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2to QGxpbnV4Zm91bmRhdGlvbi5vcmc+CgotLS0KIGFyY2gveDg2L3hlbi9zdXNwZW5kLmMgfCAgIDE2 ICsrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspCgotLS0g YS9hcmNoL3g4Ni94ZW4vc3VzcGVuZC5jCisrKyBiL2FyY2gveDg2L3hlbi9zdXNwZW5kLmMKQEAg LTEsMTIgKzEsMTUgQEAKIC8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBHUEwtMi4wCiAjaW5j bHVkZSA8bGludXgvdHlwZXMuaD4KICNpbmNsdWRlIDxsaW51eC90aWNrLmg+CisjaW5jbHVkZSA8 bGludXgvcGVyY3B1LWRlZnMuaD4KIAogI2luY2x1ZGUgPHhlbi94ZW4uaD4KICNpbmNsdWRlIDx4 ZW4vaW50ZXJmYWNlL3hlbi5oPgogI2luY2x1ZGUgPHhlbi9ncmFudF90YWJsZS5oPgogI2luY2x1 ZGUgPHhlbi9ldmVudHMuaD4KIAorI2luY2x1ZGUgPGFzbS9jcHVmZWF0dXJlcy5oPgorI2luY2x1 ZGUgPGFzbS9tc3ItaW5kZXguaD4KICNpbmNsdWRlIDxhc20veGVuL2h5cGVyY2FsbC5oPgogI2lu Y2x1ZGUgPGFzbS94ZW4vcGFnZS5oPgogI2luY2x1ZGUgPGFzbS9maXhtYXAuaD4KQEAgLTE1LDYg KzE4LDggQEAKICNpbmNsdWRlICJtbXUuaCIKICNpbmNsdWRlICJwbXUuaCIKIAorc3RhdGljIERF RklORV9QRVJfQ1BVKHU2NCwgc3BlY19jdHJsKTsKKwogdm9pZCB4ZW5fYXJjaF9wcmVfc3VzcGVu ZCh2b2lkKQogewogCXhlbl9zYXZlX3RpbWVfbWVtb3J5X2FyZWEoKTsKQEAgLTM1LDYgKzQwLDkg QEAgdm9pZCB4ZW5fYXJjaF9wb3N0X3N1c3BlbmQoaW50IGNhbmNlbGxlZAogCiBzdGF0aWMgdm9p ZCB4ZW5fdmNwdV9ub3RpZnlfcmVzdG9yZSh2b2lkICpkYXRhKQogeworCWlmICh4ZW5fcHZfZG9t YWluKCkgJiYgYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJFX1NQRUNfQ1RSTCkpCisJCXdybXNybChN U1JfSUEzMl9TUEVDX0NUUkwsIHRoaXNfY3B1X3JlYWQoc3BlY19jdHJsKSk7CisKIAkvKiBCb290 IHByb2Nlc3NvciBub3RpZmllZCB2aWEgZ2VuZXJpYyB0aW1la2VlcGluZ19yZXN1bWUoKSAqLwog CWlmIChzbXBfcHJvY2Vzc29yX2lkKCkgPT0gMCkKIAkJcmV0dXJuOwpAQCAtNDQsNyArNTIsMTUg QEAgc3RhdGljIHZvaWQgeGVuX3ZjcHVfbm90aWZ5X3Jlc3RvcmUodm9pZAogCiBzdGF0aWMgdm9p ZCB4ZW5fdmNwdV9ub3RpZnlfc3VzcGVuZCh2b2lkICpkYXRhKQogeworCXU2NCB0bXA7CisKIAl0 aWNrX3N1c3BlbmRfbG9jYWwoKTsKKworCWlmICh4ZW5fcHZfZG9tYWluKCkgJiYgYm9vdF9jcHVf aGFzKFg4Nl9GRUFUVVJFX1NQRUNfQ1RSTCkpIHsKKwkJcmRtc3JsKE1TUl9JQTMyX1NQRUNfQ1RS TCwgdG1wKTsKKwkJdGhpc19jcHVfd3JpdGUoc3BlY19jdHJsLCB0bXApOworCQl3cm1zcmwoTVNS X0lBMzJfU1BFQ19DVFJMLCAwKTsKKwl9CiB9CiAKIHZvaWQgeGVuX2FyY2hfcmVzdW1lKHZvaWQp CgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1k ZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8v bGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELsQd/FzCq6e8Od1Uf8NXd5dvYw8ku4dJu69gs8QtkA0BiLq8+T7clS5/fJr3nqvJTIuY8/S ARC-Seal: i=1; a=rsa-sha256; t=1520451728; cv=none; d=google.com; s=arc-20160816; b=v2gWuWMW6PahtfJ2qZaLdTT4VkUEqywxhTE98rgxMc+Gdu0bCxYDVuTVRngmOVKLwo HfAmLEoNWQ+baskDHKsZpMT007REcWfHv0NY7bemLj5pmfi675qxFdHi8p4YYIKTWXpq CSAWI+t/y2rKbg5Uvxwz5T38/22H6wgP/rYbEPIYeP9ssAjN6VcZE1dSKqhWQk1Mq1qP tn+Q+grl58+50WBLUqSxdOgKRfTvIHP3GyaRVGu0NR8bVPNaU3a1StNEcvhsu8YbIwms RulJdikTW7URoTHTSr+Xu3KA/ARoS6xwUCJC/hJgQ6TUGnTSA2+51teQa/Ol13qhSVw2 nBng== 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=ZmrzP02aFpb5tg4zDIZIFWp5eS1NqS/be3q3NgtF6FA=; b=pByZhkvaExF1zlchOk9SVPAMNsRNdUmy9nU1VCm2fs4tUgOT3Uu0Pbl7GwkyY6nEs4 V2M7yMvC7sqFGQUWDdANAbJtHSado7jBowpGtSeDATQHgmwQC0Px/yLWEmfqmn9V4Jut 9NRLUQOtmufXHGeEtejow3SG+c6Cy9VNTPDIM2+5d+6cZPFCBKxLaTA6DmJOoM/jYOiw cyvuz9+jtjr9xe3jbeMPLjH3X/oaLRWnf2jjhJTB/LepIa8/7B0ciczYJL9KIZcoPiu7 Aq171rTx/9Fr/GSCUg8aIMcjffD3l4eK1Yv5QjeXsrieFNDhKl8eJjksZw2UocxRl9ts Gj5g== 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.15 036/122] x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend Date: Wed, 7 Mar 2018 11:37:28 -0800 Message-Id: <20180307191734.376131923@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180307191729.190879024@linuxfoundation.org> References: <20180307191729.190879024@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?1594309192061179507?= X-GMAIL-MSGID: =?utf-8?q?1594309192061179507?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-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,12 +1,15 @@ // SPDX-License-Identifier: GPL-2.0 #include #include +#include #include #include #include #include +#include +#include #include #include #include @@ -15,6 +18,8 @@ #include "mmu.h" #include "pmu.h" +static DEFINE_PER_CPU(u64, spec_ctrl); + void xen_arch_pre_suspend(void) { xen_save_time_memory_area(); @@ -35,6 +40,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; @@ -44,7 +52,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)