From patchwork Wed May 23 07:01:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: simon X-Patchwork-Id: 10420507 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1AB460327 for ; Wed, 23 May 2018 07:47:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5BF228EE3 for ; Wed, 23 May 2018 07:47:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D452828F4C; Wed, 23 May 2018 07:47:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 735D228EE3 for ; Wed, 23 May 2018 07:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754477AbeEWHrz (ORCPT ); Wed, 23 May 2018 03:47:55 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:41669 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754461AbeEWHrr (ORCPT ); Wed, 23 May 2018 03:47:47 -0400 Received: by mail-pf0-f195.google.com with SMTP id v63-v6so10068373pfk.8; Wed, 23 May 2018 00:47:46 -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=qtfidES1XXcEeq7E3Jry9h3skYXwVWKgywLgcFkA6L0=; b=VcnNVB50az3sAhwoatus7MeGzOEBxo/DisiuODPhlyZ1L24buZrhfgATD8y94x92Q2 5CXxFQLjesitp4U5X37b+1hOj+bigSVvFFKjooY89CyoUFOQHZJUjc0qIMjbnrsdXT78 KxTmNMGMPw5R8OnQN6Dgnjw2MkrSKNud9vSttYsxnsr5RBMa4CNELj514E2hlGGcri5d fGDeoLiRGJ+IdcyoRtQ6wzux5e6Nfyt5XScHtXVu79dmJnn3sIKZH6EqVDx9EWZeRaCj 3MERWKDUbWlmxzO7wAjD9BT/oGao9jdLiAT+xml2iVqUS3hCOmwpZhB2+CI4PVoRR4K+ F6Kg== 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=qtfidES1XXcEeq7E3Jry9h3skYXwVWKgywLgcFkA6L0=; b=YiHwBP9/vfIjg7JHZiPR/GHBPU3yotOlbV4/3Qv+UJUYgIh35Eg1WGaEdWDoz/0hKr XbdJiF7C639FKb7Y9Jyni//prtDt7yPAE/XjJFouFEQbCVWdJKtVUeFWWBsEYZLW0QAK 0pe/XcbBZRKkJYbrtSt/qC1gXM0SQ9Yv1VsiD0ocIWhfXinhMGXh4e4NR0cdDz9sTYHX IW170BwiK6GNR59pnRMNTUGZx31we9cHpUngfWVUEFADpe58DUQIdblXSwN9ju2kKPvL Ia+fj9o0OmaDV6bc5r1eK4GrLThSs7jrtDhqAp64DnG7QnxymZEPM0NB/w1Tbj4iqEJs t9bA== X-Gm-Message-State: ALKqPwckmMJX2O6ROiD49xKUMKLI4mIWFbIE+xyoMTHR4JvTNRb+oOyM ByEQTLNv9eraVshV03BJ+vU= X-Google-Smtp-Source: AB8JxZoEH0HuEWgInWRVUOw315hgy5e14lNq1UWRUonn2xd19AF1iQIJ9oyHfHiYMpV0i7yGDYBoaA== X-Received: by 2002:a63:9c3:: with SMTP id 186-v6mr1455320pgj.357.1527061666616; Wed, 23 May 2018 00:47:46 -0700 (PDT) Received: from simonLocalRHEL7.cn.ibm.com ([112.73.0.89]) by smtp.gmail.com with ESMTPSA id a4-v6sm39079171pfj.19.2018.05.23.00.47.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 00:47:46 -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 v4 12/29] KVM: PPC: Book3S PR: prevent TS bits change in kvmppc_interrupt_pr() Date: Wed, 23 May 2018 15:01:55 +0800 Message-Id: <1527058932-7434-13-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527058932-7434-1-git-send-email-wei.guo.simon@gmail.com> References: <1527058932-7434-1-git-send-email-wei.guo.simon@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Simon Guo PR KVM host usually equipped with enabled TM in its host MSR value, and with non-transactional TS value. When a guest with TM active traps into PR KVM host, the rfid at the tail of kvmppc_interrupt_pr() will try to switch TS bits from S0 (Suspended & TM disabled) to N1 (Non-transactional & TM enabled). That will leads to TM Bad Thing interrupt. This patch manually sets target TS bits unchanged to avoid this exception. Signed-off-by: Simon Guo Reviewed-by: Paul Mackerras --- arch/powerpc/kvm/book3s_segment.S | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/powerpc/kvm/book3s_segment.S b/arch/powerpc/kvm/book3s_segment.S index 93a180c..98ccc7e 100644 --- a/arch/powerpc/kvm/book3s_segment.S +++ b/arch/powerpc/kvm/book3s_segment.S @@ -383,6 +383,19 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) */ PPC_LL r6, HSTATE_HOST_MSR(r13) +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM + /* + * We don't want to change MSR[TS] bits via rfi here. + * The actual TM handling logic will be in host with + * recovered DR/IR bits after HSTATE_VMHANDLER. + * And MSR_TM can be enabled in HOST_MSR so rfid may + * not suppress this change and can lead to exception. + * Manually set MSR to prevent TS state change here. + */ + mfmsr r7 + rldicl r7, r7, 64 - MSR_TS_S_LG, 62 + rldimi r6, r7, MSR_TS_S_LG, 63 - MSR_TS_T_LG +#endif PPC_LL r8, HSTATE_VMHANDLER(r13) #ifdef CONFIG_PPC64