From patchwork Wed May 23 07:01:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 918843 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40rQFz5Ygjz9s1b for ; Wed, 23 May 2018 18:11:35 +1000 (AEST) 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 lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40rQFz3sd9zF0kx for ; Wed, 23 May 2018 18:11:35 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.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 X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::244; helo=mail-pf0-x244.google.com; envelope-from=wei.guo.simon@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VZ0kld7R"; dkim-atps=neutral Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40rPkK1SdFzDr2J for ; Wed, 23 May 2018 17:47:37 +1000 (AEST) Received: by mail-pf0-x244.google.com with SMTP id a20-v6so10075186pfo.0 for ; Wed, 23 May 2018 00:47:36 -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=Q9yw5eGxkWK5RuVBvIDtfN638jo6Bb7R6plI8ZHo6SrqJ5y5tp+vgUT2w1IG4TTV8F 2/rb1pm6OQEUz1KhC25Wbljmf4JIIU+MIaZORMfLpc5z4/RT3AUrIvHXk6ZRpnGcdjKm Z5QoeESmIVuhDI6huGo9MJUFCMtkkTSwpTec7eBHT+dL8U/FZ2mIl9NOsOFRpGxzOf4P rRwecholSKY198QcOjRLM2z4CKkgH4Vio7fcytq2f/5/RSiPiuqGJNVrOwBO0BLlwxwX NexO2WgD3xrjso6O9QwxHvtD9LGncMR2V+EIBUZzj6Tb3LoreNVMQTqFaailVAy25cTw h/PQ== X-Gm-Message-State: ALKqPwcEXZCG7d0jP7DLF5FP7ff8O/VVCRIO8auzqw6mSmf5NP7lsHrE oA5eBOIKEi3qxtLmpggM4C6lLw== 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 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> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Guo , kvm-ppc@vger.kernel.org, kvm@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Simon Guo This patch simulates interrupt behavior per Power ISA while injecting interrupt in PR KVM: - When interrupt happens, transactional state should be suspended. kvmppc_mmu_book3s_64_reset_msr() will be invoked when injecting an interrupt. This patch performs this ISA logic in kvmppc_mmu_book3s_64_reset_msr(). Signed-off-by: Simon Guo Reviewed-by: Paul Mackerras --- arch/powerpc/kvm/book3s_64_mmu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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(