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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 A601EC282C4 for ; Wed, 13 Feb 2019 02:40:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6ADB0222C9 for ; Wed, 13 Feb 2019 02:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025634; bh=xgW7S3Frt+Rjjpxob43kYoM3ZR7NK8bSAeEG0hIZpcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xPVb55JSlclHxgyS4Lp/BFAZu+w07hicyLWBzQ9Q3HKIgyiq28W0Lp74DHyH7kt+V HQV4UxGr/uq2y2YNGl2OiNy3S1ZAt5sqmgo8lq53Ws6JpK55iGMHYXkbbmuxMbdV9p yD7QQMmXQ1PyqH8sIAYTlYubcZdhQ+7xFgln2Hs4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732136AbfBMCkd (ORCPT ); Tue, 12 Feb 2019 21:40:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:44200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389001AbfBMCk3 (ORCPT ); Tue, 12 Feb 2019 21:40:29 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6EFB4222C9; Wed, 13 Feb 2019 02:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025629; bh=xgW7S3Frt+Rjjpxob43kYoM3ZR7NK8bSAeEG0hIZpcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dp4dbhzt1qUmDXwrmVc4nBLiYX6+OljiB3uO0Qk81tJthg5AF3sIgQE2ZSXF0/WTm d0Vu9PYSWoXqbw8E8BRjnikPS2YlWBrkR1eKRNloKeJ62Zk/ryNY4004nbY4Cokptj lsQgECYH2OmhqtTWgHfTaKvBkkdbi0FvnSmbtYys= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Talons Lee , Boris Ostrovsky , Sasha Levin Subject: [PATCH AUTOSEL 4.14 26/34] always clear the X2APIC_ENABLE bit for PV guest Date: Tue, 12 Feb 2019 21:39:44 -0500 Message-Id: <20190213023952.21311-26-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023952.21311-1-sashal@kernel.org> References: <20190213023952.21311-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Talons Lee [ Upstream commit 5268c8f39e0efef81af2aaed160272d9eb507beb ] Commit e657fcc clears cpu capability bit instead of using fake cpuid value, the EXTD should always be off for PV guest without depending on cpuid value. So remove the cpuid check in xen_read_msr_safe() to always clear the X2APIC_ENABLE bit. Signed-off-by: Talons Lee Reviewed-by: Juergen Gross Signed-off-by: Boris Ostrovsky Signed-off-by: Sasha Levin --- arch/x86/xen/enlighten_pv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index fd173e6425cc..481d7920ea24 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -900,10 +900,7 @@ static u64 xen_read_msr_safe(unsigned int msr, int *err) val = native_read_msr_safe(msr, err); switch (msr) { case MSR_IA32_APICBASE: -#ifdef CONFIG_X86_X2APIC - if (!(cpuid_ecx(1) & (1 << (X86_FEATURE_X2APIC & 31)))) -#endif - val &= ~X2APIC_ENABLE; + val &= ~X2APIC_ENABLE; break; } return val; -- 2.19.1