linux-kernel - Re: [GIT PULL] KVM changes for Linux 6.14

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wghGxSMv3K0BEB8N3N3vwk-3v=T1FhBVJyf2u_xYYJOCA@mail.gmail.com>
Date: Sat, 25 Jan 2025 10:16:00 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Paolo Bonzini <pbonzini@...hat.com>
Cc: linux-kernel@...r.kernel.org, kvm@...r.kernel.org
Subject: Re: [GIT PULL] KVM changes for Linux 6.14

On Fri, 24 Jan 2025 at 08:38, Paolo Bonzini <pbonzini@...hat.com> wrote:
>
> but you can throw away the <<<< ... ==== part completely, and apply the
> same change on top of the new implementation:
>
> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
> index edef30359c19..9f9a29be3beb 100644
> --- a/arch/x86/kvm/cpuid.c
> +++ b/arch/x86/kvm/cpuid.c
> @@ -1177,6 +1177,7 @@ void kvm_set_cpu_caps(void)
>                 EMULATED_F(NO_SMM_CTL_MSR),
>                 /* PrefetchCtlMsr */
>                 F(WRMSR_XX_BASE_NS),
> +               F(SRSO_USER_KERNEL_NO),
>                 SYNTHESIZED_F(SBPB),
>                 SYNTHESIZED_F(IBPB_BRTYPE),
>                 SYNTHESIZED_F(SRSO_NO),

Ehh. My resolution ended up being different.

I did this instead:

               F(WRMSR_XX_BASE_NS),
               SYNTHESIZED_F(SBPB),
               SYNTHESIZED_F(IBPB_BRTYPE),
               SYNTHESIZED_F(SRSO_NO),
+              SYNTHESIZED_F(SRSO_USER_KERNEL_NO),

which (apart from the line ordering) differs from your suggestion in
F() vs SYNTHESIZED_F().

That really seemed to be the RightThing(tm) to do from the context of
the two conflicting commits, but maybe there was some reason that I
didn't catch that you kept it as a plain "F()".

So please take a look, and if I screwed up send me a fix (with a
scathing explanation for why I'm maternally related to some
less-than-gifted rodentia with syphilis).

           Linus