Skip to contentSkip to conversation

FAILED: patch "[PATCH] KVM: VMX: Add non-canonical check on writes to RTIT address" failed to apply to 4.19-stable tree

PATCH [email protected] 3 participants 5 messages Feb 9, 2020 – Feb 20, 2020

Subsystems (3)
Stable branch x86 KVM x86
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From fe6ed369fca98e99df55c932b85782a5687526b5 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Tue, 10 Dec 2019 15:24:32 -0800
Subject: [PATCH] KVM: VMX: Add non-canonical check on writes to RTIT address
MSRs

Reject writes to RTIT address MSRs if the data being written is a non-canonical address as the MSRs are subject to canonical checks, e.g. KVM will trigger an unchecked #GP when loading the values to hardware during pt_guest_enter().

Cc [email protected]
Signed-off-by Sean Christopherson <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
arch/x86/kvm/vmx/vmx.c +2 -0
index c2ced79aee3e..aea4fa957fd2 100644
@@ -2144,6 +2144,8 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 			(index >= 2 * intel_pt_validate_cap(vmx->pt_desc.caps,
 					PT_CAP_num_address_ranges)))
 			return 1;
+		if (is_noncanonical_address(data, vcpu))
+			return 1;
 		if (index % 2)
 			vmx->pt_desc.guest.addr_b[index / 2] = data;
 		else
maintainer
#1 lore raw
Quoted 18 lines · On Sun, Feb 09, 2020 at 01:31:58PM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From fe6ed369fca98e99df55c932b85782a5687526b5 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Tue, 10 Dec 2019 15:24:32 -0800
Subject: [PATCH] KVM: VMX: Add non-canonical check on writes to RTIT address MSRs

Quoted 8 lines

Reject writes to RTIT address MSRs if the data being written is a non-canonical address as the MSRs are subject to canonical checks, e.g. KVM will trigger an unchecked #GP when loading the values to hardware during pt_guest_enter().

Cc [email protected]
Signed-off-by Sean Christopherson <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>

File/code movement. Cleaned up and queued for 4.19-4.4.

Signature · 2 lines
Thanks,
Sasha
#2 lore raw
Quoted 23 lines · Sasha Levin
Quoted 22 lines · On Sun, Feb 09, 2020 at 01:31:58PM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From fe6ed369fca98e99df55c932b85782a5687526b5 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Tue, 10 Dec 2019 15:24:32 -0800
Subject: [PATCH] KVM: VMX: Add non-canonical check on writes to RTIT address MSRs

Reject writes to RTIT address MSRs if the data being written is a non-canonical address as the MSRs are subject to canonical checks, e.g. KVM will trigger an unchecked #GP when loading the values to hardware during pt_guest_enter().

Quoted 5 lines
Quoted 3 lines
Cc [email protected]
Signed-off-by Sean Christopherson <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>

File/code movement. Cleaned up and queued for 4.19-4.4.

I don't know what happened here, but you've ended up adding the entirety of arch/x86/kvm/vmx/vmx.c on all those branches rather than applying the change to the right file.

Ben.

Signature · 3 lines
Ben Hutchings, Software Developer                         Codethink Ltd
https://www.codethink.co.uk/                 Dale House, 35 Dale Street
                                     Manchester, M1 2HF, United Kingdom
author maintainer
#3 lore raw
Quoted 28 lines · Ben Hutchings
Quoted 27 lines · Sasha Levin
Quoted 25 lines · On Sun, Feb 09, 2020 at 01:31:58PM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From fe6ed369fca98e99df55c932b85782a5687526b5 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Tue, 10 Dec 2019 15:24:32 -0800
Subject: [PATCH] KVM: VMX: Add non-canonical check on writes to RTIT address MSRs

Reject writes to RTIT address MSRs if the data being written is a non-canonical address as the MSRs are subject to canonical checks, e.g. KVM will trigger an unchecked #GP when loading the values to hardware during pt_guest_enter().

Cc [email protected]
Signed-off-by Sean Christopherson <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
Quoted 5 lines
Quoted 1 line

File/code movement. Cleaned up and queued for 4.19-4.4.

I don't know what happened here, but you've ended up adding the entirety of arch/x86/kvm/vmx/vmx.c on all those branches rather than applying the change to the right file.

Oh wow that's wrong :(

I'll go revert this, as it's not actually doing anything.

Thanks for catching this.

greg k-h

maintainer
#4 lore raw
In reply to Ben Hutchings
Quoted 28 lines · Ben Hutchings
Quoted 27 lines · Sasha Levin
Quoted 25 lines · On Sun, Feb 09, 2020 at 01:31:58PM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From fe6ed369fca98e99df55c932b85782a5687526b5 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Tue, 10 Dec 2019 15:24:32 -0800
Subject: [PATCH] KVM: VMX: Add non-canonical check on writes to RTIT address MSRs

Reject writes to RTIT address MSRs if the data being written is a non-canonical address as the MSRs are subject to canonical checks, e.g. KVM will trigger an unchecked #GP when loading the values to hardware during pt_guest_enter().

Cc [email protected]
Signed-off-by Sean Christopherson <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
Quoted 5 lines
Quoted 1 line

File/code movement. Cleaned up and queued for 4.19-4.4.

I don't know what happened here, but you've ended up adding the entirety of arch/x86/kvm/vmx/vmx.c on all those branches rather than applying the change to the right file.

Ugh, sorry. I think that I got confused here by 'git cherry-pick' creating the file when it doesn't exist and it doesn't find the right file renames.

Signature · 2 lines
Thanks,
Sasha