From patchwork Mon May 8 07:23:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Niethe X-Patchwork-Id: 1778466 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=AlcMDWCy; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QFPzc6MWRz20fl for ; Tue, 9 May 2023 01:17:32 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QFPzc5XhMz3fGR for ; Tue, 9 May 2023 01:17:32 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=AlcMDWCy; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com; envelope-from=jpn@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=AlcMDWCy; dkim-atps=neutral Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QFCTr30gnz309V for ; Mon, 8 May 2023 17:24:32 +1000 (AEST) Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34870OIP001946; Mon, 8 May 2023 07:24:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=cGu622eqPrVF+RXd7Xh9Kh5icellHGjFRFq8+24ftgU=; b=AlcMDWCygPvJ/PMuLhOnEm8CJPQ+815jhoZmyrr/o2zlwsOLvm/oXl0Fy2I9MSDLkFd2 k/trGwuku+H41EH2pFEHDo/2wt2xyOiFU+sQs1nJdYneh/cQocye4+MkBD10AQJuqSNv dsAfOXqxM3rBssnwM7PzFjxeAqTuBl3aySHaQQxx+H0uh+DHbAXgA5dN++pMrnvOQSUx wtJk44cKv5nlSLt7CW8SbqreXDWtDDItYcmSKxlbO94UvOabraQLOFLfYbayvwZilsBq M12TgkiO2pGrw/b2ca4C4E9zHu50QjGrjuCZzbHstqNJWQNLHcK20aUKSkDj7Zegpsfw Ow== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qdka13cw3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:29 +0000 Received: from m0353722.ppops.net (m0353722.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3486mLuf022151; Mon, 8 May 2023 07:24:28 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qdka13cv0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:28 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3480iXh7014880; Mon, 8 May 2023 07:24:26 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3qde5fgya0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:25 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3487OM0t16450076 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 8 May 2023 07:24:22 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DC2162004D; Mon, 8 May 2023 07:24:21 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7291020040; Mon, 8 May 2023 07:24:16 +0000 (GMT) Received: from pwon.ibmuc.com (unknown [9.177.74.71]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 8 May 2023 07:24:15 +0000 (GMT) From: Jordan Niethe To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH v1 1/5] KVM: PPC: Use getters and setters for vcpu register state Date: Mon, 8 May 2023 17:23:28 +1000 Message-Id: <20230508072332.2937883-2-jpn@linux.vnet.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> References: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: pinl62dpU2FzPL1vp3P4dBUajSUjkuJm X-Proofpoint-ORIG-GUID: pHK0hgqWPlbDFw3l17BQJIeMzZuLXt4N X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-08_04,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 impostorscore=0 phishscore=0 mlxlogscore=918 bulkscore=0 suspectscore=0 clxscore=1015 malwarescore=0 spamscore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305080049 X-Mailman-Approved-At: Tue, 09 May 2023 01:16:28 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Niethe , mikey@neuling.org, sbhat@linux.ibm.com, kautuk.consul.1980@gmail.com, npiggin@gmail.com, kvm-ppc@vger.kernel.org, vaibhav@linux.ibm.com Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" There are already some getter and setter functions used for accessing vcpu register state, e.g. kvmppc_get_pc(). There are also more complicated examples that are generated by macros like kvmppc_get_sprg0() which are generated by the SHARED_SPRNG_WRAPPER() macro. In the new PAPR API for nested guest partitions the L1 is required to communicate with the L0 to modify and read nested guest state. Prepare to support this by replacing direct accesses to vcpu register state with wrapper functions. Follow the existing pattern of using macros to generate individual wrappers. These wrappers will be augmented for supporting PAPR nested guests later. Signed-off-by: Jordan Niethe --- arch/powerpc/include/asm/kvm_book3s.h | 68 +++++++- arch/powerpc/include/asm/kvm_ppc.h | 48 ++++-- arch/powerpc/kvm/book3s.c | 22 +-- arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 +- arch/powerpc/kvm/book3s_64_mmu_radix.c | 9 +- arch/powerpc/kvm/book3s_64_vio.c | 4 +- arch/powerpc/kvm/book3s_hv.c | 221 +++++++++++++------------ arch/powerpc/kvm/book3s_hv.h | 59 +++++++ arch/powerpc/kvm/book3s_hv_builtin.c | 10 +- arch/powerpc/kvm/book3s_hv_p9_entry.c | 4 +- arch/powerpc/kvm/book3s_hv_ras.c | 5 +- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 8 +- arch/powerpc/kvm/book3s_hv_rm_xics.c | 4 +- arch/powerpc/kvm/book3s_xive.c | 9 +- arch/powerpc/kvm/powerpc.c | 4 +- 15 files changed, 322 insertions(+), 157 deletions(-) diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h index bbf5e2c5fe09..4e91f54a3f9f 100644 --- a/arch/powerpc/include/asm/kvm_book3s.h +++ b/arch/powerpc/include/asm/kvm_book3s.h @@ -392,6 +392,16 @@ static inline ulong kvmppc_get_pc(struct kvm_vcpu *vcpu) return vcpu->arch.regs.nip; } +static inline void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 val) +{ + vcpu->arch.pid = val; +} + +static inline u32 kvmppc_get_pid(struct kvm_vcpu *vcpu) +{ + return vcpu->arch.pid; +} + static inline u64 kvmppc_get_msr(struct kvm_vcpu *vcpu); static inline bool kvmppc_need_byteswap(struct kvm_vcpu *vcpu) { @@ -403,10 +413,66 @@ static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu) return vcpu->arch.fault_dar; } +#define BOOK3S_WRAPPER_SET(reg, size) \ +static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ +{ \ + \ + vcpu->arch.reg = val; \ +} + +#define BOOK3S_WRAPPER_GET(reg, size) \ +static inline u##size kvmppc_get_##reg(struct kvm_vcpu *vcpu) \ +{ \ + return vcpu->arch.reg; \ +} + +#define BOOK3S_WRAPPER(reg, size) \ + BOOK3S_WRAPPER_SET(reg, size) \ + BOOK3S_WRAPPER_GET(reg, size) \ + +BOOK3S_WRAPPER(tar, 64) +BOOK3S_WRAPPER(ebbhr, 64) +BOOK3S_WRAPPER(ebbrr, 64) +BOOK3S_WRAPPER(bescr, 64) +BOOK3S_WRAPPER(ic, 64) +BOOK3S_WRAPPER(vrsave, 64) + + +#define VCORE_WRAPPER_SET(reg, size) \ +static inline void kvmppc_set_##reg ##_hv(struct kvm_vcpu *vcpu, u##size val) \ +{ \ + vcpu->arch.vcore->reg = val; \ +} + +#define VCORE_WRAPPER_GET(reg, size) \ +static inline u##size kvmppc_get_##reg ##_hv(struct kvm_vcpu *vcpu) \ +{ \ + return vcpu->arch.vcore->reg; \ +} + +#define VCORE_WRAPPER(reg, size) \ + VCORE_WRAPPER_SET(reg, size) \ + VCORE_WRAPPER_GET(reg, size) \ + + +VCORE_WRAPPER(vtb, 64) +VCORE_WRAPPER(tb_offset, 64) +VCORE_WRAPPER(lpcr, 64) + +static inline u64 kvmppc_get_dec_expires(struct kvm_vcpu *vcpu) +{ + return vcpu->arch.dec_expires; +} + +static inline void kvmppc_set_dec_expires(struct kvm_vcpu *vcpu, u64 val) +{ + vcpu->arch.dec_expires = val; +} + /* Expiry time of vcpu DEC relative to host TB */ static inline u64 kvmppc_dec_expires_host_tb(struct kvm_vcpu *vcpu) { - return vcpu->arch.dec_expires - vcpu->arch.vcore->tb_offset; + return kvmppc_get_dec_expires(vcpu) - kvmppc_get_tb_offset_hv(vcpu); } static inline bool is_kvmppc_resume_guest(int r) diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index 6bef23d6d0e3..5656d09383fc 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h @@ -910,7 +910,7 @@ static inline ulong kvmppc_get_##reg(struct kvm_vcpu *vcpu) \ #define SPRNG_WRAPPER_SET(reg, bookehv_spr) \ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, ulong val) \ { \ - mtspr(bookehv_spr, val); \ + mtspr(bookehv_spr, val); \ } \ #define SHARED_WRAPPER_GET(reg, size) \ @@ -931,10 +931,32 @@ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ vcpu->arch.shared->reg = cpu_to_le##size(val); \ } \ +#define SHARED_CACHE_WRAPPER_GET(reg, size) \ +static inline u##size kvmppc_get_##reg(struct kvm_vcpu *vcpu) \ +{ \ + if (kvmppc_shared_big_endian(vcpu)) \ + return be##size##_to_cpu(vcpu->arch.shared->reg); \ + else \ + return le##size##_to_cpu(vcpu->arch.shared->reg); \ +} \ + +#define SHARED_CACHE_WRAPPER_SET(reg, size) \ +static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ +{ \ + if (kvmppc_shared_big_endian(vcpu)) \ + vcpu->arch.shared->reg = cpu_to_be##size(val); \ + else \ + vcpu->arch.shared->reg = cpu_to_le##size(val); \ +} \ + #define SHARED_WRAPPER(reg, size) \ SHARED_WRAPPER_GET(reg, size) \ SHARED_WRAPPER_SET(reg, size) \ +#define SHARED_CACHE_WRAPPER(reg, size) \ + SHARED_CACHE_WRAPPER_GET(reg, size) \ + SHARED_CACHE_WRAPPER_SET(reg, size) \ + #define SPRNG_WRAPPER(reg, bookehv_spr) \ SPRNG_WRAPPER_GET(reg, bookehv_spr) \ SPRNG_WRAPPER_SET(reg, bookehv_spr) \ @@ -944,23 +966,29 @@ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ #define SHARED_SPRNG_WRAPPER(reg, size, bookehv_spr) \ SPRNG_WRAPPER(reg, bookehv_spr) \ +#define SHARED_SPRNG_CACHE_WRAPPER(reg, size, bookehv_spr) \ + SPRNG_WRAPPER(reg, bookehv_spr) \ + #else #define SHARED_SPRNG_WRAPPER(reg, size, bookehv_spr) \ SHARED_WRAPPER(reg, size) \ +#define SHARED_SPRNG_CACHE_WRAPPER(reg, size, bookehv_spr) \ + SHARED_CACHE_WRAPPER(reg, size) \ + #endif SHARED_WRAPPER(critical, 64) -SHARED_SPRNG_WRAPPER(sprg0, 64, SPRN_GSPRG0) -SHARED_SPRNG_WRAPPER(sprg1, 64, SPRN_GSPRG1) -SHARED_SPRNG_WRAPPER(sprg2, 64, SPRN_GSPRG2) -SHARED_SPRNG_WRAPPER(sprg3, 64, SPRN_GSPRG3) -SHARED_SPRNG_WRAPPER(srr0, 64, SPRN_GSRR0) -SHARED_SPRNG_WRAPPER(srr1, 64, SPRN_GSRR1) -SHARED_SPRNG_WRAPPER(dar, 64, SPRN_GDEAR) +SHARED_SPRNG_CACHE_WRAPPER(sprg0, 64, SPRN_GSPRG0) +SHARED_SPRNG_CACHE_WRAPPER(sprg1, 64, SPRN_GSPRG1) +SHARED_SPRNG_CACHE_WRAPPER(sprg2, 64, SPRN_GSPRG2) +SHARED_SPRNG_CACHE_WRAPPER(sprg3, 64, SPRN_GSPRG3) +SHARED_SPRNG_CACHE_WRAPPER(srr0, 64, SPRN_GSRR0) +SHARED_SPRNG_CACHE_WRAPPER(srr1, 64, SPRN_GSRR1) +SHARED_SPRNG_CACHE_WRAPPER(dar, 64, SPRN_GDEAR) SHARED_SPRNG_WRAPPER(esr, 64, SPRN_GESR) -SHARED_WRAPPER_GET(msr, 64) +SHARED_CACHE_WRAPPER_GET(msr, 64) static inline void kvmppc_set_msr_fast(struct kvm_vcpu *vcpu, u64 val) { if (kvmppc_shared_big_endian(vcpu)) @@ -968,7 +996,7 @@ static inline void kvmppc_set_msr_fast(struct kvm_vcpu *vcpu, u64 val) else vcpu->arch.shared->msr = cpu_to_le64(val); } -SHARED_WRAPPER(dsisr, 32) +SHARED_CACHE_WRAPPER(dsisr, 32) SHARED_WRAPPER(int_pending, 32) SHARED_WRAPPER(sprg4, 64) SHARED_WRAPPER(sprg5, 64) diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index 57f4e7896d67..bcb335681387 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -543,7 +543,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) regs->msr = kvmppc_get_msr(vcpu); regs->srr0 = kvmppc_get_srr0(vcpu); regs->srr1 = kvmppc_get_srr1(vcpu); - regs->pid = vcpu->arch.pid; + regs->pid = kvmppc_get_pid(vcpu); regs->sprg0 = kvmppc_get_sprg0(vcpu); regs->sprg1 = kvmppc_get_sprg1(vcpu); regs->sprg2 = kvmppc_get_sprg2(vcpu); @@ -661,19 +661,19 @@ int kvmppc_get_one_reg(struct kvm_vcpu *vcpu, u64 id, *val = get_reg_val(id, vcpu->arch.fscr); break; case KVM_REG_PPC_TAR: - *val = get_reg_val(id, vcpu->arch.tar); + *val = get_reg_val(id, kvmppc_get_tar(vcpu)); break; case KVM_REG_PPC_EBBHR: - *val = get_reg_val(id, vcpu->arch.ebbhr); + *val = get_reg_val(id, kvmppc_get_ebbhr(vcpu)); break; case KVM_REG_PPC_EBBRR: - *val = get_reg_val(id, vcpu->arch.ebbrr); + *val = get_reg_val(id, kvmppc_get_ebbrr(vcpu)); break; case KVM_REG_PPC_BESCR: - *val = get_reg_val(id, vcpu->arch.bescr); + *val = get_reg_val(id, kvmppc_get_bescr(vcpu)); break; case KVM_REG_PPC_IC: - *val = get_reg_val(id, vcpu->arch.ic); + *val = get_reg_val(id, kvmppc_get_ic(vcpu)); break; default: r = -EINVAL; @@ -746,19 +746,19 @@ int kvmppc_set_one_reg(struct kvm_vcpu *vcpu, u64 id, vcpu->arch.fscr = set_reg_val(id, *val); break; case KVM_REG_PPC_TAR: - vcpu->arch.tar = set_reg_val(id, *val); + kvmppc_set_tar(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_EBBHR: - vcpu->arch.ebbhr = set_reg_val(id, *val); + kvmppc_set_ebbhr(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_EBBRR: - vcpu->arch.ebbrr = set_reg_val(id, *val); + kvmppc_set_ebbrr(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_BESCR: - vcpu->arch.bescr = set_reg_val(id, *val); + kvmppc_set_bescr(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_IC: - vcpu->arch.ic = set_reg_val(id, *val); + kvmppc_set_ic(vcpu, set_reg_val(id, *val)); break; default: r = -EINVAL; diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index 7006bcbc2e37..5dc5d3f0015f 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -347,7 +347,7 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, unsigned long v, orig_v, gr; __be64 *hptep; long int index; - int virtmode = vcpu->arch.shregs.msr & (data ? MSR_DR : MSR_IR); + int virtmode = kvmppc_get_msr(vcpu) & (data ? MSR_DR : MSR_IR); if (kvm_is_radix(vcpu->kvm)) return kvmppc_mmu_radix_xlate(vcpu, eaddr, gpte, data, iswrite); @@ -385,7 +385,7 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, /* Get PP bits and key for permission check */ pp = gr & (HPTE_R_PP0 | HPTE_R_PP); - key = (vcpu->arch.shregs.msr & MSR_PR) ? SLB_VSID_KP : SLB_VSID_KS; + key = (kvmppc_get_msr(vcpu) & MSR_PR) ? SLB_VSID_KP : SLB_VSID_KS; key &= slb_v; /* Calculate permissions */ diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c index 9d3743ca16d5..27186cac95ca 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_radix.c +++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c @@ -15,6 +15,7 @@ #include #include +#include "book3s_hv.h" #include #include #include @@ -96,7 +97,7 @@ static long kvmhv_copy_tofrom_guest_radix(struct kvm_vcpu *vcpu, gva_t eaddr, void *to, void *from, unsigned long n) { int lpid = vcpu->kvm->arch.lpid; - int pid = vcpu->arch.pid; + int pid = kvmppc_get_pid(vcpu); /* This would cause a data segment intr so don't allow the access */ if (eaddr & (0x3FFUL << 52)) @@ -270,7 +271,7 @@ int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, /* Work out effective PID */ switch (eaddr >> 62) { case 0: - pid = vcpu->arch.pid; + pid = kvmppc_get_pid(vcpu); break; case 3: pid = 0; @@ -294,9 +295,9 @@ int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, } else { if (!(pte & _PAGE_PRIVILEGED)) { /* Check AMR/IAMR to see if strict mode is in force */ - if (vcpu->arch.amr & (1ul << 62)) + if (kvmppc_get_amr_hv(vcpu) & (1ul << 62)) gpte->may_read = 0; - if (vcpu->arch.amr & (1ul << 63)) + if (kvmppc_get_amr_hv(vcpu) & (1ul << 63)) gpte->may_write = 0; if (vcpu->arch.iamr & (1ul << 62)) gpte->may_execute = 0; diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c index 95e738ef9062..98a7b8b691f7 100644 --- a/arch/powerpc/kvm/book3s_64_vio.c +++ b/arch/powerpc/kvm/book3s_64_vio.c @@ -786,12 +786,12 @@ long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn, idx = (ioba >> stt->page_shift) - stt->offset; page = stt->pages[idx / TCES_PER_PAGE]; if (!page) { - vcpu->arch.regs.gpr[4] = 0; + kvmppc_set_gpr(vcpu, 4, 0); return H_SUCCESS; } tbl = (u64 *)page_address(page); - vcpu->arch.regs.gpr[4] = tbl[idx % TCES_PER_PAGE]; + kvmppc_set_gpr(vcpu, 4, tbl[idx % TCES_PER_PAGE]); return H_SUCCESS; } diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 6ba68dd6190b..2e01ccb97ed6 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -380,11 +380,6 @@ static void kvmppc_core_vcpu_put_hv(struct kvm_vcpu *vcpu) spin_unlock_irqrestore(&vcpu->arch.tbacct_lock, flags); } -static void kvmppc_set_pvr_hv(struct kvm_vcpu *vcpu, u32 pvr) -{ - vcpu->arch.pvr = pvr; -} - /* Dummy value used in computing PCR value below */ #define PCR_ARCH_31 (PCR_ARCH_300 << 1) @@ -791,7 +786,7 @@ static void kvmppc_update_vpa_dispatch(struct kvm_vcpu *vcpu, vpa->enqueue_dispatch_tb = cpu_to_be64(be64_to_cpu(vpa->enqueue_dispatch_tb) + stolen); - __kvmppc_create_dtl_entry(vcpu, vpa, vc->pcpu, now + vc->tb_offset, stolen); + __kvmppc_create_dtl_entry(vcpu, vpa, vc->pcpu, now + kvmppc_get_tb_offset_hv(vcpu), stolen); vcpu->arch.vpa.dirty = true; } @@ -865,7 +860,7 @@ static int kvmppc_h_set_mode(struct kvm_vcpu *vcpu, unsigned long mflags, /* Guests can't breakpoint the hypervisor */ if ((value1 & CIABR_PRIV) == CIABR_PRIV_HYPER) return H_P3; - vcpu->arch.ciabr = value1; + kvmppc_set_ciabr_hv(vcpu, value1); return H_SUCCESS; case H_SET_MODE_RESOURCE_SET_DAWR0: if (!kvmppc_power8_compatible(vcpu)) @@ -876,8 +871,8 @@ static int kvmppc_h_set_mode(struct kvm_vcpu *vcpu, unsigned long mflags, return H_UNSUPPORTED_FLAG_START; if (value2 & DABRX_HYP) return H_P4; - vcpu->arch.dawr0 = value1; - vcpu->arch.dawrx0 = value2; + kvmppc_set_dawr0_hv(vcpu, value1); + kvmppc_set_dawrx0_hv(vcpu, value2); return H_SUCCESS; case H_SET_MODE_RESOURCE_SET_DAWR1: if (!kvmppc_power8_compatible(vcpu)) @@ -892,8 +887,8 @@ static int kvmppc_h_set_mode(struct kvm_vcpu *vcpu, unsigned long mflags, return H_UNSUPPORTED_FLAG_START; if (value2 & DABRX_HYP) return H_P4; - vcpu->arch.dawr1 = value1; - vcpu->arch.dawrx1 = value2; + kvmppc_set_dawr1_hv(vcpu, value1); + kvmppc_set_dawrx1_hv(vcpu, value2); return H_SUCCESS; case H_SET_MODE_RESOURCE_ADDR_TRANS_MODE: /* @@ -1265,8 +1260,11 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) break; #endif case H_RANDOM: - if (!arch_get_random_seed_longs(&vcpu->arch.regs.gpr[4], 1)) + unsigned long rand; + + if (!arch_get_random_seed_longs(&rand, 1)) ret = H_HARDWARE; + kvmppc_set_gpr(vcpu, 4, rand); break; case H_RPT_INVALIDATE: ret = kvmppc_h_rpt_invalidate(vcpu, kvmppc_get_gpr(vcpu, 4), @@ -1367,7 +1365,7 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) */ static void kvmppc_cede(struct kvm_vcpu *vcpu) { - vcpu->arch.shregs.msr |= MSR_EE; + kvmppc_set_msr_fast(vcpu, kvmppc_get_msr(vcpu) | MSR_EE); vcpu->arch.ceded = 1; smp_mb(); if (vcpu->arch.prodded) { @@ -1538,7 +1536,7 @@ static int kvmppc_pmu_unavailable(struct kvm_vcpu *vcpu) if (!(vcpu->arch.hfscr_permitted & HFSCR_PM)) return EMULATE_FAIL; - vcpu->arch.hfscr |= HFSCR_PM; + kvmppc_set_hfscr_hv(vcpu, kvmppc_get_hfscr_hv(vcpu) | HFSCR_PM); return RESUME_GUEST; } @@ -1548,7 +1546,7 @@ static int kvmppc_ebb_unavailable(struct kvm_vcpu *vcpu) if (!(vcpu->arch.hfscr_permitted & HFSCR_EBB)) return EMULATE_FAIL; - vcpu->arch.hfscr |= HFSCR_EBB; + kvmppc_set_hfscr_hv(vcpu, kvmppc_get_hfscr_hv(vcpu) | HFSCR_EBB); return RESUME_GUEST; } @@ -1558,7 +1556,7 @@ static int kvmppc_tm_unavailable(struct kvm_vcpu *vcpu) if (!(vcpu->arch.hfscr_permitted & HFSCR_TM)) return EMULATE_FAIL; - vcpu->arch.hfscr |= HFSCR_TM; + kvmppc_set_hfscr_hv(vcpu, kvmppc_get_hfscr_hv(vcpu) | HFSCR_TM); return RESUME_GUEST; } @@ -1579,7 +1577,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, * That can happen due to a bug, or due to a machine check * occurring at just the wrong time. */ - if (vcpu->arch.shregs.msr & MSR_HV) { + if (kvmppc_get_msr(vcpu) & MSR_HV) { printk(KERN_EMERG "KVM trap in HV mode!\n"); printk(KERN_EMERG "trap=0x%x | pc=0x%lx | msr=0x%llx\n", vcpu->arch.trap, kvmppc_get_pc(vcpu), @@ -1630,7 +1628,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, * so that it knows that the machine check occurred. */ if (!vcpu->kvm->arch.fwnmi_enabled) { - ulong flags = vcpu->arch.shregs.msr & 0x083c0000; + ulong flags = kvmppc_get_msr(vcpu) & 0x083c0000; kvmppc_core_queue_machine_check(vcpu, flags); r = RESUME_GUEST; break; @@ -1659,7 +1657,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, * as a result of a hypervisor emulation interrupt * (e40) getting turned into a 700 by BML RTAS. */ - flags = vcpu->arch.shregs.msr & 0x1f0000ull; + flags = kvmppc_get_msr(vcpu) & 0x1f0000ull; kvmppc_core_queue_program(vcpu, flags); r = RESUME_GUEST; break; @@ -1668,7 +1666,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, { int i; - if (unlikely(vcpu->arch.shregs.msr & MSR_PR)) { + if (unlikely(kvmppc_get_msr(vcpu) & MSR_PR)) { /* * Guest userspace executed sc 1. This can only be * reached by the P9 path because the old path @@ -1745,7 +1743,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, break; } - if (!(vcpu->arch.shregs.msr & MSR_DR)) + if (!(kvmppc_get_msr(vcpu) & MSR_DR)) vsid = vcpu->kvm->arch.vrma_slb_v; else vsid = vcpu->arch.fault_gpa; @@ -1768,7 +1766,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, long err; vcpu->arch.fault_dar = kvmppc_get_pc(vcpu); - vcpu->arch.fault_dsisr = vcpu->arch.shregs.msr & + vcpu->arch.fault_dsisr = kvmppc_get_msr(vcpu) & DSISR_SRR1_MATCH_64S; if (kvm_is_radix(vcpu->kvm) || !cpu_has_feature(CPU_FTR_ARCH_300)) { /* @@ -1777,7 +1775,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, * hash fault handling below is v3 only (it uses ASDR * via fault_gpa). */ - if (vcpu->arch.shregs.msr & HSRR1_HISI_WRITE) + if (kvmppc_get_msr(vcpu) & HSRR1_HISI_WRITE) vcpu->arch.fault_dsisr |= DSISR_ISSTORE; r = RESUME_PAGE_FAULT; break; @@ -1790,7 +1788,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, break; } - if (!(vcpu->arch.shregs.msr & MSR_IR)) + if (!(kvmppc_get_msr(vcpu) & MSR_IR)) vsid = vcpu->kvm->arch.vrma_slb_v; else vsid = vcpu->arch.fault_gpa; @@ -1850,7 +1848,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, * Otherwise, we just generate a program interrupt to the guest. */ case BOOK3S_INTERRUPT_H_FAC_UNAVAIL: { - u64 cause = vcpu->arch.hfscr >> 56; + u64 cause = kvmppc_get_hfscr_hv(vcpu) >> 56; r = EMULATE_FAIL; if (cpu_has_feature(CPU_FTR_ARCH_300)) { @@ -1877,7 +1875,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu, kvmppc_dump_regs(vcpu); printk(KERN_EMERG "trap=0x%x | pc=0x%lx | msr=0x%llx\n", vcpu->arch.trap, kvmppc_get_pc(vcpu), - vcpu->arch.shregs.msr); + kvmppc_get_msr(vcpu)); run->hw.hardware_exit_reason = vcpu->arch.trap; r = RESUME_HOST; break; @@ -1901,11 +1899,11 @@ static int kvmppc_handle_nested_exit(struct kvm_vcpu *vcpu) * That can happen due to a bug, or due to a machine check * occurring at just the wrong time. */ - if (vcpu->arch.shregs.msr & MSR_HV) { + if (kvmppc_get_msr(vcpu) & MSR_HV) { pr_emerg("KVM trap in HV mode while nested!\n"); pr_emerg("trap=0x%x | pc=0x%lx | msr=0x%llx\n", vcpu->arch.trap, kvmppc_get_pc(vcpu), - vcpu->arch.shregs.msr); + kvmppc_get_msr(vcpu)); kvmppc_dump_regs(vcpu); return RESUME_HOST; } @@ -1962,7 +1960,7 @@ static int kvmppc_handle_nested_exit(struct kvm_vcpu *vcpu) vcpu->arch.fault_dar = kvmppc_get_pc(vcpu); vcpu->arch.fault_dsisr = kvmppc_get_msr(vcpu) & DSISR_SRR1_MATCH_64S; - if (vcpu->arch.shregs.msr & HSRR1_HISI_WRITE) + if (kvmppc_get_msr(vcpu) & HSRR1_HISI_WRITE) vcpu->arch.fault_dsisr |= DSISR_ISSTORE; srcu_idx = srcu_read_lock(&vcpu->kvm->srcu); r = kvmhv_nested_page_fault(vcpu); @@ -2167,7 +2165,7 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr, } } - vc->lpcr = new_lpcr; + kvmppc_set_lpcr_hv(vcpu, new_lpcr); spin_unlock(&vc->lock); } @@ -2192,64 +2190,64 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, *val = get_reg_val(id, vcpu->arch.dabrx); break; case KVM_REG_PPC_DSCR: - *val = get_reg_val(id, vcpu->arch.dscr); + *val = get_reg_val(id, kvmppc_get_dscr_hv(vcpu)); break; case KVM_REG_PPC_PURR: - *val = get_reg_val(id, vcpu->arch.purr); + *val = get_reg_val(id, kvmppc_get_purr_hv(vcpu)); break; case KVM_REG_PPC_SPURR: - *val = get_reg_val(id, vcpu->arch.spurr); + *val = get_reg_val(id, kvmppc_get_spurr_hv(vcpu)); break; case KVM_REG_PPC_AMR: - *val = get_reg_val(id, vcpu->arch.amr); + *val = get_reg_val(id, kvmppc_get_amr_hv(vcpu)); break; case KVM_REG_PPC_UAMOR: - *val = get_reg_val(id, vcpu->arch.uamor); + *val = get_reg_val(id, kvmppc_get_uamor_hv(vcpu)); break; case KVM_REG_PPC_MMCR0 ... KVM_REG_PPC_MMCR1: i = id - KVM_REG_PPC_MMCR0; - *val = get_reg_val(id, vcpu->arch.mmcr[i]); + *val = get_reg_val(id, kvmppc_get_mmcr_hv(vcpu, i)); break; case KVM_REG_PPC_MMCR2: - *val = get_reg_val(id, vcpu->arch.mmcr[2]); + *val = get_reg_val(id, kvmppc_get_mmcr_hv(vcpu, 2)); break; case KVM_REG_PPC_MMCRA: - *val = get_reg_val(id, vcpu->arch.mmcra); + *val = get_reg_val(id, kvmppc_get_mmcra_hv(vcpu)); break; case KVM_REG_PPC_MMCRS: *val = get_reg_val(id, vcpu->arch.mmcrs); break; case KVM_REG_PPC_MMCR3: - *val = get_reg_val(id, vcpu->arch.mmcr[3]); + *val = get_reg_val(id, kvmppc_get_mmcr_hv(vcpu, 3)); break; case KVM_REG_PPC_PMC1 ... KVM_REG_PPC_PMC8: i = id - KVM_REG_PPC_PMC1; - *val = get_reg_val(id, vcpu->arch.pmc[i]); + *val = get_reg_val(id, kvmppc_get_pmc_hv(vcpu, i)); break; case KVM_REG_PPC_SPMC1 ... KVM_REG_PPC_SPMC2: i = id - KVM_REG_PPC_SPMC1; *val = get_reg_val(id, vcpu->arch.spmc[i]); break; case KVM_REG_PPC_SIAR: - *val = get_reg_val(id, vcpu->arch.siar); + *val = get_reg_val(id, kvmppc_get_siar_hv(vcpu)); break; case KVM_REG_PPC_SDAR: - *val = get_reg_val(id, vcpu->arch.sdar); + *val = get_reg_val(id, kvmppc_get_siar_hv(vcpu)); break; case KVM_REG_PPC_SIER: - *val = get_reg_val(id, vcpu->arch.sier[0]); + *val = get_reg_val(id, kvmppc_get_sier_hv(vcpu, 0)); break; case KVM_REG_PPC_SIER2: - *val = get_reg_val(id, vcpu->arch.sier[1]); + *val = get_reg_val(id, kvmppc_get_sier_hv(vcpu, 1)); break; case KVM_REG_PPC_SIER3: - *val = get_reg_val(id, vcpu->arch.sier[2]); + *val = get_reg_val(id, kvmppc_get_sier_hv(vcpu, 2)); break; case KVM_REG_PPC_IAMR: - *val = get_reg_val(id, vcpu->arch.iamr); + *val = get_reg_val(id, kvmppc_get_iamr_hv(vcpu)); break; case KVM_REG_PPC_PSPB: - *val = get_reg_val(id, vcpu->arch.pspb); + *val = get_reg_val(id, kvmppc_get_pspb_hv(vcpu)); break; case KVM_REG_PPC_DPDES: /* @@ -2264,22 +2262,22 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, *val = get_reg_val(id, vcpu->arch.vcore->dpdes); break; case KVM_REG_PPC_VTB: - *val = get_reg_val(id, vcpu->arch.vcore->vtb); + *val = get_reg_val(id, kvmppc_get_vtb_hv(vcpu)); break; case KVM_REG_PPC_DAWR: - *val = get_reg_val(id, vcpu->arch.dawr0); + *val = get_reg_val(id, kvmppc_get_dawr0_hv(vcpu)); break; case KVM_REG_PPC_DAWRX: - *val = get_reg_val(id, vcpu->arch.dawrx0); + *val = get_reg_val(id, kvmppc_get_dawrx0_hv(vcpu)); break; case KVM_REG_PPC_DAWR1: - *val = get_reg_val(id, vcpu->arch.dawr1); + *val = get_reg_val(id, kvmppc_get_dawr1_hv(vcpu)); break; case KVM_REG_PPC_DAWRX1: - *val = get_reg_val(id, vcpu->arch.dawrx1); + *val = get_reg_val(id, kvmppc_get_dawrx1_hv(vcpu)); break; case KVM_REG_PPC_CIABR: - *val = get_reg_val(id, vcpu->arch.ciabr); + *val = get_reg_val(id, kvmppc_get_ciabr_hv(vcpu)); break; case KVM_REG_PPC_CSIGR: *val = get_reg_val(id, vcpu->arch.csigr); @@ -2291,13 +2289,13 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, *val = get_reg_val(id, vcpu->arch.tcscr); break; case KVM_REG_PPC_PID: - *val = get_reg_val(id, vcpu->arch.pid); + *val = get_reg_val(id, kvmppc_get_pid(vcpu)); break; case KVM_REG_PPC_ACOP: *val = get_reg_val(id, vcpu->arch.acop); break; case KVM_REG_PPC_WORT: - *val = get_reg_val(id, vcpu->arch.wort); + *val = get_reg_val(id, kvmppc_get_wort_hv(vcpu)); break; case KVM_REG_PPC_TIDR: *val = get_reg_val(id, vcpu->arch.tid); @@ -2323,14 +2321,14 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, spin_unlock(&vcpu->arch.vpa_update_lock); break; case KVM_REG_PPC_TB_OFFSET: - *val = get_reg_val(id, vcpu->arch.vcore->tb_offset); + *val = get_reg_val(id, kvmppc_get_tb_offset_hv(vcpu)); break; case KVM_REG_PPC_LPCR: case KVM_REG_PPC_LPCR_64: *val = get_reg_val(id, vcpu->arch.vcore->lpcr); break; case KVM_REG_PPC_PPR: - *val = get_reg_val(id, vcpu->arch.ppr); + *val = get_reg_val(id, kvmppc_get_ppr_hv(vcpu)); break; #ifdef CONFIG_PPC_TRANSACTIONAL_MEM case KVM_REG_PPC_TFHAR: @@ -2402,7 +2400,7 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, *val = get_reg_val(id, vcpu->arch.vcore->arch_compat); break; case KVM_REG_PPC_DEC_EXPIRY: - *val = get_reg_val(id, vcpu->arch.dec_expires); + *val = get_reg_val(id, kvmppc_get_dec_expires(vcpu)); break; case KVM_REG_PPC_ONLINE: *val = get_reg_val(id, vcpu->arch.online); @@ -2410,6 +2408,9 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, case KVM_REG_PPC_PTCR: *val = get_reg_val(id, vcpu->kvm->arch.l1_ptcr); break; + case KVM_REG_PPC_FSCR: + *val = get_reg_val(id, kvmppc_get_fscr_hv(vcpu)); + break; default: r = -EINVAL; break; @@ -2438,29 +2439,29 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, vcpu->arch.dabrx = set_reg_val(id, *val) & ~DABRX_HYP; break; case KVM_REG_PPC_DSCR: - vcpu->arch.dscr = set_reg_val(id, *val); + kvmppc_set_dscr_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_PURR: - vcpu->arch.purr = set_reg_val(id, *val); + kvmppc_set_purr_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_SPURR: - vcpu->arch.spurr = set_reg_val(id, *val); + kvmppc_set_spurr_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_AMR: - vcpu->arch.amr = set_reg_val(id, *val); + kvmppc_set_amr_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_UAMOR: - vcpu->arch.uamor = set_reg_val(id, *val); + kvmppc_set_uamor_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_MMCR0 ... KVM_REG_PPC_MMCR1: i = id - KVM_REG_PPC_MMCR0; - vcpu->arch.mmcr[i] = set_reg_val(id, *val); + kvmppc_set_mmcr_hv(vcpu, i, set_reg_val(id, *val)); break; case KVM_REG_PPC_MMCR2: - vcpu->arch.mmcr[2] = set_reg_val(id, *val); + kvmppc_set_mmcr_hv(vcpu, 2, set_reg_val(id, *val)); break; case KVM_REG_PPC_MMCRA: - vcpu->arch.mmcra = set_reg_val(id, *val); + kvmppc_set_mmcra_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_MMCRS: vcpu->arch.mmcrs = set_reg_val(id, *val); @@ -2470,32 +2471,32 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, break; case KVM_REG_PPC_PMC1 ... KVM_REG_PPC_PMC8: i = id - KVM_REG_PPC_PMC1; - vcpu->arch.pmc[i] = set_reg_val(id, *val); + kvmppc_set_pmc_hv(vcpu, i, set_reg_val(id, *val)); break; case KVM_REG_PPC_SPMC1 ... KVM_REG_PPC_SPMC2: i = id - KVM_REG_PPC_SPMC1; vcpu->arch.spmc[i] = set_reg_val(id, *val); break; case KVM_REG_PPC_SIAR: - vcpu->arch.siar = set_reg_val(id, *val); + kvmppc_set_siar_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_SDAR: - vcpu->arch.sdar = set_reg_val(id, *val); + kvmppc_set_sdar_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_SIER: - vcpu->arch.sier[0] = set_reg_val(id, *val); + kvmppc_set_sier_hv(vcpu, 0, set_reg_val(id, *val)); break; case KVM_REG_PPC_SIER2: - vcpu->arch.sier[1] = set_reg_val(id, *val); + kvmppc_set_sier_hv(vcpu, 1, set_reg_val(id, *val)); break; case KVM_REG_PPC_SIER3: - vcpu->arch.sier[2] = set_reg_val(id, *val); + kvmppc_set_sier_hv(vcpu, 2, set_reg_val(id, *val)); break; case KVM_REG_PPC_IAMR: - vcpu->arch.iamr = set_reg_val(id, *val); + kvmppc_set_iamr_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_PSPB: - vcpu->arch.pspb = set_reg_val(id, *val); + kvmppc_set_pspb_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_DPDES: if (cpu_has_feature(CPU_FTR_ARCH_300)) @@ -2504,25 +2505,25 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, vcpu->arch.vcore->dpdes = set_reg_val(id, *val); break; case KVM_REG_PPC_VTB: - vcpu->arch.vcore->vtb = set_reg_val(id, *val); + kvmppc_set_vtb_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_DAWR: - vcpu->arch.dawr0 = set_reg_val(id, *val); + kvmppc_set_dawr0_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_DAWRX: - vcpu->arch.dawrx0 = set_reg_val(id, *val) & ~DAWRX_HYP; + kvmppc_set_dawrx0_hv(vcpu, set_reg_val(id, *val) & ~DAWRX_HYP); break; case KVM_REG_PPC_DAWR1: - vcpu->arch.dawr1 = set_reg_val(id, *val); + kvmppc_set_dawr1_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_DAWRX1: - vcpu->arch.dawrx1 = set_reg_val(id, *val) & ~DAWRX_HYP; + kvmppc_set_dawrx1_hv(vcpu, set_reg_val(id, *val) & ~DAWRX_HYP); break; case KVM_REG_PPC_CIABR: - vcpu->arch.ciabr = set_reg_val(id, *val); + kvmppc_set_ciabr_hv(vcpu, set_reg_val(id, *val)); /* Don't allow setting breakpoints in hypervisor code */ - if ((vcpu->arch.ciabr & CIABR_PRIV) == CIABR_PRIV_HYPER) - vcpu->arch.ciabr &= ~CIABR_PRIV; /* disable */ + if ((kvmppc_get_ciabr_hv(vcpu) & CIABR_PRIV) == CIABR_PRIV_HYPER) + kvmppc_set_ciabr_hv(vcpu, kvmppc_get_ciabr_hv(vcpu) & ~CIABR_PRIV); /* disable */ break; case KVM_REG_PPC_CSIGR: vcpu->arch.csigr = set_reg_val(id, *val); @@ -2534,13 +2535,13 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, vcpu->arch.tcscr = set_reg_val(id, *val); break; case KVM_REG_PPC_PID: - vcpu->arch.pid = set_reg_val(id, *val); + kvmppc_set_pid(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_ACOP: vcpu->arch.acop = set_reg_val(id, *val); break; case KVM_REG_PPC_WORT: - vcpu->arch.wort = set_reg_val(id, *val); + kvmppc_set_wort_hv(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_TIDR: vcpu->arch.tid = set_reg_val(id, *val); @@ -2587,10 +2588,11 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, * decrementer, which is better than a large one that * causes a hang. */ - if (!vcpu->arch.dec_expires && tb_offset) - vcpu->arch.dec_expires = get_tb() + tb_offset; + kvmppc_set_tb_offset_hv(vcpu, tb_offset); + if (!kvmppc_get_dec_expires(vcpu) && tb_offset) + kvmppc_set_dec_expires(vcpu, get_tb() + tb_offset); - vcpu->arch.vcore->tb_offset = tb_offset; + kvmppc_set_tb_offset_hv(vcpu, tb_offset); break; } case KVM_REG_PPC_LPCR: @@ -2600,7 +2602,7 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, kvmppc_set_lpcr(vcpu, set_reg_val(id, *val), false); break; case KVM_REG_PPC_PPR: - vcpu->arch.ppr = set_reg_val(id, *val); + kvmppc_set_ppr_hv(vcpu, set_reg_val(id, *val)); break; #ifdef CONFIG_PPC_TRANSACTIONAL_MEM case KVM_REG_PPC_TFHAR: @@ -2671,7 +2673,7 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, r = kvmppc_set_arch_compat(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_DEC_EXPIRY: - vcpu->arch.dec_expires = set_reg_val(id, *val); + kvmppc_set_dec_expires(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_ONLINE: i = set_reg_val(id, *val); @@ -2684,6 +2686,9 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, case KVM_REG_PPC_PTCR: vcpu->kvm->arch.l1_ptcr = set_reg_val(id, *val); break; + case KVM_REG_PPC_FSCR: + kvmppc_set_fscr_hv(vcpu, set_reg_val(id, *val)); + break; default: r = -EINVAL; break; @@ -2901,19 +2906,20 @@ static int kvmppc_core_vcpu_create_hv(struct kvm_vcpu *vcpu) vcpu->arch.shared_big_endian = false; #endif #endif - vcpu->arch.mmcr[0] = MMCR0_FC; + kvmppc_set_mmcr_hv(vcpu, 0, MMCR0_FC); + if (cpu_has_feature(CPU_FTR_ARCH_31)) { - vcpu->arch.mmcr[0] |= MMCR0_PMCCEXT; - vcpu->arch.mmcra = MMCRA_BHRB_DISABLE; + kvmppc_set_mmcr_hv(vcpu, 0, kvmppc_get_mmcr_hv(vcpu, 0) | MMCR0_PMCCEXT); + kvmppc_set_mmcra_hv(vcpu, MMCRA_BHRB_DISABLE); } - vcpu->arch.ctrl = CTRL_RUNLATCH; + kvmppc_set_ctrl_hv(vcpu, CTRL_RUNLATCH); /* default to host PVR, since we can't spoof it */ kvmppc_set_pvr_hv(vcpu, mfspr(SPRN_PVR)); spin_lock_init(&vcpu->arch.vpa_update_lock); spin_lock_init(&vcpu->arch.tbacct_lock); vcpu->arch.busy_preempt = TB_NIL; - vcpu->arch.shregs.msr = MSR_ME; + kvmppc_set_msr_fast(vcpu, MSR_ME); vcpu->arch.intr_msr = MSR_SF | MSR_ME; /* @@ -2923,24 +2929,26 @@ static int kvmppc_core_vcpu_create_hv(struct kvm_vcpu *vcpu) * don't set the HFSCR_MSGP bit, and that causes those instructions * to trap and then we emulate them. */ - vcpu->arch.hfscr = HFSCR_TAR | HFSCR_EBB | HFSCR_PM | HFSCR_BHRB | - HFSCR_DSCR | HFSCR_VECVSX | HFSCR_FP; + kvmppc_set_hfscr_hv(vcpu, HFSCR_TAR | HFSCR_EBB | HFSCR_PM | HFSCR_BHRB | + HFSCR_DSCR | HFSCR_VECVSX | HFSCR_FP); + if (cpu_has_feature(CPU_FTR_HVMODE)) { - vcpu->arch.hfscr &= mfspr(SPRN_HFSCR); + kvmppc_set_hfscr_hv(vcpu, kvmppc_get_hfscr_hv(vcpu) & mfspr(SPRN_HFSCR)); + #ifdef CONFIG_PPC_TRANSACTIONAL_MEM if (cpu_has_feature(CPU_FTR_P9_TM_HV_ASSIST)) - vcpu->arch.hfscr |= HFSCR_TM; + kvmppc_set_hfscr_hv(vcpu, kvmppc_get_hfscr_hv(vcpu) | HFSCR_TM); #endif } if (cpu_has_feature(CPU_FTR_TM_COMP)) vcpu->arch.hfscr |= HFSCR_TM; - vcpu->arch.hfscr_permitted = vcpu->arch.hfscr; + vcpu->arch.hfscr_permitted = kvmppc_get_hfscr_hv(vcpu); /* * PM, EBB, TM are demand-faulted so start with it clear. */ - vcpu->arch.hfscr &= ~(HFSCR_PM | HFSCR_EBB | HFSCR_TM); + kvmppc_set_hfscr_hv(vcpu, kvmppc_get_hfscr_hv(vcpu) & ~(HFSCR_PM | HFSCR_EBB | HFSCR_TM)); kvmppc_mmu_book3s_hv_init(vcpu); @@ -4018,7 +4026,6 @@ static void vcpu_vpa_increment_dispatch(struct kvm_vcpu *vcpu) /* call our hypervisor to load up HV regs and go */ static int kvmhv_vcpu_entry_p9_nested(struct kvm_vcpu *vcpu, u64 time_limit, unsigned long lpcr, u64 *tb) { - struct kvmppc_vcore *vc = vcpu->arch.vcore; unsigned long host_psscr; unsigned long msr; struct hv_guest_state hvregs; @@ -4098,7 +4105,7 @@ static int kvmhv_vcpu_entry_p9_nested(struct kvm_vcpu *vcpu, u64 time_limit, uns if (!(lpcr & LPCR_LD)) /* Sign extend if not using large decrementer */ dec = (s32) dec; *tb = mftb(); - vcpu->arch.dec_expires = dec + (*tb + vc->tb_offset); + vcpu->arch.dec_expires = dec + (*tb + kvmppc_get_tb_offset_hv(vcpu)); timer_rearm_host_dec(*tb); @@ -4156,7 +4163,7 @@ static int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit, __this_cpu_write(cpu_in_guest, NULL); if (trap == BOOK3S_INTERRUPT_SYSCALL && - !(vcpu->arch.shregs.msr & MSR_PR)) { + !(kvmppc_get_msr(vcpu) & MSR_PR)) { unsigned long req = kvmppc_get_gpr(vcpu, 3); /* @@ -4635,7 +4642,7 @@ int kvmhv_run_single_vcpu(struct kvm_vcpu *vcpu, u64 time_limit, if (!nested) { kvmppc_core_prepare_to_enter(vcpu); - if (vcpu->arch.shregs.msr & MSR_EE) { + if (kvmppc_get_msr(vcpu) & MSR_EE) { if (xive_interrupt_pending(vcpu)) kvmppc_inject_interrupt_hv(vcpu, BOOK3S_INTERRUPT_EXTERNAL, 0); @@ -4657,7 +4664,7 @@ int kvmhv_run_single_vcpu(struct kvm_vcpu *vcpu, u64 time_limit, tb = mftb(); - kvmppc_update_vpa_dispatch_p9(vcpu, vc, tb + vc->tb_offset); + kvmppc_update_vpa_dispatch_p9(vcpu, vc, tb + kvmppc_get_tb_offset_hv(vcpu)); trace_kvm_guest_enter(vcpu); @@ -4824,7 +4831,7 @@ static int kvmppc_vcpu_run_hv(struct kvm_vcpu *vcpu) msr |= MSR_VSX; if ((cpu_has_feature(CPU_FTR_TM) || cpu_has_feature(CPU_FTR_P9_TM_HV_ASSIST)) && - (vcpu->arch.hfscr & HFSCR_TM)) + (kvmppc_get_hfscr_hv(vcpu) & HFSCR_TM)) msr |= MSR_TM; msr = msr_check_and_set(msr); @@ -4848,7 +4855,7 @@ static int kvmppc_vcpu_run_hv(struct kvm_vcpu *vcpu) if (run->exit_reason == KVM_EXIT_PAPR_HCALL) { accumulate_time(vcpu, &vcpu->arch.hcall); - if (WARN_ON_ONCE(vcpu->arch.shregs.msr & MSR_PR)) { + if (WARN_ON_ONCE(kvmppc_get_msr(vcpu) & MSR_PR)) { /* * These should have been caught reflected * into the guest by now. Final sanity check: diff --git a/arch/powerpc/kvm/book3s_hv.h b/arch/powerpc/kvm/book3s_hv.h index 2f2e59d7d433..7a7005189ab1 100644 --- a/arch/powerpc/kvm/book3s_hv.h +++ b/arch/powerpc/kvm/book3s_hv.h @@ -50,3 +50,62 @@ void accumulate_time(struct kvm_vcpu *vcpu, struct kvmhv_tb_accumulator *next); #define start_timing(vcpu, next) do {} while (0) #define end_timing(vcpu) do {} while (0) #endif + +#define HV_WRAPPER_SET(reg, size) \ +static inline void kvmppc_set_##reg ##_hv(struct kvm_vcpu *vcpu, u##size val) \ +{ \ + vcpu->arch.reg = val; \ +} + +#define HV_WRAPPER_GET(reg, size) \ +static inline u##size kvmppc_get_##reg ##_hv(struct kvm_vcpu *vcpu) \ +{ \ + return vcpu->arch.reg; \ +} + +#define HV_WRAPPER(reg, size) \ + HV_WRAPPER_SET(reg, size) \ + HV_WRAPPER_GET(reg, size) \ + +#define HV_ARRAY_WRAPPER_SET(reg, size) \ +static inline void kvmppc_set_##reg ##_hv(struct kvm_vcpu *vcpu, int i, u##size val) \ +{ \ + vcpu->arch.reg[i] = val; \ +} + +#define HV_ARRAY_WRAPPER_GET(reg, size) \ +static inline u##size kvmppc_get_##reg ##_hv(struct kvm_vcpu *vcpu, int i) \ +{ \ + return vcpu->arch.reg[i]; \ +} + +#define HV_ARRAY_WRAPPER(reg, size) \ + HV_ARRAY_WRAPPER_SET(reg, size) \ + HV_ARRAY_WRAPPER_GET(reg, size) \ + +HV_WRAPPER(mmcra, 64) +HV_WRAPPER(hfscr, 64) +HV_WRAPPER(fscr, 64) +HV_WRAPPER(dscr, 64) +HV_WRAPPER(purr, 64) +HV_WRAPPER(spurr, 64) +HV_WRAPPER(amr, 64) +HV_WRAPPER(uamor, 64) +HV_WRAPPER(siar, 64) +HV_WRAPPER(sdar, 64) +HV_WRAPPER(iamr, 64) +HV_WRAPPER(dawr0, 64) +HV_WRAPPER(dawr1, 64) +HV_WRAPPER(dawrx0, 64) +HV_WRAPPER(dawrx1, 64) +HV_WRAPPER(ciabr, 64) +HV_WRAPPER(wort, 64) +HV_WRAPPER(ppr, 64) +HV_WRAPPER(ctrl, 64) + +HV_ARRAY_WRAPPER(mmcr, 64) +HV_ARRAY_WRAPPER(sier, 64) +HV_ARRAY_WRAPPER(pmc, 32) + +HV_WRAPPER(pvr, 32) +HV_WRAPPER(pspb, 32) diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c index da85f046377a..9f9e9aab6015 100644 --- a/arch/powerpc/kvm/book3s_hv_builtin.c +++ b/arch/powerpc/kvm/book3s_hv_builtin.c @@ -182,9 +182,13 @@ EXPORT_SYMBOL_GPL(kvmppc_hwrng_present); long kvmppc_rm_h_random(struct kvm_vcpu *vcpu) { + unsigned long rand; + if (ppc_md.get_random_seed && - ppc_md.get_random_seed(&vcpu->arch.regs.gpr[4])) + ppc_md.get_random_seed(&rand)) { + kvmppc_set_gpr(vcpu, 4, rand); return H_SUCCESS; + } return H_HARDWARE; } @@ -510,7 +514,7 @@ void kvmppc_set_msr_hv(struct kvm_vcpu *vcpu, u64 msr) */ if ((msr & MSR_TS_MASK) == MSR_TS_MASK) msr &= ~MSR_TS_MASK; - vcpu->arch.shregs.msr = msr; + kvmppc_set_msr_fast(vcpu, msr); kvmppc_end_cede(vcpu); } EXPORT_SYMBOL_GPL(kvmppc_set_msr_hv); @@ -548,7 +552,7 @@ static void inject_interrupt(struct kvm_vcpu *vcpu, int vec, u64 srr1_flags) kvmppc_set_srr0(vcpu, pc); kvmppc_set_srr1(vcpu, (msr & SRR1_MSR_BITS) | srr1_flags); kvmppc_set_pc(vcpu, new_pc); - vcpu->arch.shregs.msr = new_msr; + kvmppc_set_msr_fast(vcpu, new_msr); } void kvmppc_inject_interrupt_hv(struct kvm_vcpu *vcpu, int vec, u64 srr1_flags) diff --git a/arch/powerpc/kvm/book3s_hv_p9_entry.c b/arch/powerpc/kvm/book3s_hv_p9_entry.c index 34f1db212824..34bc0a8a1288 100644 --- a/arch/powerpc/kvm/book3s_hv_p9_entry.c +++ b/arch/powerpc/kvm/book3s_hv_p9_entry.c @@ -305,7 +305,7 @@ static void switch_mmu_to_guest_radix(struct kvm *kvm, struct kvm_vcpu *vcpu, u6 u32 pid; lpid = nested ? nested->shadow_lpid : kvm->arch.lpid; - pid = vcpu->arch.pid; + pid = kvmppc_get_pid(vcpu); /* * Prior memory accesses to host PID Q3 must be completed before we @@ -330,7 +330,7 @@ static void switch_mmu_to_guest_hpt(struct kvm *kvm, struct kvm_vcpu *vcpu, u64 int i; lpid = kvm->arch.lpid; - pid = vcpu->arch.pid; + pid = kvmppc_get_pid(vcpu); /* * See switch_mmu_to_guest_radix. ptesync should not be required here diff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c index ccfd96965630..3b43c3d00311 100644 --- a/arch/powerpc/kvm/book3s_hv_ras.c +++ b/arch/powerpc/kvm/book3s_hv_ras.c @@ -15,6 +15,7 @@ #include #include #include +#include "book3s_hv.h" /* SRR1 bits for machine check on POWER7 */ #define SRR1_MC_LDSTERR (1ul << (63-42)) @@ -173,14 +174,14 @@ long kvmppc_p9_realmode_hmi_handler(struct kvm_vcpu *vcpu) ppc_md.hmi_exception_early(NULL); out: - if (vc->tb_offset) { + if (kvmppc_get_tb_offset_hv(vcpu)) { u64 new_tb = mftb() + vc->tb_offset; mtspr(SPRN_TBU40, new_tb); if ((mftb() & 0xffffff) < (new_tb & 0xffffff)) { new_tb += 0x1000000; mtspr(SPRN_TBU40, new_tb); } - vc->tb_offset_applied = vc->tb_offset; + vc->tb_offset_applied = kvmppc_get_tb_offset_hv(vcpu); } return ret; diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c index 9182324dbef9..17cb75a127b0 100644 --- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c +++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c @@ -776,8 +776,8 @@ long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags, r = rev[i].guest_rpte | (r & (HPTE_R_R | HPTE_R_C)); r &= ~HPTE_GR_RESERVED; } - vcpu->arch.regs.gpr[4 + i * 2] = v; - vcpu->arch.regs.gpr[5 + i * 2] = r; + kvmppc_set_gpr(vcpu, 4 + i * 2, v); + kvmppc_set_gpr(vcpu, 5 + i * 2, r); } return H_SUCCESS; } @@ -824,7 +824,7 @@ long kvmppc_h_clear_ref(struct kvm_vcpu *vcpu, unsigned long flags, } } } - vcpu->arch.regs.gpr[4] = gr; + kvmppc_set_gpr(vcpu, 4, gr); ret = H_SUCCESS; out: unlock_hpte(hpte, v & ~HPTE_V_HVLOCK); @@ -872,7 +872,7 @@ long kvmppc_h_clear_mod(struct kvm_vcpu *vcpu, unsigned long flags, kvmppc_set_dirty_from_hpte(kvm, v, gr); } } - vcpu->arch.regs.gpr[4] = gr; + kvmppc_set_gpr(vcpu, 4, gr); ret = H_SUCCESS; out: unlock_hpte(hpte, v & ~HPTE_V_HVLOCK); diff --git a/arch/powerpc/kvm/book3s_hv_rm_xics.c b/arch/powerpc/kvm/book3s_hv_rm_xics.c index e165bfa842bf..e42984878503 100644 --- a/arch/powerpc/kvm/book3s_hv_rm_xics.c +++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c @@ -481,7 +481,7 @@ static void icp_rm_down_cppr(struct kvmppc_xics *xics, struct kvmppc_icp *icp, unsigned long xics_rm_h_xirr_x(struct kvm_vcpu *vcpu) { - vcpu->arch.regs.gpr[5] = get_tb(); + kvmppc_set_gpr(vcpu, 5, get_tb()); return xics_rm_h_xirr(vcpu); } @@ -518,7 +518,7 @@ unsigned long xics_rm_h_xirr(struct kvm_vcpu *vcpu) } while (!icp_rm_try_update(icp, old_state, new_state)); /* Return the result in GPR4 */ - vcpu->arch.regs.gpr[4] = xirr; + kvmppc_set_gpr(vcpu, 4, xirr); return check_too_hard(xics, icp); } diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c index f4115819e738..4adff4f1896d 100644 --- a/arch/powerpc/kvm/book3s_xive.c +++ b/arch/powerpc/kvm/book3s_xive.c @@ -29,6 +29,7 @@ #include #include "book3s_xive.h" +#include "book3s_hv.h" #define __x_eoi_page(xd) ((void __iomem *)((xd)->eoi_mmio)) #define __x_trig_page(xd) ((void __iomem *)((xd)->trig_mmio)) @@ -328,7 +329,7 @@ static unsigned long xive_vm_h_xirr(struct kvm_vcpu *vcpu) */ /* Return interrupt and old CPPR in GPR4 */ - vcpu->arch.regs.gpr[4] = hirq | (old_cppr << 24); + kvmppc_set_gpr(vcpu, 4, hirq | (old_cppr << 24)); return H_SUCCESS; } @@ -364,7 +365,7 @@ static unsigned long xive_vm_h_ipoll(struct kvm_vcpu *vcpu, unsigned long server hirq = xive_vm_scan_interrupts(xc, pending, scan_poll); /* Return interrupt and old CPPR in GPR4 */ - vcpu->arch.regs.gpr[4] = hirq | (xc->cppr << 24); + kvmppc_set_gpr(vcpu, 4, hirq | (xc->cppr << 24)); return H_SUCCESS; } @@ -2779,8 +2780,6 @@ static int kvmppc_xive_create(struct kvm_device *dev, u32 type) int kvmppc_xive_xics_hcall(struct kvm_vcpu *vcpu, u32 req) { - struct kvmppc_vcore *vc = vcpu->arch.vcore; - /* The VM should have configured XICS mode before doing XICS hcalls. */ if (!kvmppc_xics_enabled(vcpu)) return H_TOO_HARD; @@ -2799,7 +2798,7 @@ int kvmppc_xive_xics_hcall(struct kvm_vcpu *vcpu, u32 req) return xive_vm_h_ipoll(vcpu, kvmppc_get_gpr(vcpu, 4)); case H_XIRR_X: xive_vm_h_xirr(vcpu); - kvmppc_set_gpr(vcpu, 5, get_tb() + vc->tb_offset); + kvmppc_set_gpr(vcpu, 5, get_tb() + kvmppc_get_tb_offset_hv(vcpu)); return H_SUCCESS; } diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index d23e25e8432d..5fbef343aaed 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -1727,7 +1727,7 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) val = get_reg_val(reg->id, vcpu->arch.vr.vscr.u[3]); break; case KVM_REG_PPC_VRSAVE: - val = get_reg_val(reg->id, vcpu->arch.vrsave); + val = get_reg_val(reg->id, kvmppc_get_vrsave(vcpu)); break; #endif /* CONFIG_ALTIVEC */ default: @@ -1782,7 +1782,7 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) r = -ENXIO; break; } - vcpu->arch.vrsave = set_reg_val(reg->id, val); + kvmppc_set_vrsave(vcpu, set_reg_val(reg->id, val)); break; #endif /* CONFIG_ALTIVEC */ default: From patchwork Mon May 8 07:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Niethe X-Patchwork-Id: 1778468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=lUej13m1; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QFQ0Z4lwVz20fl for ; Tue, 9 May 2023 01:18:22 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QFQ0Z1cd8z3fLD for ; Tue, 9 May 2023 01:18:22 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=lUej13m1; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com; envelope-from=jpn@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=lUej13m1; dkim-atps=neutral Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QFCTx4062z3blV for ; Mon, 8 May 2023 17:24:37 +1000 (AEST) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 348790I9026284; Mon, 8 May 2023 07:24:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=PIbOOZGPyupxwom3jMRdXTY0ePoCKPfgRGeeEw3pjpU=; b=lUej13m1xuxIei2t9OVChuzq+Xo6foQM4IfDWSK39y1h+OjU+1odlk/Z6lU4eJoCZhme pzrXUnhyNeLm0PB30HO02gT/ejUlARNI9EkL2HwxicADGLHQ4tLdW/E21RmL+bYiaoh5 VXGxd4ob9mYxs+BfDM7IaW+GugBWr1GmsGjxL/tO0QsgaznzPkm/T3WI6Bnhj3WloB1Y YjenTUh4d2NcB5tqt8eKyhOD6mCvRm7Ws6zuQp+ZBwg0Ptx7ezyj80BZf4D1pPwaVUxv 7KcJVl9Rhpnhwkol+Ooi6PTXi4mvTSDLIpRxcnrTjN7T6mo0Pao74h7EMVDw70azzGJF Fg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qes9ccw7a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:34 +0000 Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3487CDKH008092; Mon, 8 May 2023 07:24:34 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qes9ccw6n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:34 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3480iXh8014880; Mon, 8 May 2023 07:24:32 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3qde5fgya2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:32 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3487OS5b32440578 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 8 May 2023 07:24:28 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E629A20043; Mon, 8 May 2023 07:24:27 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C7FAD20040; Mon, 8 May 2023 07:24:22 +0000 (GMT) Received: from pwon.ibmuc.com (unknown [9.177.74.71]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 8 May 2023 07:24:22 +0000 (GMT) From: Jordan Niethe To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH v1 2/5] KVM: PPC: Add fpr getters and setters Date: Mon, 8 May 2023 17:23:29 +1000 Message-Id: <20230508072332.2937883-3-jpn@linux.vnet.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> References: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: f6Jrrw-Dlf-soXw0Gh1KOBuhpIJspw0S X-Proofpoint-ORIG-GUID: OQzGPEKf6MFiapx-0sW5SLNkivZ-fPN6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-08_04,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 lowpriorityscore=0 mlxlogscore=487 priorityscore=1501 adultscore=0 clxscore=1015 impostorscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305080049 X-Mailman-Approved-At: Tue, 09 May 2023 01:16:28 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Niethe , mikey@neuling.org, sbhat@linux.ibm.com, kautuk.consul.1980@gmail.com, npiggin@gmail.com, kvm-ppc@vger.kernel.org, vaibhav@linux.ibm.com Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add wrappers for fpr registers to prepare for supporting PAPR nested guests. Signed-off-by: Jordan Niethe --- arch/powerpc/include/asm/kvm_book3s.h | 31 +++++++++++++++++++++++++++ arch/powerpc/include/asm/kvm_booke.h | 10 +++++++++ arch/powerpc/kvm/book3s.c | 16 +++++++------- arch/powerpc/kvm/emulate_loadstore.c | 2 +- arch/powerpc/kvm/powerpc.c | 22 +++++++++---------- 5 files changed, 61 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h index 4e91f54a3f9f..a632e79639f0 100644 --- a/arch/powerpc/include/asm/kvm_book3s.h +++ b/arch/powerpc/include/asm/kvm_book3s.h @@ -413,6 +413,37 @@ static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu) return vcpu->arch.fault_dar; } +static inline u64 kvmppc_get_fpr(struct kvm_vcpu *vcpu, int i) +{ + return vcpu->arch.fp.fpr[i][TS_FPROFFSET]; +} + +static inline void kvmppc_set_fpr(struct kvm_vcpu *vcpu, int i, u64 val) +{ + vcpu->arch.fp.fpr[i][TS_FPROFFSET] = val; +} + +static inline u64 kvmppc_get_fpscr(struct kvm_vcpu *vcpu) +{ + return vcpu->arch.fp.fpscr; +} + +static inline void kvmppc_set_fpscr(struct kvm_vcpu *vcpu, u64 val) +{ + vcpu->arch.fp.fpscr = val; +} + + +static inline u64 kvmppc_get_vsx_fpr(struct kvm_vcpu *vcpu, int i, int j) +{ + return vcpu->arch.fp.fpr[i][j]; +} + +static inline void kvmppc_set_vsx_fpr(struct kvm_vcpu *vcpu, int i, int j, u64 val) +{ + vcpu->arch.fp.fpr[i][j] = val; +} + #define BOOK3S_WRAPPER_SET(reg, size) \ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ { \ diff --git a/arch/powerpc/include/asm/kvm_booke.h b/arch/powerpc/include/asm/kvm_booke.h index 0c3401b2e19e..7c3291aa8922 100644 --- a/arch/powerpc/include/asm/kvm_booke.h +++ b/arch/powerpc/include/asm/kvm_booke.h @@ -89,6 +89,16 @@ static inline ulong kvmppc_get_pc(struct kvm_vcpu *vcpu) return vcpu->arch.regs.nip; } +static inline void kvmppc_set_fpr(struct kvm_vcpu *vcpu, int i, u64 val) +{ + vcpu->arch.fp.fpr[i][TS_FPROFFSET] = val; +} + +static inline u64 kvmppc_get_fpr(struct kvm_vcpu *vcpu, int i) +{ + return vcpu->arch.fp.fpr[i][TS_FPROFFSET]; +} + #ifdef CONFIG_BOOKE static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu) { diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index bcb335681387..c12066a12b30 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -614,17 +614,17 @@ int kvmppc_get_one_reg(struct kvm_vcpu *vcpu, u64 id, break; case KVM_REG_PPC_FPR0 ... KVM_REG_PPC_FPR31: i = id - KVM_REG_PPC_FPR0; - *val = get_reg_val(id, VCPU_FPR(vcpu, i)); + *val = get_reg_val(id, kvmppc_get_fpr(vcpu, i)); break; case KVM_REG_PPC_FPSCR: - *val = get_reg_val(id, vcpu->arch.fp.fpscr); + *val = get_reg_val(id, kvmppc_get_fpscr(vcpu)); break; #ifdef CONFIG_VSX case KVM_REG_PPC_VSR0 ... KVM_REG_PPC_VSR31: if (cpu_has_feature(CPU_FTR_VSX)) { i = id - KVM_REG_PPC_VSR0; - val->vsxval[0] = vcpu->arch.fp.fpr[i][0]; - val->vsxval[1] = vcpu->arch.fp.fpr[i][1]; + val->vsxval[0] = kvmppc_get_vsx_fpr(vcpu, i, 0); + val->vsxval[1] = kvmppc_get_vsx_fpr(vcpu, i, 1); } else { r = -ENXIO; } @@ -702,7 +702,7 @@ int kvmppc_set_one_reg(struct kvm_vcpu *vcpu, u64 id, break; case KVM_REG_PPC_FPR0 ... KVM_REG_PPC_FPR31: i = id - KVM_REG_PPC_FPR0; - VCPU_FPR(vcpu, i) = set_reg_val(id, *val); + kvmppc_set_fpr(vcpu, i, set_reg_val(id, *val)); break; case KVM_REG_PPC_FPSCR: vcpu->arch.fp.fpscr = set_reg_val(id, *val); @@ -711,8 +711,8 @@ int kvmppc_set_one_reg(struct kvm_vcpu *vcpu, u64 id, case KVM_REG_PPC_VSR0 ... KVM_REG_PPC_VSR31: if (cpu_has_feature(CPU_FTR_VSX)) { i = id - KVM_REG_PPC_VSR0; - vcpu->arch.fp.fpr[i][0] = val->vsxval[0]; - vcpu->arch.fp.fpr[i][1] = val->vsxval[1]; + kvmppc_set_vsx_fpr(vcpu, i, 0, val->vsxval[0]); + kvmppc_set_vsx_fpr(vcpu, i, 1, val->vsxval[1]); } else { r = -ENXIO; } @@ -743,7 +743,7 @@ int kvmppc_set_one_reg(struct kvm_vcpu *vcpu, u64 id, break; #endif /* CONFIG_KVM_XIVE */ case KVM_REG_PPC_FSCR: - vcpu->arch.fscr = set_reg_val(id, *val); + kvmppc_set_fpscr(vcpu, set_reg_val(id, *val)); break; case KVM_REG_PPC_TAR: kvmppc_set_tar(vcpu, set_reg_val(id, *val)); diff --git a/arch/powerpc/kvm/emulate_loadstore.c b/arch/powerpc/kvm/emulate_loadstore.c index cfc9114b87d0..6458ede28b65 100644 --- a/arch/powerpc/kvm/emulate_loadstore.c +++ b/arch/powerpc/kvm/emulate_loadstore.c @@ -250,7 +250,7 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) vcpu->arch.mmio_sp64_extend = 1; emulated = kvmppc_handle_store(vcpu, - VCPU_FPR(vcpu, op.reg), size, 1); + kvmppc_get_fpr(vcpu, op.reg), size, 1); if ((op.type & UPDATE) && (emulated != EMULATE_FAIL)) kvmppc_set_gpr(vcpu, op.update_reg, op.ea); diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 5fbef343aaed..9468df8d9987 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -936,7 +936,7 @@ static inline void kvmppc_set_vsr_dword(struct kvm_vcpu *vcpu, val.vsxval[offset] = gpr; VCPU_VSX_VR(vcpu, index - 32) = val.vval; } else { - VCPU_VSX_FPR(vcpu, index, offset) = gpr; + kvmppc_set_vsx_fpr(vcpu, index, offset, gpr); } } @@ -952,8 +952,8 @@ static inline void kvmppc_set_vsr_dword_dump(struct kvm_vcpu *vcpu, val.vsxval[1] = gpr; VCPU_VSX_VR(vcpu, index - 32) = val.vval; } else { - VCPU_VSX_FPR(vcpu, index, 0) = gpr; - VCPU_VSX_FPR(vcpu, index, 1) = gpr; + kvmppc_set_vsx_fpr(vcpu, index, 0, gpr); + kvmppc_set_vsx_fpr(vcpu, index, 1, gpr); } } @@ -972,8 +972,8 @@ static inline void kvmppc_set_vsr_word_dump(struct kvm_vcpu *vcpu, } else { val.vsx32val[0] = gpr; val.vsx32val[1] = gpr; - VCPU_VSX_FPR(vcpu, index, 0) = val.vsxval[0]; - VCPU_VSX_FPR(vcpu, index, 1) = val.vsxval[0]; + kvmppc_set_vsx_fpr(vcpu, index, 0, val.vsxval[0]); + kvmppc_set_vsx_fpr(vcpu, index, 1, val.vsxval[0]); } } @@ -995,9 +995,9 @@ static inline void kvmppc_set_vsr_word(struct kvm_vcpu *vcpu, } else { dword_offset = offset / 2; word_offset = offset % 2; - val.vsxval[0] = VCPU_VSX_FPR(vcpu, index, dword_offset); + val.vsxval[0] = kvmppc_get_vsx_fpr(vcpu, index, dword_offset); val.vsx32val[word_offset] = gpr32; - VCPU_VSX_FPR(vcpu, index, dword_offset) = val.vsxval[0]; + kvmppc_set_vsx_fpr(vcpu, index, dword_offset, val.vsxval[0]); } } #endif /* CONFIG_VSX */ @@ -1192,14 +1192,14 @@ static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu) if (vcpu->kvm->arch.kvm_ops->giveup_ext) vcpu->kvm->arch.kvm_ops->giveup_ext(vcpu, MSR_FP); - VCPU_FPR(vcpu, vcpu->arch.io_gpr & KVM_MMIO_REG_MASK) = gpr; + kvmppc_set_fpr(vcpu, vcpu->arch.io_gpr & KVM_MMIO_REG_MASK, gpr); break; #ifdef CONFIG_PPC_BOOK3S case KVM_MMIO_REG_QPR: vcpu->arch.qpr[vcpu->arch.io_gpr & KVM_MMIO_REG_MASK] = gpr; break; case KVM_MMIO_REG_FQPR: - VCPU_FPR(vcpu, vcpu->arch.io_gpr & KVM_MMIO_REG_MASK) = gpr; + kvmppc_set_fpr(vcpu, vcpu->arch.io_gpr & KVM_MMIO_REG_MASK, gpr); vcpu->arch.qpr[vcpu->arch.io_gpr & KVM_MMIO_REG_MASK] = gpr; break; #endif @@ -1417,7 +1417,7 @@ static inline int kvmppc_get_vsr_data(struct kvm_vcpu *vcpu, int rs, u64 *val) } if (rs < 32) { - *val = VCPU_VSX_FPR(vcpu, rs, vsx_offset); + *val = kvmppc_get_vsx_fpr(vcpu, rs, vsx_offset); } else { reg.vval = VCPU_VSX_VR(vcpu, rs - 32); *val = reg.vsxval[vsx_offset]; @@ -1436,7 +1436,7 @@ static inline int kvmppc_get_vsr_data(struct kvm_vcpu *vcpu, int rs, u64 *val) if (rs < 32) { dword_offset = vsx_offset / 2; word_offset = vsx_offset % 2; - reg.vsxval[0] = VCPU_VSX_FPR(vcpu, rs, dword_offset); + reg.vsxval[0] = kvmppc_get_vsx_fpr(vcpu, rs, dword_offset); *val = reg.vsx32val[word_offset]; } else { reg.vval = VCPU_VSX_VR(vcpu, rs - 32); From patchwork Mon May 8 07:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Niethe X-Patchwork-Id: 1778470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=ZFd+03Sq; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QFQ1V6wq5z20fl for ; Tue, 9 May 2023 01:19:10 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QFQ1V2vz5z3fWR for ; Tue, 9 May 2023 01:19:10 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=ZFd+03Sq; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com; envelope-from=jpn@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=ZFd+03Sq; dkim-atps=neutral Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QFCV25mfmz3bjX for ; Mon, 8 May 2023 17:24:42 +1000 (AEST) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3486rqF3001896; Mon, 8 May 2023 07:24:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=CwfuVmzgoYaidA3QJbl3isUzf11hIu2fpk5T5C/Kfz4=; b=ZFd+03SqbdKWqzQh19CzbK3XDajcB7qK6aHTdejN5BewvUiFv2R3GEqSkfOhm3BQSR2P YKUXB58JBdHYmhlw/tO0UACc4z9rKysBCbkRhuJtDIEf4w4euh5Uer9DLhe7JE3j4812 Hpb2XpHAIeuq8J/G1IzdWL7s5pUfrV0cmm7tJrGi95f19K0qtxqdn6R5x3JbRUubTtlw vZQn35vUH/OxF53pyzr1HZh14J2V4UPpElp2WIVZF2ixDRXdc6IHGdylDUlpuiqic1Yi XzezuM4xGC03sMQdPXy58c/f7na1wHLkNjdI8y/7Q4uohBscyw+h2TzqhN4N1xQ4edFN BA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qev7agxuq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:40 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3486s8us002259; Mon, 8 May 2023 07:24:39 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qev7agxu4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:39 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3483tphY024507; Mon, 8 May 2023 07:24:37 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma05fra.de.ibm.com (PPS) with ESMTPS id 3qdeh6gsvm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:37 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3487OXL021824234 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 8 May 2023 07:24:33 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C7E5220049; Mon, 8 May 2023 07:24:33 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D233620040; Mon, 8 May 2023 07:24:28 +0000 (GMT) Received: from pwon.ibmuc.com (unknown [9.177.74.71]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 8 May 2023 07:24:28 +0000 (GMT) From: Jordan Niethe To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH v1 3/5] KVM: PPC: Add vr getters and setters Date: Mon, 8 May 2023 17:23:30 +1000 Message-Id: <20230508072332.2937883-4-jpn@linux.vnet.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> References: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: nBgfdPwxV6lkX6zJZaAnyLwezfVbNdI0 X-Proofpoint-GUID: Kw6xNVrmimQETqM-erf9C-fyWODNdsyB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-08_04,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 clxscore=1015 suspectscore=0 mlxscore=0 bulkscore=0 impostorscore=0 phishscore=0 mlxlogscore=686 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305080049 X-Mailman-Approved-At: Tue, 09 May 2023 01:16:28 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Niethe , mikey@neuling.org, sbhat@linux.ibm.com, kautuk.consul.1980@gmail.com, npiggin@gmail.com, kvm-ppc@vger.kernel.org, vaibhav@linux.ibm.com Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add wrappers for vr registers to prepare for supporting PAPR nested guests. Signed-off-by: Jordan Niethe --- arch/powerpc/include/asm/kvm_book3s.h | 20 +++++++++++ arch/powerpc/kvm/powerpc.c | 50 +++++++++++++-------------- 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h index a632e79639f0..77653c5b356b 100644 --- a/arch/powerpc/include/asm/kvm_book3s.h +++ b/arch/powerpc/include/asm/kvm_book3s.h @@ -444,6 +444,26 @@ static inline void kvmppc_set_vsx_fpr(struct kvm_vcpu *vcpu, int i, int j, u64 v vcpu->arch.fp.fpr[i][j] = val; } +static inline vector128 kvmppc_get_vsx_vr(struct kvm_vcpu *vcpu, int i) +{ + return vcpu->arch.vr.vr[i]; +} + +static inline void kvmppc_set_vsx_vr(struct kvm_vcpu *vcpu, int i, vector128 val) +{ + vcpu->arch.vr.vr[i] = val; +} + +static inline u32 kvmppc_get_vscr(struct kvm_vcpu *vcpu) +{ + return vcpu->arch.vr.vscr.u[3]; +} + +static inline void kvmppc_set_vscr(struct kvm_vcpu *vcpu, u32 val) +{ + vcpu->arch.vr.vscr.u[3] = val; +} + #define BOOK3S_WRAPPER_SET(reg, size) \ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ { \ diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 9468df8d9987..c1084d40e292 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -932,9 +932,9 @@ static inline void kvmppc_set_vsr_dword(struct kvm_vcpu *vcpu, return; if (index >= 32) { - val.vval = VCPU_VSX_VR(vcpu, index - 32); + val.vval = kvmppc_get_vsx_vr(vcpu, index - 32); val.vsxval[offset] = gpr; - VCPU_VSX_VR(vcpu, index - 32) = val.vval; + kvmppc_set_vsx_vr(vcpu, index - 32, val.vval); } else { kvmppc_set_vsx_fpr(vcpu, index, offset, gpr); } @@ -947,10 +947,10 @@ static inline void kvmppc_set_vsr_dword_dump(struct kvm_vcpu *vcpu, int index = vcpu->arch.io_gpr & KVM_MMIO_REG_MASK; if (index >= 32) { - val.vval = VCPU_VSX_VR(vcpu, index - 32); + val.vval = kvmppc_get_vsx_vr(vcpu, index - 32); val.vsxval[0] = gpr; val.vsxval[1] = gpr; - VCPU_VSX_VR(vcpu, index - 32) = val.vval; + kvmppc_set_vsx_vr(vcpu, index - 32, val.vval); } else { kvmppc_set_vsx_fpr(vcpu, index, 0, gpr); kvmppc_set_vsx_fpr(vcpu, index, 1, gpr); @@ -968,7 +968,7 @@ static inline void kvmppc_set_vsr_word_dump(struct kvm_vcpu *vcpu, val.vsx32val[1] = gpr; val.vsx32val[2] = gpr; val.vsx32val[3] = gpr; - VCPU_VSX_VR(vcpu, index - 32) = val.vval; + kvmppc_set_vsx_vr(vcpu, index - 32, val.vval); } else { val.vsx32val[0] = gpr; val.vsx32val[1] = gpr; @@ -989,9 +989,9 @@ static inline void kvmppc_set_vsr_word(struct kvm_vcpu *vcpu, return; if (index >= 32) { - val.vval = VCPU_VSX_VR(vcpu, index - 32); + val.vval = kvmppc_get_vsx_vr(vcpu, index - 32); val.vsx32val[offset] = gpr32; - VCPU_VSX_VR(vcpu, index - 32) = val.vval; + kvmppc_set_vsx_vr(vcpu, index - 32, val.vval); } else { dword_offset = offset / 2; word_offset = offset % 2; @@ -1056,9 +1056,9 @@ static inline void kvmppc_set_vmx_dword(struct kvm_vcpu *vcpu, if (offset == -1) return; - val.vval = VCPU_VSX_VR(vcpu, index); + val.vval = kvmppc_get_vsx_vr(vcpu, index); val.vsxval[offset] = gpr; - VCPU_VSX_VR(vcpu, index) = val.vval; + kvmppc_set_vsx_vr(vcpu, index, val.vval); } static inline void kvmppc_set_vmx_word(struct kvm_vcpu *vcpu, @@ -1072,9 +1072,9 @@ static inline void kvmppc_set_vmx_word(struct kvm_vcpu *vcpu, if (offset == -1) return; - val.vval = VCPU_VSX_VR(vcpu, index); + val.vval = kvmppc_get_vsx_vr(vcpu, index); val.vsx32val[offset] = gpr32; - VCPU_VSX_VR(vcpu, index) = val.vval; + kvmppc_set_vsx_vr(vcpu, index, val.vval); } static inline void kvmppc_set_vmx_hword(struct kvm_vcpu *vcpu, @@ -1088,9 +1088,9 @@ static inline void kvmppc_set_vmx_hword(struct kvm_vcpu *vcpu, if (offset == -1) return; - val.vval = VCPU_VSX_VR(vcpu, index); + val.vval = kvmppc_get_vsx_vr(vcpu, index); val.vsx16val[offset] = gpr16; - VCPU_VSX_VR(vcpu, index) = val.vval; + kvmppc_set_vsx_vr(vcpu, index, val.vval); } static inline void kvmppc_set_vmx_byte(struct kvm_vcpu *vcpu, @@ -1104,9 +1104,9 @@ static inline void kvmppc_set_vmx_byte(struct kvm_vcpu *vcpu, if (offset == -1) return; - val.vval = VCPU_VSX_VR(vcpu, index); + val.vval = kvmppc_get_vsx_vr(vcpu, index); val.vsx8val[offset] = gpr8; - VCPU_VSX_VR(vcpu, index) = val.vval; + kvmppc_set_vsx_vr(vcpu, index, val.vval); } #endif /* CONFIG_ALTIVEC */ @@ -1419,7 +1419,7 @@ static inline int kvmppc_get_vsr_data(struct kvm_vcpu *vcpu, int rs, u64 *val) if (rs < 32) { *val = kvmppc_get_vsx_fpr(vcpu, rs, vsx_offset); } else { - reg.vval = VCPU_VSX_VR(vcpu, rs - 32); + reg.vval = kvmppc_get_vsx_vr(vcpu, rs - 32); *val = reg.vsxval[vsx_offset]; } break; @@ -1439,7 +1439,7 @@ static inline int kvmppc_get_vsr_data(struct kvm_vcpu *vcpu, int rs, u64 *val) reg.vsxval[0] = kvmppc_get_vsx_fpr(vcpu, rs, dword_offset); *val = reg.vsx32val[word_offset]; } else { - reg.vval = VCPU_VSX_VR(vcpu, rs - 32); + reg.vval = kvmppc_get_vsx_vr(vcpu, rs - 32); *val = reg.vsx32val[vsx_offset]; } break; @@ -1554,7 +1554,7 @@ static int kvmppc_get_vmx_dword(struct kvm_vcpu *vcpu, int index, u64 *val) if (vmx_offset == -1) return -1; - reg.vval = VCPU_VSX_VR(vcpu, index); + reg.vval = kvmppc_get_vsx_vr(vcpu, index); *val = reg.vsxval[vmx_offset]; return result; @@ -1572,7 +1572,7 @@ static int kvmppc_get_vmx_word(struct kvm_vcpu *vcpu, int index, u64 *val) if (vmx_offset == -1) return -1; - reg.vval = VCPU_VSX_VR(vcpu, index); + reg.vval = kvmppc_get_vsx_vr(vcpu, index); *val = reg.vsx32val[vmx_offset]; return result; @@ -1590,7 +1590,7 @@ static int kvmppc_get_vmx_hword(struct kvm_vcpu *vcpu, int index, u64 *val) if (vmx_offset == -1) return -1; - reg.vval = VCPU_VSX_VR(vcpu, index); + reg.vval = kvmppc_get_vsx_vr(vcpu, index); *val = reg.vsx16val[vmx_offset]; return result; @@ -1608,7 +1608,7 @@ static int kvmppc_get_vmx_byte(struct kvm_vcpu *vcpu, int index, u64 *val) if (vmx_offset == -1) return -1; - reg.vval = VCPU_VSX_VR(vcpu, index); + reg.vval = kvmppc_get_vsx_vr(vcpu, index); *val = reg.vsx8val[vmx_offset]; return result; @@ -1717,14 +1717,14 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) r = -ENXIO; break; } - val.vval = vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0]; + val.vval = kvmppc_get_vsx_vr(vcpu, reg->id - KVM_REG_PPC_VR0); break; case KVM_REG_PPC_VSCR: if (!cpu_has_feature(CPU_FTR_ALTIVEC)) { r = -ENXIO; break; } - val = get_reg_val(reg->id, vcpu->arch.vr.vscr.u[3]); + val = get_reg_val(reg->id, kvmppc_get_vscr(vcpu)); break; case KVM_REG_PPC_VRSAVE: val = get_reg_val(reg->id, kvmppc_get_vrsave(vcpu)); @@ -1768,14 +1768,14 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) r = -ENXIO; break; } - vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0] = val.vval; + kvmppc_set_vsx_vr(vcpu, reg->id - KVM_REG_PPC_VR0, val.vval); break; case KVM_REG_PPC_VSCR: if (!cpu_has_feature(CPU_FTR_ALTIVEC)) { r = -ENXIO; break; } - vcpu->arch.vr.vscr.u[3] = set_reg_val(reg->id, val); + kvmppc_set_vscr(vcpu, set_reg_val(reg->id, val)); break; case KVM_REG_PPC_VRSAVE: if (!cpu_has_feature(CPU_FTR_ALTIVEC)) { From patchwork Mon May 8 07:23:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Niethe X-Patchwork-Id: 1778471 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=KQNGZltZ; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QFQ2R3nwwz20fl for ; Tue, 9 May 2023 01:19:59 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QFQ2R2hhfz3fQH for ; Tue, 9 May 2023 01:19:59 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=KQNGZltZ; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com; envelope-from=jpn@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=KQNGZltZ; dkim-atps=neutral Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QFCVB32KCz3c96 for ; Mon, 8 May 2023 17:24:50 +1000 (AEST) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3486rhaQ001769; Mon, 8 May 2023 07:24:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=VbjvJo7V4eX/WHFQfr5tKi4S5WnHGvyQcKTwHmScYMg=; b=KQNGZltZi81o/Y5pO8gVQBmsxRbZIhpXmpcZsoZ/o9WpzsWjHDXjb3P0QKrfbRafy/VK 3Olg7zagZRBwlRJ8alLU/oFN1mODMiXvy3TMEG1K97OKLPUMAueV6CEQQbScKB6m+eie VaZQGaonYkZAfNFacPN5ZOn/tByV2EFlkE+me9TaNyptK0mzO3rHjC+h5zvN6CvCXrGU 7ZOmwCyt3SvRx+sKsQaoAP2GJYujvfxpDn7sSY974b9DDf0JkTUJXMZsjNl/NzlgOAKJ ywstc5m6kt1Br+iiTxClICaAbELBlWrWP7BXG2GwWvalY69rduOFg2oOnKmjPp2mkVTT oQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qev7agxyd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:47 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 348714mZ030831; Mon, 8 May 2023 07:24:47 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qev7agxxr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:46 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3483TLM3003399; Mon, 8 May 2023 07:24:45 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma03fra.de.ibm.com (PPS) with ESMTPS id 3qdeh6gsnr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:44 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3487Oejk6685290 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 8 May 2023 07:24:40 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B6FA120049; Mon, 8 May 2023 07:24:40 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C485020043; Mon, 8 May 2023 07:24:34 +0000 (GMT) Received: from pwon.ibmuc.com (unknown [9.177.74.71]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 8 May 2023 07:24:34 +0000 (GMT) From: Jordan Niethe To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH v1 4/5] powerpc: Add helper library for Guest State Buffers Date: Mon, 8 May 2023 17:23:31 +1000 Message-Id: <20230508072332.2937883-5-jpn@linux.vnet.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> References: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: vPFbtDZiQdnF8m2z2cjs6V9K-srWN-HN X-Proofpoint-GUID: hxMvruVLzBdPIXu6ZQLNE1MNdwkP1FUV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-08_04,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 clxscore=1015 suspectscore=0 mlxscore=0 bulkscore=0 impostorscore=0 phishscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305080049 X-Mailman-Approved-At: Tue, 09 May 2023 01:16:28 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Niethe , mikey@neuling.org, sbhat@linux.ibm.com, kautuk.consul.1980@gmail.com, npiggin@gmail.com, kvm-ppc@vger.kernel.org, vaibhav@linux.ibm.com Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The new PAPR nested guest API introduces the concept of a Guest State Buffer for communication about L2 guests between L1 and L0 hosts. In the new API, the L0 manages the L2 on behalf of the L1. This means that if the L1 needs to change L2 state (e.g. GPRs, SPRs, partition table...), it must request the L0 perform the modification. If the nested host needs to read L2 state likewise this request must go through the L0. The Guest State Buffer is a Type-Length-Value style data format defined in the PAPR which assigns all relevant partition state a unique identity. Unlike a typical TLV format the length is redundant as the length of each identity is fixed but is included for checking correctness. A guest state buffer consists of an element count followed by a stream of elements, where elements are composed of an ID number, data length, then the data: Header: <---4 bytes---> +----------------+----- | Element Count | Elements... +----------------+----- Element: <----2 bytes---> <-2 bytes-> <-Length bytes-> +----------------+-----------+----------------+ | Guest State ID | Length | Data | +----------------+-----------+----------------+ Guest State IDs have other attributes defined in the PAPR such as whether they are per thread or per guest, or read-only. Introduce a library for using guest state buffers. This includes support for actions such as creating buffers, adding elements to buffers, reading the value of elements and parsing buffers. This will be used later by the PAPR nested guest support. Signed-off-by: Jordan Niethe --- arch/powerpc/include/asm/guest-state-buffer.h | 1001 +++++++++++++++++ arch/powerpc/lib/Makefile | 3 +- arch/powerpc/lib/guest-state-buffer.c | 560 +++++++++ arch/powerpc/lib/test-guest-state-buffer.c | 334 ++++++ 4 files changed, 1897 insertions(+), 1 deletion(-) create mode 100644 arch/powerpc/include/asm/guest-state-buffer.h create mode 100644 arch/powerpc/lib/guest-state-buffer.c create mode 100644 arch/powerpc/lib/test-guest-state-buffer.c diff --git a/arch/powerpc/include/asm/guest-state-buffer.h b/arch/powerpc/include/asm/guest-state-buffer.h new file mode 100644 index 000000000000..332669302a0b --- /dev/null +++ b/arch/powerpc/include/asm/guest-state-buffer.h @@ -0,0 +1,1001 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Interface based on include/net/netlink.h + */ +#ifndef _ASM_POWERPC_GUEST_STATE_BUFFER_H +#define _ASM_POWERPC_GUEST_STATE_BUFFER_H + +#include +#include +#include + +/************************************************************************** + * Guest State Buffer Constants + **************************************************************************/ +#define GSID_BLANK 0x0000 + +#define GSID_HOST_STATE_SIZE 0x0001 /* Size of Hypervisor Internal Format VCPU state */ +#define GSID_RUN_OUTPUT_MIN_SIZE 0x0002 /* Minimum size of the Run VCPU output buffer */ +#define GSID_LOGICAL_PVR 0x0003 /* Logical PVR */ +#define GSID_TB_OFFSET 0x0004 /* Timebase Offset */ +#define GSID_PARTITION_TABLE 0x0005 /* Partition Scoped Page Table */ +#define GSID_PROCESS_TABLE 0x0006 /* Process Table */ + +#define GSID_RUN_INPUT 0x0C00 /* Run VCPU Input Buffer */ +#define GSID_RUN_OUTPUT 0x0C01 /* Run VCPU Out Buffer */ +#define GSID_VPA 0x0C02 /* HRA to Guest VCPU VPA */ + +#define GSID_GPR0 0x1000 +#define GSID_GPR1 0x1001 +#define GSID_GPR2 0x1002 +#define GSID_GPR3 0x1003 +#define GSID_GPR4 0x1004 +#define GSID_GPR5 0x1005 +#define GSID_GPR6 0x1006 +#define GSID_GPR7 0x1007 +#define GSID_GPR8 0x1008 +#define GSID_GPR9 0x1009 +#define GSID_GPR10 0x100A +#define GSID_GPR11 0x100B +#define GSID_GPR12 0x100C +#define GSID_GPR13 0x100D +#define GSID_GPR14 0x100E +#define GSID_GPR15 0x100F +#define GSID_GPR16 0x1010 +#define GSID_GPR17 0x1011 +#define GSID_GPR18 0x1012 +#define GSID_GPR19 0x1013 +#define GSID_GPR20 0x1014 +#define GSID_GPR21 0x1015 +#define GSID_GPR22 0x1016 +#define GSID_GPR23 0x1017 +#define GSID_GPR24 0x1018 +#define GSID_GPR25 0x1019 +#define GSID_GPR26 0x101A +#define GSID_GPR27 0x101B +#define GSID_GPR28 0x101C +#define GSID_GPR29 0x101D +#define GSID_GPR30 0x101E +#define GSID_GPR31 0x101F +#define GSID_HDEC_EXPIRY_TB 0x1020 +#define GSID_NIA 0x1021 +#define GSID_MSR 0x1022 +#define GSID_LR 0x1023 +#define GSID_XER 0x1024 +#define GSID_CTR 0x1025 +#define GSID_CFAR 0x1026 +#define GSID_SRR0 0x1027 +#define GSID_SRR1 0x1028 +#define GSID_DAR 0x1029 +#define GSID_DEC_EXPIRY_TB 0x102A +#define GSID_VTB 0x102B +#define GSID_LPCR 0x102C +#define GSID_HFSCR 0x102D +#define GSID_FSCR 0x102E +#define GSID_FPSCR 0x102F +#define GSID_DAWR0 0x1030 +#define GSID_DAWR1 0x1031 +#define GSID_CIABR 0x1032 +#define GSID_PURR 0x1033 +#define GSID_SPURR 0x1034 +#define GSID_IC 0x1035 +#define GSID_SPRG0 0x1036 +#define GSID_SPRG1 0x1037 +#define GSID_SPRG2 0x1038 +#define GSID_SPRG3 0x1039 +#define GSID_PPR 0x103A +#define GSID_MMCR0 0x103B +#define GSID_MMCR1 0x103C +#define GSID_MMCR2 0x103D +#define GSID_MMCR3 0x103E +#define GSID_MMCRA 0x103F +#define GSID_SIER 0x1040 +#define GSID_SIER2 0x1041 +#define GSID_SIER3 0x1042 +#define GSID_BESCR 0x1043 +#define GSID_EBBHR 0x1044 +#define GSID_EBBRR 0x1045 +#define GSID_AMR 0x1046 +#define GSID_IAMR 0x1047 +#define GSID_AMOR 0x1048 +#define GSID_UAMOR 0x1049 +#define GSID_SDAR 0x104A +#define GSID_SIAR 0x104B +#define GSID_DSCR 0x104C +#define GSID_TAR 0x104D +#define GSID_DEXCR 0x104E +#define GSID_HDEXCR 0x104F +#define GSID_HASHKEYR 0x1050 +#define GSID_HASHPKEYR 0x1051 +#define GSID_CTRL 0x1052 + +#define GSID_CR 0x2000 +#define GSID_PIDR 0x2001 +#define GSID_DSISR 0x2002 +#define GSID_VSCR 0x2003 +#define GSID_VRSAVE 0x2004 +#define GSID_DAWRX0 0x2005 +#define GSID_DAWRX1 0x2006 +#define GSID_PMC1 0x2007 +#define GSID_PMC2 0x2008 +#define GSID_PMC3 0x2009 +#define GSID_PMC4 0x200A +#define GSID_PMC5 0x200B +#define GSID_PMC6 0x200C +#define GSID_WORT 0x200D +#define GSID_PSPB 0x200E + +#define GSID_VSRS0 0x3000 +#define GSID_VSRS1 0x3001 +#define GSID_VSRS2 0x3002 +#define GSID_VSRS3 0x3003 +#define GSID_VSRS4 0x3004 +#define GSID_VSRS5 0x3005 +#define GSID_VSRS6 0x3006 +#define GSID_VSRS7 0x3007 +#define GSID_VSRS8 0x3008 +#define GSID_VSRS9 0x3009 +#define GSID_VSRS10 0x300A +#define GSID_VSRS11 0x300B +#define GSID_VSRS12 0x300C +#define GSID_VSRS13 0x300D +#define GSID_VSRS14 0x300E +#define GSID_VSRS15 0x300F +#define GSID_VSRS16 0x3010 +#define GSID_VSRS17 0x3011 +#define GSID_VSRS18 0x3012 +#define GSID_VSRS19 0x3013 +#define GSID_VSRS20 0x3014 +#define GSID_VSRS21 0x3015 +#define GSID_VSRS22 0x3016 +#define GSID_VSRS23 0x3017 +#define GSID_VSRS24 0x3018 +#define GSID_VSRS25 0x3019 +#define GSID_VSRS26 0x301A +#define GSID_VSRS27 0x301B +#define GSID_VSRS28 0x301C +#define GSID_VSRS29 0x301D +#define GSID_VSRS30 0x301E +#define GSID_VSRS31 0x301F +#define GSID_VSRS32 0x3020 +#define GSID_VSRS33 0x3021 +#define GSID_VSRS34 0x3022 +#define GSID_VSRS35 0x3023 +#define GSID_VSRS36 0x3024 +#define GSID_VSRS37 0x3025 +#define GSID_VSRS38 0x3026 +#define GSID_VSRS39 0x3027 +#define GSID_VSRS40 0x3028 +#define GSID_VSRS41 0x3029 +#define GSID_VSRS42 0x302A +#define GSID_VSRS43 0x302B +#define GSID_VSRS44 0x302C +#define GSID_VSRS45 0x302D +#define GSID_VSRS46 0x302E +#define GSID_VSRS47 0x302F +#define GSID_VSRS48 0x3030 +#define GSID_VSRS49 0x3031 +#define GSID_VSRS50 0x3032 +#define GSID_VSRS51 0x3033 +#define GSID_VSRS52 0x3034 +#define GSID_VSRS53 0x3035 +#define GSID_VSRS54 0x3036 +#define GSID_VSRS55 0x3037 +#define GSID_VSRS56 0x3038 +#define GSID_VSRS57 0x3039 +#define GSID_VSRS58 0x303A +#define GSID_VSRS59 0x303B +#define GSID_VSRS60 0x303C +#define GSID_VSRS61 0x303D +#define GSID_VSRS62 0x303E +#define GSID_VSRS63 0x303F + +#define GSID_HDAR 0xF000 +#define GSID_HDSISR 0xF001 +#define GSID_HEIR 0xF002 +#define GSID_ASDR 0xF003 + + +#define GSE_GUESTWIDE_START GSID_BLANK +#define GSE_GUESTWIDE_END GSID_PROCESS_TABLE +#define GSE_GUESTWIDE_COUNT (GSE_GUESTWIDE_END - GSE_GUESTWIDE_START + 1) + +#define GSE_META_START GSID_RUN_INPUT +#define GSE_META_END GSID_VPA +#define GSE_META_COUNT (GSE_META_END - GSE_META_START + 1) + +#define GSE_DW_REGS_START GSID_GPR0 +#define GSE_DW_REGS_END GSID_CTRL +#define GSE_DW_REGS_COUNT (GSE_DW_REGS_END - GSE_DW_REGS_START + 1) + +#define GSE_W_REGS_START GSID_CR +#define GSE_W_REGS_END GSID_PSPB +#define GSE_W_REGS_COUNT (GSE_W_REGS_END - GSE_W_REGS_START + 1) + +#define GSE_VSRS_START GSID_VSRS0 +#define GSE_VSRS_END GSID_VSRS63 +#define GSE_VSRS_COUNT (GSE_VSRS_END - GSE_VSRS_START + 1) + +#define GSE_INTR_REGS_START GSID_HDAR +#define GSE_INTR_REGS_END GSID_ASDR +#define GSE_INTR_REGS_COUNT (GSE_INTR_REGS_END - GSE_INTR_REGS_START + 1) + +#define GSE_IDEN_COUNT \ + (GSE_GUESTWIDE_COUNT + GSE_META_COUNT + GSE_DW_REGS_COUNT + \ + GSE_W_REGS_COUNT + GSE_VSRS_COUNT + GSE_INTR_REGS_COUNT) + + +/** + * Ranges of guest state buffer elements + */ +enum { + GS_CLASS_GUESTWIDE = 0x01, + GS_CLASS_META = 0x02, + GS_CLASS_DWORD_REG = 0x04, + GS_CLASS_WORD_REG = 0x08, + GS_CLASS_VECTOR = 0x10, + GS_CLASS_INTR = 0x20, +}; + +/** + * Types of guest state buffer elements + */ +enum { + GSE_BE32, + GSE_BE64, + GSE_VEC128, + GSE_PARTITION_TABLE, + GSE_PROCESS_TABLE, + GSE_BUFFER, + __GSE_TYPE_MAX, +}; + +/** + * Flags for guest state elements + */ +enum { + GS_FLAGS_WIDE = 0x01, +}; + +/** + * struct gs_part_table - deserialized partition table information element + * @address: start of the partition table + * @ea_bits: number of bits in the effective address + * @gpd_size: root page directory size + */ +struct gs_part_table { + u64 address; + u64 ea_bits; + u64 gpd_size; +}; + +/** + * struct gs_proc_table - deserialized process table information element + * @address: start of the process table + * @gpd_size: process table size + */ +struct gs_proc_table { + u64 address; + u64 gpd_size; +}; + +/** + * struct gs_buff_info - deserialized meta guest state buffer information + * @address: start of the guest state buffer + * @size: size of the guest state buffer + */ +struct gs_buff_info { + u64 address; + u64 size; +}; + +/** + * struct gs_header - serialized guest state buffer header + * @nelem: count of guest state elements in the buffer + * @data: start of the stream of elements in the buffer + */ +struct gs_header { + __be32 nelems; + char data[]; +} __packed; + +/** + * struct gs_elem - serialized guest state buffer element + * @iden: Guest State ID + * @len: length of data + * @data: the guest state buffer element's value + */ +struct gs_elem { + __be16 iden; + __be16 len; + char data[]; +} __packed; + +/** + * struct gs_buff - a guest state buffer with metadata. + * @capacity: total length of the buffer + * @len: current length of the elements and header + * @guest_id: guest id associated with the buffer + * @vcpu_id: vcpu_id associated with the buffer + * @hdr: the serialised guest state buffer + */ +struct gs_buff { + size_t capacity; + size_t len; + unsigned long guest_id; + unsigned long vcpu_id; + struct gs_header *hdr; +}; + +/** + * struct gs_bitmap - a bitmap for element ids + * @bitmap: a bitmap large enough for all Guest State IDs + */ +struct gs_bitmap { +/* private: */ + DECLARE_BITMAP(bitmap, GSE_IDEN_COUNT); +}; + +/** + * struct gs_parser - a map of element ids to locations in a buffer + * @iterator: bitmap used for iterating + * @gses: contains the pointers to elements + * + * A guest state parser is used for deserialising a guest state buffer. + * Given a buffer, it then allows looking up guest state elements using + * a guest state id. + */ +struct gs_parser { +/* private: */ + struct gs_bitmap iterator; + struct gs_elem *gses[GSE_IDEN_COUNT]; +}; + +enum { + GSM_GUEST_WIDE = 0x1, + GSM_SEND = 0x2, + GSM_RECEIVE = 0x4, + GSM_GSB_OWNER = 0x8, +}; + +struct gs_msg; + +/** + * struct gs_msg_ops - guest state message behavior + * @get_size: maximum size required for the message data + * @fill_info: serializes to the guest state buffer format + * @refresh_info: dserializes from the guest state buffer format + */ +struct gs_msg_ops { + size_t (*get_size)(struct gs_msg *gsm); + int (*fill_info)(struct gs_buff *gsb, struct gs_msg *gsm); + int (*refresh_info)(struct gs_msg *gsm, struct gs_buff *gsb); +}; + +/** + * struct gs_msg - a guest state message + * @bitmap: the guest state ids that should be included + * @ops: modify message behavior for reading and writing to buffers + * @flags: guest wide or thread wide + * @data: location where buffer data will be written to or from. + * + * A guest state message is allows flexibility in sending in receiving data + * in a guest state buffer format. + */ +struct gs_msg { + struct gs_bitmap bitmap; + struct gs_msg_ops *ops; + unsigned long flags; + void *data; +}; + +/************************************************************************** + * Guest State IDs + **************************************************************************/ + +u16 gsid_size(u16 iden); +unsigned long gsid_flags(u16 iden); +u64 gsid_mask(u16 iden); + +/************************************************************************** + * Guest State Buffers + **************************************************************************/ +struct gs_buff *gsb_new(size_t size, unsigned long guest_id, + unsigned long vcpu_id, gfp_t flags); +void gsb_free(struct gs_buff *gsb); +void *gsb_put(struct gs_buff *gsb, size_t size); + +/** + * gsb_header() - the header of a guest state buffer + * @gsb: guest state buffer + * + * Returns a pointer to the buffer header. + */ +static inline struct gs_header *gsb_header(struct gs_buff *gsb) +{ + return gsb->hdr; +} + +/** + * gsb_data() - the elements of a guest state buffer + * @gsb: guest state buffer + * + * Returns a pointer to the first element of the buffer data. + */ +static inline struct gs_elem *gsb_data(struct gs_buff *gsb) +{ + return (struct gs_elem *)gsb_header(gsb)->data; +} + +/** + * gsb_len() - the current length of a guest state buffer + * @gsb: guest state buffer + * + * Returns the length including the header of a buffer. + */ +static inline size_t gsb_len(struct gs_buff *gsb) +{ + return gsb->len; +} + +/** + * gsb_capacity() - the capacity of a guest state buffer + * @gsb: guest state buffer + * + * Returns the capacity of a buffer. + */ +static inline size_t gsb_capacity(struct gs_buff *gsb) +{ + return gsb->capacity; +} + +/** + * gsb_paddress() - the physical address of buffer + * @gsb: guest state buffer + * + * Returns the physical address of the buffer. + */ +static inline u64 gsb_paddress(struct gs_buff *gsb) +{ + return __pa(gsb_header(gsb)); +} + +/** + * gsb_nelems() - the number of elements in a buffer + * @gsb: guest state buffer + * + * Returns the number of elements in a buffer + */ +static inline u32 gsb_nelems(struct gs_buff *gsb) +{ + return be32_to_cpu(gsb_header(gsb)->nelems); +} + +/** + * gsb_reset() - empty a guest state buffer + * @gsb: guest state buffer + * + * Reset the number of elements and length of buffer to empty. + */ +static inline void gsb_reset(struct gs_buff *gsb) +{ + gsb_header(gsb)->nelems = cpu_to_be32(0); + gsb->len = sizeof(struct gs_header); +} + +/** + * gsb_data_len() - the length of a buffer excluding the header + * @gsb: guest state buffer + * + * Returns the length of a buffer excluding the header + */ +static inline size_t gsb_data_len(struct gs_buff *gsb) +{ + return gsb->len - sizeof(struct gs_header); +} + +/** + * gsb_data_cap() - the capacity of a buffer excluding the header + * @gsb: guest state buffer + * + * Returns the capacity of a buffer excluding the header + */ +static inline size_t gsb_data_cap(struct gs_buff *gsb) +{ + return gsb->capacity - sizeof(struct gs_header); +} + +/** + * gsb_for_each_elem - iterate over the elements in a buffer + * @i: loop counter + * @pos: set to current element + * @gsb: guest state buffer + * @rem: initialized to buffer capacity, holds bytes currently remaining in stream + */ +#define gsb_for_each_elem(i, pos, gsb, rem) \ + gse_for_each_elem(i, gsb_nelems(gsb), pos, gsb_data(gsb), \ + gsb_data_cap(gsb), rem) + +/************************************************************************** + * Guest State Elements + **************************************************************************/ + +/** + * gse_iden() - guest state ID of element + * @gse: guest state element + * + * Return the guest state ID in host endianness. + */ +static inline u16 gse_iden(const struct gs_elem *gse) +{ + return be16_to_cpu(gse->iden); +} + +/** + * gse_len() - length of guest state element data + * @gse: guest state element + * + * Returns the length of guest state element data + */ +static inline u16 gse_len(const struct gs_elem *gse) +{ + return be16_to_cpu(gse->len); +} + +/** + * gse_total_len() - total length of guest state element + * @gse: guest state element + * + * Returns the length of the data plus the ID and size header. + */ +static inline u16 gse_total_len(const struct gs_elem *gse) +{ + return be16_to_cpu(gse->len) + sizeof(*gse); +} + +/** + * gse_total_size() - space needed for a given data length + * @size: data length + * + * Returns size plus the space needed for the ID and size header. + */ +static inline u16 gse_total_size(u16 size) +{ + return sizeof(struct gs_elem) + size; +} + +/** + * gse_data() - pointer to data of a guest state element + * @gse: guest state element + * + * Returns a pointer to the beginning of guest state element data. + */ +static inline void *gse_data(const struct gs_elem *gse) +{ + return (void *)gse->data; +} + +/** + * gse_ok() - checks space exists for guest state element + * @gse: guest state element + * @remaining: bytes of space remaining + * + * Returns true if the guest state element can fit in remaining space. + */ +static inline bool gse_ok(const struct gs_elem *gse, int remaining) +{ + return remaining >= gse_total_len(gse); +} + +/** + * gse_next() - iterate to the next guest state element in a stream + * @gse: stream of guest state elements + * @remaining: length of the guest element stream + * + * Returns the next guest state element in a stream of elements. The length of + * the stream is updated in remaining. + */ +static inline struct gs_elem *gse_next(const struct gs_elem *gse, + int *remaining) +{ + int len = sizeof(*gse) + gse_len(gse); + + *remaining -= len; + return (struct gs_elem *)(gse->data + gse_len(gse)); +} + +/** + * gse_for_each_elem - iterate over a stream of guest state elements + * @i: loop counter + * @max: number of elements + * @pos: set to current element + * @head: head of elements + * @len: length of the stream + * @rem: initialized to len, holds bytes currently remaining elements + */ +#define gse_for_each_elem(i, max, pos, head, len, rem) \ + for (i = 0, pos = head, rem = len; gse_ok(pos, rem) && i < max; \ + pos = gse_next(pos, &(rem)), i++) + +int __gse_put(struct gs_buff *gsb, u16 iden, u16 size, const void *data); +int gse_parse(struct gs_parser *gsp, struct gs_buff *gsb); + +/** + * gse_put_be32() - add a be32 guest state element to a buffer + * @gsb: guest state buffer to add element to + * @iden: guest state ID + * @val: big endian value + */ +static inline int gse_put_be32(struct gs_buff *gsb, u16 iden, __be32 val) +{ + __be32 tmp; + + tmp = val; + return __gse_put(gsb, iden, sizeof(__be32), &tmp); +} + +/** + * gse_put_u32() - add a host endian 32bit int guest state element to a buffer + * @gsb: guest state buffer to add element to + * @iden: guest state ID + * @val: host endian value + */ +static inline int gse_put_u32(struct gs_buff *gsb, u16 iden, u32 val) +{ + __be32 tmp; + + tmp = cpu_to_be32(val); + return gse_put_be32(gsb, iden, tmp); +} + +/** + * gse_put_be64() - add a be64 guest state element to a buffer + * @gsb: guest state buffer to add element to + * @iden: guest state ID + * @val: big endian value + */ +static inline int gse_put_be64(struct gs_buff *gsb, u16 iden, __be64 val) +{ + __be64 tmp; + + tmp = val; + return __gse_put(gsb, iden, sizeof(__be64), &tmp); +} + +/** + * gse_put_u64() - add a host endian 64bit guest state element to a buffer + * @gsb: guest state buffer to add element to + * @iden: guest state ID + * @val: host endian value + */ +static inline int gse_put_u64(struct gs_buff *gsb, u16 iden, u64 val) +{ + __be64 tmp; + + tmp = cpu_to_be64(val); + return gse_put_be64(gsb, iden, tmp); +} + +/** + * __gse_put_reg() - add a register type guest state element to a buffer + * @gsb: guest state buffer to add element to + * @iden: guest state ID + * @val: host endian value + * + * Adds a register type guest state element. Uses the guest state ID for + * determining the length of the guest element. If the guest state ID has + * bits that can not be set they will be cleared. + */ +static inline int __gse_put_reg(struct gs_buff *gsb, u16 iden, u64 val) +{ + val &= gsid_mask(iden); + if (gsid_size(iden) == sizeof(u64)) + return gse_put_u64(gsb, iden, val); + + if (gsid_size(iden) == sizeof(u32)) { + u32 tmp; + + tmp = (u32)val; + if (tmp != val) + return -EINVAL; + + return gse_put_u32(gsb, iden, tmp); + } + return -EINVAL; +} + +/** + * gse_put_vector128() - add a vector guest state element to a buffer + * @gsb: guest state buffer to add element to + * @iden: guest state ID + * @val: 16 byte vector value + */ +static inline int gse_put_vector128(struct gs_buff *gsb, u16 iden, + vector128 val) +{ + __be64 tmp[2]; + union { + __vector128 v; + u64 dw[2]; + } u; + + u.v = val; + tmp[0] = cpu_to_be64(u.dw[TS_FPROFFSET]); + tmp[1] = cpu_to_be64(u.dw[TS_VSRLOWOFFSET]); + return __gse_put(gsb, iden, sizeof(tmp), &tmp); +} + +/** + * gse_put_part_table() - add a partition table guest state element to a buffer + * @gsb: guest state buffer to add element to + * @iden: guest state ID + * @val: partition table value + */ +static inline int gse_put_part_table(struct gs_buff *gsb, u16 iden, + struct gs_part_table val) +{ + __be64 tmp[3]; + + tmp[0] = cpu_to_be64(val.address); + tmp[1] = cpu_to_be64(val.ea_bits); + tmp[2] = cpu_to_be64(val.gpd_size); + return __gse_put(gsb, GSID_PARTITION_TABLE, sizeof(tmp), &tmp); +} + +/** + * gse_put_proc_table() - add a process table guest state element to a buffer + * @gsb: guest state buffer to add element to + * @iden: guest state ID + * @val: process table value + */ +static inline int gse_put_proc_table(struct gs_buff *gsb, u16 iden, + struct gs_proc_table val) +{ + __be64 tmp[2]; + + tmp[0] = cpu_to_be64(val.address); + tmp[1] = cpu_to_be64(val.gpd_size); + return __gse_put(gsb, GSID_PROCESS_TABLE, sizeof(tmp), &tmp); +} + +/** + * gse_put_buff_info() - adds a GSB description guest state element to a buffer + * @gsb: guest state buffer to add element to + * @iden: guest state ID + * @val: guest state buffer description value + */ +static inline int gse_put_buff_info(struct gs_buff *gsb, u16 iden, + struct gs_buff_info val) +{ + __be64 tmp[2]; + + tmp[0] = cpu_to_be64(val.address); + tmp[1] = cpu_to_be64(val.size); + return __gse_put(gsb, iden, sizeof(tmp), &tmp); +} + +int __gse_put(struct gs_buff *gsb, u16 iden, u16 size, const void *data); + +/** + * gse_get_be32() - return the data of a be32 element + * @gse: guest state element + */ +static inline __be32 gse_get_be32(const struct gs_elem *gse) +{ + return *(__be32 *)gse_data(gse); +} + +/** + * gse_get_u32() - return the data of a be32 element in host endianness + * @gse: guest state element + */ +static inline u32 gse_get_u32(const struct gs_elem *gse) +{ + return be32_to_cpu(gse_get_be32(gse)); +} + +/** + * gse_get_be64() - return the data of a be64 element + * @gse: guest state element + */ +static inline __be64 gse_get_be64(const struct gs_elem *gse) +{ + return *(__be64 *)gse_data(gse); +} + +/** + * gse_get_u64() - return the data of a be64 element in host endianness + * @gse: guest state element + */ +static inline u64 gse_get_u64(const struct gs_elem *gse) +{ + return be64_to_cpu(gse_get_be64(gse)); +} + +/** + * __gse_get_reg() - return the date of a register type guest state element + * @gse: guest state element + * + * Determine the element data size from its guest state ID and return the + * correctly sized value. + */ +static inline u64 __gse_get_reg(const struct gs_elem *gse) +{ + if (gse_len(gse) == sizeof(u64)) + return gse_get_u64(gse); + + if (gse_len(gse) == sizeof(u32)) { + u32 tmp; + + tmp = gse_get_u32(gse); + return (u64)tmp; + } + return 0; +} + +/** + * gse_get_vector128() - return the data of a vector element + * @gse: guest state element + */ +static inline vector128 gse_get_vector128(const struct gs_elem *gse) +{ + union { + __vector128 v; + u64 dw[2]; + } u; + __be64 *src; + + src = (__be64 *)gse_data(gse); + u.dw[TS_FPROFFSET] = be64_to_cpu(src[0]); + u.dw[TS_VSRLOWOFFSET] = be64_to_cpu(src[1]); + return u.v; +} + +/** + * gse_put - add a guest state element to a buffer + * @gsb: guest state buffer to add to + * @iden: guest state identity + * @v: generic value + */ +#define gse_put(gsb, iden, v) \ + (_Generic((v), \ + u64 : __gse_put_reg, \ + long unsigned int : __gse_put_reg, \ + u32 : __gse_put_reg, \ + struct gs_buff_info : gse_put_buff_info, \ + struct gs_proc_table : gse_put_proc_table, \ + struct gs_part_table : gse_put_part_table, \ + vector128 : gse_put_vector128)(gsb, iden, v)) + +/** + * gse_get - return the data of a guest state element + * @gsb: guest state element to add to + * @v: generic value pointer to return in + */ +#define gse_get(gse, v) \ + (*v = (_Generic((v), \ + u64 * : __gse_get_reg, \ + unsigned long * : __gse_get_reg, \ + u32 * : __gse_get_reg, \ + vector128 * : gse_get_vector128)(gse))) + +/************************************************************************** + * Guest State Bitmap + **************************************************************************/ + +bool gsbm_test(struct gs_bitmap *gsbm, u16 iden); +void gsbm_set(struct gs_bitmap *gsbm, u16 iden); +void gsbm_clear(struct gs_bitmap *gsbm, u16 iden); +u16 gsbm_next(struct gs_bitmap *gsbm, u16 prev); + +/** + * gsbm_zero - zero the entire bitmap + * @gsbm: guest state buffer bitmap + */ +static inline void gsbm_zero(struct gs_bitmap *gsbm) +{ + bitmap_zero(gsbm->bitmap, GSE_IDEN_COUNT); +} + +/** + * gsbm_fill - fill the entire bitmap + * @gsbm: guest state buffer bitmap + */ +static inline void gsbm_fill(struct gs_bitmap *gsbm) +{ + bitmap_fill(gsbm->bitmap, GSE_IDEN_COUNT); + clear_bit(0, gsbm->bitmap); +} + +/** + * gsbm_for_each - iterate the present guest state IDs + * @gsbm: guest state buffer bitmap + * @iden: current guest state ID + */ +#define gsbm_for_each(gsbm, iden) \ + for (iden = gsbm_next(gsbm, 0); iden != 0; iden = gsbm_next(gsbm, iden)) + + +/************************************************************************** + * Guest State Parser + **************************************************************************/ + +void gsp_insert(struct gs_parser *gsp, u16 iden, struct gs_elem *gse); +struct gs_elem *gsp_lookup(struct gs_parser *gsp, u16 iden); + +/** + * gsp_for_each - iterate the pairs + * @gsp: guest state buffer bitmap + * @iden: current guest state ID + * @gse: guest state element + */ +#define gsp_for_each(gsp, iden, gse) \ + for (iden = gsbm_next(&(gsp)->iterator, 0), \ + gse = gsp_lookup((gsp), iden); \ + iden != 0; iden = gsbm_next(&(gsp)->iterator, iden), \ + gse = gsp_lookup((gsp), iden)) + +/************************************************************************** + * Guest State Message + **************************************************************************/ + +/** + * gsm_for_each - iterate the guest state IDs included in a guest state message + * @gsp: guest state buffer bitmap + * @iden: current guest state ID + * @gse: guest guest state element + */ +#define gsm_for_each(gsm, iden) \ + for (iden = gsbm_next(&gsm->bitmap, 0); iden != 0; \ + iden = gsbm_next(&gsm->bitmap, iden)) + +int gsm_init(struct gs_msg *mgs, struct gs_msg_ops *ops, void *data, + unsigned long flags); + +struct gs_msg *gsm_new(struct gs_msg_ops *ops, void *data, unsigned long flags, + gfp_t gfp_flags); +void gsm_free(struct gs_msg *gsm); +size_t gsm_size(struct gs_msg *gsm); +int gsm_fill_info(struct gs_msg *gsm, struct gs_buff *gsb); +int gsm_refresh_info(struct gs_msg *gsm, struct gs_buff *gsb); + +/** + * gsm_include - indicate a guest state ID should be included when serializing + * @gsm: guest state message + * @iden: guest state ID + */ +static inline void gsm_include(struct gs_msg *gsm, u16 iden) +{ + gsbm_set(&gsm->bitmap, iden); +} + +/** + * gsm_includes - check if a guest state ID will be included when serializing + * @gsm: guest state message + * @iden: guest state ID + */ +static inline bool gsm_includes(struct gs_msg *gsm, u16 iden) +{ + return gsbm_test(&gsm->bitmap, iden); +} + +/** + * gsm_includes - indicate all guest state IDs should be included when serializing + * @gsm: guest state message + * @iden: guest state ID + */ +static inline void gsm_include_all(struct gs_msg *gsm) +{ + gsbm_fill(&gsm->bitmap); +} + +/** + * gsm_include - clear the guest state IDs that should be included when serializing + * @gsm: guest state message + */ +static inline void gsm_reset(struct gs_msg *gsm) +{ + gsbm_zero(&gsm->bitmap); +} + +#endif /* _ASM_POWERPC_GUEST_STATE_BUFFER_H */ diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index c4db459d304a..9e9e41aa8c3b 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -49,7 +49,8 @@ extra-$(CONFIG_PPC64) += crtsavres.o endif obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \ - memcpy_power7.o restart_table.o + memcpy_power7.o restart_table.o \ + guest-state-buffer.o test-guest-state-buffer.o obj64-y += copypage_64.o copyuser_64.o mem_64.o hweight_64.o \ memcpy_64.o copy_mc_64.o diff --git a/arch/powerpc/lib/guest-state-buffer.c b/arch/powerpc/lib/guest-state-buffer.c new file mode 100644 index 000000000000..35ecb37c95d7 --- /dev/null +++ b/arch/powerpc/lib/guest-state-buffer.c @@ -0,0 +1,560 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "asm/hvcall.h" +#include +#include +#include + +static const u16 gse_iden_len[__GSE_TYPE_MAX] = { + [GSE_BE32] = sizeof(__be32), + [GSE_BE64] = sizeof(__be64), + [GSE_VEC128] = sizeof(vector128), + [GSE_PARTITION_TABLE] = sizeof(struct gs_part_table), + [GSE_PROCESS_TABLE] = sizeof(struct gs_proc_table), + [GSE_BUFFER] = sizeof(struct gs_buff_info), +}; + +/** + * gsb_new() - create a new guest state buffer + * @size: total size of the guest state buffer (includes header) + * @guest_id: guest_id + * @vcpu_id: vcpu_id + * @flags: GFP flags + * + * Returns a guest state buffer. + */ +struct gs_buff *gsb_new(size_t size, unsigned long guest_id, + unsigned long vcpu_id, gfp_t flags) +{ + struct gs_buff *gsb; + + gsb = kzalloc(sizeof(*gsb), flags); + if (!gsb) + return NULL; + + size = roundup_pow_of_two(size); + gsb->hdr = kzalloc(size, GFP_KERNEL); + if (!gsb->hdr) + goto free; + + gsb->capacity = size; + gsb->len = sizeof(struct gs_header); + gsb->vcpu_id = vcpu_id; + gsb->guest_id = guest_id; + + gsb->hdr->nelems = cpu_to_be32(0); + + return gsb; + +free: + kfree(gsb); + return NULL; +} +EXPORT_SYMBOL(gsb_new); + +/** + * gsb_free() - free a guest state buffer + * @gsb: guest state buffer + */ +void gsb_free(struct gs_buff *gsb) +{ + kfree(gsb->hdr); + kfree(gsb); +} +EXPORT_SYMBOL(gsb_free); + +/** + * gsb_put() - allocate space in a guest state buffer + * @gsb: buffer to allocate in + * @size: amount of space to allocate + * + * Returns a pointer to the amount of space requested within the buffer and + * increments the count of elements in the buffer. + * + * Does not check if there is enough space in the buffer. + */ +void *gsb_put(struct gs_buff *gsb, size_t size) +{ + u32 nelems = gsb_nelems(gsb); + void *p; + + p = (void *)gsb_header(gsb) + gsb_len(gsb); + gsb->len += size; + + gsb_header(gsb)->nelems = cpu_to_be32(nelems + 1); + return p; +} +EXPORT_SYMBOL(gsb_put); + +static int gsid_class(u16 iden) +{ + if ((iden >= GSE_GUESTWIDE_START) && (iden <= GSE_GUESTWIDE_END)) + return GS_CLASS_GUESTWIDE; + + if ((iden >= GSE_META_START) && (iden <= GSE_META_END)) + return GS_CLASS_META; + + if ((iden >= GSE_DW_REGS_START) && (iden <= GSE_DW_REGS_END)) + return GS_CLASS_DWORD_REG; + + if ((iden >= GSE_W_REGS_START) && (iden <= GSE_W_REGS_END)) + return GS_CLASS_WORD_REG; + + if ((iden >= GSE_VSRS_START) && (iden <= GSE_VSRS_END)) + return GS_CLASS_VECTOR; + + if ((iden >= GSE_INTR_REGS_START) && (iden <= GSE_INTR_REGS_END)) + return GS_CLASS_INTR; + + return -1; +} + +static int gsid_type(u16 iden) +{ + int type = -1; + + switch (gsid_class(iden)) { + case GS_CLASS_GUESTWIDE: + switch (iden) { + case GSID_HOST_STATE_SIZE: + case GSID_RUN_OUTPUT_MIN_SIZE: + case GSID_TB_OFFSET: + type = GSE_BE64; + break; + case GSID_PARTITION_TABLE: + type = GSE_PARTITION_TABLE; + break; + case GSID_PROCESS_TABLE: + type = GSE_PROCESS_TABLE; + break; + case GSID_LOGICAL_PVR: + type = GSE_BE32; + break; + } + break; + case GS_CLASS_META: + switch (iden) { + case GSID_RUN_INPUT: + case GSID_RUN_OUTPUT: + type = GSE_BUFFER; + break; + case GSID_VPA: + type = GSE_BE64; + break; + } + break; + case GS_CLASS_DWORD_REG: + type = GSE_BE64; + break; + case GS_CLASS_WORD_REG: + type = GSE_BE32; + break; + case GS_CLASS_VECTOR: + type = GSE_VEC128; + break; + case GS_CLASS_INTR: + switch (iden) { + case GSID_HDAR: + case GSID_ASDR: + type = GSE_BE64; + break; + case GSID_HEIR: + case GSID_HDSISR: + type = GSE_BE32; + break; + } + break; + } + + return type; +} + +/** + * gsid_flags() - the flags for a guest state ID + * @iden: guest state ID + * + * Returns any flags for the guest state ID. + */ +unsigned long gsid_flags(u16 iden) +{ + unsigned long flags = 0; + + switch (gsid_class(iden)) { + case GS_CLASS_GUESTWIDE: + flags = GS_FLAGS_WIDE; + break; + case GS_CLASS_META: + case GS_CLASS_DWORD_REG: + case GS_CLASS_WORD_REG: + case GS_CLASS_VECTOR: + case GS_CLASS_INTR: + break; + } + + return flags; +} + +/** + * gsid_size() - the size of a guest state ID + * @iden: guest state ID + * + * Returns the size of guest state ID. + */ +u16 gsid_size(u16 iden) +{ + int type; + + type = gsid_type(iden); + if (type == -1) + return 0; + + if (type >= __GSE_TYPE_MAX) + return 0; + + return gse_iden_len[type]; +} + +/** + * gsid_mask() - the settable bits of a guest state ID + * @iden: guest state ID + * + * Returns a mask of settable bits for a guest state ID. + */ +u64 gsid_mask(u16 iden) +{ + u64 mask = ~0ull; + + switch (iden) { + case GSID_LPCR: + mask = LPCR_DPFD | LPCR_ILE | LPCR_AIL | LPCR_LD | LPCR_MER | LPCR_GTSE; + break; + case GSID_MSR: + mask = ~(MSR_HV | MSR_S | MSR_ME); + break; + } + + return mask; +} + +/** + * __gse_put() - add a guest state element to a buffer + * @gsb: buffer to the element to + * @iden: guest state ID + * @size: length of data + * @data: pointer to data + */ +int __gse_put(struct gs_buff *gsb, u16 iden, u16 size, const void *data) +{ + struct gs_elem *gse; + u16 total_size; + + total_size = sizeof(*gse) + size; + if (total_size + gsb_len(gsb) > gsb_capacity(gsb)) + return -ENOMEM; + + if (gsid_size(iden) != size) + return -EINVAL; + + gse = gsb_put(gsb, total_size); + gse->iden = cpu_to_be16(iden); + gse->len = cpu_to_be16(size); + memcpy(gse->data, data, size); + + return 0; +} +EXPORT_SYMBOL(__gse_put); + +/** + * gse_parse() - create a parse map from a guest state buffer + * @gsp: guest state parser + * @gsb: guest state buffer + */ +int gse_parse(struct gs_parser *gsp, struct gs_buff *gsb) +{ + struct gs_elem *curr; + int rem, i; + + gsb_for_each_elem(i, curr, gsb, rem) { + if (gse_len(curr) != gsid_size(gse_iden(curr))) + return -EINVAL; + gsp_insert(gsp, gse_iden(curr), curr); + } + + if (gsb_nelems(gsb) != i) + return -EINVAL; + return 0; +} +EXPORT_SYMBOL(gse_parse); + +static inline int gse_flatten_iden(u16 iden) +{ + int bit = 0; + int class; + + class = gsid_class(iden); + + if (class == GS_CLASS_GUESTWIDE) { + bit += iden - GSE_GUESTWIDE_START; + return bit; + } + + bit += GSE_GUESTWIDE_COUNT; + + if (class == GS_CLASS_META) { + bit += iden - GSE_META_START; + return bit; + } + + bit += GSE_META_COUNT; + + if (class == GS_CLASS_DWORD_REG) { + bit += iden - GSE_DW_REGS_START; + return bit; + } + + bit += GSE_DW_REGS_COUNT; + + if (class == GS_CLASS_WORD_REG) { + bit += iden - GSE_W_REGS_START; + return bit; + } + + bit += GSE_W_REGS_COUNT; + + if (class == GS_CLASS_VECTOR) { + bit += iden - GSE_VSRS_START; + return bit; + } + + bit += GSE_VSRS_COUNT; + + if (class == GS_CLASS_INTR) { + bit += iden - GSE_INTR_REGS_START; + return bit; + } + + return 0; +} + +static inline u16 gse_unflatten_iden(int bit) +{ + u16 iden; + + if (bit < GSE_GUESTWIDE_COUNT) { + iden = GSE_GUESTWIDE_START + bit; + return iden; + } + bit -= GSE_GUESTWIDE_COUNT; + + if (bit < GSE_META_COUNT) { + iden = GSE_META_START + bit; + return iden; + } + bit -= GSE_META_COUNT; + + if (bit < GSE_DW_REGS_COUNT) { + iden = GSE_DW_REGS_START + bit; + return iden; + } + bit -= GSE_DW_REGS_COUNT; + + if (bit < GSE_W_REGS_COUNT) { + iden = GSE_W_REGS_START + bit; + return iden; + } + bit -= GSE_W_REGS_COUNT; + + if (bit < GSE_VSRS_COUNT) { + iden = GSE_VSRS_START + bit; + return iden; + } + bit -= GSE_VSRS_COUNT; + + if (bit < GSE_IDEN_COUNT) { + iden = GSE_INTR_REGS_START + bit; + return iden; + } + + return 0; +} + +/** + * gsp_insert() - add a mapping from an guest state ID to an element + * @gsp: guest state parser + * @iden: guest state id (key) + * @gse: guest state element (value) + */ +void gsp_insert(struct gs_parser *gsp, u16 iden, struct gs_elem *gse) +{ + int i; + + i = gse_flatten_iden(iden); + gsbm_set(&gsp->iterator, iden); + gsp->gses[i] = gse; +} +EXPORT_SYMBOL(gsp_insert); + +/** + * gsp_lookup() - lookup an element from a guest state ID + * @gsp: guest state parser + * @iden: guest state ID (key) + * + * Returns the guest state element if present. + */ +struct gs_elem *gsp_lookup(struct gs_parser *gsp, u16 iden) +{ + int i; + + i = gse_flatten_iden(iden); + return gsp->gses[i]; +} +EXPORT_SYMBOL(gsp_lookup); + +/** + * gsbm_set() - set the guest state ID + * @gsbm: guest state bitmap + * @iden: guest state ID + */ +void gsbm_set(struct gs_bitmap *gsbm, u16 iden) +{ + set_bit(gse_flatten_iden(iden), gsbm->bitmap); +} +EXPORT_SYMBOL(gsbm_set); + +/** + * gsbm_clear() - clear the guest state ID + * @gsbm: guest state bitmap + * @iden: guest state ID + */ +void gsbm_clear(struct gs_bitmap *gsbm, u16 iden) +{ + clear_bit(gse_flatten_iden(iden), gsbm->bitmap); +} +EXPORT_SYMBOL(gsbm_clear); + +/** + * gsbm_test() - test the guest state ID + * @gsbm: guest state bitmap + * @iden: guest state ID + */ +bool gsbm_test(struct gs_bitmap *gsbm, u16 iden) +{ + return test_bit(gse_flatten_iden(iden), gsbm->bitmap); +} +EXPORT_SYMBOL(gsbm_test); + +/** + * gsbm_next() - return the next set guest state ID + * @gsbm: guest state bitmap + * @prev: last guest state ID + */ +u16 gsbm_next(struct gs_bitmap *gsbm, u16 prev) +{ + int bit, pbit; + + pbit = prev ? gse_flatten_iden(prev) + 1 : 0; + bit = find_next_bit(gsbm->bitmap, GSE_IDEN_COUNT, pbit); + + if (bit < GSE_IDEN_COUNT) + return gse_unflatten_iden(bit); + return 0; +} +EXPORT_SYMBOL(gsbm_next); + +/** + * gsm_init() - initialize a guest state message + * @gsm: guest state message + * @ops: callbacks + * @data: private data + * @flags: guest wide or thread wide + */ +int gsm_init(struct gs_msg *gsm, struct gs_msg_ops *ops, void *data, + unsigned long flags) +{ + memset(gsm, 0, sizeof(*gsm)); + gsm->ops = ops; + gsm->data = data; + gsm->flags = flags; + + return 0; +} +EXPORT_SYMBOL(gsm_init); + +/** + * gsm_init() - creates a new guest state message + * @ops: callbacks + * @data: private data + * @flags: guest wide or thread wide + * @gfp_flags: GFP allocation flags + * + * Returns an initialized guest state message. + */ +struct gs_msg *gsm_new(struct gs_msg_ops *ops, void *data, unsigned long flags, + gfp_t gfp_flags) +{ + struct gs_msg *gsm; + + gsm = kzalloc(sizeof(*gsm), gfp_flags); + if (!gsm) + return NULL; + + gsm_init(gsm, ops, data, flags); + + return gsm; +} +EXPORT_SYMBOL(gsm_new); + +/** + * gsm_size() - creates a new guest state message + * @gsm: self + * + * Returns the size required for the message. + */ +size_t gsm_size(struct gs_msg *gsm) +{ + if (gsm->ops->get_size) + return gsm->ops->get_size(gsm); + return 0; +} +EXPORT_SYMBOL(gsm_size); + +/** + * gsm_free() - free guest state message + * @gsm: guest state message + * + * Returns the size required for the message. + */ +void gsm_free(struct gs_msg *gsm) +{ + kfree(gsm); +} +EXPORT_SYMBOL(gsm_free); + +/** + * gsm_fill_info() - serialises message to guest state buffer format + * @gsm: self + * @gsb: buffer to serialise into + */ +int gsm_fill_info(struct gs_msg *gsm, struct gs_buff *gsb) +{ + if (!gsm->ops->fill_info) + return -EINVAL; + + gsb_reset(gsb); + return gsm->ops->fill_info(gsb, gsm); +} +EXPORT_SYMBOL(gsm_fill_info); + +/** + * gsm_fill_info() - deserialises from guest state buffer + * @gsm: self + * @gsb: buffer to serialise from + */ +int gsm_refresh_info(struct gs_msg *gsm, struct gs_buff *gsb) +{ + if (!gsm->ops->fill_info) + return -EINVAL; + + return gsm->ops->refresh_info(gsm, gsb); +} +EXPORT_SYMBOL(gsm_refresh_info); diff --git a/arch/powerpc/lib/test-guest-state-buffer.c b/arch/powerpc/lib/test-guest-state-buffer.c new file mode 100644 index 000000000000..b6853462264a --- /dev/null +++ b/arch/powerpc/lib/test-guest-state-buffer.c @@ -0,0 +1,334 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include + +#include + +#define check(x) \ + do { \ + if (!(x)) \ + pr_err("guest-state-buffer: test failed at line %d\n", \ + __LINE__); \ + } while (0) + +static void __init test_creating_buffer(void) +{ + struct gs_buff *gsb; + size_t size = 0x100; + + gsb = gsb_new(size, 0, 0, GFP_KERNEL); + check(gsb); + if (!gsb) + return; + check(gsb->hdr); + if (!gsb->hdr) + return; + check(gsb->capacity == roundup_pow_of_two(size)); + check(gsb->len == sizeof(__be32)); + + gsb_free(gsb); +} + +static void __init test_adding_element(void) +{ + const struct gs_elem *head, *curr; + union { + __vector128 v; + u64 dw[2]; + } u; + int rem; + struct gs_buff *gsb; + size_t size = 0x1000; + int i, rc; + u64 data; + + gsb = gsb_new(size, 0, 0, GFP_KERNEL); + check(gsb); + if (!gsb) + return; + + /* Single elements, direct use of __gse_put() */ + data = 0xdeadbeef; + rc = __gse_put(gsb, GSID_GPR0, 8, &data); + check(rc >= 0); + + head = gsb_data(gsb); + check(gse_iden(head) == GSID_GPR0); + check(gse_len(head) == 8); + data = 0; + memcpy(&data, gse_data(head), 8); + check(data == 0xdeadbeef); + + /* Multiple elements, simple wrapper */ + rc = gse_put_u64(gsb, GSID_GPR1, 0xcafef00d); + check(rc >= 0); + + u.dw[0] = 0x1; + u.dw[1] = 0x2; + rc = gse_put_vector128(gsb, GSID_VSRS0, u.v); + check(rc >= 0); + u.dw[0] = 0x0; + u.dw[1] = 0x0; + + gsb_for_each_elem(i, curr, gsb, rem) { + switch (i) { + case 0: + check(gse_iden(curr) == GSID_GPR0); + check(gse_len(curr) == 8); + check(gse_get_be64(curr) == 0xdeadbeef); + break; + case 1: + check(gse_iden(curr) == GSID_GPR1); + check(gse_len(curr) == 8); + check(gse_get_u64(curr) == 0xcafef00d); + break; + case 2: + check(gse_iden(curr) == GSID_VSRS0); + check(gse_len(curr) == 16); + u.v = gse_get_vector128(curr); + check(u.dw[0] == 0x1); + check(u.dw[1] = 0x2); + break; + } + } + check(i == 3); + + gsb_reset(gsb); + check(gsb_nelems(gsb) == 0); + check(gsb_len(gsb) == sizeof(struct gs_header)); + + gsb_free(gsb); +} + +static void __init test_gs_parsing(void) +{ + struct gs_elem *gse; + struct gs_parser gsp = { 0 }; + struct gs_buff *gsb; + size_t size = 0x1000; + u64 tmp1, tmp2; + + gsb = gsb_new(size, 0, 0, GFP_KERNEL); + check(gsb); + if (!gsb) + return; + + tmp1 = 0xdeadbeefull; + gse_put(gsb, GSID_GPR0, tmp1); + + check(gse_parse(&gsp, gsb) >= 0); + + gse = gsp_lookup(&gsp, GSID_GPR0); + if (!gse) + return; + gse_get(gse, &tmp2); + check(tmp2 == 0xdeadbeefull); + + gsb_free(gsb); +} + +static void __init test_gs_bitmap(void) +{ + struct gs_bitmap gsbm = { 0 }; + struct gs_bitmap gsbm1 = { 0 }; + struct gs_bitmap gsbm2 = { 0 }; + u16 iden; + int i, j; + + i = 0; + for (u16 iden = GSID_HOST_STATE_SIZE; + iden <= GSID_PROCESS_TABLE; iden++) { + gsbm_set(&gsbm, iden); + gsbm_set(&gsbm1, iden); + check(gsbm_test(&gsbm, iden)); + gsbm_clear(&gsbm, iden); + check(!gsbm_test(&gsbm, iden)); + i++; + } + + for (u16 iden = GSID_RUN_INPUT; iden <= GSID_VPA; + iden++) { + gsbm_set(&gsbm, iden); + gsbm_set(&gsbm1, iden); + check(gsbm_test(&gsbm, iden)); + gsbm_clear(&gsbm, iden); + check(!gsbm_test(&gsbm, iden)); + i++; + } + + for (u16 iden = GSID_GPR0; iden <= GSID_CTRL; + iden++) { + gsbm_set(&gsbm, iden); + gsbm_set(&gsbm1, iden); + check(gsbm_test(&gsbm, iden)); + gsbm_clear(&gsbm, iden); + check(!gsbm_test(&gsbm, iden)); + i++; + } + + for (u16 iden = GSID_CR; iden <= GSID_PSPB; iden++) { + gsbm_set(&gsbm, iden); + gsbm_set(&gsbm1, iden); + check(gsbm_test(&gsbm, iden)); + gsbm_clear(&gsbm, iden); + check(!gsbm_test(&gsbm, iden)); + i++; + } + + for (u16 iden = GSID_VSRS0; iden <= GSID_VSRS63; + iden++) { + gsbm_set(&gsbm, iden); + gsbm_set(&gsbm1, iden); + check(gsbm_test(&gsbm, iden)); + gsbm_clear(&gsbm, iden); + check(!gsbm_test(&gsbm, iden)); + i++; + } + + for (u16 iden = GSID_HDAR; iden <= GSID_ASDR; + iden++) { + gsbm_set(&gsbm, iden); + gsbm_set(&gsbm1, iden); + check(gsbm_test(&gsbm, iden)); + gsbm_clear(&gsbm, iden); + check(!gsbm_test(&gsbm, iden)); + i++; + } + + j = 0; + gsbm_for_each(&gsbm1, iden) + { + gsbm_set(&gsbm2, iden); + j++; + } + check(i == j); + check(!memcmp(&gsbm1, &gsbm2, sizeof(gsbm1))); +} + +struct gs_msg_test1_data { + u64 a; + u32 b; + struct gs_part_table c; + struct gs_proc_table d; + struct gs_buff_info e; +}; + +static size_t __init test1_get_size(struct gs_msg *gsm) +{ + size_t size = 0; + u16 ids[] = { + GSID_PARTITION_TABLE, + GSID_PROCESS_TABLE, + GSID_RUN_INPUT, + GSID_GPR0, + GSID_CR, + }; + + for (int i = 0; i < ARRAY_SIZE(ids); i++) + size += gse_total_size(gsid_size(ids[i])); + return size; +} + +static int __init test1_fill_info(struct gs_buff *gsb, struct gs_msg *gsm) +{ + struct gs_msg_test1_data *data = gsm->data; + + if (gsm_includes(gsm, GSID_GPR0)) + gse_put(gsb, GSID_GPR0, data->a); + + if (gsm_includes(gsm, GSID_CR)) + gse_put(gsb, GSID_CR, data->b); + + if (gsm_includes(gsm, GSID_PARTITION_TABLE)) + gse_put(gsb, GSID_PARTITION_TABLE, data->c); + + if (gsm_includes(gsm, GSID_PROCESS_TABLE)) + gse_put(gsb, GSID_PARTITION_TABLE, data->d); + + if (gsm_includes(gsm, GSID_RUN_INPUT)) + gse_put(gsb, GSID_RUN_INPUT, data->e); + + return 0; +} + +static int __init test1_refresh_info(struct gs_msg *gsm, struct gs_buff *gsb) +{ + struct gs_parser gsp = { 0 }; + struct gs_msg_test1_data *data = gsm->data; + struct gs_elem *gse; + int rc; + + rc = gse_parse(&gsp, gsb); + if (rc < 0) + return rc; + + gse = gsp_lookup(&gsp, GSID_GPR0); + if (gse) + gse_get(gse, &data->a); + + gse = gsp_lookup(&gsp, GSID_CR); + if (gse) + gse_get(gse, &data->b); + + return 0; +} + +static struct gs_msg_ops gs_msg_test1_ops __initdata = { + .get_size = test1_get_size, + .fill_info = test1_fill_info, + .refresh_info = test1_refresh_info, +}; + +static void __init test_gs_msg(void) +{ + struct gs_msg_test1_data test1_data = { + .a = 0xdeadbeef, + .b = 0x1, + }; + struct gs_msg *gsm; + struct gs_buff *gsb; + + gsm = gsm_new(&gs_msg_test1_ops, &test1_data, GSM_SEND, GFP_KERNEL); + check(gsm); + if (!gsm) + return; + + gsb = gsb_new(gsm_size(gsm), 0, 0, GFP_KERNEL); + check(gsb); + if (!gsb) + return; + + gsm_include(gsm, GSID_PARTITION_TABLE); + gsm_include(gsm, GSID_PROCESS_TABLE); + gsm_include(gsm, GSID_RUN_INPUT); + gsm_include(gsm, GSID_GPR0); + gsm_include(gsm, GSID_CR); + + gsm_fill_info(gsm, gsb); + + memset(&test1_data, 0, sizeof(test1_data)); + + gsm_refresh_info(gsm, gsb); + check(test1_data.a == 0xdeadbeef); + check(test1_data.b == 0x1); + + gsm_free(gsm); +} + + +static int __init test_guest_state_buffer(void) +{ + pr_info("Running guest state buffer self-tests ...\n"); + + test_creating_buffer(); + test_adding_element(); + + test_gs_bitmap(); + test_gs_parsing(); + + test_gs_msg(); + + return 0; +} +late_initcall(test_guest_state_buffer); From patchwork Mon May 8 07:23:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jordan Niethe X-Patchwork-Id: 1778472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=geiO8142; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QFQ3N5sqyz1ymw for ; Tue, 9 May 2023 01:20:48 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QFQ3N4qP2z3fWt for ; Tue, 9 May 2023 01:20:48 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=geiO8142; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=jpn@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=geiO8142; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QFCVM2JdPz3bxY for ; Mon, 8 May 2023 17:24:59 +1000 (AEST) Received: from pps.filterd (m0353726.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3486ahNZ010697; Mon, 8 May 2023 07:24:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=pp1; bh=5J1yE8FzGr52EEPCYHMRTi17jeiUlClCZPiLdnttlVI=; b=geiO8142oqNWB7/0YdaY+31KKFGnkKulXR6LlJbvecFzmF74+vt8RFpJ/H8dAf8UMRpZ OPbnsMqqzF5HqVjxN0IblC0F0Rg1edYeEMDCaQcnEIh7vmseK7T1dPrPLRq9yVnecd1c 3dfj+EZIfRmZVfmPUjUwmhVZk7WFRPed2w8Ss/R/xENJfMALgaS1tiHUpvuoEF6gznn6 Bq/wz0ZJl1zTkOLOW9JpDbW7LCfJKViy0Z/cvqewOejdY6a5sh8t6nRV4ubFrkRQLpAI gHLGuSDhQXYkWhceJJP4jYHR52e0Lu+5X2Jy6kmcFMQQxbbFpywEuBIImEA2PjVmOPY6 Rg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qetchk7mm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:55 +0000 Received: from m0353726.ppops.net (m0353726.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 34874O5o011818; Mon, 8 May 2023 07:24:55 GMT Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qetchk7kf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:54 +0000 Received: from pps.filterd (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3485ZZKZ003881; Mon, 8 May 2023 07:24:52 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma01fra.de.ibm.com (PPS) with ESMTPS id 3qdeh6gsch-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 May 2023 07:24:51 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3487Olos3080862 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 8 May 2023 07:24:47 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1594A2004B; Mon, 8 May 2023 07:24:47 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D46AA20040; Mon, 8 May 2023 07:24:41 +0000 (GMT) Received: from pwon.ibmuc.com (unknown [9.177.74.71]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 8 May 2023 07:24:41 +0000 (GMT) From: Jordan Niethe To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH v1 5/5] KVM: PPC: Add support for nested PAPR guests Date: Mon, 8 May 2023 17:23:32 +1000 Message-Id: <20230508072332.2937883-6-jpn@linux.vnet.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> References: <20230508072332.2937883-1-jpn@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Y7bdz8zKd7mFVNulZmiIKDj8ywLxdmQV X-Proofpoint-GUID: P5tCZ0wDqHdfwbZRlsYZF8qUKTBHkDRd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-08_04,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 impostorscore=0 mlxscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305080049 X-Mailman-Approved-At: Tue, 09 May 2023 01:16:28 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Niethe , mikey@neuling.org, sbhat@linux.ibm.com, kautuk.consul.1980@gmail.com, npiggin@gmail.com, kvm-ppc@vger.kernel.org, vaibhav@linux.ibm.com Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" A series of hcalls have been added to the PAPR which allow a regular guest partition to create and manage guest partitions of its own. Add support to KVM to utilize these hcalls to enable running nested guests. Overview of the new hcall usage: - L1 and L0 negotiate capabilities with H_GUEST_{G,S}ET_CAPABILITIES() - L1 requests the L0 create a L2 with H_GUEST_CREATE() and receives a handle to use in future hcalls - L1 requests the L0 create a L2 vCPU with H_GUEST_CREATE_VCPU() - L1 sets up the L2 using H_GUEST_SET and the H_GUEST_VCPU_RUN input buffer - L1 requests the L0 runs the L2 vCPU using H_GUEST_VCPU_RUN() - L2 returns to L1 with an exit reason and L1 reads the H_GUEST_VCPU_RUN output buffer populated by the L0 - L1 handles the exit using H_GET_STATE if necessary - L1 reruns L2 vCPU with H_GUEST_VCPU_RUN - L1 frees the L2 in the L0 with H_GUEST_DELETE() Support for the new API is determined by trying H_GUEST_GET_CAPABILITIES. On a successful return, the new API will then be used. Use the vcpu register state setters for tracking modified guest state elements and copy the thread wide values into the H_GUEST_VCPU_RUN input buffer immediately before running a L2. The guest wide elements can not be added to the input buffer so send them with a seperate H_GUEST_SET call if necessary. Make the vcpu register getter load the corresponding value from the real host with H_GUEST_GET. To avoid unnecessarily calling H_GUEST_GET, track which values have already been loaded between H_GUEST_VCPU_RUN calls. If an element is present in the H_GUEST_VCPU_RUN output buffer it also does not need to be loaded again. There is existing support for running nested guests on KVM with powernv. However the interface used for this is not supported by other PAPR hosts. This existing API is still supported. Signed-off-by: Jordan Niethe --- Documentation/powerpc/index.rst | 1 + Documentation/powerpc/kvm-nested.rst | 636 ++++++++++++ arch/powerpc/include/asm/guest-state-buffer.h | 150 ++- arch/powerpc/include/asm/hvcall.h | 30 + arch/powerpc/include/asm/kvm_book3s.h | 122 ++- arch/powerpc/include/asm/kvm_book3s_64.h | 6 + arch/powerpc/include/asm/kvm_host.h | 21 + arch/powerpc/include/asm/kvm_ppc.h | 64 +- arch/powerpc/include/asm/plpar_wrappers.h | 198 ++++ arch/powerpc/kvm/Makefile | 1 + arch/powerpc/kvm/book3s_hv.c | 118 ++- arch/powerpc/kvm/book3s_hv.h | 75 +- arch/powerpc/kvm/book3s_hv_nested.c | 34 +- arch/powerpc/kvm/book3s_hv_papr.c | 947 ++++++++++++++++++ arch/powerpc/kvm/emulate_loadstore.c | 4 +- 15 files changed, 2314 insertions(+), 93 deletions(-) create mode 100644 Documentation/powerpc/kvm-nested.rst create mode 100644 arch/powerpc/kvm/book3s_hv_papr.c diff --git a/Documentation/powerpc/index.rst b/Documentation/powerpc/index.rst index 85e80e30160b..5a15dc6389ab 100644 --- a/Documentation/powerpc/index.rst +++ b/Documentation/powerpc/index.rst @@ -25,6 +25,7 @@ powerpc isa-versions kaslr-booke32 mpc52xx + kvm-nested papr_hcalls pci_iov_resource_on_powernv pmu-ebb diff --git a/Documentation/powerpc/kvm-nested.rst b/Documentation/powerpc/kvm-nested.rst new file mode 100644 index 000000000000..942f422d61a9 --- /dev/null +++ b/Documentation/powerpc/kvm-nested.rst @@ -0,0 +1,636 @@ +.. SPDX-License-Identifier: GPL-2.0 + +==================================== +Nested KVM on POWER +==================================== + +Introduction +============ + +This document explains how a guest operating system can act as a +hypervisor and run nested guests through the use of hypercalls, if the +hypervisor has implemented them. The terms L0, L1, and L2 are used to +refer to different software entities. L0 is the hypervisor mode entity +that would normally be called the "host" or "hypervisor". L1 is a +guest virtual machine that is directly run under L0 and is initiated +and controlled by L0. L2 is a guest virtual machine that is initiated +and controlled by L1 acting as a hypervisor. + +Existing API +============ + +Linux/KVM has had support for Nesting as an L0 or L1 since 2018 + +The L0 code was added:: + + commit 8e3f5fc1045dc49fd175b978c5457f5f51e7a2ce + Author: Paul Mackerras + Date: Mon Oct 8 16:31:03 2018 +1100 + KVM: PPC: Book3S HV: Framework and hcall stubs for nested virtualization + +The L1 code was added:: + + commit 360cae313702cdd0b90f82c261a8302fecef030a + Author: Paul Mackerras + Date: Mon Oct 8 16:31:04 2018 +1100 + KVM: PPC: Book3S HV: Nested guest entry via hypercall + +This API works primarily using a single hcall h_enter_nested(). This +call made by the L1 to tell the L0 to start an L2 vCPU with the given +state. The L0 then starts this L2 and runs until an L2 exit condition +is reached. Once the L2 exits, the state of the L2 is given back to +the L1 by the L0. The full L2 vCPU state is always transferred from +and to L1 when the L2 is run. The L0 doesn't keep any state on the L2 +vCPU (except in the short sequence in the L0 on L1 -> L2 entry and L2 +-> L1 exit). + +The only state kept by the L0 is the partition table. The L1 registers +it's partition table using the h_set_partition_table() hcall. All +other state held by the L0 about the L2s is cached state (such as +shadow page tables). + +The L1 may run any L2 or vCPU without first informing the L0. It +simply starts the vCPU using h_enter_nested(). The creation of L2s and +vCPUs is done implicitly whenever h_enter_nested() is called. + +In this document, we call this existing API the v1 API. + +New PAPR API +=============== + +The new PAPR API changes from the v1 API such that the creating L2 and +associated vCPUs is explicit. In this document, we call this the v2 +API. + +h_enter_nested() is replaced with H_GUEST_VCPU_RUN(). Before this can +be called the L1 must explicitly create the L2 using h_guest_create() +and any associated vCPUs() created with h_guest_create_vCPU(). Getting +and setting vCPU state can also be performed using h_guest_{g|s}et +hcall. + +The basic execution flow is for an L1 to create an L2, run it, and +delete it is: + +- L1 and L0 negotiate capabilities with H_GUEST_{G,S}ET_CAPABILITIES() + (normally at L1 boot time). + +- L1 requests the L0 create an L2 with H_GUEST_CREATE() and receives a token + +- L1 requests the L0 create an L2 vCPU with H_GUEST_CREATE_VCPU() + +- L1 and L0 communicate the vCPU state using the H_GUEST_{G,S}ET() hcall + +- L1 requests the L0 runs the vCPU running H_GUEST_VCPU_RUN() hcall + +- L1 deletes L2 with H_GUEST_DELETE() + +More details of the individual hcalls follows: + +HCALL Details +============= + +This documentation is provided to give an overall understating of the +API. It doesn't aim to provide all the details required to implement +an L1 or L0. Latest version of PAPR can be referred for more details. + +All these HCALLs are made by the L1 to the L0. + +H_GUEST_GET_CAPABILITIES() +-------------------------- + +This is called to get the capabilities of the L0 nested +hypervisor. This includes capabilities such the CPU versions (eg +POWER9, POWER10) that are supported as L2s:: + + H_GUEST_GET_CAPABILITIES(uint64 flags) + + Parameters: + Input: + flags: Reserved + Output: + R3: Return code + R4: Hypervisor Supported Capabilities bitmap 1 + +H_GUEST_SET_CAPABILITIES() +-------------------------- + +This is called to inform the L0 of the capabilities of the L1 +hypervisor. The set of flags passed here are the same as +H_GUEST_GET_CAPABILITIES() + +Typically, GET will be called first and then SET will be called with a +subset of the flags returned from GET. This process allows the L0 and +L1 to negotiate an agreed set of capabilities:: + + H_GUEST_SET_CAPABILITIES(uint64 flags, + uint64 capabilitiesBitmap1) + Parameters: + Input: + flags: Reserved + capabilitiesBitmap1: Only capabilities advertised through + H_GUEST_GET_CAPABILITIES + Output: + R3: Return code + R4: If R3 = H_P2: The number of invalid bitmaps + R5: If R3 = H_P2: The index of first invalid bitmap + +H_GUEST_CREATE() +---------------- + +This is called to create an L2. A unique ID of the L2 created +(similar to an LPID) is returned, which can be used on subsequent HCALLs to +identify the L2:: + + H_GUEST_CREATE(uint64 flags, + uint64 continueToken); + Parameters: + Input: + flags: Reserved + continueToken: Initial call set to -1. Subsequent calls, + after H_Busy or H_LongBusyOrder has been + returned, value that was returned in R4. + Output: + R3: Return code. Notable: + H_Not_Enough_Resources: Unable to create Guest VCPU due to not + enough Hypervisor memory. See H_GUEST_CREATE_GET_STATE(flags = + takeOwnershipOfVcpuState) + R4: If R3 = H_Busy or_H_LongBusyOrder -> continueToken + +H_GUEST_CREATE_VCPU() +--------------------- + +This is called to create a vCPU associated with an L2. The L2 id +(returned from H_GUEST_CREATE()) should be passed it. Also passed in +is a unique (for this L2) vCPUid. This vCPUid is allocated by the +L1:: + + H_GUEST_CREATE_VCPU(uint64 flags, + uint64 guestId, + uint64 vcpuId); + Parameters: + Input: + flags: Reserved + guestId: ID obtained from H_GUEST_CREATE + vcpuId: ID of the vCPU to be created. This must be within the + range of 0 to 2047 + Output: + R3: Return code. Notable: + H_Not_Enough_Resources: Unable to create Guest VCPU due to not + enough Hypervisor memory. See H_GUEST_CREATE_GET_STATE(flags = + takeOwnershipOfVcpuState) + +H_GUEST_GET_STATE() +------------------- + +This is called to get state associated with an L2 (Guest-wide or vCPU specific). +This info is passed via the Guest State Buffer (GSB), a standard format as +explained later in this doc, necessary details below: + +This can set either L2 wide or vcpu specific information. Examples of +L2 wide is the timebase offset or process scoped page table +info. Examples of vCPU wide are GPRs or VSRs. A bit in the flags +parameter specifies if this call is L2 wide or vCPU specific and the +IDs in the GSB must match this. + +The L1 provides a pointer to the GSB as a parameter to this call. Also +provided is the L2 and vCPU IDs associated with the state to set. + +The L1 writes only the IDs and sizes in the GSB. L0 writes the +associated values for each ID in the GSB:: + + H_GUEST_GET_STATE(uint64 flags, + uint64 guestId, + uint64 vcpuId, + uint64 dataBuffer, + uint64 dataBufferSizeInBytes); + Parameters: + Input: + flags: + Bit 0: getGuestWideState: Request state of the Guest instead + of an individual VCPU. + Bit 1: takeOwnershipOfVcpuState Indicate the L1 is taking + over ownership of the VCPU state and that the L0 can free + the storage holding the state. The VCPU state will need to + be returned to the Hypervisor via H_GUEST_SET_STATE prior + to H_GUEST_RUN_VCPU being called for this VCPU. The data + returned in the dataBuffer is in a Hypervisor internal + format. + Bits 2-63: Reserved + guestId: ID obtained from H_GUEST_CREATE + vcpuId: ID of the vCPU pass to H_GUEST_CREATE_VCPU + dataBuffer: A L1 real address of the GSB. + If takeOwnershipOfVcpuState, size must be at least the size + returned by ID=0x0001 + dataBufferSizeInBytes: Size of dataBuffer + Output: + R3: Return code + R4: If R3 = H_Invalid_Element_Id: The array index of the bad + element ID. + If R3 = H_Invalid_Element_Size: The array index of the bad + element size. + If R3 = H_Invalid_Element_Value: The array index of the bad + element value. + +H_GUEST_SET_STATE() +------------------- + +This is called to set L2 wide or vCPU specific L2 state. This info is +passed via the Guest State Buffer (GSB), necessary details below: + +This can set either L2 wide or vcpu specific information. Examples of +L2 wide is the timebase offset or process scoped page table +info. Examples of vCPU wide are GPRs or VSRs. A bit in the flags +parameter specifies if this call is L2 wide or vCPU specific and the +IDs in the GSB must match this. + +The L1 provides a pointer to the GSB as a parameter to this call. Also +provided is the L2 and vCPU IDs associated with the state to set. + +The L1 writes all values in the GSB and the L0 only reads the GSB for +this call:: + + H_GUEST_SET_STATE(uint64 flags, + uint64 guestId, + uint64 vcpuId, + uint64 dataBuffer, + uint64 dataBufferSizeInBytes); + Parameters: + Input: + flags: + Bit 0: getGuestWideState: Request state of the Guest instead + of an individual VCPU. + Bit 1: returnOwnershipOfVcpuState Return Guest VCPU state. See + GET_STATE takeOwnershipOfVcpuState + Bits 2-63: Reserved + guestId: ID obtained from H_GUEST_CREATE + vcpuId: ID of the vCPU pass to H_GUEST_CREATE_VCPU + dataBuffer: A L1 real address of the GSB. + If takeOwnershipOfVcpuState, size must be at least the size + returned by ID=0x0001 + dataBufferSizeInBytes: Size of dataBuffer + Output: + R3: Return code + R4: If R3 = H_Invalid_Element_Id: The array index of the bad + element ID. + If R3 = H_Invalid_Element_Size: The array index of the bad + element size. + If R3 = H_Invalid_Element_Value: The array index of the bad + element value. + +H_GUEST_RUN_VCPU() +------------------ + +This is called to run an L2 vCPU. The L2 and vCPU IDs are passed in as +parameters. The vCPU run with the state set previously using +H_GUEST_SET_STATE(). When the L2 exits, the L1 will resume from this +hcall. + +This hcall also has associated input and output GSBs. Unlike +H_GUEST_{S,G}ET_STATE(), these GSB pointers are not passed in as +parameters to the hcall (This was done in the interest of +performance). The locations of these GSBs must be preregistered using +the H_GUEST_SET_STATE() call with ID 0x0c00 and 0x0c01 (see table +below). + +The input GSB may contain only VCPU wide elements to be set. This GSB +may also contain zero elements (ie 0 in the first 4 bytes of the GSB) +if nothing needs to be set. + +On exit from the hcall, the output buffer is filled with elements +determined by the L0. The reason for the exit is contained in GPR4 (ie +NIP is put in GPR4). The elements returned depend on the exit +type. For example, if the exit reason is the L2 doing a hcall (GPR4 = +0xc00), then GPR3-12 are provided in the output GSB as this is the +state likely needed to service the hcall. If additional state is +needed, H_GUEST_GET_STATE() may be called by the L1. + +To synthesize interrupts in the L2, when calling H_GUEST_RUN_VCPU() +the L1 may set a flag (as a hcall parameter) and the L0 will +synthesize the interrupt in the L2. Alternatively, the L1 may +synthesize the interrupt itself using H_GUEST_SET_STATE() or the +H_GUEST_RUN_VCPU() input GSB to set the state appropriately:: + + H_GUEST_RUN_VCPU(uint64 flags, + uint64 guestId, + uint64 vcpuId, + uint64 dataBuffer, + uint64 dataBufferSizeInBytes); + Parameters: + Input: + flags: + Bit 0: generateExternalInterrupt: Generate an external interrupt + Bit 1: generatePrivilegedDoorbell: Generate a Privileged Doorbell + Bit 2: sendToSystemReset”: Generate a System Reset Interrupt + Bits 3-63: Reserved + guestId: ID obtained from H_GUEST_CREATE + vcpuId: ID of the vCPU pass to H_GUEST_CREATE_VCPU + Output: + R3: Return code + R4: If R3 = H_Success: The reason L1 VCPU exited (ie. NIA) + 0x000: The VCPU stopped running for an unspecified reason. An + example of this is the Hypervisor stopping a VCPU running + due to an outstanding interrupt for the Host Partition. + 0x980: HDEC + 0xC00: HCALL + 0xE00: HDSI + 0xE20: HISI + 0xE40: HEA + 0xF80: HV Fac Unavail + If R3 = H_Invalid_Element_Id, H_Invalid_Element_Size, or + H_Invalid_Element_Value: R4 is offset of the invalid element + in the input buffer. + +H_GUEST_DELETE() +---------------- + +This is called to delete an L2. All associated vCPUs are also +deleted. No specific vCPU delete call is provided. + +A flag may be provided to delete all guests. This is used to reset the +L0 in the case of kdump/kexec:: + + H_GUEST_DELETE(uint64 flags, + uint64 guestId) + Parameters: + Input: + flags: + Bit 0: deleteAllGuests: deletes all guests + Bits 1-63: Reserved + guestId: ID obtained from H_GUEST_CREATE + Output: + R3: Return code + +Guest State Buffer +================== + +The Guest State Buffer (GSB) is the main method of communicating state +about the L2 between the L1 and L0 via H_GUEST_{G,S}ET() and +H_GUEST_VCPU_RUN() calls. + +State may be associated with a whole L2 (eg timebase offset) or a +specific L2 vCPU (eg. GPR state). Only L2 VCPU state maybe be set by +H_GUEST_VCPU_RUN(). + +All data in the GSB is big endian (as is standard in PAPR) + +The Guest state buffer has a header which gives the number of +elements, followed by the GSB elements themselves. + +GSB header: + ++----------+----------+-------------------------------------------+ +| Offset | Size | Purpose | +| Bytes | Bytes | | ++==========+==========+===========================================+ +| 0 | 4 | Number of elements | ++----------+----------+-------------------------------------------+ +| 4 | | Guest state buffer elements | ++----------+----------+-------------------------------------------+ + +GSB element: + ++----------+----------+-------------------------------------------+ +| Offset | Size | Purpose | +| Bytes | Bytes | | ++==========+==========+===========================================+ +| 0 | 2 | ID | ++----------+----------+-------------------------------------------+ +| 2 | 2 | Size of Value | ++----------+----------+-------------------------------------------+ +| 4 | As above | Value | ++----------+----------+-------------------------------------------+ + +The ID in the GSB element specifies what is to be set. This includes +archtected state like GPRs, VSRs, SPRs, plus also some meta data about +the partition like the timebase offset and partition scoped page +table information. + ++--------+-------+----+--------+----------------------------------+ +| ID | Size | RW | Thread | Details | +| | Bytes | | Guest | | +| | | | Scope | | ++========+=======+====+========+==================================+ +| 0x0000 | | RW | TG | NOP element | ++--------+-------+----+--------+----------------------------------+ +| 0x0001 | 0x08 | R | G | Size of L0 vCPU state. See: | +| | | | | H_GUEST_GET_STATE: | +| | | | | flags = takeOwnershipOfVcpuState | ++--------+-------+----+--------+----------------------------------+ +| 0x0002 | 0x08 | R | G | Size Run vCPU out buffer | ++--------+-------+----+--------+----------------------------------+ +| 0x0003 | 0x04 | RW | G | Logical PVR | ++--------+-------+----+--------+----------------------------------+ +| 0x0004 | 0x08 | RW | G | TB Offset (L1 relative) | ++--------+-------+----+--------+----------------------------------+ +| 0x0005 | 0x18 | RW | G |Partition scoped page tbl info: | +| | | | | | +| | | | |- 0x00 Addr part scope table | +| | | | |- 0x08 Num addr bits | +| | | | |- 0x10 Size root dir | ++--------+-------+----+--------+----------------------------------+ +| 0x0006 | 0x10 | RW | G |Process Table Information: | +| | | | | | +| | | | |- 0x0 Addr proc scope table | +| | | | |- 0x8 Table size. | ++--------+-------+----+--------+----------------------------------+ +| 0x0007-| | | | Reserved | +| 0x0BFF | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0x0C00 | 0x10 | RW | T |Run vCPU Input Buffer: | +| | | | | | +| | | | |- 0x0 Addr of buffer | +| | | | |- 0x8 Buffer Size. | ++--------+-------+----+--------+----------------------------------+ +| 0x0C01 | 0x10 | RW | T |Run vCPU Output Buffer: | +| | | | | | +| | | | |- 0x0 Addr of buffer | +| | | | |- 0x8 Buffer Size. | ++--------+-------+----+--------+----------------------------------+ +| 0x0C02 | 0x08 | RW | T | vCPU VPA Address | ++--------+-------+----+--------+----------------------------------+ +| 0x0C03-| | | | Reserved | +| 0x0FFF | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0x1000-| 0x08 | RW | T | GPR 0-31 | +| 0x101F | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0x1020 | 0x08 | T | T | HDEC expiry TB | ++--------+-------+----+--------+----------------------------------+ +| 0x1021 | 0x08 | RW | T | NIA | ++--------+-------+----+--------+----------------------------------+ +| 0x1022 | 0x08 | RW | T | MSR | ++--------+-------+----+--------+----------------------------------+ +| 0x1023 | 0x08 | RW | T | LR | ++--------+-------+----+--------+----------------------------------+ +| 0x1024 | 0x08 | RW | T | XER | ++--------+-------+----+--------+----------------------------------+ +| 0x1025 | 0x08 | RW | T | CTR | ++--------+-------+----+--------+----------------------------------+ +| 0x1026 | 0x08 | RW | T | CFAR | ++--------+-------+----+--------+----------------------------------+ +| 0x1027 | 0x08 | RW | T | SRR0 | ++--------+-------+----+--------+----------------------------------+ +| 0x1028 | 0x08 | RW | T | SRR1 | ++--------+-------+----+--------+----------------------------------+ +| 0x1029 | 0x08 | RW | T | DAR | ++--------+-------+----+--------+----------------------------------+ +| 0x102A | 0x08 | RW | T | DEC expiry TB | ++--------+-------+----+--------+----------------------------------+ +| 0x102B | 0x08 | RW | T | VTB | ++--------+-------+----+--------+----------------------------------+ +| 0x102C | 0x08 | RW | T | LPCR | ++--------+-------+----+--------+----------------------------------+ +| 0x102D | 0x08 | RW | T | HFSCR | ++--------+-------+----+--------+----------------------------------+ +| 0x102E | 0x08 | RW | T | FSCR | ++--------+-------+----+--------+----------------------------------+ +| 0x102F | 0x08 | RW | T | FPSCR | ++--------+-------+----+--------+----------------------------------+ +| 0x1030 | 0x08 | RW | T | DAWR0 | ++--------+-------+----+--------+----------------------------------+ +| 0x1031 | 0x08 | RW | T | DAWR1 | ++--------+-------+----+--------+----------------------------------+ +| 0x1032 | 0x08 | RW | T | CIABR | ++--------+-------+----+--------+----------------------------------+ +| 0x1033 | 0x08 | RW | T | PURR | ++--------+-------+----+--------+----------------------------------+ +| 0x1034 | 0x08 | RW | T | SPURR | ++--------+-------+----+--------+----------------------------------+ +| 0x1035 | 0x08 | RW | T | IC | ++--------+-------+----+--------+----------------------------------+ +| 0x1036-| 0x08 | RW | T | SPRG 0-3 | +| 0x1039 | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0x103A | 0x08 | W | T | PPR | ++--------+-------+----+--------+----------------------------------+ +| 0x103B | 0x08 | RW | T | MMCR 0-3 | +| 0x103E | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0x103F | 0x08 | RW | T | MMCRA | ++--------+-------+----+--------+----------------------------------+ +| 0x1040 | 0x08 | RW | T | SIER | ++--------+-------+----+--------+----------------------------------+ +| 0x1041 | 0x08 | RW | T | SIER 2 | ++--------+-------+----+--------+----------------------------------+ +| 0x1042 | 0x08 | RW | T | SIER 3 | ++--------+-------+----+--------+----------------------------------+ +| 0x1043 | 0x08 | RW | T | BESCR | ++--------+-------+----+--------+----------------------------------+ +| 0x1044 | 0x08 | RW | T | EBBHR | ++--------+-------+----+--------+----------------------------------+ +| 0x1045 | 0x08 | RW | T | EBBRR | ++--------+-------+----+--------+----------------------------------+ +| 0x1046 | 0x08 | RW | T | AMR | ++--------+-------+----+--------+----------------------------------+ +| 0x1047 | 0x08 | RW | T | IAMR | ++--------+-------+----+--------+----------------------------------+ +| 0x1048 | 0x08 | RW | T | AMOR | ++--------+-------+----+--------+----------------------------------+ +| 0x1049 | 0x08 | RW | T | UAMOR | ++--------+-------+----+--------+----------------------------------+ +| 0x104A | 0x08 | RW | T | SDAR | ++--------+-------+----+--------+----------------------------------+ +| 0x104B | 0x08 | RW | T | SIAR | ++--------+-------+----+--------+----------------------------------+ +| 0x104C | 0x08 | RW | T | DSCR | ++--------+-------+----+--------+----------------------------------+ +| 0x104D | 0x08 | RW | T | TAR | ++--------+-------+----+--------+----------------------------------+ +| 0x104E | 0x08 | RW | T | DEXCR | ++--------+-------+----+--------+----------------------------------+ +| 0x104F | 0x08 | RW | T | HDEXCR | ++--------+-------+----+--------+----------------------------------+ +| 0x1050 | 0x08 | RW | T | HASHKEYR | ++--------+-------+----+--------+----------------------------------+ +| 0x1051 | 0x08 | RW | T | HASHPKEYR | ++--------+-------+----+--------+----------------------------------+ +| 0x1052 | 0x08 | RW | T | CTRL | ++--------+-------+----+--------+----------------------------------+ +| 0x1053-| | | | Reserved | +| 0x1FFF | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0x2000 | 0x04 | RW | T | CR | ++--------+-------+----+--------+----------------------------------+ +| 0x2001 | 0x04 | RW | T | PIDR | ++--------+-------+----+--------+----------------------------------+ +| 0x2002 | 0x04 | RW | T | DSISR | ++--------+-------+----+--------+----------------------------------+ +| 0x2003 | 0x04 | RW | T | VSCR | ++--------+-------+----+--------+----------------------------------+ +| 0x2004 | 0x04 | RW | T | VRSAVE | ++--------+-------+----+--------+----------------------------------+ +| 0x2005 | 0x04 | RW | T | DAWRX0 | ++--------+-------+----+--------+----------------------------------+ +| 0x2006 | 0x04 | RW | T | DAWRX1 | ++--------+-------+----+--------+----------------------------------+ +| 0x2007-| 0x04 | RW | T | PMC 1-6 | +| 0x200c | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0x200D | 0x04 | RW | T | WORT | ++--------+-------+----+--------+----------------------------------+ +| 0x200E | 0x04 | RW | T | PSPB | ++--------+-------+----+--------+----------------------------------+ +| 0x200F-| | | | Reserved | +| 0x2FFF | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0x3000-| 0x10 | RW | T | VSR 0-63 | +| 0x303F | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0x3040-| | | | Reserved | +| 0xEFFF | | | | | ++--------+-------+----+--------+----------------------------------+ +| 0xF000 | 0x08 | R | T | HDAR | ++--------+-------+----+--------+----------------------------------+ +| 0xF001 | 0x04 | R | T | HDSISR | ++--------+-------+----+--------+----------------------------------+ +| 0xF002 | 0x04 | R | T | HEIR | ++--------+-------+----+--------+----------------------------------+ +| 0xF003 | 0x08 | R | T | ASDR | ++--------+-------+----+--------+----------------------------------+ + + +Miscellaneous info +================== + +State not in ptregs/hvregs +-------------------------- + +In the v1 API, some state is not in the ptregs/hvstate. This includes +the vector register and some SPRs. For the L1 to set this state for +the L2, the L1 loads up these hardware registers before the +h_enter_nested() call and the L0 ensures they end up as the L2 state +(by not touching them). + +The v2 API removes this and explicitly sets this state via the GSB. + +L1 Implementation details: Caching state +---------------------------------------- + +In the v1 API, all state is sent from the L1 to the L0 and vice versa +on every h_enter_nested() hcall. If the L0 is not currently running +any L2s, the L0 has no state information about them. The only +exception to this is the location of the partition table, registered +via h_set_partition_table(). + +The v2 API changes this so that the L0 retains the L2 state even when +it's vCPUs are no longer running. This means that the L1 only needs to +communicate with the L0 about L2 state when it needs to modify the L2 +state, or when it's value is out of date. This provides an opportunity +for performance optimisation. + +When a vCPU exits from a H_GUEST_RUN_VCPU() call, the L1 internally +marks all L2 state as invalid. This means that if the L1 wants to know +the L2 state (say via a kvm_get_one_reg() call), it needs call +H_GUEST_GET_STATE() to get that state. Once it's read, it's marked as +valid in L1 until the L2 is run again. + +Also, when an L1 modifies L2 vcpu state, it doesn't need to write it +to the L0 until that L2 vcpu runs again. Hence when the L1 updates +state (say via a kvm_set_one_reg() call), it writes to an internal L1 +copy and only flushes this copy to the L0 when the L2 runs again via +the H_GUEST_VCPU_RUN() input buffer. + +This lazy updating of state by the L1 avoids unnecessary +H_GUEST_{G|S}ET_STATE() calls. + + diff --git a/arch/powerpc/include/asm/guest-state-buffer.h b/arch/powerpc/include/asm/guest-state-buffer.h index 332669302a0b..0ac1e4374630 100644 --- a/arch/powerpc/include/asm/guest-state-buffer.h +++ b/arch/powerpc/include/asm/guest-state-buffer.h @@ -5,6 +5,7 @@ #ifndef _ASM_POWERPC_GUEST_STATE_BUFFER_H #define _ASM_POWERPC_GUEST_STATE_BUFFER_H +#include "asm/hvcall.h" #include #include #include @@ -14,16 +15,16 @@ **************************************************************************/ #define GSID_BLANK 0x0000 -#define GSID_HOST_STATE_SIZE 0x0001 /* Size of Hypervisor Internal Format VCPU state */ -#define GSID_RUN_OUTPUT_MIN_SIZE 0x0002 /* Minimum size of the Run VCPU output buffer */ -#define GSID_LOGICAL_PVR 0x0003 /* Logical PVR */ -#define GSID_TB_OFFSET 0x0004 /* Timebase Offset */ -#define GSID_PARTITION_TABLE 0x0005 /* Partition Scoped Page Table */ -#define GSID_PROCESS_TABLE 0x0006 /* Process Table */ +#define GSID_HOST_STATE_SIZE 0x0001 +#define GSID_RUN_OUTPUT_MIN_SIZE 0x0002 +#define GSID_LOGICAL_PVR 0x0003 +#define GSID_TB_OFFSET 0x0004 +#define GSID_PARTITION_TABLE 0x0005 +#define GSID_PROCESS_TABLE 0x0006 -#define GSID_RUN_INPUT 0x0C00 /* Run VCPU Input Buffer */ -#define GSID_RUN_OUTPUT 0x0C01 /* Run VCPU Out Buffer */ -#define GSID_VPA 0x0C02 /* HRA to Guest VCPU VPA */ +#define GSID_RUN_INPUT 0x0C00 +#define GSID_RUN_OUTPUT 0x0C01 +#define GSID_VPA 0x0C02 #define GSID_GPR0 0x1000 #define GSID_GPR1 0x1001 @@ -998,4 +999,135 @@ static inline void gsm_reset(struct gs_msg *gsm) gsbm_zero(&gsm->bitmap); } +/** + * gsb_recv - request all elements in the buffer have their value updated. + * @gsb: guest state buffer + * @flags: guest wide or thread wide + * + * Performs the H_GUEST_GET_STATE hcall for the guest state buffer. + * After returning from the hcall the guest state elements that were + * present in the buffer will have updated values from the hypervisor. + */ +static inline int gsb_recv(struct gs_buff *gsb, unsigned long flags) +{ + unsigned long hflags = 0; + unsigned long i; + int rc; + + if (flags & GS_FLAGS_WIDE) + hflags |= H_GUEST_FLAGS_WIDE; + + rc = plpar_guest_get_state(hflags, gsb->guest_id, gsb->vcpu_id, + __pa(gsb->hdr), gsb->capacity, &i); + return rc; +} + +/** + * gsb_receive_data - flexibly update values from a guest state buffer + * @gsb: guest state buffer + * @gsm: guest state message + * + * Requests updated values for the guest state values included in the guest + * state message. The guest state message will then deserialize the guest state + * buffer. + */ +static inline int gsb_receive_data(struct gs_buff *gsb, struct gs_msg *gsm) +{ + int rc; + + rc = gsm_fill_info(gsm, gsb); + if (rc < 0) + return rc; + + rc = gsb_recv(gsb, gsm->flags); + if (rc < 0) + return rc; + + rc = gsm_refresh_info(gsm, gsb); + if (rc < 0) + return rc; + return 0; +} + +/** + * gsb_recv - receive a single guest state ID + * @gsb: guest state buffer + * @gsm: guest state message + * @iden: guest state identity + */ +static inline int gsb_receive_datum(struct gs_buff *gsb, struct gs_msg *gsm, + u16 iden) +{ + int rc; + + gsm_include(gsm, iden); + rc = gsb_receive_data(gsb, gsm); + if (rc < 0) + return rc; + gsm_reset(gsm); + return 0; +} + +/** + * gsb_send - send all elements in the buffer to the hypervisor. + * @gsb: guest state buffer + * @flags: guest wide or thread wide + * + * Performs the H_GUEST_SET_STATE hcall for the guest state buffer. + */ +static inline int gsb_send(struct gs_buff *gsb, unsigned long flags) +{ + unsigned long hflags = 0; + unsigned long i; + int rc; + + if (gsb_nelems(gsb) == 0) + return 0; + + if (flags & GS_FLAGS_WIDE) + hflags |= H_GUEST_FLAGS_WIDE; + + rc = plpar_guest_set_state(hflags, gsb->guest_id, gsb->vcpu_id, + __pa(gsb->hdr), gsb->capacity, &i); + return rc; +} + +/** + * gsb_send_data - flexibly send values from a guest state buffer + * @gsb: guest state buffer + * @gsm: guest state message + * + * Sends the guest state values included in the guest state message. + */ +static inline int gsb_send_data(struct gs_buff *gsb, struct gs_msg *gsm) +{ + int rc; + + rc = gsm_fill_info(gsm, gsb); + if (rc < 0) + return rc; + rc = gsb_send(gsb, gsm->flags); + + return rc; +} + +/** + * gsb_recv - send a single guest state ID + * @gsb: guest state buffer + * @gsm: guest state message + * @iden: guest state identity + */ +static inline int gsb_send_datum(struct gs_buff *gsb, struct gs_msg *gsm, + u16 iden) +{ + int rc; + + gsm_include(gsm, iden); + rc = gsb_send_data(gsb, gsm); + if (rc < 0) + return rc; + gsm_reset(gsm); + return 0; +} + #endif /* _ASM_POWERPC_GUEST_STATE_BUFFER_H */ diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h index c099780385dd..ddb99e982917 100644 --- a/arch/powerpc/include/asm/hvcall.h +++ b/arch/powerpc/include/asm/hvcall.h @@ -100,6 +100,18 @@ #define H_COP_HW -74 #define H_STATE -75 #define H_IN_USE -77 + +#define H_INVALID_ELEMENT_ID -79 +#define H_INVALID_ELEMENT_SIZE -80 +#define H_INVALID_ELEMENT_VALUE -81 +#define H_INPUT_BUFFER_NOT_DEFINED -82 +#define H_INPUT_BUFFER_TOO_SMALL -83 +#define H_OUTPUT_BUFFER_NOT_DEFINED -84 +#define H_OUTPUT_BUFFER_TOO_SMALL -85 +#define H_PARTITION_PAGE_TABLE_NOT_DEFINED -86 +#define H_GUEST_VCPU_STATE_NOT_HV_OWNED -87 + + #define H_UNSUPPORTED_FLAG_START -256 #define H_UNSUPPORTED_FLAG_END -511 #define H_MULTI_THREADS_ACTIVE -9005 @@ -381,6 +393,15 @@ #define H_ENTER_NESTED 0xF804 #define H_TLB_INVALIDATE 0xF808 #define H_COPY_TOFROM_GUEST 0xF80C +#define H_GUEST_GET_CAPABILITIES 0x460 +#define H_GUEST_SET_CAPABILITIES 0x464 +#define H_GUEST_CREATE 0x470 +#define H_GUEST_CREATE_VCPU 0x474 +#define H_GUEST_GET_STATE 0x478 +#define H_GUEST_SET_STATE 0x47C +#define H_GUEST_RUN_VCPU 0x480 +#define H_GUEST_COPY_MEMORY 0x484 +#define H_GUEST_DELETE 0x488 /* Flags for H_SVM_PAGE_IN */ #define H_PAGE_IN_SHARED 0x1 @@ -467,6 +488,15 @@ #define H_RPTI_PAGE_1G 0x08 #define H_RPTI_PAGE_ALL (-1UL) +/* Flags for H_GUEST_{S,G}_STATE */ +#define H_GUEST_FLAGS_WIDE (1UL<<(63-0)) + +/* Flag values used for H_{S,G}SET_GUEST_CAPABILITIES */ +#define H_GUEST_CAP_COPY_MEM (1UL<<(63-0)) +#define H_GUEST_CAP_POWER9 (1UL<<(63-1)) +#define H_GUEST_CAP_POWER10 (1UL<<(63-2)) +#define H_GUEST_CAP_BITMAP2 (1UL<<(63-63)) + #ifndef __ASSEMBLY__ #include diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h index 77653c5b356b..65ad34c13aa0 100644 --- a/arch/powerpc/include/asm/kvm_book3s.h +++ b/arch/powerpc/include/asm/kvm_book3s.h @@ -12,6 +12,7 @@ #include #include #include +#include struct kvmppc_bat { u64 raw; @@ -316,6 +317,57 @@ long int kvmhv_nested_page_fault(struct kvm_vcpu *vcpu); void kvmppc_giveup_fac(struct kvm_vcpu *vcpu, ulong fac); + +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE + +extern bool __kvmhv_on_papr; + +static inline bool kvmhv_on_papr(void) +{ + return __kvmhv_on_papr; +} + +#else + +static inline bool kvmhv_on_papr(void) +{ + return false; +} + +#endif + +int __kvmhv_papr_reload_ptregs(struct kvm_vcpu *vcpu, struct pt_regs *regs); +int __kvmhv_papr_mark_dirty_ptregs(struct kvm_vcpu *vcpu, struct pt_regs *regs); +int __kvmhv_papr_mark_dirty(struct kvm_vcpu *vcpu, u16 iden); +int __kvmhv_papr_cached_reload(struct kvm_vcpu *vcpu, u16 iden); + +static inline int kvmhv_papr_reload_ptregs(struct kvm_vcpu *vcpu, struct pt_regs *regs) +{ + if (kvmhv_on_papr()) + return __kvmhv_papr_reload_ptregs(vcpu, regs); + return 0; +} +static inline int kvmhv_papr_mark_dirty_ptregs(struct kvm_vcpu *vcpu, struct pt_regs *regs) +{ + if (kvmhv_on_papr()) + return __kvmhv_papr_mark_dirty_ptregs(vcpu, regs); + return 0; +} + +static inline int kvmhv_papr_mark_dirty(struct kvm_vcpu *vcpu, u16 iden) +{ + if (kvmhv_on_papr()) + return __kvmhv_papr_mark_dirty(vcpu, iden); + return 0; +} + +static inline int kvmhv_papr_cached_reload(struct kvm_vcpu *vcpu, u16 iden) +{ + if (kvmhv_on_papr()) + return __kvmhv_papr_cached_reload(vcpu, iden); + return 0; +} + extern int kvm_irq_bypass; static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu) @@ -335,70 +387,84 @@ static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu) static inline void kvmppc_set_gpr(struct kvm_vcpu *vcpu, int num, ulong val) { vcpu->arch.regs.gpr[num] = val; + kvmhv_papr_mark_dirty(vcpu, GSID_GPR0 + num); } static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num) { + kvmhv_papr_cached_reload(vcpu, GSID_GPR0 + num); return vcpu->arch.regs.gpr[num]; } static inline void kvmppc_set_cr(struct kvm_vcpu *vcpu, u32 val) { vcpu->arch.regs.ccr = val; + kvmhv_papr_mark_dirty(vcpu, GSID_CR); } static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu) { + kvmhv_papr_cached_reload(vcpu, GSID_CR); return vcpu->arch.regs.ccr; } static inline void kvmppc_set_xer(struct kvm_vcpu *vcpu, ulong val) { vcpu->arch.regs.xer = val; + kvmhv_papr_mark_dirty(vcpu, GSID_XER); } static inline ulong kvmppc_get_xer(struct kvm_vcpu *vcpu) { + kvmhv_papr_cached_reload(vcpu, GSID_XER); return vcpu->arch.regs.xer; } static inline void kvmppc_set_ctr(struct kvm_vcpu *vcpu, ulong val) { vcpu->arch.regs.ctr = val; + kvmhv_papr_mark_dirty(vcpu, GSID_CTR); } static inline ulong kvmppc_get_ctr(struct kvm_vcpu *vcpu) { + kvmhv_papr_cached_reload(vcpu, GSID_CTR); return vcpu->arch.regs.ctr; } static inline void kvmppc_set_lr(struct kvm_vcpu *vcpu, ulong val) { vcpu->arch.regs.link = val; + kvmhv_papr_mark_dirty(vcpu, GSID_LR); } static inline ulong kvmppc_get_lr(struct kvm_vcpu *vcpu) { + kvmhv_papr_cached_reload(vcpu, GSID_LR); return vcpu->arch.regs.link; } static inline void kvmppc_set_pc(struct kvm_vcpu *vcpu, ulong val) { vcpu->arch.regs.nip = val; + kvmhv_papr_mark_dirty(vcpu, GSID_NIA); } static inline ulong kvmppc_get_pc(struct kvm_vcpu *vcpu) { + kvmhv_papr_cached_reload(vcpu, GSID_NIA); return vcpu->arch.regs.nip; } static inline void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 val) { vcpu->arch.pid = val; + kvmhv_papr_mark_dirty(vcpu, GSID_PIDR); } static inline u32 kvmppc_get_pid(struct kvm_vcpu *vcpu) { + kvmhv_papr_cached_reload(vcpu, GSID_PIDR); return vcpu->arch.pid; } @@ -415,109 +481,127 @@ static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu) static inline u64 kvmppc_get_fpr(struct kvm_vcpu *vcpu, int i) { + kvmhv_papr_cached_reload(vcpu, GSID_VSRS0 + i); return vcpu->arch.fp.fpr[i][TS_FPROFFSET]; } static inline void kvmppc_set_fpr(struct kvm_vcpu *vcpu, int i, u64 val) { vcpu->arch.fp.fpr[i][TS_FPROFFSET] = val; + kvmhv_papr_mark_dirty(vcpu, GSID_VSRS0 + i); } static inline u64 kvmppc_get_fpscr(struct kvm_vcpu *vcpu) { + kvmhv_papr_cached_reload(vcpu, GSID_FPSCR); return vcpu->arch.fp.fpscr; } static inline void kvmppc_set_fpscr(struct kvm_vcpu *vcpu, u64 val) { vcpu->arch.fp.fpscr = val; + kvmhv_papr_mark_dirty(vcpu, GSID_FPSCR); } static inline u64 kvmppc_get_vsx_fpr(struct kvm_vcpu *vcpu, int i, int j) { + kvmhv_papr_cached_reload(vcpu, GSID_VSRS0 + i); return vcpu->arch.fp.fpr[i][j]; } static inline void kvmppc_set_vsx_fpr(struct kvm_vcpu *vcpu, int i, int j, u64 val) { vcpu->arch.fp.fpr[i][j] = val; + kvmhv_papr_mark_dirty(vcpu, GSID_VSRS0 + i); } static inline vector128 kvmppc_get_vsx_vr(struct kvm_vcpu *vcpu, int i) { + kvmhv_papr_cached_reload(vcpu, GSID_VSRS32 + i); return vcpu->arch.vr.vr[i]; } static inline void kvmppc_set_vsx_vr(struct kvm_vcpu *vcpu, int i, vector128 val) { vcpu->arch.vr.vr[i] = val; + kvmhv_papr_mark_dirty(vcpu, GSID_VSRS32 + i); } static inline u32 kvmppc_get_vscr(struct kvm_vcpu *vcpu) { + kvmhv_papr_cached_reload(vcpu, GSID_VSCR); return vcpu->arch.vr.vscr.u[3]; } static inline void kvmppc_set_vscr(struct kvm_vcpu *vcpu, u32 val) { vcpu->arch.vr.vscr.u[3] = val; + kvmhv_papr_mark_dirty(vcpu, GSID_VSCR); } -#define BOOK3S_WRAPPER_SET(reg, size) \ +#define BOOK3S_WRAPPER_SET(reg, size, iden) \ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ { \ \ vcpu->arch.reg = val; \ + kvmhv_papr_mark_dirty(vcpu, iden); \ } -#define BOOK3S_WRAPPER_GET(reg, size) \ +#define BOOK3S_WRAPPER_GET(reg, size, iden) \ static inline u##size kvmppc_get_##reg(struct kvm_vcpu *vcpu) \ { \ + kvmhv_papr_cached_reload(vcpu, iden); \ return vcpu->arch.reg; \ } -#define BOOK3S_WRAPPER(reg, size) \ - BOOK3S_WRAPPER_SET(reg, size) \ - BOOK3S_WRAPPER_GET(reg, size) \ +#define BOOK3S_WRAPPER(reg, size, iden) \ + BOOK3S_WRAPPER_SET(reg, size, iden) \ + BOOK3S_WRAPPER_GET(reg, size, iden) \ -BOOK3S_WRAPPER(tar, 64) -BOOK3S_WRAPPER(ebbhr, 64) -BOOK3S_WRAPPER(ebbrr, 64) -BOOK3S_WRAPPER(bescr, 64) -BOOK3S_WRAPPER(ic, 64) -BOOK3S_WRAPPER(vrsave, 64) +BOOK3S_WRAPPER(tar, 64, GSID_TAR) +BOOK3S_WRAPPER(ebbhr, 64, GSID_EBBHR) +BOOK3S_WRAPPER(ebbrr, 64, GSID_EBBRR) +BOOK3S_WRAPPER(bescr, 64, GSID_BESCR) +BOOK3S_WRAPPER(ic, 64, GSID_IC) +BOOK3S_WRAPPER(vrsave, 64, GSID_VRSAVE) -#define VCORE_WRAPPER_SET(reg, size) \ +#define VCORE_WRAPPER_SET(reg, size, iden) \ static inline void kvmppc_set_##reg ##_hv(struct kvm_vcpu *vcpu, u##size val) \ { \ vcpu->arch.vcore->reg = val; \ + kvmhv_papr_mark_dirty(vcpu, iden); \ } -#define VCORE_WRAPPER_GET(reg, size) \ +#define VCORE_WRAPPER_GET(reg, size, iden) \ static inline u##size kvmppc_get_##reg ##_hv(struct kvm_vcpu *vcpu) \ { \ + kvmhv_papr_cached_reload(vcpu, iden); \ return vcpu->arch.vcore->reg; \ } -#define VCORE_WRAPPER(reg, size) \ - VCORE_WRAPPER_SET(reg, size) \ - VCORE_WRAPPER_GET(reg, size) \ +#define VCORE_WRAPPER(reg, size, iden) \ + VCORE_WRAPPER_SET(reg, size, iden) \ + VCORE_WRAPPER_GET(reg, size, iden) \ -VCORE_WRAPPER(vtb, 64) -VCORE_WRAPPER(tb_offset, 64) -VCORE_WRAPPER(lpcr, 64) +VCORE_WRAPPER(vtb, 64, GSID_VTB) +VCORE_WRAPPER(tb_offset, 64, GSID_TB_OFFSET) +VCORE_WRAPPER(lpcr, 64, GSID_LPCR) static inline u64 kvmppc_get_dec_expires(struct kvm_vcpu *vcpu) { + kvmhv_papr_cached_reload(vcpu, GSID_TB_OFFSET); + kvmhv_papr_cached_reload(vcpu, GSID_DEC_EXPIRY_TB); return vcpu->arch.dec_expires; } static inline void kvmppc_set_dec_expires(struct kvm_vcpu *vcpu, u64 val) { vcpu->arch.dec_expires = val; + kvmhv_papr_cached_reload(vcpu, GSID_TB_OFFSET); + kvmhv_papr_mark_dirty(vcpu, GSID_DEC_EXPIRY_TB); } /* Expiry time of vcpu DEC relative to host TB */ diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h index d49065af08e9..689e14284127 100644 --- a/arch/powerpc/include/asm/kvm_book3s_64.h +++ b/arch/powerpc/include/asm/kvm_book3s_64.h @@ -677,6 +677,12 @@ static inline pte_t *find_kvm_host_pte(struct kvm *kvm, unsigned long mmu_seq, extern pte_t *find_kvm_nested_guest_pte(struct kvm *kvm, unsigned long lpid, unsigned long ea, unsigned *hshift); +int kvmhv_papr_vcpu_create(struct kvm_vcpu *vcpu, struct kvmhv_papr_host *nested_state); +void kvmhv_papr_vcpu_free(struct kvm_vcpu *vcpu, struct kvmhv_papr_host *nested_state); +int kvmhv_papr_flush_vcpu(struct kvm_vcpu *vcpu, u64 time_limit); +int kvmhv_papr_set_ptbl_entry(u64 lpid, u64 dw0, u64 dw1); +int kvmhv_papr_parse_output(struct kvm_vcpu *vcpu); + #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */ #endif /* __ASM_KVM_BOOK3S_64_H__ */ diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h index 959f566a455c..26b252fe0d4e 100644 --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h @@ -25,6 +25,7 @@ #include #include #include +#include #define __KVM_HAVE_ARCH_VCPU_DEBUGFS @@ -509,6 +510,23 @@ union xive_tma_w01 { __be64 w01; }; + /* Nested PAPR host H_GUEST_RUN_VCPU configuration */ +struct kvmhv_papr_config { + struct gs_buff_info vcpu_run_output_cfg; + struct gs_buff_info vcpu_run_input_cfg; + u64 vcpu_run_output_size; +}; + + /* Nested PAPR host state */ +struct kvmhv_papr_host { + struct kvmhv_papr_config cfg; + struct gs_buff *vcpu_run_output; + struct gs_buff *vcpu_run_input; + struct gs_msg *vcpu_message; + struct gs_msg *vcore_message; + struct gs_bitmap valids; +}; + struct kvm_vcpu_arch { ulong host_stack; u32 host_pid; @@ -575,6 +593,7 @@ struct kvm_vcpu_arch { ulong dscr; ulong amr; ulong uamor; + ulong amor; ulong iamr; u32 ctrl; u32 dabrx; @@ -829,6 +848,8 @@ struct kvm_vcpu_arch { u64 nested_hfscr; /* HFSCR that the L1 requested for the nested guest */ u32 nested_vcpu_id; gpa_t nested_io_gpr; + /* For nested APIv2 guests*/ + struct kvmhv_papr_host papr_host; #endif #ifdef CONFIG_KVM_BOOK3S_HV_EXIT_TIMING diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index 5656d09383fc..0af34cda4da9 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h @@ -589,6 +589,35 @@ static inline bool kvmhv_on_pseries(void) { return false; } + +#endif + +#ifndef CONFIG_PPC_BOOK3S + +static inline bool kvmhv_on_papr(void) +{ + return false; +} + +static inline int kvmhv_papr_reload_ptregs(struct kvm_vcpu *vcpu, struct pt_regs *regs) +{ + return 0; +} +static inline int kvmhv_papr_mark_dirty_ptregs(struct kvm_vcpu *vcpu, struct pt_regs *regs) +{ + return 0; +} + +static inline int kvmhv_papr_mark_dirty(struct kvm_vcpu *vcpu, u16 iden) +{ + return 0; +} + +static inline int kvmhv_papr_cached_reload(struct kvm_vcpu *vcpu, u16 iden) +{ + return 0; +} + #endif #ifdef CONFIG_KVM_XICS @@ -931,31 +960,33 @@ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ vcpu->arch.shared->reg = cpu_to_le##size(val); \ } \ -#define SHARED_CACHE_WRAPPER_GET(reg, size) \ +#define SHARED_CACHE_WRAPPER_GET(reg, size, iden) \ static inline u##size kvmppc_get_##reg(struct kvm_vcpu *vcpu) \ { \ + kvmhv_papr_cached_reload(vcpu, iden); \ if (kvmppc_shared_big_endian(vcpu)) \ return be##size##_to_cpu(vcpu->arch.shared->reg); \ else \ return le##size##_to_cpu(vcpu->arch.shared->reg); \ } \ -#define SHARED_CACHE_WRAPPER_SET(reg, size) \ +#define SHARED_CACHE_WRAPPER_SET(reg, size, iden) \ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ { \ if (kvmppc_shared_big_endian(vcpu)) \ vcpu->arch.shared->reg = cpu_to_be##size(val); \ else \ vcpu->arch.shared->reg = cpu_to_le##size(val); \ + kvmhv_papr_mark_dirty(vcpu, iden); \ } \ #define SHARED_WRAPPER(reg, size) \ SHARED_WRAPPER_GET(reg, size) \ SHARED_WRAPPER_SET(reg, size) \ -#define SHARED_CACHE_WRAPPER(reg, size) \ - SHARED_CACHE_WRAPPER_GET(reg, size) \ - SHARED_CACHE_WRAPPER_SET(reg, size) \ +#define SHARED_CACHE_WRAPPER(reg, size, iden) \ + SHARED_CACHE_WRAPPER_GET(reg, size, iden) \ + SHARED_CACHE_WRAPPER_SET(reg, size, iden) \ #define SPRNG_WRAPPER(reg, bookehv_spr) \ SPRNG_WRAPPER_GET(reg, bookehv_spr) \ @@ -974,29 +1005,30 @@ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ #define SHARED_SPRNG_WRAPPER(reg, size, bookehv_spr) \ SHARED_WRAPPER(reg, size) \ -#define SHARED_SPRNG_CACHE_WRAPPER(reg, size, bookehv_spr) \ - SHARED_CACHE_WRAPPER(reg, size) \ +#define SHARED_SPRNG_CACHE_WRAPPER(reg, size, bookehv_spr, iden) \ + SHARED_CACHE_WRAPPER(reg, size, iden) \ #endif SHARED_WRAPPER(critical, 64) -SHARED_SPRNG_CACHE_WRAPPER(sprg0, 64, SPRN_GSPRG0) -SHARED_SPRNG_CACHE_WRAPPER(sprg1, 64, SPRN_GSPRG1) -SHARED_SPRNG_CACHE_WRAPPER(sprg2, 64, SPRN_GSPRG2) -SHARED_SPRNG_CACHE_WRAPPER(sprg3, 64, SPRN_GSPRG3) -SHARED_SPRNG_CACHE_WRAPPER(srr0, 64, SPRN_GSRR0) -SHARED_SPRNG_CACHE_WRAPPER(srr1, 64, SPRN_GSRR1) -SHARED_SPRNG_CACHE_WRAPPER(dar, 64, SPRN_GDEAR) +SHARED_SPRNG_CACHE_WRAPPER(sprg0, 64, SPRN_GSPRG0, GSID_SPRG0) +SHARED_SPRNG_CACHE_WRAPPER(sprg1, 64, SPRN_GSPRG1, GSID_SPRG1) +SHARED_SPRNG_CACHE_WRAPPER(sprg2, 64, SPRN_GSPRG2, GSID_SPRG2) +SHARED_SPRNG_CACHE_WRAPPER(sprg3, 64, SPRN_GSPRG3, GSID_SPRG3) +SHARED_SPRNG_CACHE_WRAPPER(srr0, 64, SPRN_GSRR0, GSID_SRR0) +SHARED_SPRNG_CACHE_WRAPPER(srr1, 64, SPRN_GSRR1, GSID_SRR1) +SHARED_SPRNG_CACHE_WRAPPER(dar, 64, SPRN_GDEAR, GSID_DAR) SHARED_SPRNG_WRAPPER(esr, 64, SPRN_GESR) -SHARED_CACHE_WRAPPER_GET(msr, 64) +SHARED_CACHE_WRAPPER_GET(msr, 64, GSID_MSR) static inline void kvmppc_set_msr_fast(struct kvm_vcpu *vcpu, u64 val) { if (kvmppc_shared_big_endian(vcpu)) vcpu->arch.shared->msr = cpu_to_be64(val); else vcpu->arch.shared->msr = cpu_to_le64(val); + kvmhv_papr_mark_dirty(vcpu, GSID_MSR); } -SHARED_CACHE_WRAPPER(dsisr, 32) +SHARED_CACHE_WRAPPER(dsisr, 32, GSID_DSISR) SHARED_WRAPPER(int_pending, 32) SHARED_WRAPPER(sprg4, 64) SHARED_WRAPPER(sprg5, 64) diff --git a/arch/powerpc/include/asm/plpar_wrappers.h b/arch/powerpc/include/asm/plpar_wrappers.h index 8239c0af5eb2..b48f90884522 100644 --- a/arch/powerpc/include/asm/plpar_wrappers.h +++ b/arch/powerpc/include/asm/plpar_wrappers.h @@ -6,6 +6,7 @@ #include #include +#include #include #include @@ -342,6 +343,203 @@ static inline long plpar_get_cpu_characteristics(struct h_cpu_char_result *p) return rc; } +static inline long plpar_guest_create(unsigned long flags, unsigned long *guest_id) +{ + unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; + unsigned long token; + long rc; + + token = -1UL; + while (true) { + rc = plpar_hcall(H_GUEST_CREATE, retbuf, flags, token); + if (rc == H_SUCCESS) { + *guest_id = retbuf[0]; + break; + } + + if (rc == H_BUSY) { + token = retbuf[0]; + cpu_relax(); + continue; + } + + if (H_IS_LONG_BUSY(rc)) { + token = retbuf[0]; + mdelay(get_longbusy_msecs(rc)); + continue; + } + + break; + } + + return rc; +} + +static inline long plpar_guest_create_vcpu(unsigned long flags, + unsigned long guest_id, + unsigned long vcpu_id) +{ + long rc; + + while (true) { + rc = plpar_hcall_norets(H_GUEST_CREATE_VCPU, 0, guest_id, vcpu_id); + + if (rc == H_BUSY) { + cpu_relax(); + continue; + } + + if (H_IS_LONG_BUSY(rc)) { + mdelay(get_longbusy_msecs(rc)); + continue; + } + + break; + } + + return rc; +} + +static inline long plpar_guest_set_state(unsigned long flags, + unsigned long guest_id, + unsigned long vcpu_id, + unsigned long data_buffer, + unsigned long data_size, + unsigned long *failed_index) +{ + unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; + long rc; + + while (true) { + rc = plpar_hcall(H_GUEST_SET_STATE, retbuf, flags, guest_id, + vcpu_id, data_buffer, data_size); + + if (rc == H_BUSY) { + cpu_relax(); + continue; + } + + if (H_IS_LONG_BUSY(rc)) { + mdelay(get_longbusy_msecs(rc)); + continue; + } + + if (rc == H_INVALID_ELEMENT_ID) + *failed_index = retbuf[0]; + else if (rc == H_INVALID_ELEMENT_SIZE) + *failed_index = retbuf[0]; + else if (rc == H_INVALID_ELEMENT_VALUE) + *failed_index = retbuf[0]; + + break; + } + + return rc; +} + +static inline long plpar_guest_get_state(unsigned long flags, + unsigned long guest_id, + unsigned long vcpu_id, + unsigned long data_buffer, + unsigned long data_size, + unsigned long *failed_index) +{ + unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; + long rc; + + while (true) { + rc = plpar_hcall(H_GUEST_GET_STATE, retbuf, flags, guest_id, + vcpu_id, data_buffer, data_size); + + if (rc == H_BUSY) { + cpu_relax(); + continue; + } + + if (H_IS_LONG_BUSY(rc)) { + mdelay(get_longbusy_msecs(rc)); + continue; + } + + if (rc == H_INVALID_ELEMENT_ID) + *failed_index = retbuf[0]; + else if (rc == H_INVALID_ELEMENT_SIZE) + *failed_index = retbuf[0]; + else if (rc == H_INVALID_ELEMENT_VALUE) + *failed_index = retbuf[0]; + + break; + } + + return rc; +} + +static inline long plpar_guest_run_vcpu(unsigned long flags, unsigned long guest_id, + unsigned long vcpu_id, int *trap, + unsigned long *failed_index) +{ + unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; + long rc; + + rc = plpar_hcall(H_GUEST_RUN_VCPU, retbuf, flags, guest_id, vcpu_id); + if (rc == H_SUCCESS) + *trap = retbuf[0]; + else if (rc == H_INVALID_ELEMENT_ID) + *failed_index = retbuf[0]; + else if (rc == H_INVALID_ELEMENT_SIZE) + *failed_index = retbuf[0]; + else if (rc == H_INVALID_ELEMENT_VALUE) + *failed_index = retbuf[0]; + + return rc; +} + +static inline long plpar_guest_delete(unsigned long flags, u64 guest_id) +{ + long rc; + + while (true) { + rc = plpar_hcall_norets(H_GUEST_DELETE, flags, guest_id); + if (rc == H_BUSY) { + cpu_relax(); + continue; + } + + if (H_IS_LONG_BUSY(rc)) { + mdelay(get_longbusy_msecs(rc)); + continue; + } + + break; + } + + return rc; +} + +static inline long plpar_guest_set_capabilities(unsigned long flags, + unsigned long capabilities) +{ + unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; + long rc; + + rc = plpar_hcall(H_GUEST_SET_CAPABILITIES, retbuf, flags, capabilities); + + return rc; +} + +static inline long plpar_guest_get_capabilities(unsigned long flags, + unsigned long *capabilities) +{ + unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; + long rc; + + rc = plpar_hcall(H_GUEST_GET_CAPABILITIES, retbuf, flags); + if (rc == H_SUCCESS) + *capabilities = retbuf[0]; + + return rc; +} + /* * Wrapper to H_RPT_INVALIDATE hcall that handles return values appropriately * diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index 5319d889b184..3d2ca9b16930 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile @@ -87,6 +87,7 @@ kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \ book3s_hv_ras.o \ book3s_hv_builtin.o \ book3s_hv_p9_perf.o \ + book3s_hv_papr.o \ $(kvm-book3s_64-builtin-tm-objs-y) \ $(kvm-book3s_64-builtin-xics-objs-y) endif diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 2e01ccb97ed6..1b00a815fbb9 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -2906,14 +2906,21 @@ static int kvmppc_core_vcpu_create_hv(struct kvm_vcpu *vcpu) vcpu->arch.shared_big_endian = false; #endif #endif - kvmppc_set_mmcr_hv(vcpu, 0, MMCR0_FC); + if (kvmhv_on_papr()) { + err = kvmhv_papr_vcpu_create(vcpu, &vcpu->arch.papr_host); + if (err < 0) + return err; + } + + kvmppc_set_mmcr_hv(vcpu, 0, MMCR0_FC); if (cpu_has_feature(CPU_FTR_ARCH_31)) { kvmppc_set_mmcr_hv(vcpu, 0, kvmppc_get_mmcr_hv(vcpu, 0) | MMCR0_PMCCEXT); kvmppc_set_mmcra_hv(vcpu, MMCRA_BHRB_DISABLE); } kvmppc_set_ctrl_hv(vcpu, CTRL_RUNLATCH); + kvmppc_set_amor_hv(vcpu, ~0); /* default to host PVR, since we can't spoof it */ kvmppc_set_pvr_hv(vcpu, mfspr(SPRN_PVR)); spin_lock_init(&vcpu->arch.vpa_update_lock); @@ -2987,6 +2994,8 @@ static int kvmppc_core_vcpu_create_hv(struct kvm_vcpu *vcpu) kvm->arch.vcores[core] = vcore; kvm->arch.online_vcores++; mutex_unlock(&kvm->arch.mmu_setup_lock); + if (kvmhv_on_papr()) + kvmppc_set_lpcr_hv(vcpu, vcpu->arch.vcore->lpcr); } } mutex_unlock(&kvm->lock); @@ -3059,6 +3068,8 @@ static void kvmppc_core_vcpu_free_hv(struct kvm_vcpu *vcpu) unpin_vpa(vcpu->kvm, &vcpu->arch.slb_shadow); unpin_vpa(vcpu->kvm, &vcpu->arch.vpa); spin_unlock(&vcpu->arch.vpa_update_lock); + if (kvmhv_on_papr()) + kvmhv_papr_vcpu_free(vcpu, &vcpu->arch.papr_host); } static int kvmppc_core_check_requests_hv(struct kvm_vcpu *vcpu) @@ -4023,6 +4034,50 @@ static void vcpu_vpa_increment_dispatch(struct kvm_vcpu *vcpu) } } +static int kvmhv_vcpu_entry_papr(struct kvm_vcpu *vcpu, u64 time_limit, unsigned long lpcr, u64 *tb) +{ + struct kvmhv_papr_host *ph; + unsigned long msr, i; + int trap; + long rc; + + ph = &vcpu->arch.papr_host; + + msr = mfmsr(); + kvmppc_msr_hard_disable_set_facilities(vcpu, msr); + if (lazy_irq_pending()) + return 0; + + kvmhv_papr_flush_vcpu(vcpu, time_limit); + + accumulate_time(vcpu, &vcpu->arch.in_guest); + rc = plpar_guest_run_vcpu(0, vcpu->kvm->arch.lpid, vcpu->vcpu_id, + &trap, &i); + + if (rc != H_SUCCESS) { + pr_err("KVM Guest Run VCPU hcall failed\n"); + if (rc == H_INVALID_ELEMENT_ID) + pr_err("KVM: Guest Run VCPU invalid element id at %ld\n", i); + else if (rc == H_INVALID_ELEMENT_SIZE) + pr_err("KVM: Guest Run VCPU invalid element size at %ld\n", i); + else if (rc == H_INVALID_ELEMENT_VALUE) + pr_err("KVM: Guest Run VCPU invalid element value at %ld\n", i); + return 0; + } + accumulate_time(vcpu, &vcpu->arch.guest_exit); + + *tb = mftb(); + gsm_reset(ph->vcpu_message); + gsm_reset(ph->vcore_message); + gsbm_zero(&ph->valids); + + kvmhv_papr_parse_output(vcpu); + + timer_rearm_host_dec(*tb); + + return trap; +} + /* call our hypervisor to load up HV regs and go */ static int kvmhv_vcpu_entry_p9_nested(struct kvm_vcpu *vcpu, u64 time_limit, unsigned long lpcr, u64 *tb) { @@ -4140,7 +4195,10 @@ static int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit, vcpu_vpa_increment_dispatch(vcpu); if (kvmhv_on_pseries()) { - trap = kvmhv_vcpu_entry_p9_nested(vcpu, time_limit, lpcr, tb); + if (!kvmhv_on_papr()) + trap = kvmhv_vcpu_entry_p9_nested(vcpu, time_limit, lpcr, tb); + else + trap = kvmhv_vcpu_entry_papr(vcpu, time_limit, lpcr, tb); /* H_CEDE has to be handled now, not later */ if (trap == BOOK3S_INTERRUPT_SYSCALL && !nested && @@ -5100,6 +5158,7 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm, */ void kvmppc_update_lpcr(struct kvm *kvm, unsigned long lpcr, unsigned long mask) { + struct kvm_vcpu *vcpu; long int i; u32 cores_done = 0; @@ -5120,6 +5179,12 @@ void kvmppc_update_lpcr(struct kvm *kvm, unsigned long lpcr, unsigned long mask) if (++cores_done >= kvm->arch.online_vcores) break; } + + if (kvmhv_on_papr()) { + kvm_for_each_vcpu(i, vcpu, kvm) { + kvmppc_set_lpcr_hv(vcpu, vcpu->arch.vcore->lpcr); + } + } } void kvmppc_setup_partition_table(struct kvm *kvm) @@ -5386,15 +5451,43 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm) /* Allocate the guest's logical partition ID */ - lpid = kvmppc_alloc_lpid(); - if ((long)lpid < 0) - return -ENOMEM; - kvm->arch.lpid = lpid; + if (!kvmhv_on_papr()) { + lpid = kvmppc_alloc_lpid(); + if ((long)lpid < 0) + return -ENOMEM; + kvm->arch.lpid = lpid; + } kvmppc_alloc_host_rm_ops(); kvmhv_vm_nested_init(kvm); + if (kvmhv_on_papr()) { + long rc; + unsigned long guest_id; + + rc = plpar_guest_create(0, &guest_id); + + if (rc != H_SUCCESS) + pr_err("KVM: Create Guest hcall failed, rc=%ld\n", rc); + + switch (rc) { + case H_PARAMETER: + case H_FUNCTION: + case H_STATE: + return -EINVAL; + case H_NOT_ENOUGH_RESOURCES: + case H_ABORTED: + return -ENOMEM; + case H_AUTHORITY: + return -EPERM; + case H_NOT_AVAILABLE: + return -EBUSY; + } + kvm->arch.lpid = guest_id; + } + + /* * Since we don't flush the TLB when tearing down a VM, * and this lpid might have previously been used, @@ -5464,7 +5557,10 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm) lpcr |= LPCR_HAIL; ret = kvmppc_init_vm_radix(kvm); if (ret) { - kvmppc_free_lpid(kvm->arch.lpid); + if (kvmhv_on_papr()) + plpar_guest_delete(0, kvm->arch.lpid); + else + kvmppc_free_lpid(kvm->arch.lpid); return ret; } kvmppc_setup_partition_table(kvm); @@ -5554,10 +5650,14 @@ static void kvmppc_core_destroy_vm_hv(struct kvm *kvm) kvm->arch.process_table = 0; if (kvm->arch.secure_guest) uv_svm_terminate(kvm->arch.lpid); - kvmhv_set_ptbl_entry(kvm->arch.lpid, 0, 0); + if (!kvmhv_on_papr()) + kvmhv_set_ptbl_entry(kvm->arch.lpid, 0, 0); } - kvmppc_free_lpid(kvm->arch.lpid); + if (kvmhv_on_papr()) + plpar_guest_delete(0, kvm->arch.lpid); + else + kvmppc_free_lpid(kvm->arch.lpid); kvmppc_free_pimap(kvm); } diff --git a/arch/powerpc/kvm/book3s_hv.h b/arch/powerpc/kvm/book3s_hv.h index 7a7005189ab1..94a69f105f7c 100644 --- a/arch/powerpc/kvm/book3s_hv.h +++ b/arch/powerpc/kvm/book3s_hv.h @@ -3,6 +3,8 @@ /* * Privileged (non-hypervisor) host registers to save. */ +#include "asm/guest-state-buffer.h" + struct p9_host_os_sprs { unsigned long iamr; unsigned long amr; @@ -51,61 +53,66 @@ void accumulate_time(struct kvm_vcpu *vcpu, struct kvmhv_tb_accumulator *next); #define end_timing(vcpu) do {} while (0) #endif -#define HV_WRAPPER_SET(reg, size) \ +#define HV_WRAPPER_SET(reg, size, iden) \ static inline void kvmppc_set_##reg ##_hv(struct kvm_vcpu *vcpu, u##size val) \ { \ vcpu->arch.reg = val; \ + kvmhv_papr_mark_dirty(vcpu, iden); \ } -#define HV_WRAPPER_GET(reg, size) \ +#define HV_WRAPPER_GET(reg, size, iden) \ static inline u##size kvmppc_get_##reg ##_hv(struct kvm_vcpu *vcpu) \ { \ + kvmhv_papr_cached_reload(vcpu, iden); \ return vcpu->arch.reg; \ } -#define HV_WRAPPER(reg, size) \ - HV_WRAPPER_SET(reg, size) \ - HV_WRAPPER_GET(reg, size) \ +#define HV_WRAPPER(reg, size, iden) \ + HV_WRAPPER_SET(reg, size, iden) \ + HV_WRAPPER_GET(reg, size, iden) \ -#define HV_ARRAY_WRAPPER_SET(reg, size) \ +#define HV_ARRAY_WRAPPER_SET(reg, size, iden) \ static inline void kvmppc_set_##reg ##_hv(struct kvm_vcpu *vcpu, int i, u##size val) \ { \ vcpu->arch.reg[i] = val; \ + kvmhv_papr_mark_dirty(vcpu, iden + i); \ } -#define HV_ARRAY_WRAPPER_GET(reg, size) \ +#define HV_ARRAY_WRAPPER_GET(reg, size, iden) \ static inline u##size kvmppc_get_##reg ##_hv(struct kvm_vcpu *vcpu, int i) \ { \ + kvmhv_papr_cached_reload(vcpu, iden + i); \ return vcpu->arch.reg[i]; \ } -#define HV_ARRAY_WRAPPER(reg, size) \ - HV_ARRAY_WRAPPER_SET(reg, size) \ - HV_ARRAY_WRAPPER_GET(reg, size) \ +#define HV_ARRAY_WRAPPER(reg, size, iden) \ + HV_ARRAY_WRAPPER_SET(reg, size, iden) \ + HV_ARRAY_WRAPPER_GET(reg, size, iden) \ -HV_WRAPPER(mmcra, 64) -HV_WRAPPER(hfscr, 64) -HV_WRAPPER(fscr, 64) -HV_WRAPPER(dscr, 64) -HV_WRAPPER(purr, 64) -HV_WRAPPER(spurr, 64) -HV_WRAPPER(amr, 64) -HV_WRAPPER(uamor, 64) -HV_WRAPPER(siar, 64) -HV_WRAPPER(sdar, 64) -HV_WRAPPER(iamr, 64) -HV_WRAPPER(dawr0, 64) -HV_WRAPPER(dawr1, 64) -HV_WRAPPER(dawrx0, 64) -HV_WRAPPER(dawrx1, 64) -HV_WRAPPER(ciabr, 64) -HV_WRAPPER(wort, 64) -HV_WRAPPER(ppr, 64) -HV_WRAPPER(ctrl, 64) +HV_WRAPPER(mmcra, 64, GSID_MMCRA) +HV_WRAPPER(hfscr, 64, GSID_HFSCR) +HV_WRAPPER(fscr, 64, GSID_FSCR) +HV_WRAPPER(dscr, 64, GSID_DSCR) +HV_WRAPPER(purr, 64, GSID_PURR) +HV_WRAPPER(spurr, 64, GSID_SPURR) +HV_WRAPPER(amr, 64, GSID_AMR) +HV_WRAPPER(uamor, 64, GSID_UAMOR) +HV_WRAPPER(siar, 64, GSID_SIAR) +HV_WRAPPER(sdar, 64, GSID_SDAR) +HV_WRAPPER(iamr, 64, GSID_IAMR) +HV_WRAPPER(dawr0, 64, GSID_DAWR0) +HV_WRAPPER(dawr1, 64, GSID_DAWR1) +HV_WRAPPER(dawrx0, 64, GSID_DAWRX0) +HV_WRAPPER(dawrx1, 64, GSID_DAWRX1) +HV_WRAPPER(ciabr, 64, GSID_CIABR) +HV_WRAPPER(wort, 64, GSID_WORT) +HV_WRAPPER(ppr, 64, GSID_PPR) +HV_WRAPPER(ctrl, 64, GSID_CTRL); +HV_WRAPPER(amor, 64, GSID_AMOR) -HV_ARRAY_WRAPPER(mmcr, 64) -HV_ARRAY_WRAPPER(sier, 64) -HV_ARRAY_WRAPPER(pmc, 32) +HV_ARRAY_WRAPPER(mmcr, 64, GSID_MMCR0) +HV_ARRAY_WRAPPER(sier, 64, GSID_SIER) +HV_ARRAY_WRAPPER(pmc, 32, GSID_PMC1) -HV_WRAPPER(pvr, 32) -HV_WRAPPER(pspb, 32) +HV_WRAPPER(pvr, 32, GSID_LOGICAL_PVR) +HV_WRAPPER(pspb, 32, GSID_PSPB) diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c index 5a64a1341e6f..7736ec18278c 100644 --- a/arch/powerpc/kvm/book3s_hv_nested.c +++ b/arch/powerpc/kvm/book3s_hv_nested.c @@ -428,10 +428,12 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) return vcpu->arch.trap; } +static unsigned long nested_capabilities; + long kvmhv_nested_init(void) { long int ptb_order; - unsigned long ptcr; + unsigned long ptcr, host_capabilities; long rc; if (!kvmhv_on_pseries()) @@ -439,6 +441,23 @@ long kvmhv_nested_init(void) if (!radix_enabled()) return -ENODEV; + rc = plpar_guest_get_capabilities(0, &host_capabilities); + if (rc == H_SUCCESS) { + unsigned long capabilities; + + capabilities = H_GUEST_CAP_POWER9 | H_GUEST_CAP_POWER10; + + nested_capabilities = capabilities & host_capabilities; + rc = plpar_guest_set_capabilities(0, nested_capabilities); + if (rc != H_SUCCESS) { + pr_err("kvm-hv: Could not set parent hypervisor capabilities (rc=%ld)\n", rc); + return -ENODEV; + } + + __kvmhv_on_papr = true; + return 0; + } + /* Partition table entry is 1<<4 bytes in size, hence the 4. */ ptb_order = KVM_MAX_NESTED_GUESTS_SHIFT + 4; /* Minimum partition table size is 1<<12 bytes */ @@ -507,10 +526,15 @@ void kvmhv_set_ptbl_entry(unsigned int lpid, u64 dw0, u64 dw1) return; } - pseries_partition_tb[lpid].patb0 = cpu_to_be64(dw0); - pseries_partition_tb[lpid].patb1 = cpu_to_be64(dw1); - /* L0 will do the necessary barriers */ - kvmhv_flush_lpid(lpid); + if (!kvmhv_on_papr()) { + pseries_partition_tb[lpid].patb0 = cpu_to_be64(dw0); + pseries_partition_tb[lpid].patb1 = cpu_to_be64(dw1); + /* L0 will do the necessary barriers */ + kvmhv_flush_lpid(lpid); + } + + if (kvmhv_on_papr()) + kvmhv_papr_set_ptbl_entry(lpid, dw0, dw1); } static void kvmhv_set_nested_ptbl(struct kvm_nested_guest *gp) diff --git a/arch/powerpc/kvm/book3s_hv_papr.c b/arch/powerpc/kvm/book3s_hv_papr.c new file mode 100644 index 000000000000..d0569e784dcd --- /dev/null +++ b/arch/powerpc/kvm/book3s_hv_papr.c @@ -0,0 +1,947 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright 2023 Jordan Niethe, IBM Corp. + * + * Authors: + * Jordan Niethe + * + * Description: KVM functions specific to running on Book 3S + * processors as a PAPR guest. + * + */ + +#include "linux/blk-mq.h" +#include "linux/console.h" +#include "linux/gfp_types.h" +#include "linux/signal.h" +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include "trace_hv.h" + +bool __kvmhv_on_papr __read_mostly; +EXPORT_SYMBOL_GPL(__kvmhv_on_papr); + + +static size_t gs_msg_ops_kvmhv_papr_config_get_size(struct gs_msg *gsm) +{ + u16 ids[] = { + GSID_RUN_OUTPUT_MIN_SIZE, + GSID_RUN_INPUT, + GSID_RUN_OUTPUT, + + }; + size_t size = 0; + + for (int i = 0; i < ARRAY_SIZE(ids); i++) + size += gse_total_size(gsid_size(ids[i])); + return size; +} + +static int gs_msg_ops_kvmhv_papr_config_fill_info(struct gs_buff *gsb, + struct gs_msg *gsm) +{ + struct kvmhv_papr_config *cfg; + int rc; + + cfg = gsm->data; + + if (gsm_includes(gsm, GSID_RUN_OUTPUT_MIN_SIZE)) { + rc = gse_put(gsb, GSID_RUN_OUTPUT_MIN_SIZE, + cfg->vcpu_run_output_size); + if (rc < 0) + return rc; + } + + if (gsm_includes(gsm, GSID_RUN_INPUT)) { + rc = gse_put(gsb, GSID_RUN_INPUT, cfg->vcpu_run_input_cfg); + if (rc < 0) + return rc; + } + + if (gsm_includes(gsm, GSID_RUN_OUTPUT)) { + gse_put(gsb, GSID_RUN_OUTPUT, cfg->vcpu_run_output_cfg); + if (rc < 0) + return rc; + } + + return 0; +} + +static int gs_msg_ops_kvmhv_papr_config_refresh_info(struct gs_msg *gsm, + struct gs_buff *gsb) +{ + struct kvmhv_papr_config *cfg; + struct gs_parser gsp = { 0 }; + struct gs_elem *gse; + int rc; + + cfg = gsm->data; + + rc = gse_parse(&gsp, gsb); + if (rc < 0) + return rc; + + gse = gsp_lookup(&gsp, GSID_RUN_OUTPUT_MIN_SIZE); + if (gse) + gse_get(gse, &cfg->vcpu_run_output_size); + return 0; +} + +struct gs_msg_ops config_msg_ops = { + .get_size = gs_msg_ops_kvmhv_papr_config_get_size, + .fill_info = gs_msg_ops_kvmhv_papr_config_fill_info, + .refresh_info = gs_msg_ops_kvmhv_papr_config_refresh_info, +}; + +static size_t gs_msg_ops_vcpu_get_size(struct gs_msg *gsm) +{ + struct gs_bitmap gsbm = { 0 }; + size_t size = 0; + u16 iden; + + gsbm_fill(&gsbm); + gsbm_for_each(&gsbm, iden) { + switch (iden) { + case GSID_HOST_STATE_SIZE: + case GSID_RUN_OUTPUT_MIN_SIZE: + case GSID_PARTITION_TABLE: + case GSID_PROCESS_TABLE: + case GSID_RUN_INPUT: + case GSID_RUN_OUTPUT: + break; + default: + size += gse_total_size(gsid_size(iden)); + } + } + return size; +} + +static int gs_msg_ops_vcpu_fill_info(struct gs_buff *gsb, struct gs_msg *gsm) +{ + struct kvm_vcpu *vcpu; + vector128 v; + int rc, i; + u16 iden; + + vcpu = gsm->data; + + gsm_for_each(gsm, iden) + { + rc = 0; + + if ((gsm->flags & GS_FLAGS_WIDE) != + (gsid_flags(iden) & GS_FLAGS_WIDE)) + continue; + + switch (iden) { + case GSID_DSCR: + rc = gse_put(gsb, iden, vcpu->arch.dscr); + break; + case GSID_MMCRA: + rc = gse_put(gsb, iden, vcpu->arch.mmcra); + break; + case GSID_HFSCR: + rc = gse_put(gsb, iden, vcpu->arch.hfscr); + break; + case GSID_PURR: + rc = gse_put(gsb, iden, vcpu->arch.purr); + break; + case GSID_SPURR: + rc = gse_put(gsb, iden, vcpu->arch.spurr); + break; + case GSID_AMR: + rc = gse_put(gsb, iden, vcpu->arch.amr); + break; + case GSID_UAMOR: + rc = gse_put(gsb, iden, vcpu->arch.uamor); + break; + case GSID_SIAR: + rc = gse_put(gsb, iden, vcpu->arch.siar); + break; + case GSID_SDAR: + rc = gse_put(gsb, iden, vcpu->arch.sdar); + break; + case GSID_IAMR: + rc = gse_put(gsb, iden, vcpu->arch.iamr); + break; + case GSID_DAWR0: + rc = gse_put(gsb, iden, vcpu->arch.dawr0); + break; + case GSID_DAWR1: + rc = gse_put(gsb, iden, vcpu->arch.dawr1); + break; + case GSID_DAWRX0: + rc = gse_put(gsb, iden, vcpu->arch.dawrx0); + break; + case GSID_DAWRX1: + rc = gse_put(gsb, iden, vcpu->arch.dawrx1); + break; + case GSID_CIABR: + rc = gse_put(gsb, iden, vcpu->arch.ciabr); + break; + case GSID_WORT: + rc = gse_put(gsb, iden, vcpu->arch.wort); + break; + case GSID_PPR: + rc = gse_put(gsb, iden, vcpu->arch.ppr); + break; + case GSID_PSPB: + rc = gse_put(gsb, iden, vcpu->arch.pspb); + break; + case GSID_TAR: + rc = gse_put(gsb, iden, vcpu->arch.tar); + break; + case GSID_FSCR: + rc = gse_put(gsb, iden, vcpu->arch.fscr); + break; + case GSID_EBBHR: + rc = gse_put(gsb, iden, vcpu->arch.ebbhr); + break; + case GSID_EBBRR: + rc = gse_put(gsb, iden, vcpu->arch.ebbrr); + break; + case GSID_BESCR: + rc = gse_put(gsb, iden, vcpu->arch.bescr); + break; + case GSID_IC: + rc = gse_put(gsb, iden, vcpu->arch.ic); + break; + case GSID_CTRL: + rc = gse_put(gsb, iden, vcpu->arch.ctrl); + break; + case GSID_PIDR: + rc = gse_put(gsb, iden, vcpu->arch.pid); + break; + case GSID_AMOR: + rc = gse_put(gsb, iden, vcpu->arch.amor); + break; + case GSID_VRSAVE: + rc = gse_put(gsb, iden, vcpu->arch.vrsave); + break; + case GSID_MMCR0 ... GSID_MMCR3: + i = iden - GSID_MMCR0; + rc = gse_put(gsb, iden, vcpu->arch.mmcr[i]); + break; + case GSID_SIER ... GSID_SIER3: + i = iden - GSID_SIER; + rc = gse_put(gsb, iden, vcpu->arch.sier[i]); + break; + case GSID_PMC1 ... GSID_PMC6: + i = iden - GSID_PMC1; + rc = gse_put(gsb, iden, vcpu->arch.pmc[i]); + break; + case GSID_GPR0 ... GSID_GPR31: + i = iden - GSID_GPR0; + rc = gse_put(gsb, iden, vcpu->arch.regs.gpr[i]); + break; + case GSID_CR: + rc = gse_put(gsb, iden, vcpu->arch.regs.ccr); + break; + case GSID_XER: + rc = gse_put(gsb, iden, vcpu->arch.regs.xer); + break; + case GSID_CTR: + rc = gse_put(gsb, iden, vcpu->arch.regs.ctr); + break; + case GSID_LR: + rc = gse_put(gsb, iden, vcpu->arch.regs.link); + break; + case GSID_NIA: + rc = gse_put(gsb, iden, vcpu->arch.regs.nip); + break; + case GSID_SRR0: + rc = gse_put(gsb, iden, vcpu->arch.shregs.srr0); + break; + case GSID_SRR1: + rc = gse_put(gsb, iden, vcpu->arch.shregs.srr1); + break; + case GSID_SPRG0: + rc = gse_put(gsb, iden, vcpu->arch.shregs.sprg0); + break; + case GSID_SPRG1: + rc = gse_put(gsb, iden, vcpu->arch.shregs.sprg1); + break; + case GSID_SPRG2: + rc = gse_put(gsb, iden, vcpu->arch.shregs.sprg2); + break; + case GSID_SPRG3: + rc = gse_put(gsb, iden, vcpu->arch.shregs.sprg3); + break; + case GSID_DAR: + rc = gse_put(gsb, iden, vcpu->arch.shregs.dar); + break; + case GSID_DSISR: + rc = gse_put(gsb, iden, vcpu->arch.shregs.dsisr); + break; + case GSID_MSR: + rc = gse_put(gsb, iden, vcpu->arch.shregs.msr); + break; + case GSID_VTB: + rc = gse_put(gsb, iden, vcpu->arch.vcore->vtb); + break; + case GSID_LPCR: + rc = gse_put(gsb, iden, vcpu->arch.vcore->lpcr); + break; + case GSID_TB_OFFSET: + rc = gse_put(gsb, iden, vcpu->arch.vcore->tb_offset); + break; + case GSID_LOGICAL_PVR: + rc = gse_put(gsb, iden, vcpu->arch.pvr); + break; + case GSID_FPSCR: + rc = gse_put(gsb, iden, vcpu->arch.fp.fpscr); + break; + case GSID_VSRS0 ... GSID_VSRS31: + i = iden - GSID_VSRS0; + memcpy(&v, &vcpu->arch.fp.fpr[i], + sizeof(vcpu->arch.fp.fpr[i])); + rc = gse_put(gsb, iden, v); + break; +#ifdef CONFIG_VSX + case GSID_VSCR: + rc = gse_put(gsb, iden, vcpu->arch.vr.vscr.u[3]); + break; + case GSID_VSRS32 ... GSID_VSRS63: + i = iden - GSID_VSRS32; + rc = gse_put(gsb, iden, vcpu->arch.vr.vr[i]); + break; +#endif + case GSID_DEC_EXPIRY_TB: + u64 dw; + + dw = vcpu->arch.dec_expires - + vcpu->arch.vcore->tb_offset; + rc = gse_put(gsb, iden, dw); + break; + } + + if (rc < 0) + return rc; + } + + return 0; +} + +static int gs_msg_ops_vcpu_refresh_info(struct gs_msg *gsm, struct gs_buff *gsb) +{ + struct gs_parser gsp = { 0 }; + struct kvmhv_papr_host *ph; + struct gs_bitmap *valids; + struct kvm_vcpu *vcpu; + struct gs_elem *gse; + vector128 v; + int rc, i; + u16 iden; + + vcpu = gsm->data; + + rc = gse_parse(&gsp, gsb); + if (rc < 0) + return rc; + + ph = &vcpu->arch.papr_host; + valids = &ph->valids; + + gsp_for_each(&gsp, iden, gse) + { + switch (iden) { + case GSID_DSCR: + gse_get(gse, &vcpu->arch.dscr); + break; + case GSID_MMCRA: + gse_get(gse, &vcpu->arch.mmcra); + break; + case GSID_HFSCR: + gse_get(gse, &vcpu->arch.hfscr); + break; + case GSID_PURR: + gse_get(gse, &vcpu->arch.purr); + break; + case GSID_SPURR: + gse_get(gse, &vcpu->arch.spurr); + break; + case GSID_AMR: + gse_get(gse, &vcpu->arch.amr); + break; + case GSID_UAMOR: + gse_get(gse, &vcpu->arch.uamor); + break; + case GSID_SIAR: + gse_get(gse, &vcpu->arch.siar); + break; + case GSID_SDAR: + gse_get(gse, &vcpu->arch.sdar); + break; + case GSID_IAMR: + gse_get(gse, &vcpu->arch.iamr); + break; + case GSID_DAWR0: + gse_get(gse, &vcpu->arch.dawr0); + break; + case GSID_DAWR1: + gse_get(gse, &vcpu->arch.dawr1); + break; + case GSID_DAWRX0: + gse_get(gse, &vcpu->arch.dawrx0); + break; + case GSID_DAWRX1: + gse_get(gse, &vcpu->arch.dawrx1); + break; + case GSID_CIABR: + gse_get(gse, &vcpu->arch.ciabr); + break; + case GSID_WORT: + gse_get(gse, &vcpu->arch.wort); + break; + case GSID_PPR: + gse_get(gse, &vcpu->arch.ppr); + break; + case GSID_PSPB: + gse_get(gse, &vcpu->arch.pspb); + break; + case GSID_TAR: + gse_get(gse, &vcpu->arch.tar); + break; + case GSID_FSCR: + gse_get(gse, &vcpu->arch.fscr); + break; + case GSID_EBBHR: + gse_get(gse, &vcpu->arch.ebbhr); + break; + case GSID_EBBRR: + gse_get(gse, &vcpu->arch.ebbrr); + break; + case GSID_BESCR: + gse_get(gse, &vcpu->arch.bescr); + break; + case GSID_IC: + gse_get(gse, &vcpu->arch.ic); + break; + case GSID_CTRL: + gse_get(gse, &vcpu->arch.ctrl); + break; + case GSID_PIDR: + gse_get(gse, &vcpu->arch.pid); + break; + case GSID_AMOR: + gse_get(gse, &vcpu->arch.amor); + break; + case GSID_VRSAVE: + gse_get(gse, &vcpu->arch.vrsave); + break; + case GSID_MMCR0 ... GSID_MMCR3: + i = iden - GSID_MMCR0; + gse_get(gse, &vcpu->arch.mmcr[i]); + break; + case GSID_SIER ... GSID_SIER3: + i = iden - GSID_SIER; + gse_get(gse, &vcpu->arch.sier[i]); + break; + case GSID_PMC1 ... GSID_PMC6: + i = iden - GSID_PMC1; + gse_get(gse, &vcpu->arch.pmc[i]); + break; + case GSID_GPR0 ... GSID_GPR31: + i = iden - GSID_GPR0; + gse_get(gse, &vcpu->arch.regs.gpr[i]); + break; + case GSID_CR: + gse_get(gse, &vcpu->arch.regs.ccr); + break; + case GSID_XER: + gse_get(gse, &vcpu->arch.regs.xer); + break; + case GSID_CTR: + gse_get(gse, &vcpu->arch.regs.ctr); + break; + case GSID_LR: + gse_get(gse, &vcpu->arch.regs.link); + break; + case GSID_NIA: + gse_get(gse, &vcpu->arch.regs.nip); + break; + case GSID_SRR0: + gse_get(gse, &vcpu->arch.shregs.srr0); + break; + case GSID_SRR1: + gse_get(gse, &vcpu->arch.shregs.srr1); + break; + case GSID_SPRG0: + gse_get(gse, &vcpu->arch.shregs.sprg0); + break; + case GSID_SPRG1: + gse_get(gse, &vcpu->arch.shregs.sprg1); + break; + case GSID_SPRG2: + gse_get(gse, &vcpu->arch.shregs.sprg2); + break; + case GSID_SPRG3: + gse_get(gse, &vcpu->arch.shregs.sprg3); + break; + case GSID_DAR: + gse_get(gse, &vcpu->arch.shregs.dar); + break; + case GSID_DSISR: + gse_get(gse, &vcpu->arch.shregs.dsisr); + break; + case GSID_MSR: + gse_get(gse, &vcpu->arch.shregs.msr); + break; + case GSID_VTB: + gse_get(gse, &vcpu->arch.vcore->vtb); + break; + case GSID_LPCR: + gse_get(gse, &vcpu->arch.vcore->lpcr); + break; + case GSID_TB_OFFSET: + gse_get(gse, &vcpu->arch.vcore->tb_offset); + break; + case GSID_LOGICAL_PVR: + gse_get(gse, &vcpu->arch.pvr); + break; + case GSID_FPSCR: + gse_get(gse, &vcpu->arch.fp.fpscr); + break; + case GSID_VSRS0 ... GSID_VSRS31: + gse_get(gse, &v); + i = iden - GSID_VSRS0; + memcpy(&vcpu->arch.fp.fpr[i], &v, + sizeof(vcpu->arch.fp.fpr[i])); + break; +#ifdef CONFIG_VSX + case GSID_VSCR: + gse_get(gse, &vcpu->arch.vr.vscr.u[3]); + break; + case GSID_VSRS32 ... GSID_VSRS63: + i = iden - GSID_VSRS32; + gse_get(gse, &vcpu->arch.vr.vr[i]); + break; +#endif + case GSID_HDAR: + gse_get(gse, &vcpu->arch.fault_dar); + break; + case GSID_HDSISR: + gse_get(gse, &vcpu->arch.fault_dsisr); + break; + case GSID_ASDR: + gse_get(gse, &vcpu->arch.fault_gpa); + break; + case GSID_HEIR: + u32 inst; + + gse_get(gse, &inst); + vcpu->arch.emul_inst = inst; + break; + case GSID_DEC_EXPIRY_TB: + u64 dw; + + gse_get(gse, &dw); + vcpu->arch.dec_expires = + dw + vcpu->arch.vcore->tb_offset; + break; + default: + continue; + } + gsbm_set(valids, iden); + } + + return 0; +} + +struct gs_msg_ops vcpu_message_ops = { + .get_size = gs_msg_ops_vcpu_get_size, + .fill_info = gs_msg_ops_vcpu_fill_info, + .refresh_info = gs_msg_ops_vcpu_refresh_info, +}; + +static int kvmhv_papr_host_create(struct kvm_vcpu *vcpu, + struct kvmhv_papr_host *ph) +{ + struct kvmhv_papr_config *cfg; + struct gs_buff *gsb, *vcpu_run_output, *vcpu_run_input; + unsigned long guest_id, vcpu_id; + struct gs_msg *gsm, *vcpu_message, *vcore_message; + int rc; + + cfg = &ph->cfg; + guest_id = vcpu->kvm->arch.lpid; + vcpu_id = vcpu->vcpu_id; + + gsm = gsm_new(&config_msg_ops, cfg, GS_FLAGS_WIDE, GFP_KERNEL); + if (!gsm) { + rc = -ENOMEM; + goto err; + } + + gsb = gsb_new(gsm_size(gsm), guest_id, vcpu_id, GFP_KERNEL); + if (!gsb) { + rc = -ENOMEM; + goto free_gsm; + } + + rc = gsb_receive_datum(gsb, gsm, GSID_RUN_OUTPUT_MIN_SIZE); + if (rc < 0) { + pr_err("KVM-PAPR: couldn't get vcpu run output buffer minimum size\n"); + goto free_gsb; + } + + vcpu_run_output = gsb_new(cfg->vcpu_run_output_size, guest_id, vcpu_id, GFP_KERNEL); + if (!vcpu_run_output) { + rc = -ENOMEM; + goto free_gsb; + } + + cfg->vcpu_run_output_cfg.address = gsb_paddress(vcpu_run_output); + cfg->vcpu_run_output_cfg.size = gsb_capacity(vcpu_run_output); + ph->vcpu_run_output = vcpu_run_output; + + gsm->flags = 0; + rc = gsb_send_datum(gsb, gsm, GSID_RUN_OUTPUT); + if (rc < 0) { + pr_err("KVM-PAPR: couldn't set vcpu run output buffer\n"); + goto free_gs_out; + } + + vcpu_message = gsm_new(&vcpu_message_ops, vcpu, 0, GFP_KERNEL); + if (!vcpu_message) { + rc = -ENOMEM; + goto free_gs_out; + } + gsm_include_all(vcpu_message); + + ph->vcpu_message = vcpu_message; + + vcpu_run_input = gsb_new(gsm_size(vcpu_message), guest_id, vcpu_id, GFP_KERNEL); + if (!vcpu_run_input) { + rc = -ENOMEM; + goto free_vcpu_message; + } + + ph->vcpu_run_input = vcpu_run_input; + cfg->vcpu_run_input_cfg.address = gsb_paddress(vcpu_run_input); + cfg->vcpu_run_input_cfg.size = gsb_capacity(vcpu_run_input); + rc = gsb_send_datum(gsb, gsm, GSID_RUN_INPUT); + if (rc < 0) { + pr_err("KVM-PAPR: couldn't set vcpu run input buffer\n"); + goto free_vcpu_run_input; + } + + vcore_message = + gsm_new(&vcpu_message_ops, vcpu, GS_FLAGS_WIDE, GFP_KERNEL); + if (!vcore_message) { + rc = -ENOMEM; + goto free_vcpu_run_input; + } + + gsm_include_all(vcore_message); + ph->vcore_message = vcore_message; + + gsbm_fill(&ph->valids); + gsm_free(gsm); + gsb_free(gsb); + return 0; + +free_vcpu_run_input: + gsb_free(vcpu_run_input); +free_vcpu_message: + gsm_free(vcpu_message); +free_gs_out: + gsb_free(vcpu_run_output); +free_gsb: + gsb_free(gsb); +free_gsm: + gsm_free(gsm); +err: + return rc; +} + +/** + * __kvmhv_papr_mark_dirty() - mark a Guest State ID to be sent to the host + * @vcpu: vcpu + * @iden: guest state ID + * + * Mark a guest state ID as having been changed by the L1 host and thus + * the new value must be sent to the L0 hypervisor. See kvmhv_papr_flush_vcpu() + */ +int __kvmhv_papr_mark_dirty(struct kvm_vcpu *vcpu, u16 iden) +{ + struct kvmhv_papr_host *ph; + struct gs_bitmap *valids; + struct gs_msg *gsm; + + if (!iden) + return 0; + + ph = &vcpu->arch.papr_host; + valids = &ph->valids; + gsm = ph->vcpu_message; + gsm_include(gsm, iden); + gsm = ph->vcore_message; + gsm_include(gsm, iden); + gsbm_set(valids, iden); + return 0; +} +EXPORT_SYMBOL_GPL(__kvmhv_papr_mark_dirty); + +/** + * __kvmhv_papr_cached_reload() - reload a Guest State ID from the host + * @vcpu: vcpu + * @iden: guest state ID + * + * Reload the value for the guest state ID from the L0 host into the L1 host. + * This is cached so that going out to the L0 host only happens if neccessary. + */ +int __kvmhv_papr_cached_reload(struct kvm_vcpu *vcpu, u16 iden) +{ + struct kvmhv_papr_host *ph; + struct gs_bitmap *valids; + struct gs_buff *gsb; + struct gs_msg gsm; + int rc; + + if (!iden) + return 0; + + ph = &vcpu->arch.papr_host; + valids = &ph->valids; + if (gsbm_test(valids, iden)) + return 0; + + gsb = ph->vcpu_run_input; + gsm_init(&gsm, &vcpu_message_ops, vcpu, gsid_flags(iden)); + rc = gsb_receive_datum(gsb, &gsm, iden); + if (rc < 0) { + pr_err("KVM-PAPR: couldn't get GSID: 0x%x\n", iden); + return rc; + } + return 0; +} +EXPORT_SYMBOL_GPL(__kvmhv_papr_cached_reload); + +/** + * kvmhv_papr_flush_vcpu() - send modified Guest State IDs to the host + * @vcpu: vcpu + * @time_limit: hdec expiry tb + * + * Send the values marked by __kvmhv_papr_mark_dirty() to the L0 host. Thread + * wide values are copied to the H_GUEST_RUN_VCPU input buffer. Guest wide + * values need to be sent with H_GUEST_SET first. + * + * The hdec tb offset is always sent to L0 host. + */ +int kvmhv_papr_flush_vcpu(struct kvm_vcpu *vcpu, u64 time_limit) +{ + struct kvmhv_papr_host *ph; + struct gs_buff *gsb; + struct gs_msg *gsm; + int rc; + + ph = &vcpu->arch.papr_host; + gsb = ph->vcpu_run_input; + gsm = ph->vcore_message; + rc = gsb_send_data(gsb, gsm); + if (rc < 0) { + pr_err("KVM-PAPR: couldn't set guest wide elements\n"); + return rc; + } + + gsm = ph->vcpu_message; + rc = gsm_fill_info(gsm, gsb); + if (rc < 0) { + pr_err("KVM-PAPR: couldn't fill vcpu run input buffer\n"); + return rc; + } + + rc = gse_put(gsb, GSID_HDEC_EXPIRY_TB, time_limit); + if (rc < 0) + return rc; + return 0; +} +EXPORT_SYMBOL_GPL(kvmhv_papr_flush_vcpu); + + +/** + * kvmhv_papr_set_ptbl_entry() - send partition and process table state to L0 host + * @lpid: guest id + * @dw0: partition table double word + * @dw1: process table double word + */ +int kvmhv_papr_set_ptbl_entry(u64 lpid, u64 dw0, u64 dw1) +{ + struct gs_part_table patbl; + struct gs_proc_table prtbl; + struct gs_buff *gsb; + size_t size; + int rc; + + size = gse_total_size(gsid_size(GSID_PARTITION_TABLE)) + + gse_total_size(gsid_size(GSID_PROCESS_TABLE)) + + sizeof(struct gs_header); + gsb = gsb_new(size, lpid, 0, GFP_KERNEL); + if (!gsb) + return -ENOMEM; + + patbl.address = dw0 & RPDB_MASK; + patbl.ea_bits = ((((dw0 & RTS1_MASK) >> (RTS1_SHIFT - 3)) | + ((dw0 & RTS2_MASK) >> RTS2_SHIFT)) + + 31); + patbl.gpd_size = 1ul << ((dw0 & RPDS_MASK) + 3); + rc = gse_put(gsb, GSID_PARTITION_TABLE, patbl); + if (rc < 0) + goto free_gsb; + + prtbl.address = dw1 & PRTB_MASK; + prtbl.gpd_size = 1ul << ((dw1 & PRTS_MASK) + 12); + rc = gse_put(gsb, GSID_PROCESS_TABLE, prtbl); + if (rc < 0) + goto free_gsb; + + rc = gsb_send(gsb, GS_FLAGS_WIDE); + if (rc < 0) { + pr_err("KVM-PAPR: couldn't set the PATE\n"); + goto free_gsb; + } + + gsb_free(gsb); + return 0; + +free_gsb: + gsb_free(gsb); + return rc; +} +EXPORT_SYMBOL_GPL(kvmhv_papr_set_ptbl_entry); + +/** + * kvmhv_papr_parse_output() - receive values from H_GUEST_RUN_VCPU output + * @vcpu: vcpu + * + * Parse the output buffer from H_GUEST_RUN_VCPU to update vcpu. + */ +int kvmhv_papr_parse_output(struct kvm_vcpu *vcpu) +{ + struct kvmhv_papr_host *ph; + struct gs_buff *gsb; + struct gs_msg gsm; + + ph = &vcpu->arch.papr_host; + gsb = ph->vcpu_run_output; + + vcpu->arch.fault_dar = 0; + vcpu->arch.fault_dsisr = 0; + vcpu->arch.fault_gpa = 0; + vcpu->arch.emul_inst = 0; + + gsm_init(&gsm, &vcpu_message_ops, vcpu, 0); + gsm_refresh_info(&gsm, gsb); + + return 0; +} +EXPORT_SYMBOL_GPL(kvmhv_papr_parse_output); + +static void kvmhv_papr_host_free(struct kvm_vcpu *vcpu, + struct kvmhv_papr_host *ph) +{ + gsm_free(ph->vcpu_message); + gsm_free(ph->vcore_message); + gsb_free(ph->vcpu_run_input); + gsb_free(ph->vcpu_run_output); +} + +int __kvmhv_papr_reload_ptregs(struct kvm_vcpu *vcpu, struct pt_regs *regs) +{ + int rc; + + for (int i = 0; i < 32; i++) { + rc = kvmhv_papr_cached_reload(vcpu, GSID_GPR0 + i); + if (rc < 0) + return rc; + } + + rc = kvmhv_papr_cached_reload(vcpu, GSID_CR); + if (rc < 0) + return rc; + rc = kvmhv_papr_cached_reload(vcpu, GSID_XER); + if (rc < 0) + return rc; + rc = kvmhv_papr_cached_reload(vcpu, GSID_CTR); + if (rc < 0) + return rc; + rc = kvmhv_papr_cached_reload(vcpu, GSID_LR); + if (rc < 0) + return rc; + rc = kvmhv_papr_cached_reload(vcpu, GSID_NIA); + if (rc < 0) + return rc; + + return 0; +} +EXPORT_SYMBOL_GPL(__kvmhv_papr_reload_ptregs); + +int __kvmhv_papr_mark_dirty_ptregs(struct kvm_vcpu *vcpu, struct pt_regs *regs) +{ + for (int i = 0; i < 32; i++) + kvmhv_papr_mark_dirty(vcpu, GSID_GPR0 + i); + + kvmhv_papr_mark_dirty(vcpu, GSID_CR); + kvmhv_papr_mark_dirty(vcpu, GSID_XER); + kvmhv_papr_mark_dirty(vcpu, GSID_CTR); + kvmhv_papr_mark_dirty(vcpu, GSID_LR); + kvmhv_papr_mark_dirty(vcpu, GSID_NIA); + + return 0; +} +EXPORT_SYMBOL_GPL(__kvmhv_papr_mark_dirty_ptregs); + +/** + * kvmhv_papr_vcpu_create() - create nested vcpu for the PAPR API + * @vcpu: vcpu + * @ph: PAPR nested host state + * + * Parse the output buffer from H_GUEST_RUN_VCPU to update vcpu. + */ +int kvmhv_papr_vcpu_create(struct kvm_vcpu *vcpu, + struct kvmhv_papr_host *ph) +{ + long rc; + + rc = plpar_guest_create_vcpu(0, vcpu->kvm->arch.lpid, vcpu->vcpu_id); + + if (rc != H_SUCCESS) { + pr_err("KVM: Create Guest vcpu hcall failed, rc=%ld\n", rc); + switch (rc) { + case H_NOT_ENOUGH_RESOURCES: + case H_ABORTED: + return -ENOMEM; + case H_AUTHORITY: + return -EPERM; + default: + return -EINVAL; + } + } + + rc = kvmhv_papr_host_create(vcpu, ph); + + return rc; +} +EXPORT_SYMBOL_GPL(kvmhv_papr_vcpu_create); + +/** + * kvmhv_papr_vcpu_free() - free the PAPR host state + * @vcpu: vcpu + * @ph: PAPR nested host state + */ +void kvmhv_papr_vcpu_free(struct kvm_vcpu *vcpu, + struct kvmhv_papr_host *ph) +{ + kvmhv_papr_host_free(vcpu, ph); +} +EXPORT_SYMBOL_GPL(kvmhv_papr_vcpu_free); diff --git a/arch/powerpc/kvm/emulate_loadstore.c b/arch/powerpc/kvm/emulate_loadstore.c index 6458ede28b65..2c40a693cd77 100644 --- a/arch/powerpc/kvm/emulate_loadstore.c +++ b/arch/powerpc/kvm/emulate_loadstore.c @@ -92,7 +92,8 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) vcpu->arch.mmio_host_swabbed = 0; emulated = EMULATE_FAIL; - vcpu->arch.regs.msr = vcpu->arch.shared->msr; + vcpu->arch.regs.msr = kvmppc_get_msr(vcpu); + kvmhv_papr_reload_ptregs(vcpu, &vcpu->arch.regs); if (analyse_instr(&op, &vcpu->arch.regs, ppc_inst(inst)) == 0) { int type = op.type & INSTR_TYPE_MASK; int size = GETSIZE(op.type); @@ -356,6 +357,7 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) } } + kvmhv_papr_mark_dirty_ptregs(vcpu, &vcpu->arch.regs); trace_kvm_ppc_instr(inst, kvmppc_get_pc(vcpu), emulated); /* Advance past emulated instruction. */