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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 75A2EC432C0 for ; Sat, 30 Nov 2019 23:27:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37D912075A for ; Sat, 30 Nov 2019 23:27:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575156457; bh=Ig3hXYu5WjaJ0AvqWKk+t2xuR7KeWQIhrIUiuzLS2Hw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=cIiHdtfi9XOc2Fe4OfRxEF++sEsFGSMjUZVeJuUmtjAAtt84gWWBLwMJOyyWOZLCJ p/rlvqCxZURnpvVfULs0/sU/X+bxAj1O4ExsBiPPsih+ehnjQaJ8SIj4xx0Veev+f8 hpkq9mkvXLjGkOxwhZl0Dd7o6GJFSxZMnYogcTf4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727296AbfK3X1e (ORCPT ); Sat, 30 Nov 2019 18:27:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:52534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727179AbfK3X1e (ORCPT ); Sat, 30 Nov 2019 18:27:34 -0500 Received: from sol.localdomain (c-24-5-143-220.hsd1.ca.comcast.net [24.5.143.220]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6D8662075A; Sat, 30 Nov 2019 23:27:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575156453; bh=Ig3hXYu5WjaJ0AvqWKk+t2xuR7KeWQIhrIUiuzLS2Hw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QAjfE5/HyuKMVUAoiD3P0PPeXvjG1yOVBToroY67MWQlABL/ilzdxWIf+Qi/abrlU byv2SyjRTMwlA85hZJoKDQ0B3iGBd/BFHqLEZlcpF3SP2AwOgadMYKXPjjFPzze5/d LaKkHeMb932QQ7Tl7M/aH3OSUaMqEDaiswZ6uPAY= Date: Sat, 30 Nov 2019 15:27:31 -0800 From: Eric Biggers To: Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, jmattson@redhat.com, ehabkost@redhat.com, konrad.wilk@oracle.com Subject: Re: [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf Message-ID: <20191130232731.GA9495@sol.localdomain> References: <1566376002-17121-1-git-send-email-pbonzini@redhat.com> <1566376002-17121-2-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1566376002-17121-2-git-send-email-pbonzini@redhat.com> User-Agent: Mutt/1.12.2 (2019-09-21) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi Paolo, On Wed, Aug 21, 2019 at 10:26:40AM +0200, Paolo Bonzini wrote: > The AMD_* bits have to be set from the vendor-independent > feature and bug flags, because KVM_GET_SUPPORTED_CPUID does not care > about the vendor and they should be set on Intel processors as well. > On top of this, SSBD, STIBP and AMD_SSB_NO bit were not set, and > VIRT_SSBD does not have to be added manually because it is a > cpufeature that comes directly from the host's CPUID bit. > > Signed-off-by: Paolo Bonzini > --- > arch/x86/kvm/cpuid.c | 21 +++++++++++++-------- > 1 file changed, 13 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 22c2720cd948..43caeb6059b9 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -729,18 +729,23 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, > g_phys_as = phys_as; > entry->eax = g_phys_as | (virt_as << 8); > entry->edx = 0; > + entry->ebx &= kvm_cpuid_8000_0008_ebx_x86_features; > + cpuid_mask(&entry->ebx, CPUID_8000_0008_EBX); > /* > - * IBRS, IBPB and VIRT_SSBD aren't necessarily present in > - * hardware cpuid > + * AMD has separate bits for each SPEC_CTRL bit. > + * arch/x86/kernel/cpu/bugs.c is kind enough to > + * record that in cpufeatures so use them. > */ > - if (boot_cpu_has(X86_FEATURE_AMD_IBPB)) > + if (boot_cpu_has(X86_FEATURE_IBPB)) > entry->ebx |= F(AMD_IBPB); > - if (boot_cpu_has(X86_FEATURE_AMD_IBRS)) > + if (boot_cpu_has(X86_FEATURE_IBRS)) > entry->ebx |= F(AMD_IBRS); > - if (boot_cpu_has(X86_FEATURE_VIRT_SSBD)) > - entry->ebx |= F(VIRT_SSBD); > - entry->ebx &= kvm_cpuid_8000_0008_ebx_x86_features; > - cpuid_mask(&entry->ebx, CPUID_8000_0008_EBX); > + if (boot_cpu_has(X86_FEATURE_STIBP)) > + entry->ebx |= F(AMD_STIBP); > + if (boot_cpu_has(X86_FEATURE_SSBD)) > + entry->ebx |= F(AMD_SSBD); > + if (!boot_cpu_has_bug(X86_BUG_SPEC_STORE_BYPASS)) > + entry->ebx |= F(AMD_SSB_NO); > /* > * The preference is to use SPEC CTRL MSR instead of the > * VIRT_SPEC MSR. This patch started causing a warning about an unchecked MSR access, when starting a VM. Processor is: "AMD Ryzen Threadripper 1950X 16-Core Processor" The warning appears both in the host and guest kernel logs. On the host: [ 12.121802] unchecked MSR access error: RDMSR from 0x48 at rIP: 0xffffffff8b049765 (svm_vcpu_run+0x6a5/0x720) [ 12.121806] Call Trace: [ 12.121812] ? kvm_arch_vcpu_ioctl_run+0x902/0x1b70 [ 12.121814] ? kvm_vm_ioctl_irq_line+0x1e/0x30 [ 12.121817] ? kvm_vcpu_ioctl+0x21e/0x560 [ 12.121821] ? vfs_writev+0xc0/0xf0 [ 12.121824] ? do_vfs_ioctl+0x41d/0x690 [ 12.121826] ? ksys_ioctl+0x59/0x90 [ 12.121827] ? __x64_sys_ioctl+0x11/0x20 [ 12.121828] ? do_syscall_64+0x43/0x130 [ 12.121832] ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 On the guest: [ 0.799090] unchecked MSR access error: WRMSR to 0x48 (tried to write 0x0000000000000004) at rIP: 0xffffffff81028272 (speculation_ctrl_update+0x132/0x2c0) [ 0.801823] Call Trace: [ 0.801831] ? seccomp_set_mode_filter+0x18d/0x800 [ 0.801833] speculation_ctrl_update_current+0x21/0x30 [ 0.801837] task_update_spec_tif+0x1d/0x20 [ 0.801839] ssb_prctl_set+0xb5/0xd0 [ 0.801841] arch_seccomp_spec_mitigate+0x2a/0x50 [ 0.801843] seccomp_set_mode_filter+0x788/0x800 [ 0.801845] do_seccomp+0x34/0x200 [ 0.801849] __x64_sys_seccomp+0x15/0x20 [ 0.801852] do_syscall_64+0x4a/0x1f0 [ 0.809349] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 0.810548] RIP: 0033:0x7f431db92e9d [ 0.811528] Code: 00 c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d b3 5f 0c 00 f7 d8 64 89 01 48 [ 0.814754] RSP: 002b:00007ffca5506788 EFLAGS: 00000246 ORIG_RAX: 000000000000013d [ 0.816075] RAX: ffffffffffffffda RBX: 0000556956c07580 RCX: 00007f431db92e9d [ 0.817367] RDX: 0000556956c023e0 RSI: 0000000000000000 RDI: 0000000000000001 [ 0.818698] RBP: 0000556956c023e0 R08: 0000000000000007 R09: 0000556956b73730 [ 0.819948] R10: 0000556956b7101a R11: 0000000000000246 R12: 000000000000002d [ 0.821184] R13: 0040000000002001 R14: 00007f431d9b4898 R15: 0000000000000000 The VM still boots though. I've actually been seeing this for a while but haven't had a chance to bisect it until now. Reverting the commit (4c6903a0f9d76) on mainline makes the warnings go away. Any ideas? Presumably something isn't working as intended. - Eric