From patchwork Thu Jan 11 10:11:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 858997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lh8sxHBp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHMCC1zgLz9t75 for ; Thu, 11 Jan 2018 21:13:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933178AbeAKKNK (ORCPT ); Thu, 11 Jan 2018 05:13:10 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:46086 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933340AbeAKKNJ (ORCPT ); Thu, 11 Jan 2018 05:13:09 -0500 Received: by mail-pf0-f195.google.com with SMTP id y5so1310722pff.13; Thu, 11 Jan 2018 02:13:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kSQcuN7doeiv0hEibfof9Vac1TdUIqRXeQQBG+lZ0vQ=; b=lh8sxHBpWzqARNvKxunU1JT3v4YZ9WYH1dbziy28XLQwTgHyFsPJwMEXkRprKe6Mu/ SzzfyFA8haEcAkQcoTWV+KCwwwbeuVT17lsi3GTQ92QfWDQysVqf26rI5Bazw1QEJgMC fNiGpasfWTRmvBXyT4EX8haaL86p7VBTd4MyaNnKkWqaiACUzPzZjraoeSVb7ia1i/Ft yIJWaAPtXX6j6EHT+Z/zfcwPUdMsZxCU8zuPejZhAfK1P62kvjDLEeBMwwGDDQTkBqbe 5SoAQ6dGYt6VyEQuynvEc31oNCoLbrSEyU1HsNcU9sEUMqqsHvDkN0Y+bB3CH2Se3HHV kEeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kSQcuN7doeiv0hEibfof9Vac1TdUIqRXeQQBG+lZ0vQ=; b=BSanrgNc021A+Qcn0FP2SwweRuoqf93+flVvPhUlG2rrj4ud4xAX2z60RYHU2e51Md k9vmp/sNSjtHvc2O+dgtKKpuaAESvf8mfINaj7oooN0WFa4ILyELMkbiAOFqX5uqPJ91 93ICmx0PcWcikok+ZercAnIztVAwR1CtfH6bDYU56s1YQYB0fBAOuETU1hBbtMw3Q0Zw nYmw0wOJNqHmKvA7vvEEDZYcRFYfG7p0kG29aj477sBB+sF3l9xx4xYtn7fHFUhQlXUB VBWFUKhcM8oW0AO9qJXo7P9jKoxciBaH2H38umhIBnQge8DVIuZnSn3nzlY71/195tpA KFCw== X-Gm-Message-State: AKwxytcNhNkFh1+8NdtQZaxiIB/MguBORGKKgWi+Yq3yhyNYIYeL4+P4 Ypjj30OcaMIwGBjZ2lxLG4606g== X-Google-Smtp-Source: ACJfBosNuUCYo31qBe9TsnWWcWVgilo+LQARQzn777ci2XYHdt+wY1GBg147ui0DUNp2gCTwWy/XhA== X-Received: by 10.98.78.148 with SMTP id c142mr7111111pfb.153.1515665588939; Thu, 11 Jan 2018 02:13:08 -0800 (PST) Received: from simonLocalRHEL7.cn.ibm.com ([112.73.0.88]) by smtp.gmail.com with ESMTPSA id m11sm34336122pgt.56.2018.01.11.02.13.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 02:13:08 -0800 (PST) From: wei.guo.simon@gmail.com To: linuxppc-dev@lists.ozlabs.org Cc: Paul Mackerras , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Simon Guo Subject: [PATCH 22/26] KVM: PPC: Book3S PR: add emulation for trechkpt in PR KVM. Date: Thu, 11 Jan 2018 18:11:35 +0800 Message-Id: <1515665499-31710-23-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1515665499-31710-1-git-send-email-wei.guo.simon@gmail.com> References: <1515665499-31710-1-git-send-email-wei.guo.simon@gmail.com> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org From: Simon Guo This patch adds host emulation when guest PR KVM executes "trechkpt.", which is a privileged instruction and will trap into host. We firstly copy vcpu ongoing content into vcpu tm checkpoint content, then perform kvmppc_restore_tm_pr() to do trechkpt. with updated vcpu tm checkpoint vals. Signed-off-by: Simon Guo --- arch/powerpc/kvm/book3s_emulate.c | 57 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/book3s_emulate.c b/arch/powerpc/kvm/book3s_emulate.c index 51c0e20..52a2e46 100644 --- a/arch/powerpc/kvm/book3s_emulate.c +++ b/arch/powerpc/kvm/book3s_emulate.c @@ -52,6 +52,7 @@ #define OP_31_XOP_TBEGIN 654 #define OP_31_XOP_TRECLAIM 942 +#define OP_31_XOP_TRCHKPT 1006 /* DCBZ is actually 1014, but we patch it to 1010 so we get a trap */ #define OP_31_XOP_DCBZ 1010 @@ -94,7 +95,7 @@ static bool spr_allowed(struct kvm_vcpu *vcpu, enum priv_level level) } #ifdef CONFIG_PPC_TRANSACTIONAL_MEM -void kvmppc_copyto_vcpu_tm(struct kvm_vcpu *vcpu) +static void kvmppc_copyto_vcpu_tm(struct kvm_vcpu *vcpu) { memcpy(&vcpu->arch.gpr_tm[0], &vcpu->arch.gpr[0], sizeof(vcpu->arch.gpr_tm)); @@ -166,6 +167,32 @@ static void kvmppc_emulate_treclaim(struct kvm_vcpu *vcpu, int ra_val) tm_disable(); preempt_enable(); } + +static void kvmppc_emulate_trchkpt(struct kvm_vcpu *vcpu) +{ + unsigned long guest_msr = kvmppc_get_msr(vcpu); + + preempt_disable(); + vcpu->arch.save_msr_tm = MSR_TS_S; + vcpu->arch.save_msr_tm &= ~(MSR_FP | MSR_VEC | MSR_VSX); + vcpu->arch.save_msr_tm |= (vcpu->arch.guest_owned_ext & + (MSR_FP | MSR_VEC | MSR_VSX)); + /* + * need flush FP/VEC/VSX to vcpu save area before + * copy. + */ + kvmppc_giveup_ext(vcpu, MSR_VSX); + kvmppc_copyto_vcpu_tm(vcpu); + kvmppc_restore_tm_pr(vcpu); + preempt_enable(); + + /* + * as a result of trecheckpoint. set TS to suspended. + */ + guest_msr &= ~(MSR_TS_MASK); + guest_msr |= MSR_TS_S; + kvmppc_set_msr(vcpu, guest_msr); +} #endif int kvmppc_core_emulate_op_pr(struct kvm_run *run, struct kvm_vcpu *vcpu, @@ -457,6 +484,34 @@ int kvmppc_core_emulate_op_pr(struct kvm_run *run, struct kvm_vcpu *vcpu, kvmppc_emulate_treclaim(vcpu, ra_val); break; } + case OP_31_XOP_TRCHKPT: + { + ulong guest_msr = kvmppc_get_msr(vcpu); + unsigned long texasr; + + /* generate interrupt based on priorities */ + if (guest_msr & MSR_PR) { + /* Privileged Instruction type Program Intr */ + kvmppc_core_queue_program(vcpu, SRR1_PROGPRIV); + emulated = EMULATE_AGAIN; + break; + } + + tm_enable(); + texasr = mfspr(SPRN_TEXASR); + tm_disable(); + + if (MSR_TM_ACTIVE(guest_msr) || + !(texasr & (TEXASR_FS))) { + /* TM bad thing interrupt */ + kvmppc_core_queue_program(vcpu, SRR1_PROGTM); + emulated = EMULATE_AGAIN; + break; + } + + kvmppc_emulate_trchkpt(vcpu); + break; + } #endif default: emulated = EMULATE_FAIL;