| Message ID | 1340395460-11993-1-git-send-email-stuart.yoder@freescale.com |
|---|---|
| State | New, archived |
| Headers | show |
On 22.06.2012, at 22:04, Stuart Yoder wrote: > From: Liu Yu-B13201 <Yu.Liu@freescale.com> > > And add a new flag definition in kvm_ppc_pvinfo to indicate > whether the host supports the EV_IDLE hcall. > > Signed-off-by: Liu Yu <yu.liu@freescale.com> > [stuart.yoder@freescale.com: cleanup,fixes for conditions allowing idle] > Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com> > --- > -v11: > -added PV info flag definition in api.txt > > Documentation/virtual/kvm/api.txt | 7 +++++-- > arch/powerpc/include/asm/Kbuild | 1 + > arch/powerpc/kvm/powerpc.c | 10 ++++++++-- > include/linux/kvm.h | 2 ++ > 4 files changed, 16 insertions(+), 4 deletions(-) > > diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt > index 310fe50..920c3c4 100644 > --- a/Documentation/virtual/kvm/api.txt > +++ b/Documentation/virtual/kvm/api.txt > @@ -1190,12 +1190,15 @@ struct kvm_ppc_pvinfo { > This ioctl fetches PV specific information that need to be passed to the guest > using the device tree or other means from vm context. > > -For now the only implemented piece of information distributed here is an array > -of 4 instructions that make up a hypercall. > +The hcall array defines 4 instructions that make up a hypercall. > > If any additional field gets added to this structure later on, a bit for that > additional piece of information will be set in the flags bitmap. > > +The flags bitmap is defined as: > + > + /* the host supports the ePAPR idle hcall > + #define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1<<0) > > 4.48 KVM_ASSIGN_PCI_DEVICE > > diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild > index 7e313f1..13d6b7b 100644 > --- a/arch/powerpc/include/asm/Kbuild > +++ b/arch/powerpc/include/asm/Kbuild > @@ -34,5 +34,6 @@ header-y += termios.h > header-y += types.h > header-y += ucontext.h > header-y += unistd.h > +header-y += epapr_hcalls.h > > generic-y += rwsem.h > diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c > index 30cf01c..53d4d45 100644 > --- a/arch/powerpc/kvm/powerpc.c > +++ b/arch/powerpc/kvm/powerpc.c > @@ -38,8 +38,7 @@ > > int kvm_arch_vcpu_runnable(struct kvm_vcpu *v) > { > - return !(v->arch.shared->msr & MSR_WE) || > - !!(v->arch.pending_exceptions) || > + return !!(v->arch.pending_exceptions) || > v->requests; > } > > @@ -86,6 +85,11 @@ int kvmppc_kvm_pv(struct kvm_vcpu *vcpu) > > /* Second return value is in r4 */ > break; > + case _EV_HCALL_TOKEN(EV_EPAPR_VENDOR_ID, EV_IDLE): include/asm/epapr_hcalls.h:#define EV_HCALL_TOKEN(hcall_num) _EV_HCALL_TOKEN(EV_EPAPR_VENDOR_ID, hcall_num) So we're better off using the non-_ version here, no? :) Alex -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: kvm-ppc-owner@vger.kernel.org [mailto:kvm-ppc-owner@vger.kernel.org] On Behalf Of Alexander Graf > Sent: Monday, July 02, 2012 7:18 AM > To: Yoder Stuart-B08248 > Cc: kvm-ppc@vger.kernel.org; kvm@vger.kernel.org > Subject: Re: [PATCH v11 4/8] KVM: PPC: Add support for ePAPR idle hcall in host kernel > > > On 22.06.2012, at 22:04, Stuart Yoder wrote: > > > From: Liu Yu-B13201 <Yu.Liu@freescale.com> > > > > And add a new flag definition in kvm_ppc_pvinfo to indicate > > whether the host supports the EV_IDLE hcall. > > > > Signed-off-by: Liu Yu <yu.liu@freescale.com> > > [stuart.yoder@freescale.com: cleanup,fixes for conditions allowing idle] > > Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com> > > --- > > -v11: > > -added PV info flag definition in api.txt > > > > Documentation/virtual/kvm/api.txt | 7 +++++-- > > arch/powerpc/include/asm/Kbuild | 1 + > > arch/powerpc/kvm/powerpc.c | 10 ++++++++-- > > include/linux/kvm.h | 2 ++ > > 4 files changed, 16 insertions(+), 4 deletions(-) > > > > diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt > > index 310fe50..920c3c4 100644 > > --- a/Documentation/virtual/kvm/api.txt > > +++ b/Documentation/virtual/kvm/api.txt > > @@ -1190,12 +1190,15 @@ struct kvm_ppc_pvinfo { > > This ioctl fetches PV specific information that need to be passed to the guest > > using the device tree or other means from vm context. > > > > -For now the only implemented piece of information distributed here is an array > > -of 4 instructions that make up a hypercall. > > +The hcall array defines 4 instructions that make up a hypercall. > > > > If any additional field gets added to this structure later on, a bit for that > > additional piece of information will be set in the flags bitmap. > > > > +The flags bitmap is defined as: > > + > > + /* the host supports the ePAPR idle hcall > > + #define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1<<0) > > > > 4.48 KVM_ASSIGN_PCI_DEVICE > > > > diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild > > index 7e313f1..13d6b7b 100644 > > --- a/arch/powerpc/include/asm/Kbuild > > +++ b/arch/powerpc/include/asm/Kbuild > > @@ -34,5 +34,6 @@ header-y += termios.h > > header-y += types.h > > header-y += ucontext.h > > header-y += unistd.h > > +header-y += epapr_hcalls.h > > > > generic-y += rwsem.h > > diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c > > index 30cf01c..53d4d45 100644 > > --- a/arch/powerpc/kvm/powerpc.c > > +++ b/arch/powerpc/kvm/powerpc.c > > @@ -38,8 +38,7 @@ > > > > int kvm_arch_vcpu_runnable(struct kvm_vcpu *v) > > { > > - return !(v->arch.shared->msr & MSR_WE) || > > - !!(v->arch.pending_exceptions) || > > + return !!(v->arch.pending_exceptions) || > > v->requests; > > } > > > > @@ -86,6 +85,11 @@ int kvmppc_kvm_pv(struct kvm_vcpu *vcpu) > > > > /* Second return value is in r4 */ > > break; > > + case _EV_HCALL_TOKEN(EV_EPAPR_VENDOR_ID, EV_IDLE): > > include/asm/epapr_hcalls.h:#define EV_HCALL_TOKEN(hcall_num) _EV_HCALL_TOKEN(EV_EPAPR_VENDOR_ID, > hcall_num) > > So we're better off using the non-_ version here, no? :) Yes, will fix that. Stuart -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 310fe50..920c3c4 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -1190,12 +1190,15 @@ struct kvm_ppc_pvinfo { This ioctl fetches PV specific information that need to be passed to the guest using the device tree or other means from vm context. -For now the only implemented piece of information distributed here is an array -of 4 instructions that make up a hypercall. +The hcall array defines 4 instructions that make up a hypercall. If any additional field gets added to this structure later on, a bit for that additional piece of information will be set in the flags bitmap. +The flags bitmap is defined as: + + /* the host supports the ePAPR idle hcall + #define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1<<0) 4.48 KVM_ASSIGN_PCI_DEVICE diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index 7e313f1..13d6b7b 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild @@ -34,5 +34,6 @@ header-y += termios.h header-y += types.h header-y += ucontext.h header-y += unistd.h +header-y += epapr_hcalls.h generic-y += rwsem.h diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 30cf01c..53d4d45 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -38,8 +38,7 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *v) { - return !(v->arch.shared->msr & MSR_WE) || - !!(v->arch.pending_exceptions) || + return !!(v->arch.pending_exceptions) || v->requests; } @@ -86,6 +85,11 @@ int kvmppc_kvm_pv(struct kvm_vcpu *vcpu) /* Second return value is in r4 */ break; + case _EV_HCALL_TOKEN(EV_EPAPR_VENDOR_ID, EV_IDLE): + r = EV_SUCCESS; + kvm_vcpu_block(vcpu); + clear_bit(KVM_REQ_UNHALT, &vcpu->requests); + break; default: r = EV_UNIMPLEMENTED; break; @@ -767,6 +771,8 @@ static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo) pvinfo->hcall[3] = inst_nop; #endif + pvinfo->flags = KVM_PPC_PVINFO_FLAGS_EV_IDLE; + return 0; } diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 2ce09aa..c03e59e 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -473,6 +473,8 @@ struct kvm_ppc_smmu_info { struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ]; }; +#define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1<<0) + #define KVMIO 0xAE /* machine type bits, to be used as argument to KVM_CREATE_VM */