kvm/x86: Reject Hyper-V hypercall continuation
authorAndrey Smetanin <asmetanin@virtuozzo.com>
Thu, 11 Feb 2016 13:45:00 +0000 (16:45 +0300)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 16 Feb 2016 17:48:42 +0000 (18:48 +0100)
Currently we do not support Hyper-V hypercall continuation
so reject it.

Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com>
Reviewed-by: Roman Kagan <rkagan@virtuozzo.com>
CC: Gleb Natapov <gleb@kernel.org>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Joerg Roedel <joro@8bytes.org>
CC: "K. Y. Srinivasan" <kys@microsoft.com>
CC: Haiyang Zhang <haiyangz@microsoft.com>
CC: Roman Kagan <rkagan@virtuozzo.com>
CC: Denis V. Lunev <den@openvz.org>
CC: qemu-devel@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/hyperv.c

index 599b06733f0245f46eed935e3347ad0cc4fdc4d3..e8af5978762b82b9ed5131e2744888cb45a8ac3c 100644 (file)
@@ -1083,6 +1083,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)
 
        trace_kvm_hv_hypercall(code, fast, rep_cnt, rep_idx, ingpa, outgpa);
 
+       /* Hypercall continuation is not supported yet */
+       if (rep_cnt || rep_idx) {
+               res = HV_STATUS_INVALID_HYPERCALL_CODE;
+               goto set_result;
+       }
+
        switch (code) {
        case HVCALL_NOTIFY_LONG_SPIN_WAIT:
                kvm_vcpu_on_spin(vcpu);
@@ -1092,6 +1098,7 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)
                break;
        }
 
+set_result:
        ret = res | (((u64)rep_done & 0xfff) << 32);
        if (longmode) {
                kvm_register_write(vcpu, VCPU_REGS_RAX, ret);