diff options
| author | Gleb Natapov <gleb@redhat.com> | 2010-10-14 11:22:55 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-01-12 11:23:21 +0200 |
| commit | 6adba527420651b6cacaf392541c09fb108711a2 (patch) | |
| tree | 1f81e4fc0bdf46b39ed62587a493f085633e8ac1 /arch/x86/kvm | |
| parent | 6c047cd982f944fa63b2d96de2a06463d113f9fa (diff) | |
| download | op-kernel-dev-6adba527420651b6cacaf392541c09fb108711a2.zip op-kernel-dev-6adba527420651b6cacaf392541c09fb108711a2.tar.gz | |
KVM: Let host know whether the guest can handle async PF in non-userspace context.
If guest can detect that it runs in non-preemptable context it can
handle async PFs at any time, so let host know that it can send async
PF even if guest cpu is not in userspace.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/x86.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ac4c368..fff70b5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1429,8 +1429,8 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data) { gpa_t gpa = data & ~0x3f; - /* Bits 1:5 are resrved, Should be zero */ - if (data & 0x3e) + /* Bits 2:5 are resrved, Should be zero */ + if (data & 0x3c) return 1; vcpu->arch.apf.msr_val = data; @@ -1444,6 +1444,7 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data) if (kvm_gfn_to_hva_cache_init(vcpu->kvm, &vcpu->arch.apf.data, gpa)) return 1; + vcpu->arch.apf.send_user_only = !(data & KVM_ASYNC_PF_SEND_ALWAYS); kvm_async_pf_wakeup_all(vcpu); return 0; } |
