x86/kvm/fpu: Fix guest migration bugs that can crash guest
cover x86/kvm/fpu: Fix guest migration bugs that can crash guest
This patchset comes from a bug I found during qemu guest migration from a host with newer CPU to a host with an older version of this CPU, and thus having less FPU features.
When the guests were created, the one with less features is used as config, so migration is possible.
Patch 1 fix a bug that always happens during this migration, and is related to the fact that xsave saves all feature flags, but xrstor does not touch the PKRU flag.
Patch 2 comes from a concearn I have of the same bug as above hapenning through different means, such as a future bug in qemu, and rendering a lot of VMs unmigratable. Also, I think it makes sense to limit the fatures to what the vcpu supports, as if it were baremetal it would crash.
Please let me know of anything to improve!
Best regards,
Leo
Leonardo Bras (2):
x86/kvm/fpu: Mask guest fpstate->xfeatures with guest_supported_xcr0 x86/kvm/fpu: Limit setting guest fpu features based on
guest_supported_xcr0
arch/x86/kvm/cpuid.c | 3 +++ arch/x86/kvm/x86.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)
Signature · 1 line
2.35.1
PATCH 1/2 x86/kvm/fpu: Mask guest fpstate->xfeatures with guest_supported_xcr0
During host/guest switch (like in kvm_arch_vcpu_ioctl_run()), the kernel swaps the fpu between host/guest contexts, by using fpu_swap_kvm_fpstate().
When xsave feature is available, the fpu swap is done by:
- xsave(s) instruction, with guest's fpstate->xfeatures as mask, is used to store the current state of the fpu registers to a buffer.
- xrstor(s) instruction, with (fpu_kernel_cfg.max_features & XFEATURE_MASK_FPSTATE) as mask, is used to put the buffer into fpu regs.
For xsave(s) the mask is used to limit what parts of the fpu regs will be copied to the buffer. Likewise on xrstor(s), the mask is used to limit what parts of the fpu regs will be changed.
The mask for xsave(s), the guest's fpstate->xfeatures, is defined on kvm_arch_vcpu_create(), which (in summary) sets it to all features supported by the cpu which are enabled on kernel config.
This means that xsave(s) will save to guest buffer all the fpu regs contents the cpu has enabled when the guest is paused, even if they are not used.
This would not be an issue, if xrstor(s) would also do that.
xrstor(s)'s mask for host/guest swap is basically every valid feature contained in kernel config, except XFEATURE_MASK_PKRU. Accordingto kernel src, it is instead switched in switch_to() and flush_thread().
Then, the following happens with a host supporting PKRU starts a guest that does not support it:
1 - Host has XFEATURE_MASK_PKRU set. 1st switch to guest,
2 - xsave(s) fpu regs to host fpustate (buffer has XFEATURE_MASK_PKRU) 3 - xrstor(s) guest fpustate to fpu regs (fpu regs have XFEATURE_MASK_PKRU) 4 - guest runs, then switch back to host,
5 - xsave(s) fpu regs to guest fpstate (buffer now have XFEATURE_MASK_PKRU) 6 - xrstor(s) host fpstate to fpu regs.
On 5, even though the guest does not support PKRU, it does have the flag set on guest fpstate, which is transferred to userspace via vcpu ioctl KVM_GET_XSAVE.
This becomes a problem when the user decides on migrating the above guest to another machine that does not support PKRU:
The new host restores guest's fpu regs to as they were before (xrstor(s)), but since the new host don't support PKRU, a general-protection exception ocurs in xrstor(s) and that crashes the guest.
This can be solved by making the guest's fpstate->xfeatures only hold values compatible to guest_supported_xcr0. This way, on 5 the only flags saved by xsave(s) will be the ones compatible to guest requirements, and thus there will be no issue during migration.
--- arch/x86/kvm/cpuid.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kvm/cpuid.c +3 -0
@@ -296,6 +296,9 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) vcpu->arch.guest_supported_xcr0 =cpuid_get_supported_xcr0 (vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent); +/* Mask out features unsupported by guest */ + vcpu->arch.guest_fpu.fpstate->xfeatures &= vcpu->arch.guest_supported_xcr0; +kvm_update_pv_runtime (vcpu); vcpu->arch.maxphyaddr =cpuid_query_maxphyaddr (vcpu);
Signature · 1 line
2.35.1
Paolo Bonzini
maintainerRe: [PATCH v1 1/2] x86/kvm/fpu: Mask guest fpstate->xfeatures with guest_supported_xcr0
Quoted 21 lines · Leonardo Bras
During host/guest switch (like in
kvm_arch_vcpu_ioctl_run()), the kernel swaps the fpu between host/guest contexts, by usingfpu_swap_kvm_fpstate().When xsave feature is available, the fpu swap is done by:
- xsave(s) instruction, with guest'sfpstate->xfeaturesas mask, is used to store the current state of the fpu registers to a buffer.
- xrstor(s) instruction, with (fpu_kernel_cfg.max_features &XFEATURE_MASK_FPSTATE) as mask, is used to put the buffer into fpu regs.For xsave(s) the mask is used to limit what parts of the fpu regs will be copied to the buffer. Likewise on xrstor(s), the mask is used to limit what parts of the fpu regs will be changed.
The mask for xsave(s), the guest's
fpstate->xfeatures, is defined onkvm_arch_vcpu_create(), which (in summary) sets it to all features supported by the cpu which are enabled on kernel config.This means that xsave(s) will save to guest buffer all the fpu regs contents the cpu has enabled when the guest is paused, even if they are not used.
Quoted 6 lines
This would not be an issue, if xrstor(s) would also do that.
xrstor(s)'s mask for host/guest swap is basically every valid feature contained in kernel config, except
XFEATURE_MASK_PKRU. Accordingto kernel src, it is instead switched inswitch_to()andflush_thread().
Hi Leonardo, is this an issue when patch 2 is applied? With this patch, we have to reason about the effect of calling KVM_SET_CPUID2 twice calls back to back. I think an "&=" would be wrong in that case.
On the other hand, with patch 2 the change is only in the KVM_SET_XSAVE output, which is much more self-contained.
Thanks,
Paolo
Quoted 43 lines
Then, the following happens with a host supporting PKRU starts a guest that does not support it:
1 - Host hasXFEATURE_MASK_PKRUset. 1st switch to guest,
2 - xsave(s) fpu regs to host fpustate (buffer hasXFEATURE_MASK_PKRU) 3 - xrstor(s) guest fpustate to fpu regs (fpu regs haveXFEATURE_MASK_PKRU) 4 - guest runs, then switch back to host,
5 - xsave(s) fpu regs to guest fpstate (buffer now haveXFEATURE_MASK_PKRU) 6 - xrstor(s) host fpstate to fpu regs.On 5, even though the guest does not support PKRU, it does have the flag set on guest fpstate, which is transferred to userspace via vcpu ioctl
KVM_GET_XSAVE.This becomes a problem when the user decides on migrating the above guest to another machine that does not support PKRU:
The new host restores guest's fpu regs to as they were before (xrstor(s)), but since the new host don't support PKRU, a general-protection exception ocurs in xrstor(s) and that crashes the guest.This can be solved by making the guest's
fpstate->xfeaturesonly hold values compatible toguest_supported_xcr0. This way, on 5 the only flags saved by xsave(s) will be the ones compatible to guest requirements, and thus there will be no issue during migration.Signed-off-by Leonardo Bras <[email protected]>--- arch/x86/kvm/cpuid.c | 3 +++ 1 file changed, 3 insertions(+)arch/x86/kvm/cpuid.c +3
-0@@ -296,6 +296,9 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) vcpu->arch.guest_supported_xcr0 =cpuid_get_supported_xcr0 (vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent); +/* Mask out features unsupported by guest */ + vcpu->arch.guest_fpu.fpstate->xfeatures &= vcpu->arch.guest_supported_xcr0; +kvm_update_pv_runtime (vcpu); vcpu->arch.maxphyaddr =cpuid_query_maxphyaddr (vcpu);
Re: [PATCH v1 1/2] x86/kvm/fpu: Mask guest fpstate->xfeatures with guest_supported_xcr0
Hello Paolo,
Quoted 23 lines · Paolo Bonzini
Quoted 21 lines · Leonardo Bras
During host/guest switch (like in
kvm_arch_vcpu_ioctl_run()), the kernel swaps the fpu between host/guest contexts, by usingfpu_swap_kvm_fpstate().When xsave feature is available, the fpu swap is done by:
- xsave(s) instruction, with guest'sfpstate->xfeaturesas mask, is used to store the current state of the fpu registers to a buffer.
- xrstor(s) instruction, with (fpu_kernel_cfg.max_features &XFEATURE_MASK_FPSTATE) as mask, is used to put the buffer into fpu regs.For xsave(s) the mask is used to limit what parts of the fpu regs will be copied to the buffer. Likewise on xrstor(s), the mask is used to limit what parts of the fpu regs will be changed.
The mask for xsave(s), the guest's
fpstate->xfeatures, is defined onkvm_arch_vcpu_create(), which (in summary) sets it to all features supported by the cpu which are enabled on kernel config.This means that xsave(s) will save to guest buffer all the fpu regs contents the cpu has enabled when the guest is paused, even if they are not used.
Quoted 8 lines
Quoted 6 lines
This would not be an issue, if xrstor(s) would also do that.
xrstor(s)'s mask for host/guest swap is basically every valid feature contained in kernel config, except
XFEATURE_MASK_PKRU. According to kernel src, it is instead switched inswitch_to()andflush_thread().Hi Leonardo, is this an issue when patch 2 is applied?
Yes.
This issue happens on host/guest context switch, instead of KVM_{GET,SET}_XSAVE, so this bug will be triggered whenever the guest doesn't support PKRU but the host
does, without any interference of above IOCTLs.
In fact, IIUC, even if we are able to fix the feature bit with KVM_SET_XSAVE, it would
come back after another host/guest context switch if we don't fix vcpu->arch.guest_fpu.fpstate->xfeatures.
Quoted 3 lines
With this patch,
we have to reason about the effect of callingKVM_SET_CPUID2twice calls back to back. I think an "&=" would be wrong in that case.
So, you suggest something like this ?
vcpu->arch.guest_fpu.fpstate->xfeatures =
fpu_user_cfg.default_features & vcpu->arch.guest_supported_xcr0;
Quoted 3 lines
On the other hand, with patch 2 the change is only in the
KVM_SET_XSAVEoutput, which is much more self-contained.
Agree, but they solve different sources of the same issue. Patch 2 will only address a bug that can happen if userspace mistakenly tries to set a feature the guest does not support.
Quoted 2 lines
Thanks,
Thank you!
Best regards,
Leo
[...]
Paolo Bonzini
maintainerRe: [PATCH v1 1/2] x86/kvm/fpu: Mask guest fpstate->xfeatures with guest_supported_xcr0
Quoted 9 lines · Leonardo Bras Soares Passos
Quoted 3 lines
With this patch,
we have to reason about the effect of callingKVM_SET_CPUID2twice calls back to back. I think an "&=" would be wrong in that case.So, you suggest something like this ?
vcpu->arch.guest_fpu.fpstate->xfeatures=fpu_user_cfg.default_features & vcpu->arch.guest_supported_xcr0;
Yes, but you need to change user_xfeatures instead of xfeatures. KVM_GET_XSAVE and KVM_SET_XSAVE will take it into account automatically:
- KVM_GET_XSAVE: fpu_copy_guest_fpstate_to_uabi -> __copy_xstate_to_uabi_buf
- KVM_SET_XSAVE: fpu_copy_uabi_to_guest_fpstate -> copy_uabi_from_kernel_to_xstate -> copy_uabi_to_xstate -> validate_user_xstate_buffer
Paolo
Re: [PATCH v1 1/2] x86/kvm/fpu: Mask guest fpstate->xfeatures with guest_supported_xcr0
Quoted 12 lines · Paolo Bonzini
Quoted 9 lines · Leonardo Bras Soares Passos
Quoted 3 lines
With this patch,
we have to reason about the effect of callingKVM_SET_CPUID2twice calls back to back. I think an "&=" would be wrong in that case.So, you suggest something like this ?
vcpu->arch.guest_fpu.fpstate->xfeatures=fpu_user_cfg.default_features & vcpu->arch.guest_supported_xcr0;
Quoted 8 lines
Yes, but you need to change
user_xfeaturesinstead of xfeatures.KVM_GET_XSAVEandKVM_SET_XSAVEwill take it into account automatically:-
KVM_GET_XSAVE:fpu_copy_guest_fpstate_to_uabi->__copy_xstate_to_uabi_buf-
KVM_SET_XSAVE:fpu_copy_uabi_to_guest_fpstate->copy_uabi_from_kernel_to_xstate->copy_uabi_to_xstate->validate_user_xstate_buffer
Ok, I understand how this replaces patch 2/2, so no issue on that.
About patch 1/2, you suggest that instead of fixing what we save in the regs buffer, we fix only what we want to return to the user when they call KVM_GET_XSAVE, is that correct?
Quoted 3 lines
Paolo
Paolo Bonzini
maintainerRe: [PATCH v1 1/2] x86/kvm/fpu: Mask guest fpstate->xfeatures with guest_supported_xcr0
Quoted 23 lines · Leonardo Bras Soares Passos
Quoted 12 lines · Paolo Bonzini
Quoted 9 lines · Leonardo Bras Soares Passos
Quoted 3 lines
With this patch,
we have to reason about the effect of callingKVM_SET_CPUID2twice calls back to back. I think an "&=" would be wrong in that case.So, you suggest something like this ?
vcpu->arch.guest_fpu.fpstate->xfeatures=fpu_user_cfg.default_features & vcpu->arch.guest_supported_xcr0;Quoted 8 lines
Yes, but you need to change
user_xfeaturesinstead of xfeatures.KVM_GET_XSAVEandKVM_SET_XSAVEwill take it into account automatically:-
KVM_GET_XSAVE:fpu_copy_guest_fpstate_to_uabi->__copy_xstate_to_uabi_buf-
KVM_SET_XSAVE:fpu_copy_uabi_to_guest_fpstate->copy_uabi_from_kernel_to_xstate->copy_uabi_to_xstate->validate_user_xstate_buffer
Quoted 5 lines
Ok, I understand how this replaces patch 2/2, so no issue on that.
About patch 1/2, you suggest that instead of fixing what we save in the regs buffer, we fix only what we want to return to the user when they call
KVM_GET_XSAVE, is that correct?
Yes, exactly.
Paolo
Re: [PATCH v1 1/2] x86/kvm/fpu: Mask guest fpstate->xfeatures with guest_supported_xcr0
Quoted 25 lines · Paolo Bonzini
Quoted 23 lines · Leonardo Bras Soares Passos
Quoted 20 lines · Paolo Bonzini
Quoted 9 lines · Leonardo Bras Soares Passos
Quoted 3 lines
With this patch,
we have to reason about the effect of callingKVM_SET_CPUID2twice calls back to back. I think an "&=" would be wrong in that case.So, you suggest something like this ?
vcpu->arch.guest_fpu.fpstate->xfeatures=fpu_user_cfg.default_features & vcpu->arch.guest_supported_xcr0;Yes, but you need to change
user_xfeaturesinstead of xfeatures.KVM_GET_XSAVEandKVM_SET_XSAVEwill take it into account automatically:-
KVM_GET_XSAVE:fpu_copy_guest_fpstate_to_uabi->__copy_xstate_to_uabi_buf-
KVM_SET_XSAVE:fpu_copy_uabi_to_guest_fpstate->copy_uabi_from_kernel_to_xstate->copy_uabi_to_xstate->validate_user_xstate_buffer
Quoted 7 lines
Quoted 5 lines
Ok, I understand how this replaces patch 2/2, so no issue on that.
About patch 1/2, you suggest that instead of fixing what we save in the regs buffer, we fix only what we want to return to the user when they call
KVM_GET_XSAVE, is that correct?Yes, exactly.
Thanks! I will update my patch and send a v2 shortly.
I got really curious while I was debugging this issue:
- Is it ok that the cpu has other features enabled (like PKRU), while our vcpu does not have them?
- Should guest OS always use the cpuid for checking features available?
- Would it be better if we could have exactly the same fpu features enabled in the cpu, as we have in the vcpu?
- Why do we xsave with a mask different from what we xrstor ?
Quoted 3 lines
Paolo
PATCH 2/2 x86/kvm/fpu: Limit setting guest fpu features based on guest_supported_xcr0
In reply to Leonardo BrasAs of today, if userspace tries to set guest's fpu features to any value (vcpu ioctl: KVM_SET_XSAVE), it is checked against the supported features of the host cpu, and the supported features of KVM.
This makes possible to set the guest fpstate with features that were not enabled during guest creation, but are available in the host cpu.
This becomes an issue during guest migration, if the target host does not support the given feature:
1 - Create guest vcpu without support to featureA, on a source host that
supports it,
2 - Set featureA to guest vcpu, even if it does not support it.
It will run just fine, as the current host cpu supports featureA,
3 - Migrate guest to another host, which does not support featureA, 4 - After migration is completed, restoring guest fpustate to fpu regs will
cause a general-protection exception, and crash the guest.
A way to avoid the issue is by returning error if the user tries to set any feature not enabled during guest creation (guest_supported_xcr0).
--- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +2 -1
@@ -5010,7 +5010,8 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,return fpu_copy_uabi_to_guest_fpstate (&vcpu->arch.guest_fpu, guest_xsave->region, - supported_xcr0, &vcpu->arch.pkru); + vcpu->arch.guest_supported_xcr0, + &vcpu->arch.pkru); } static void kvm_vcpu_ioctl_x86_get_xcrs(struct kvm_vcpu *vcpu,
Signature · 1 line
2.35.1