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: 858981 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="LeiIuXdE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHMB7016vz9t41 for ; Thu, 11 Jan 2018 21:12:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932985AbeAKKMO (ORCPT ); Thu, 11 Jan 2018 05:12:14 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34706 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932684AbeAKKMM (ORCPT ); Thu, 11 Jan 2018 05:12:12 -0500 Received: by mail-pf0-f193.google.com with SMTP id e76so1307294pfk.1; Thu, 11 Jan 2018 02:12:12 -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=g+tEHiTVjIwR2Ubs0CXrHs8IqB4FDN8j4luI3uVoMEijyuN0KGQF0Ndnznb7iLfTgc iJ4lI0YJw5ZJ6Gk9LrWX8Y5AzZIldYSm9lzBqI02UtESCVMx11yAjl4Jl95uEqw+U0hZ iDx8pQqUkhyUxpe8cCIKRNchmYGasCZlEgRNfCY0iDxmyN+mMg2AUY1OMQtJiEiDjnOw 98arbJ88USffUwrHEBo50J9jFFEnC+4Xd/tbxLp1pLmVAZmDppbVTGxp5zOvowhArluO ktc4GVKqE8NkDKWLDEoFdxnKnxw3oCjUsxl71nro8lbl4A1zAzJLvv0lHpb2uZrfjsDP /eWg== X-Gm-Message-State: AKGB3mI4g0qRrG7q0oRHOLLxh7Y6M/A3HH7kaSWgsh7mCXVaOx5G1S87 hRJ+ZIeJtucv1bjdxyG1gO8= 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 Cc: Paul Mackerras , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Simon Guo 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> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org 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 */