Message ID | 1527058932-7434-9-git-send-email-wei.guo.simon@gmail.com |
---|---|
State | Accepted |
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="VZ0kld7R"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rPkP3W5mz9s4V for <incoming@patchwork.ozlabs.org>; Wed, 23 May 2018 17:47:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754393AbeEWHrk (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Wed, 23 May 2018 03:47:40 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:41654 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754395AbeEWHrf (ORCPT <rfc822;kvm-ppc@vger.kernel.org>); Wed, 23 May 2018 03:47:35 -0400 Received: by mail-pf0-f194.google.com with SMTP id v63-v6so10068109pfk.8; Wed, 23 May 2018 00:47:35 -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=VZ0kld7RsZUHLf+l2Sto8tluATf58IxV9RSdqSUlSvDET3AoKrdtSdlILunqWYG8Nr sttEtqCX70NnJYFwZg8r+cHtn1el107AT0zK8cLo05K6bMFyybvhoEf8hjQdRVNXFwx4 vbV7gVMdvXYMPQDhRIzmRmgU7dDuHyFrjEa8us3jOYGTf5uPsSq9Rlee6ZnM7RZDcAqt dKXATQL/g66gPsGX7IqUsiYluOrOFKhiWzCX5ylPovAK9MPp0yscHkUaoWE9ooTSGxLl H+gdo3EjtnzUYYUs0jdAD/SdQYkauChQ8sQUk+yqg/4zc5CyJ6JjNOJzDaXViMj3VY/A njPQ== 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=ffJ9x8yy++W0vhpGfKEB3bqZXEGj8qU468KTRAfRr0ntxxRBgG3q5LJKEGbKDUr7XY zJSW7QRF4KMvFQL7nBXufloL5IvpMfnV6Fdtp/3NE+YgHOQeljz8sipMy6gFaIneSN4S SNih1jdsskK/FOa7M1LauDg41gC6Xb804k27HT5TzAbhRLITStnGJ/3mnSTTITajNnvp kM6YGprzEgLDY6iRWU0pI7yAYGs6nmYHOBSYjrUpKH4Qx0tiC6NECXnqUJ8AE+iDeiBb yGMXt9wba5D90vkQ9gf/FO6ABm48Ikm51GiATDsfdLAXgrpTMXlocBwIeLF98x/PUklS nifg== X-Gm-Message-State: ALKqPwey2ZZA16jayQ5bAe76Czp03JEChdBmBIlM6Ule4AUMGayfqqBS QAnsEc0fFPKNytYPWX7K0eU= X-Google-Smtp-Source: AB8JxZpYWCBSWLADRWH2OqDM94cR8/Ofy23NDhN/StiV/FJNgn1EUEuUYU9bNENKd6HRS8Qjq2y+wA== X-Received: by 2002:a65:6489:: with SMTP id e9-v6mr1477961pgv.44.1527061655182; Wed, 23 May 2018 00:47:35 -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.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 00:47:34 -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 v4 08/29] KVM: PPC: Book3S PR: In PR KVM suspends Transactional state when inject an interrupt. Date: Wed, 23 May 2018 15:01:51 +0800 Message-Id: <1527058932-7434-9-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-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(