The Annnoying Affair has No eXcuses - Bulletin #2

The Annnoying Affair has No eXcuses - Bulletin #2

[Thomas Gleixner]

[-- Attachment #1: Type: text/plain, Size: 729 bytes --]

Folks,

I've merged Linus tree into master to pick up the KVM fix and applied
Paolo's V9 series. The commits are considered stable from now on. Any
further tweaks need to go on top.

The stable branches linux-5.3.y, linux-4.19.y and linix-4.14.y have been
updated to the latest stable and the fallout in the backports of TAA has
been fixed.

The non KVM parts of the NX series has been backported to them. Paolo will
provide the KVM backports including the commits which need to be
additionally backported as prerequisites for 5.3, 4.19 and 4.14.

The changes are available as usual from:

  cvs.ou.linutronix.de:linux/speck/linux  

Git bundle for the master branch is attached. Applies on top of 5.4-rc6.

Thanks,

        tglx

[-- Attachment #2: Type: application/octet-stream, Size: 41777 bytes --]

[MODERATED] Re: The Annnoying Affair has No eXcuses - Bulletin #2

[Luck, Tony]

On Mon, Nov 04, 2019 at 01:09:21PM +0100, speck for Thomas Gleixner wrote:
> Folks,
> 
> I've merged Linus tree into master to pick up the KVM fix and applied
> Paolo's V9 series. The commits are considered stable from now on. Any
> further tweaks need to go on top.

Small typo causes build error:

arch/x86/kvm/../../../virt/kvm/kvm_main.c: In function ‘kvm_create_vm’:
arch/x86/kvm/../../../virt/kvm/kvm_main.c:703:31: error: expected ‘;’ before ‘:’ token
   goto out_err_no_mmu_notifier:
                               ^
                               ;

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index d32a50aa104c..4aab3547a165 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -700,7 +700,7 @@ static struct kvm *kvm_create_vm(unsigned long type)
 
 	r = kvm_init_mmu_notifier(kvm);
 	if (r)
-		goto out_err_no_mmu_notifier:
+		goto out_err_no_mmu_notifier;
 
 	r = kvm_arch_post_init_vm(kvm);
 	if (r)

[MODERATED] Re: The Annnoying Affair has No eXcuses - Bulletin #2

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1572 bytes --]

On Mon, 2019-11-04 at 13:09 +0100, speck for Thomas Gleixner wrote:
> Folks,
> 
> I've merged Linus tree into master to pick up the KVM fix and applied
> Paolo's V9 series. The commits are considered stable from now on. Any
> further tweaks need to go on top.
> 
> The stable branches linux-5.3.y, linux-4.19.y and linix-4.14.y have been
> updated to the latest stable and the fallout in the backports of TAA has
> been fixed.
> 
> The non KVM parts of the NX series has been backported to them. Paolo will
> provide the KVM backports including the commits which need to be
> additionally backported as prerequisites for 5.3, 4.19 and 4.14.

Based on a quick comparison between your 4.19 branch and mine:

* You've included "x86/cpu: Add Atom Tremont (Jacobsville)" and
"x86/cpu: Add Tremont to the cpu vulnerability whitelist", but Paolo
seemed to say these weren't worth adding so I've dropped them.

* Your backport of "KVM: x86: use Intel speculation bugs and features
as derived in generic x86 code" is messed up; at least the indentation
is wrong.

* I backported commit 3ff519f29d98 "KVM: x86: adjust kvm_mmu_page
member to save 8 bytes" as this made it easier to apply the other
changes in arch/x86/include/asm/kvm_host.h.

Ben.

> The changes are available as usual from:
> 
>   cvs.ou.linutronix.de:linux/speck/linux  
> 
> Git bundle for the master branch is attached. Applies on top of 5.4-rc6.
> 
> Thanks,
> 
>         tglx
-- 
Ben Hutchings
Design a system any fool can use, and only a fool will want to use it.


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: The Annnoying Affair has No eXcuses - Bulletin #2

[Thomas Gleixner]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

On Mon, 4 Nov 2019, speck for Luck, Tony wrote:

> On Mon, Nov 04, 2019 at 01:09:21PM +0100, speck for Thomas Gleixner wrote:
> > Folks,
> > 
> > I've merged Linus tree into master to pick up the KVM fix and applied
> > Paolo's V9 series. The commits are considered stable from now on. Any
> > further tweaks need to go on top.
> 
> Small typo causes build error:
> 
> arch/x86/kvm/../../../virt/kvm/kvm_main.c: In function ‘kvm_create_vm’:
> arch/x86/kvm/../../../virt/kvm/kvm_main.c:703:31: error: expected ‘;’ before ‘:’ token
>    goto out_err_no_mmu_notifier:
                                 ^
Uuurgh. /me looks for a brown paperbag and goes to fix.

Re: The Annnoying Affair has No eXcuses - Bulletin #2

[Thomas Gleixner]

[-- Attachment #1: Type: text/plain, Size: 853 bytes --]

On Mon, 4 Nov 2019, speck for Thomas Gleixner wrote:
> On Mon, 4 Nov 2019, speck for Luck, Tony wrote:
> 
> > On Mon, Nov 04, 2019 at 01:09:21PM +0100, speck for Thomas Gleixner wrote:
> > > Folks,
> > > 
> > > I've merged Linus tree into master to pick up the KVM fix and applied
> > > Paolo's V9 series. The commits are considered stable from now on. Any
> > > further tweaks need to go on top.
> > 
> > Small typo causes build error:
> > 
> > arch/x86/kvm/../../../virt/kvm/kvm_main.c: In function ‘kvm_create_vm’:
> > arch/x86/kvm/../../../virt/kvm/kvm_main.c:703:31: error: expected ‘;’ before ‘:’ token
> >    goto out_err_no_mmu_notifier:
>                                  ^
> Uuurgh. /me looks for a brown paperbag and goes to fix.

Fixed in the master branch. New bundle attached.

Sorry for the noise!

	tglx

[-- Attachment #2: Type: application/octet-stream, Size: 41776 bytes --]

Re: The Annnoying Affair has No eXcuses - Bulletin #2

[Thomas Gleixner]

On Mon, 4 Nov 2019, speck for Ben Hutchings wrote:
> On Mon, 2019-11-04 at 13:09 +0100, speck for Thomas Gleixner wrote:
> > Folks,
> > 
> > I've merged Linus tree into master to pick up the KVM fix and applied
> > Paolo's V9 series. The commits are considered stable from now on. Any
> > further tweaks need to go on top.
> > 
> > The stable branches linux-5.3.y, linux-4.19.y and linix-4.14.y have been
> > updated to the latest stable and the fallout in the backports of TAA has
> > been fixed.
> > 
> > The non KVM parts of the NX series has been backported to them. Paolo will
> > provide the KVM backports including the commits which need to be
> > additionally backported as prerequisites for 5.3, 4.19 and 4.14.
> 
> Based on a quick comparison between your 4.19 branch and mine:
> 
> * You've included "x86/cpu: Add Atom Tremont (Jacobsville)" and
> "x86/cpu: Add Tremont to the cpu vulnerability whitelist", but Paolo
> seemed to say these weren't worth adding so I've dropped them.

Hmm. Not sure about that, but it doesn't really matter.

> * Your backport of "KVM: x86: use Intel speculation bugs and features
> as derived in generic x86 code" is messed up; at least the indentation
> is wrong.

Yes indeed.
 
> * I backported commit 3ff519f29d98 "KVM: x86: adjust kvm_mmu_page
> member to save 8 bytes" as this made it easier to apply the other
> changes in arch/x86/include/asm/kvm_host.h.

For which part TAA or NX?

Thanks,

	tglx

[MODERATED] Re: The Annnoying Affair has No eXcuses - Bulletin #2

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 471 bytes --]

On Mon, 2019-11-04 at 20:30 +0100, speck for Thomas Gleixner wrote:
> On Mon, 4 Nov 2019, speck for Ben Hutchings wrote:
[...]
> > * I backported commit 3ff519f29d98 "KVM: x86: adjust kvm_mmu_page
> > member to save 8 bytes" as this made it easier to apply the other
> > changes in arch/x86/include/asm/kvm_host.h.
> 
> For which part TAA or NX?

For NX.

Ben.

-- 
Ben Hutchings
Design a system any fool can use, and only a fool will want to use it.



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: The Annnoying Affair has No eXcuses - Bulletin #2

[Thomas Gleixner]

On Mon, 4 Nov 2019, speck for Ben Hutchings wrote:
> On Mon, 2019-11-04 at 20:30 +0100, speck for Thomas Gleixner wrote:
> > On Mon, 4 Nov 2019, speck for Ben Hutchings wrote:
> [...]
> > > * I backported commit 3ff519f29d98 "KVM: x86: adjust kvm_mmu_page
> > > member to save 8 bytes" as this made it easier to apply the other
> > > changes in arch/x86/include/asm/kvm_host.h.
> > 
> > For which part TAA or NX?
> 
> For NX.

Assumed that. Thanks for confirming. I still let Paolo sort this out as he
already offered to do so.

Thanks,

	tglx

Re: The Annnoying Affair has No eXcuses - Bulletin #2

[Thomas Gleixner]

On Mon, 4 Nov 2019, speck for Thomas Gleixner wrote:
> On Mon, 4 Nov 2019, speck for Ben Hutchings wrote:
> > * Your backport of "KVM: x86: use Intel speculation bugs and features
> > as derived in generic x86 code" is messed up; at least the indentation
> > is wrong.
> 
> Yes indeed.

Fixed that up and pushed out updated 4.19/4.14 branches.

Thanks,

	tglx

[MODERATED] Re: The Annnoying Affair has No eXcuses - Bulletin #2

[Paolo Bonzini]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

On 05/11/19 01:28, speck for Thomas Gleixner wrote:
> On Mon, 4 Nov 2019, speck for Ben Hutchings wrote:
>> On Mon, 2019-11-04 at 20:30 +0100, speck for Thomas Gleixner wrote:
>>> On Mon, 4 Nov 2019, speck for Ben Hutchings wrote:
>> [...]
>>>> * I backported commit 3ff519f29d98 "KVM: x86: adjust kvm_mmu_page
>>>> member to save 8 bytes" as this made it easier to apply the other
>>>> changes in arch/x86/include/asm/kvm_host.h.
>>>
>>> For which part TAA or NX?
>>
>> For NX.
> 
> Assumed that. Thanks for confirming. I still let Paolo sort this out as he
> already offered to do so.

Yes, I should get everything sorted out tomorrow.

Paolo