Message ID | 1526875786-10372-9-git-send-email-wei.guo.simon@gmail.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <kvm-ppc-owner@vger.kernel.org> 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=<UNKNOWN>) 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="AiSqbn/i"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40q5nb69gGz9s5R for <incoming@patchwork.ozlabs.org>; Mon, 21 May 2018 14:45:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752763AbeEUEpw (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Mon, 21 May 2018 00:45:52 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:43683 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750970AbeEUEpo (ORCPT <rfc822;kvm-ppc@vger.kernel.org>); Mon, 21 May 2018 00:45:44 -0400 Received: by mail-pl0-f66.google.com with SMTP id c41-v6so8035148plj.10; Sun, 20 May 2018 21:45:44 -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=KIrslZ383enpRXxh0pICVmwnGdJ1nXZ4Va7e6AAsmX0=; b=AiSqbn/iDuZ8DXbJqK15qCCQEwZ2CHHvZUNctlJ0nH1jRf/j6Qc+Yj9P3p/9XaXRvL GPLrBdER2zWW/pJ1vBlj5R2YEo7nodoBA6AcmZGqP56WJxHGy1PFj5UXuAtAMVCaFC7O pT2IITqsksxspbX39+OTYNhcdiAvCRRTjwwyuWPcQVvIlfM0asJgWMNy2pMsdVQDOcur tptqNjUJC8VxpsT9YGvk7lWvUYuQHxykR8kqPwuFy+Pyho95wnwLUqJJLPSPgMfPmW4x FoMVCN5uPUeUk15bClZJxYHLEQabxKN5EBwUFkPj5dahqriA4SHmfShWhTasDzNTXC3o lsSA== 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=KIrslZ383enpRXxh0pICVmwnGdJ1nXZ4Va7e6AAsmX0=; b=B44mjTVJoj4yfwNuEXMeTu8Hqyjsu4Hnr3wyA+CnYCJyeQS92IkNv2JLmjUoPYUuyh FUxlItT5twWnkXePE2jz9muczkAoSdj0mdDUj1uvbzFTxdUVq9hCQ69pTLN6ntsKRTia nr6uAejSgmy666woO6Nn/EJ/u/AkFMv0r5n+mjmTCGoXfy4IaA/N+IJX90MN41BwaEjs gxCI3xIB9cDRaX6BnTxwPVDOFRGDpj2RxTzxDDXAjNkW1UTZXDdyja03W3NYh+gszJ3M a1LV3XCwCJ10lPUZwTUao/SaivdMrDXFOyCP1A9Icuc8Tu4Fc9ojQS2N+NJvOb+uGM+R FgcQ== X-Gm-Message-State: ALKqPwe6qS55lYRmeepfZ+ylz6BQNxkSASzoDhQJ6IbajK54LZhm3tON pu18PWwNZ9LExqbvAJ9DB24= X-Google-Smtp-Source: AB8JxZqGIu/dtfMUaGldsjJGjHhjuHeXcGvZy/vXq4TN5+KMrs40tuPH1DDTgDJsQzOEh8r0hL0cgQ== X-Received: by 2002:a17:902:8c83:: with SMTP id t3-v6mr19053933plo.357.1526877944386; Sun, 20 May 2018 21:45:44 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 21:45:43 -0700 (PDT) From: wei.guo.simon@gmail.com To: linuxppc-dev@lists.ozlabs.org Cc: Paul Mackerras <paulus@ozlabs.org>, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Simon Guo <wei.guo.simon@gmail.com> Subject: [PATCH v3 08/29] KVM: PPC: Book3S PR: In PR KVM suspends Transactional state when inject an interrupt. Date: Mon, 21 May 2018 12:09:25 +0800 Message-Id: <1526875786-10372-9-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: <kvm-ppc.vger.kernel.org> X-Mailing-List: kvm-ppc@vger.kernel.org |
Series |
KVM: PPC: Book3S PR: Transaction memory support on PR KVM
|
expand
|
diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c index a93d719..cf9d686 100644 --- a/arch/powerpc/kvm/book3s_64_mmu.c +++ b/arch/powerpc/kvm/book3s_64_mmu.c @@ -38,7 +38,16 @@ static void kvmppc_mmu_book3s_64_reset_msr(struct kvm_vcpu *vcpu) { - kvmppc_set_msr(vcpu, vcpu->arch.intr_msr); + unsigned long msr = vcpu->arch.intr_msr; + unsigned long cur_msr = kvmppc_get_msr(vcpu); + + /* If transactional, change to suspend mode on IRQ delivery */ + if (MSR_TM_TRANSACTIONAL(cur_msr)) + msr |= MSR_TS_S; + else + msr |= cur_msr & MSR_TS_MASK; + + kvmppc_set_msr(vcpu, msr); } static struct kvmppc_slb *kvmppc_mmu_book3s_64_find_slbe(