From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AA23ECDFB8 for ; Mon, 23 Jul 2018 12:49:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1DE2020856 for ; Mon, 23 Jul 2018 12:49:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DE2020856 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388399AbeGWNuN (ORCPT ); Mon, 23 Jul 2018 09:50:13 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:51854 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388695AbeGWNsK (ORCPT ); Mon, 23 Jul 2018 09:48:10 -0400 Received: from localhost (LFbn-1-12238-233.w90-92.abo.wanadoo.fr [90.92.53.233]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id E4CEFC77; Mon, 23 Jul 2018 12:47:03 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brian Woods , Juergen Gross , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , boris.ostrovsky@oracle.com, xen-devel@lists.xenproject.org, Ingo Molnar , "Srivatsa S. Bhat" Subject: [PATCH 4.4 098/107] x86/xen: Add call of speculative_store_bypass_ht_init() to PV paths Date: Mon, 23 Jul 2018 14:42:32 +0200 Message-Id: <20180723122418.416950924@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180723122413.003644357@linuxfoundation.org> References: <20180723122413.003644357@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Juergen Gross commit 74899d92e66663dc7671a8017b3146dcd4735f3b upstream. Commit: 1f50ddb4f418 ("x86/speculation: Handle HT correctly on AMD") ... added speculative_store_bypass_ht_init() to the per-CPU initialization sequence. speculative_store_bypass_ht_init() needs to be called on each CPU for PV guests, too. Reported-by: Brian Woods Tested-by: Brian Woods Signed-off-by: Juergen Gross Cc: Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: boris.ostrovsky@oracle.com Cc: xen-devel@lists.xenproject.org Fixes: 1f50ddb4f4189243c05926b842dc1a0332195f31 ("x86/speculation: Handle HT correctly on AMD") Link: https://lore.kernel.org/lkml/20180621084331.21228-1-jgross@suse.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman Signed-off-by: Srivatsa S. Bhat Signed-off-by: Greg Kroah-Hartman --- arch/x86/xen/smp.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -87,6 +88,8 @@ static void cpu_bringup(void) cpu_data(cpu).x86_max_cores = 1; set_cpu_sibling_map(cpu); + speculative_store_bypass_ht_init(); + xen_setup_cpu_clockevents(); notify_cpu_starting(cpu); @@ -357,6 +360,8 @@ static void __init xen_smp_prepare_cpus( } set_cpu_sibling_map(0); + speculative_store_bypass_ht_init(); + xen_pmu_init(0); if (xen_smp_intr_init(0)) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.4 098/107] x86/xen: Add call of speculative_store_bypass_ht_init() to PV paths Date: Mon, 23 Jul 2018 14:42:32 +0200 Message-ID: <20180723122418.416950924@linuxfoundation.org> References: <20180723122413.003644357@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.89) (envelope-from ) id 1fhaF0-00089S-2d for xen-devel@lists.xenproject.org; Mon, 23 Jul 2018 12:47:06 +0000 In-Reply-To: <20180723122413.003644357@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 , Peter Zijlstra , Greg Kroah-Hartman , "Srivatsa S. Bhat" , Brian Woods , stable@vger.kernel.org, Ingo Molnar , xen-devel@lists.xenproject.org, Thomas Gleixner , Linus Torvalds , boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org NC40LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IEp1ZXJnZW4gR3Jv c3MgPGpncm9zc0BzdXNlLmNvbT4KCmNvbW1pdCA3NDg5OWQ5MmU2NjY2M2RjNzY3MWE4MDE3YjMx NDZkY2Q0NzM1ZjNiIHVwc3RyZWFtLgoKQ29tbWl0OgoKICAxZjUwZGRiNGY0MTggKCJ4ODYvc3Bl Y3VsYXRpb246IEhhbmRsZSBIVCBjb3JyZWN0bHkgb24gQU1EIikKCi4uLiBhZGRlZCBzcGVjdWxh dGl2ZV9zdG9yZV9ieXBhc3NfaHRfaW5pdCgpIHRvIHRoZSBwZXItQ1BVIGluaXRpYWxpemF0aW9u IHNlcXVlbmNlLgoKc3BlY3VsYXRpdmVfc3RvcmVfYnlwYXNzX2h0X2luaXQoKSBuZWVkcyB0byBi ZSBjYWxsZWQgb24gZWFjaCBDUFUgZm9yClBWIGd1ZXN0cywgdG9vLgoKUmVwb3J0ZWQtYnk6IEJy aWFuIFdvb2RzIDxicmlhbi53b29kc0BhbWQuY29tPgpUZXN0ZWQtYnk6IEJyaWFuIFdvb2RzIDxi cmlhbi53b29kc0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NA c3VzZS5jb20+CkNjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4KQ2M6IExpbnVzIFRvcnZhbGRz IDx0b3J2YWxkc0BsaW51eC1mb3VuZGF0aW9uLm9yZz4KQ2M6IFBldGVyIFppamxzdHJhIDxwZXRl cnpAaW5mcmFkZWFkLm9yZz4KQ2M6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRl PgpDYzogYm9yaXMub3N0cm92c2t5QG9yYWNsZS5jb20KQ2M6IHhlbi1kZXZlbEBsaXN0cy54ZW5w cm9qZWN0Lm9yZwpGaXhlczogMWY1MGRkYjRmNDE4OTI0M2MwNTkyNmI4NDJkYzFhMDMzMjE5NWYz MSAoIng4Ni9zcGVjdWxhdGlvbjogSGFuZGxlIEhUIGNvcnJlY3RseSBvbiBBTUQiKQpMaW5rOiBo dHRwczovL2xvcmUua2VybmVsLm9yZy9sa21sLzIwMTgwNjIxMDg0MzMxLjIxMjI4LTEtamdyb3Nz QHN1c2UuY29tClNpZ25lZC1vZmYtYnk6IEluZ28gTW9sbmFyIDxtaW5nb0BrZXJuZWwub3JnPgpT aWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24u b3JnPgpTaWduZWQtb2ZmLWJ5OiBTcml2YXRzYSBTLiBCaGF0IDxzcml2YXRzYUBjc2FpbC5taXQu ZWR1PgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5k YXRpb24ub3JnPgotLS0KIGFyY2gveDg2L3hlbi9zbXAuYyB8ICAgIDUgKysrKysKIDEgZmlsZSBj aGFuZ2VkLCA1IGluc2VydGlvbnMoKykKCi0tLSBhL2FyY2gveDg2L3hlbi9zbXAuYworKysgYi9h cmNoL3g4Ni94ZW4vc21wLmMKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlIDx4ZW4vaW50ZXJm YWNlL3ZjcHUuaD4KICNpbmNsdWRlIDx4ZW4vaW50ZXJmYWNlL3hlbnBtdS5oPgogCisjaW5jbHVk ZSA8YXNtL3NwZWMtY3RybC5oPgogI2luY2x1ZGUgPGFzbS94ZW4vaW50ZXJmYWNlLmg+CiAjaW5j bHVkZSA8YXNtL3hlbi9oeXBlcmNhbGwuaD4KIApAQCAtODcsNiArODgsOCBAQCBzdGF0aWMgdm9p ZCBjcHVfYnJpbmd1cCh2b2lkKQogCWNwdV9kYXRhKGNwdSkueDg2X21heF9jb3JlcyA9IDE7CiAJ c2V0X2NwdV9zaWJsaW5nX21hcChjcHUpOwogCisJc3BlY3VsYXRpdmVfc3RvcmVfYnlwYXNzX2h0 X2luaXQoKTsKKwogCXhlbl9zZXR1cF9jcHVfY2xvY2tldmVudHMoKTsKIAogCW5vdGlmeV9jcHVf c3RhcnRpbmcoY3B1KTsKQEAgLTM1Nyw2ICszNjAsOCBAQCBzdGF0aWMgdm9pZCBfX2luaXQgeGVu X3NtcF9wcmVwYXJlX2NwdXMoCiAJfQogCXNldF9jcHVfc2libGluZ19tYXAoMCk7CiAKKwlzcGVj dWxhdGl2ZV9zdG9yZV9ieXBhc3NfaHRfaW5pdCgpOworCiAJeGVuX3BtdV9pbml0KDApOwogCiAJ aWYgKHhlbl9zbXBfaW50cl9pbml0KDApKQoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0 cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlz dGluZm8veGVuLWRldmVs