From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric B Munson Subject: [PATCH 3/5 V4] Add ioctl for KVM_GUEST_STOPPED Date: Tue, 29 Nov 2011 16:35:37 -0500 Message-ID: <1322602539-27004-4-git-send-email-emunson@mgebm.net> References: <1322602539-27004-1-git-send-email-emunson@mgebm.net> Return-path: In-Reply-To: <1322602539-27004-1-git-send-email-emunson@mgebm.net> Sender: kvm-owner@vger.kernel.org To: avi@redhat.com Cc: Eric B Munson , mingo@redhat.com, hpa@zytor.com, arnd@arndb.de, ryanh@linux.vnet.ibm.com, aliguori@us.ibm.com, mtosatti@redhat.com, jeremy.fitzhardinge@citrix.com, kvm@vger.kernel.org, linux-arch@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org List-Id: linux-arch.vger.kernel.org Now that we have a flag that will tell the guest it was suspended, create an interface for that communication using a KVM ioctl. Signed-off-by: Eric B Munson Cc: mingo@redhat.com Cc: hpa@zytor.com Cc: arnd@arndb.de Cc: ryanh@linux.vnet.ibm.com Cc: aliguori@us.ibm.com Cc: mtosatti@redhat.com Cc: jeremy.fitzhardinge@citrix.com Cc: kvm@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org --- arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/kvm/x86.c | 20 ++++++++++++++++++++ include/linux/kvm.h | 2 ++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index b4973f4..beb94c6 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -672,6 +672,8 @@ int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes, gpa_t addr, unsigned long *ret); u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn); +int kvm_set_guest_paused(struct kvm_vcpu *vcpu); + extern bool tdp_enabled; u64 vcpu_tsc_khz(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c38efd7..0127617 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3295,6 +3295,10 @@ long kvm_arch_vcpu_ioctl(struct file *filp, goto out; } + case KVM_GUEST_PAUSED: { + r = kvm_set_guest_paused(vcpu); + break; + } default: r = -EINVAL; } @@ -6117,6 +6121,22 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason, } EXPORT_SYMBOL_GPL(kvm_task_switch); +/* + * kvm_set_guest_paused() indicates to the guest kernel that it has been + * stopped by the hypervisor. This function will be called from the host only. + * EINVAL is returned when the host attempts to set the flag for a guest that + * does not support pv clocks. + */ +int kvm_set_guest_paused(struct kvm_vcpu *vcpu) +{ + struct pvclock_vcpu_time_info *src = &vcpu->arch.hv_clock; + if (!vcpu->arch.time_page) + return -EINVAL; + src->flags |= PVCLOCK_GUEST_STOPPED; + return 0; +} +EXPORT_SYMBOL_GPL(kvm_set_guest_paused); + int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) { diff --git a/include/linux/kvm.h b/include/linux/kvm.h index c3892fc..15578a2 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -762,6 +762,8 @@ struct kvm_clock_data { #define KVM_CREATE_SPAPR_TCE _IOW(KVMIO, 0xa8, struct kvm_create_spapr_tce) /* Available with KVM_CAP_RMA */ #define KVM_ALLOCATE_RMA _IOR(KVMIO, 0xa9, struct kvm_allocate_rma) +/* VM is being stopped by host */ +#define KVM_GUEST_PAUSED _IO(KVMIO, 0xaa) #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) -- 1.7.5.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from oz.csail.mit.edu ([128.30.30.239]:41217 "EHLO mail.mgebm.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756879Ab1K2Vf5 (ORCPT ); Tue, 29 Nov 2011 16:35:57 -0500 From: Eric B Munson Subject: [PATCH 3/5 V4] Add ioctl for KVM_GUEST_STOPPED Date: Tue, 29 Nov 2011 16:35:37 -0500 Message-ID: <1322602539-27004-4-git-send-email-emunson@mgebm.net> In-Reply-To: <1322602539-27004-1-git-send-email-emunson@mgebm.net> References: <1322602539-27004-1-git-send-email-emunson@mgebm.net> Sender: linux-arch-owner@vger.kernel.org List-ID: To: avi@redhat.com Cc: Eric B Munson , mingo@redhat.com, hpa@zytor.com, arnd@arndb.de, ryanh@linux.vnet.ibm.com, aliguori@us.ibm.com, mtosatti@redhat.com, jeremy.fitzhardinge@citrix.com, kvm@vger.kernel.org, linux-arch@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org Message-ID: <20111129213537.kG71T_oQpRw1VNkG_liBEsJXNMomO8sNzgIoVcXeLKc@z> Now that we have a flag that will tell the guest it was suspended, create an interface for that communication using a KVM ioctl. Signed-off-by: Eric B Munson Cc: mingo@redhat.com Cc: hpa@zytor.com Cc: arnd@arndb.de Cc: ryanh@linux.vnet.ibm.com Cc: aliguori@us.ibm.com Cc: mtosatti@redhat.com Cc: jeremy.fitzhardinge@citrix.com Cc: kvm@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org --- arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/kvm/x86.c | 20 ++++++++++++++++++++ include/linux/kvm.h | 2 ++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index b4973f4..beb94c6 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -672,6 +672,8 @@ int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes, gpa_t addr, unsigned long *ret); u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn); +int kvm_set_guest_paused(struct kvm_vcpu *vcpu); + extern bool tdp_enabled; u64 vcpu_tsc_khz(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c38efd7..0127617 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3295,6 +3295,10 @@ long kvm_arch_vcpu_ioctl(struct file *filp, goto out; } + case KVM_GUEST_PAUSED: { + r = kvm_set_guest_paused(vcpu); + break; + } default: r = -EINVAL; } @@ -6117,6 +6121,22 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason, } EXPORT_SYMBOL_GPL(kvm_task_switch); +/* + * kvm_set_guest_paused() indicates to the guest kernel that it has been + * stopped by the hypervisor. This function will be called from the host only. + * EINVAL is returned when the host attempts to set the flag for a guest that + * does not support pv clocks. + */ +int kvm_set_guest_paused(struct kvm_vcpu *vcpu) +{ + struct pvclock_vcpu_time_info *src = &vcpu->arch.hv_clock; + if (!vcpu->arch.time_page) + return -EINVAL; + src->flags |= PVCLOCK_GUEST_STOPPED; + return 0; +} +EXPORT_SYMBOL_GPL(kvm_set_guest_paused); + int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) { diff --git a/include/linux/kvm.h b/include/linux/kvm.h index c3892fc..15578a2 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -762,6 +762,8 @@ struct kvm_clock_data { #define KVM_CREATE_SPAPR_TCE _IOW(KVMIO, 0xa8, struct kvm_create_spapr_tce) /* Available with KVM_CAP_RMA */ #define KVM_ALLOCATE_RMA _IOR(KVMIO, 0xa9, struct kvm_allocate_rma) +/* VM is being stopped by host */ +#define KVM_GUEST_PAUSED _IO(KVMIO, 0xaa) #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) -- 1.7.5.4