From patchwork Thu Jan 11 10:11:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 859000 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="Z51t+RZM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHMCM5pc6z9t7W for ; Thu, 11 Jan 2018 21:13:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933354AbeAKKNS (ORCPT ); Thu, 11 Jan 2018 05:13:18 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35731 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933080AbeAKKNR (ORCPT ); Thu, 11 Jan 2018 05:13:17 -0500 Received: by mail-pf0-f193.google.com with SMTP id t12so1307718pfg.2; Thu, 11 Jan 2018 02:13:17 -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=eMlQ/n2ju27M4EODWYigGRUDvJUljKlkARORJJEQnvE=; b=Z51t+RZMVUQSr3wtkLTigkhdTO9g4LCd1syqnZzu6HxtskbDP+/MNA86YJFOZi51bx WwpS/iRILqa1JtpjHQZ5+k6NdAaLYIoi00ba+JFv1aYUrMyx4bOwiEj20b94ca8kCDrp PC2ehpPDBnHsjKJumDZndOlwJY5SXpZaVZR2hK4dqSVgDWqaDIzf3NqPELfFkE+et/TA EUqoIdkaHhgf0lpr+maQ9x674sFmnScEbtnn7INDPYt7ONjaS+04fQ3urlipXQjZvH/t pjczpbLAnk2XgY6yLKFY3WKQu74oBVW0DCph5OQvgkXFrvjhyjdprQijl9rE+sjzN1uz 9xSQ== 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=eMlQ/n2ju27M4EODWYigGRUDvJUljKlkARORJJEQnvE=; b=lcEAE9gXQm3zVwflqP5LHe2p1lcdFKqa3Lf0XocfeKpusWgJ+JTTC3auLiRanYAf6b ZU8o+HnNDL/iFOBoBEv+z2V6vHbPyRrA7qeJkKPkRhngf24Y9j4Nphj0peQL6XsOn+nF 7szZ50d5gm170ZTtt6Z+2y9ij1jT9QU6626Ai/fV1Ss41ay7mRjAgImEYRmH3lZr9R0Y o0+l3kY4GuIu2fsSitz1gw7MOwwBA2Dft80pxoAaY+lH64X7M9KADSgYYooJ8vQhwN4X WxBrQ9VGMgt8Q+FdsnoyDxPQc2KiuUfzQlFCJ3EeMnM2cPfI38fRkfOtdMD1WcvueyBD SQQw== X-Gm-Message-State: AKwxytc5qkBQqrwEaftCOloQX6tu3dNMezHOmKEbxz5NxeYTXUYc2Uho PJWi+wcsfurZcO0r/HtIVGMYaQ== X-Google-Smtp-Source: ACJfBotp5wJuBCUql+MG9g4WDyHb4W6964yB3nXzCxA3IKUF2+OEo3Y1iz3slS479Wu40U0b0z8vSQ== X-Received: by 10.84.218.1 with SMTP id q1mr10001200pli.123.1515665596825; Thu, 11 Jan 2018 02:13:16 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 02:13:16 -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 24/26] KVM: PPC: Book3S PR: add guard code to prevent returning to guest with PR=0 and Transactional state Date: Thu, 11 Jan 2018 18:11:37 +0800 Message-Id: <1515665499-31710-25-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 Currently PR KVM doesn't support transaction memory at guest privilege state. This patch adds a check at setting guest msr, so that we can never return to guest with PR=0 and TS=0b10. A tabort will be emulated to indicate this and fail transaction immediately. Signed-off-by: Simon Guo --- arch/powerpc/include/uapi/asm/tm.h | 2 +- arch/powerpc/kvm/book3s.h | 1 + arch/powerpc/kvm/book3s_emulate.c | 2 +- arch/powerpc/kvm/book3s_pr.c | 13 ++++++++++++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/uapi/asm/tm.h b/arch/powerpc/include/uapi/asm/tm.h index e1bf0e2..e2947c9 100644 --- a/arch/powerpc/include/uapi/asm/tm.h +++ b/arch/powerpc/include/uapi/asm/tm.h @@ -13,7 +13,7 @@ #define TM_CAUSE_TLBI 0xdc #define TM_CAUSE_FAC_UNAV 0xda #define TM_CAUSE_SYSCALL 0xd8 -#define TM_CAUSE_MISC 0xd6 /* future use */ +#define TM_CAUSE_PRIV_T 0xd6 #define TM_CAUSE_SIGNAL 0xd4 #define TM_CAUSE_ALIGNMENT 0xd2 #define TM_CAUSE_EMULATE 0xd0 diff --git a/arch/powerpc/kvm/book3s.h b/arch/powerpc/kvm/book3s.h index d2b3ec0..9beb57b 100644 --- a/arch/powerpc/kvm/book3s.h +++ b/arch/powerpc/kvm/book3s.h @@ -32,4 +32,5 @@ extern int kvmppc_core_emulate_mfspr_pr(struct kvm_vcpu *vcpu, extern int kvmppc_book3s_init_pr(void); extern void kvmppc_book3s_exit_pr(void); +extern void kvmppc_emulate_tabort(struct kvm_vcpu *vcpu, int ra_val); #endif diff --git a/arch/powerpc/kvm/book3s_emulate.c b/arch/powerpc/kvm/book3s_emulate.c index 65eb236..11d76be 100644 --- a/arch/powerpc/kvm/book3s_emulate.c +++ b/arch/powerpc/kvm/book3s_emulate.c @@ -196,7 +196,7 @@ static void kvmppc_emulate_trchkpt(struct kvm_vcpu *vcpu) } /* emulate tabort. at guest privilege state */ -static void kvmppc_emulate_tabort(struct kvm_vcpu *vcpu, int ra_val) +void kvmppc_emulate_tabort(struct kvm_vcpu *vcpu, int ra_val) { /* currently we only emulate tabort. but no emulation of other * tabort variants since there is no kernel usage of them at diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index f65415b..cc568bc 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -461,12 +461,23 @@ static void kvmppc_recalc_shadow_msr(struct kvm_vcpu *vcpu) static void kvmppc_set_msr_pr(struct kvm_vcpu *vcpu, u64 msr) { - ulong old_msr = kvmppc_get_msr(vcpu); + ulong old_msr; #ifdef EXIT_DEBUG printk(KERN_INFO "KVM: Set MSR to 0x%llx\n", msr); #endif +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM + /* We should never target guest MSR to TS=10 && PR=0, + * since we always fail transaction for guest privilege + * state. + */ + if (!(msr & MSR_PR) && MSR_TM_TRANSACTIONAL(msr)) + kvmppc_emulate_tabort(vcpu, + TM_CAUSE_PRIV_T | TM_CAUSE_PERSISTENT); +#endif + + old_msr = kvmppc_get_msr(vcpu); msr &= to_book3s(vcpu)->msr_mask; kvmppc_set_msr_fast(vcpu, msr); kvmppc_recalc_shadow_msr(vcpu);