From patchwork Wed Mar 7 22:31:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stuart Yoder X-Patchwork-Id: 145349 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2D305B6F98 for ; Thu, 8 Mar 2012 09:31:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758264Ab2CGWby (ORCPT ); Wed, 7 Mar 2012 17:31:54 -0500 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14]:36871 "EHLO tx2outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755742Ab2CGWbx (ORCPT ); Wed, 7 Mar 2012 17:31:53 -0500 Received: from mail34-tx2-R.bigfish.com (10.9.14.251) by TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id 14.1.225.23; Wed, 7 Mar 2012 22:31:52 +0000 Received: from mail34-tx2 (localhost [127.0.0.1]) by mail34-tx2-R.bigfish.com (Postfix) with ESMTP id C292832027A; Wed, 7 Mar 2012 22:31:52 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail34-tx2 (localhost.localdomain [127.0.0.1]) by mail34-tx2 (MessageSwitch) id 1331159510780352_18688; Wed, 7 Mar 2012 22:31:50 +0000 (UTC) Received: from TX2EHSMHS039.bigfish.com (unknown [10.9.14.244]) by mail34-tx2.bigfish.com (Postfix) with ESMTP id AE78136004B; Wed, 7 Mar 2012 22:31:50 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS039.bigfish.com (10.9.99.139) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 7 Mar 2012 22:31:49 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.1.355.3; Wed, 7 Mar 2012 16:31:48 -0600 Received: from right.am.freescale.net (right.am.freescale.net [10.82.193.13]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q27MVf3M011333; Wed, 7 Mar 2012 15:31:43 -0700 From: Stuart Yoder To: , , Subject: [PATCH v8 2/4] KVM: PPC: epapr: Add idle hcall support for host Date: Wed, 7 Mar 2012 16:31:38 -0600 Message-ID: <1331159500-15257-3-git-send-email-stuart.yoder@freescale.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1331159500-15257-1-git-send-email-stuart.yoder@freescale.com> References: <1331159500-15257-1-git-send-email-stuart.yoder@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org From: Liu Yu-B13201 And add a new flag definition in kvm_ppc_pvinfo to indicate whether host support EV_IDLE hcall. Signed-off-by: Liu Yu [stuart.yoder@freescale.com: fixes for conditions allowing idle] Signed-off-by: Stuart Yoder --- -v8: updated hcall instruction for e500mc to be sc 1 arch/powerpc/include/asm/Kbuild | 1 + arch/powerpc/include/asm/kvm_para.h | 14 ++++++++++++-- arch/powerpc/kvm/booke.c | 6 ++++++ arch/powerpc/kvm/powerpc.c | 14 ++++++++++++-- include/linux/kvm.h | 2 ++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index d51df17..b68cb1c 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild @@ -34,3 +34,4 @@ header-y += termios.h header-y += types.h header-y += ucontext.h header-y += unistd.h +header-y += epapr_hcalls.h diff --git a/arch/powerpc/include/asm/kvm_para.h b/arch/powerpc/include/asm/kvm_para.h index b3b4667..5617c8c 100644 --- a/arch/powerpc/include/asm/kvm_para.h +++ b/arch/powerpc/include/asm/kvm_para.h @@ -90,9 +90,19 @@ struct kvm_vcpu_arch_shared { }; #define KVM_SC_MAGIC_R0 0x4b564d21 /* "KVM!" */ -#define HC_VENDOR_KVM (42 << 16) + +#include + +/* ePAPR Hypercall Vendor ID */ +#define HC_VENDOR_EPAPR (EV_EPAPR_VENDOR_ID << 16) +#define HC_VENDOR_KVM (EV_KVM_VENDOR_ID << 16) + +/* ePAPR Hypercall Token */ +#define HC_EV_IDLE EV_IDLE + +/* ePAPR Hypercall Return Codes */ #define HC_EV_SUCCESS 0 -#define HC_EV_UNIMPLEMENTED 12 +#define HC_EV_UNIMPLEMENTED EV_UNIMPLEMENTED #define KVM_FEATURE_MAGIC_PAGE 1 diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index f0ef0be..9fde645 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -593,6 +593,12 @@ static void kvmppc_core_check_exceptions(struct kvm_vcpu *vcpu) unsigned int priority; if (vcpu->requests) { + /* kvm_vcpu_block() sets KVM_REQ_UNHALT, but it is + * not cleared elsewhere as on x86. Clear it here + * for now, otherwise we never go idle. + */ + clear_bit(KVM_REQ_UNHALT, &vcpu->requests); + if (kvm_check_request(KVM_REQ_PENDING_TIMER, vcpu)) { smp_mb(); update_timer_ints(vcpu); diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index ee489f4..84e215b 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -48,8 +48,7 @@ static unsigned int perfmon_refcount; int kvm_arch_vcpu_runnable(struct kvm_vcpu *v) { - bool ret = !(v->arch.shared->msr & MSR_WE) || - !!(v->arch.pending_exceptions) || + bool ret = !!(v->arch.pending_exceptions) || v->requests; #ifdef CONFIG_BOOKE @@ -100,6 +99,10 @@ int kvmppc_kvm_pv(struct kvm_vcpu *vcpu) /* Second return value is in r4 */ break; + case HC_VENDOR_EPAPR | HC_EV_IDLE: + r = HC_EV_SUCCESS; + kvm_vcpu_block(vcpu); + break; default: r = HC_EV_UNIMPLEMENTED; break; @@ -888,6 +891,10 @@ out: static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo) { +#ifdef CONFIG_KVM_BOOKE_HV + u32 inst_sc1 = 0x44000022; + pvinfo->hcall[0] = inst_sc1; +#else u32 inst_lis = 0x3c000000; u32 inst_ori = 0x60000000; u32 inst_nop = 0x60000000; @@ -907,6 +914,9 @@ static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo) pvinfo->hcall[1] = inst_ori | (KVM_SC_MAGIC_R0 & inst_imm_mask); pvinfo->hcall[2] = inst_sc; 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 28ced78..32b8f54 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -438,6 +438,8 @@ struct kvm_ppc_pvinfo { __u8 pad[108]; }; +#define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1<<0) + #define KVMIO 0xAE /*