From patchwork Thu Jan 11 10:11:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 859021 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zHMYW1kLYz9s7M for ; Thu, 11 Jan 2018 21:29:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LeiIuXdE"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zHMYW0PV2zF0WQ for ; Thu, 11 Jan 2018 21:29:03 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LeiIuXdE"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::243; helo=mail-pf0-x243.google.com; envelope-from=wei.guo.simon@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LeiIuXdE"; dkim-atps=neutral Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zHMB61jXnzF0Tk for ; Thu, 11 Jan 2018 21:12:14 +1100 (AEDT) Received: by mail-pf0-x243.google.com with SMTP id d23so1310704pfe.9 for ; Thu, 11 Jan 2018 02:12:14 -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=biEL1BN4lVeQIKN91OlBgmTC7bljBxVFN2NsviMchfU=; b=LeiIuXdEdjMlP6So+Ne76QDlNo0YAzbpdWpLQi+u4nzVK1pQN2kUgIF1B1w1UOKBcB uuzNfOUvJ4/fYkQBesaE/U7jVGz50N585ms80+ZX13p4rC68WXnSWcLAiMNLFU/8GXkI YCG9nBVIMpjI9EiA5Zh24h2pDO4uUmxUhHmHbNPoRfon6n7mD+R7KSWTtXgjTrZTzVzM gZFisPbdT0/4Dy7lI7J4V9a6+gDTMX7ePf/EG+/lEVRj7Mf/qPQ5s7nXUMREBkI9yDe+ TRRO+gSS7ddZMqnL0dVAulx03KIwaEfkRo7Mi+5VZOpxkqwFGGs/MizwDmLUV537Hi/J r05g== 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=biEL1BN4lVeQIKN91OlBgmTC7bljBxVFN2NsviMchfU=; b=tmHv7VHR9gUfUpxMxNW+00YOB0m10kh3iYyq0lb3aIUY78NOXrwjXAhrk20Lxeo1aO Fw6vEQpVxOotu2n9XjJYzqScQeZ/VfdQ2iDyoQVplHun4ep7DNGT1D2kWI0onG7LWeIl 2iGpEP3Xgc6q57zQHTqHZaq0TguOy1/ttCH+ZnY9nXjIjpDsAa5C96Bn8JnS29tekN+T WqnjqCEwrmuD4KwkKv8U+9yYwoH3hIQ+t0nn35t1BO68TCCqZ+kiPv5RlviCBXntgKll IjgnuHSDYRybCDyTYSPegqi8abIpU1l048c9Eppo6AlS4s1/k6i/AP7YsRNwo9rUc5Ql EZrA== X-Gm-Message-State: AKGB3mJlbD5e4kohYHA0XTS996wn1w4ov3nqNPXC1SIkhJptB5VI5BsF 2Cql2PzMtnTBEQZmemFcCCWBEg== X-Google-Smtp-Source: ACJfBouVsUshLBOy0Z/anaOYip2qXgSO4Z0gSvnXPG8BunZa4J62FL3glfQN+4w4sVOtz64IgfJXuA== X-Received: by 10.98.16.132 with SMTP id 4mr12418752pfq.42.1515665532430; Thu, 11 Jan 2018 02:12:12 -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.12.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 02:12:11 -0800 (PST) From: wei.guo.simon@gmail.com To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 06/26] KVM: PPC: Book3S PR: PR KVM pass through MSR TM/TS bits to shadow_msr. Date: Thu, 11 Jan 2018 18:11:19 +0800 Message-Id: <1515665499-31710-7-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> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Guo , kvm-ppc@vger.kernel.org, kvm@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Simon Guo PowerPC TM functionality needs MSR TM/TS bits support in hardware level. Guest TM functionality can not be emulated with "fake" MSR (msr in magic page) TS bits. This patch syncs TM/TS bits in shadow_msr with the MSR value in magic page, so that the MSR TS value which guest sees is consistent with actual MSR bits running in guest. Signed-off-by: Simon Guo Reviewed-by: Paul Mackerras --- arch/powerpc/kvm/book3s_pr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index d0dc862..4e9acdd 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -322,7 +322,12 @@ static void kvmppc_recalc_shadow_msr(struct kvm_vcpu *vcpu) ulong smsr = guest_msr; /* Guest MSR values */ +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM + smsr &= MSR_FE0 | MSR_FE1 | MSR_SF | MSR_SE | MSR_BE | MSR_LE | + MSR_TM | MSR_TS_MASK; +#else smsr &= MSR_FE0 | MSR_FE1 | MSR_SF | MSR_SE | MSR_BE | MSR_LE; +#endif /* Process MSR values */ smsr |= MSR_ME | MSR_RI | MSR_IR | MSR_DR | MSR_PR | MSR_EE; /* External providers the guest reserved */