Re: [RFC PATCH 2/3] x86/cpufeatures: Combine word 11 and 12 into new scattered features word 11

[Sean Christopherson]

On Fri, Jun 14, 2019 at 04:57:34PM +0200, Borislav Petkov wrote:
> On Fri, Jun 14, 2019 at 07:39:12AM -0700, Sean Christopherson wrote:
> > KVM can't handle Linux-defined leafs without extra tricks
> 
> and that's what I'm proposing - an extra trick.

It's not a trick, it's bug suppression.

Try running a kernel built with only patches 1/2 and 2/2 applied, along
with KVM's assertions removed.  It'll probably boot fine since most of the
affected features are option things, but Linux's feature reporting will be
all kinds of screwed up.

E.g. this WARN triggers because CPUID_7_EDX is 17, not 18 as expected,
and so the word at c->x86_capability[18] is never written.  Run the kernel
again after applying patch 3/3 and the warning magically disappears...

/* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */
#define X86_FEATURE_SPEC_CTRL_SSBD	(18*32+31) /* "" Speculative Store Bypass Disable */

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 5b0e9d869ce5..6c30fb244594 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -823,6 +823,8 @@ void get_cpu_cap(struct cpuinfo_x86 *c)
                c->x86_capability[CPUID_7_0_EBX] = ebx;
                c->x86_capability[CPUID_7_ECX] = ecx;
                c->x86_capability[CPUID_7_EDX] = edx;
+
+               WARN_ON((edx & BIT(31)) && !cpu_has(c, X86_FEATURE_SPEC_CTRL_SSBD));
        }
 
        /* Extended state features: level 0x0000000d */


[    0.085583] WARNING: CPU: 0 PID: 0 at /home/sean/go/src/kernel.org/sinux/arch/x86/kernel/cpu/common.c:827 get_cpu_cap+0x1c9/0x1d0
[    0.085583] Modules linked in:
[    0.085585] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G        W         5.2.0-rc2+ #4
[    0.085585] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015
[    0.085586] RIP: 0010:get_cpu_cap+0x1c9/0x1d0
[    0.085587] Code: <0f> 0b e9 7f fe ff ff 48 8b 05 d9 39 fe 00 ba 01 00 00 00 41 54 b9
[    0.085588] RSP: 0000:ffffffff82003e80 EFLAGS: 00010246
[    0.085588] RAX: 0000000000000000 RBX: 00000000009c4fbb RCX: 0000000000000004
[    0.085589] RDX: 0000000084000000 RSI: 0000000000000000 RDI: ffffffff820f71e0
[    0.085589] RBP: ffffffff820f71e0 R08: 0000000000000001 R09: 0000000000000001
[    0.085589] R10: 000000000002c4f8 R11: 0000000000000002 R12: ffffffff82486920
[    0.085590] R13: ffffffff8248d2e0 R14: ffff88827fff73c0 R15: 000000000000010f
[    0.085590] FS:  0000000000000000(0000) GS:ffff888277a00000(0000) knlGS:0000000000000000
[    0.085592] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[    0.085592] CR2: 00000000ffffffff CR3: 0000000005009001 CR4: 00000000000606b0
[    0.085592] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[    0.085593] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[    0.085593] Call Trace:
[    0.085595]  identify_cpu+0xbb/0x540
[    0.085597]  identify_boot_cpu+0xc/0x6f
[    0.085598]  check_bugs+0x26/0x852
[    0.085599]  start_kernel+0x47a/0x4ab
[    0.085601]  secondary_startup_64+0xa4/0xb0
[    0.085602] ---[ end trace 33fbe952b06dbb68 ]---