From patchwork Mon May 21 04:09:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 917374 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40q6JW2Dwxz9s15 for ; Mon, 21 May 2018 15:09:15 +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="AiSqbn/i"; 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 40q6JW0SFrzDqMg for ; Mon, 21 May 2018 15:09:15 +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="AiSqbn/i"; 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:c01::243; helo=mail-pl0-x243.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="AiSqbn/i"; dkim-atps=neutral Received: from mail-pl0-x243.google.com (mail-pl0-x243.google.com [IPv6:2607:f8b0:400e:c01::243]) (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 40q5nQ2B9kzF0bZ for ; Mon, 21 May 2018 14:45:46 +1000 (AEST) Received: by mail-pl0-x243.google.com with SMTP id v24-v6so8051752plo.3 for ; Sun, 20 May 2018 21:45: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=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=QyHfCdguR5ltIHdc4GAWljKVf9VDPWBQYphQsgnkVdJtwJY9KHAFuXXhH5xqH4c4HL TdUuZYfwAWDLcbD8z1iZ1pabOTOWjhIABgTJjlAbGOpNMtu3EZBBLkJuo0udjNpsdOIf PUcVL9tmgwkiMgz9XRPuc/+yew0SUcCPupMFHpv3Wban27XmFpX/hcNW071ZE1Ct9SEg g/g+Q43ccvayrFLRb+h3ZidPopWf5GfakjiryoropkfdhqYt8rh0nhBm8lla0sepsnoT 00DslwcEUMJS9X22JRdmPd3PjHkJw1rlHU8JfDeB9Aq0iCillstI6f0X6VSW9say4we/ WwGw== X-Gm-Message-State: ALKqPwfZcJZDfiaGOYjl9m4WtYIfqY6cCY7zryvdByU+wpKRo8JyI7jj yxT22GqqImILt+JqR+fhEsoMiQ== 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 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> 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(