From patchwork Mon May 21 04:09:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 917342 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iZMcW1O+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40q5nf2D6xz9s7c for ; Mon, 21 May 2018 14:45:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752522AbeEUEp4 (ORCPT ); Mon, 21 May 2018 00:45:56 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34944 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750703AbeEUEps (ORCPT ); Mon, 21 May 2018 00:45:48 -0400 Received: by mail-pg0-f65.google.com with SMTP id 11-v6so4177351pge.2; Sun, 20 May 2018 21:45:48 -0700 (PDT) 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=G9cU21vxoCQ0p25Ua6QtVLiMsd2UnFM6la/gx2bKPuc=; b=iZMcW1O+1mscys+otI1xhSN0a63aMhYHkK/kjHGLr9NVwJ1Jnm6vLeYzKK0BBmsl5L E/+ndWQpRtM06AYIltmfAnA9QHMyQkJieDzNOzDYKohqqi9rmWC9vfVo/R3ArOrvjUiP Eq7E6d6lPs0w378QkNLJTrKZWBnhPIB4FEOkjNOqIqKM4k51e5+7KDFvVIPPkQMExVJH SV3qWDdI7t4m/yHIGe7C3EY61IISYCL3STvUfmSNml4j8jAgHi9WVCRFT4rn5TzXjQJ+ ymra6/OCKWbNz1rAezrkDVU9m3XbD1W+swFPsEQyYbrub1tqt/P9W/B2yZc4hM8v15YY 7wXw== 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=G9cU21vxoCQ0p25Ua6QtVLiMsd2UnFM6la/gx2bKPuc=; b=fHtuMPxEyGjtuUVxI70TrJvuOaMzFwoo7axiv0h7KulB0A60T1FQixFHMkhNlLQ+IN BQ6ENB7AJYBmZM0mXGPoyj2nMQ4LmYva1bdlQs/hXlbug3fCOwSrNGbMIPSsAajrbloF FvIX8Wv/JAxcUoglS224P4RNDFPsu45Hr8LDH7ld9DCRCtelThtS5sWDZUyuhry57YFu xpdU0gEEcF2PEOz5BtjlNiAwFArt6UtbZJWn2G3D//Vmr31L82mv9o0S+52ngIFGyVLe LYussc6SB1kW5qgNdTAHD3tduJW4pCDyl+eYbELbKvY/3GxiYor/cXPcCSoSu1qYllVJ s05A== X-Gm-Message-State: ALKqPweZrXsVQPhKAhFM5981L2SkJt3TKI45zLwKt9vlTBg/pOd2ZMfp /OBFrlDa5Ftg+HWMzBX1Dkk= X-Google-Smtp-Source: AB8JxZrKl0mYZMudqY81PlA0KrZDthAPWydqx+bui0M65sQ6MKz2ebjOtNtN7OdV0CrKWoU0x4y9Bw== X-Received: by 2002:a65:56cb:: with SMTP id w11-v6mr14264083pgs.175.1526877948146; Sun, 20 May 2018 21:45:48 -0700 (PDT) Received: from simonLocalRHEL7.cn.ibm.com ([112.73.0.89]) by smtp.gmail.com with ESMTPSA id t14-v6sm24575514pfa.31.2018.05.20.21.45.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 21:45:47 -0700 (PDT) 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 v3 09/29] KVM: PPC: Book3S PR: PR KVM pass through MSR TM/TS bits to shadow_msr. Date: Mon, 21 May 2018 12:09:26 +0800 Message-Id: <1526875786-10372-10-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526875786-10372-1-git-send-email-wei.guo.simon@gmail.com> References: <1526875786-10372-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 67061d3..d3237f5 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -312,7 +312,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 */