From patchwork Mon Jan 9 06:24:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 9503889 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 EA2C460757 for ; Mon, 9 Jan 2017 06:30:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB486280D0 for ; Mon, 9 Jan 2017 06:30:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFE772815E; Mon, 9 Jan 2017 06:30:21 +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=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 81D5F280D0 for ; Mon, 9 Jan 2017 06:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942222AbdAIG2U (ORCPT ); Mon, 9 Jan 2017 01:28:20 -0500 Received: from outprodmail01.cc.columbia.edu ([128.59.72.39]:38716 "EHLO outprodmail01.cc.columbia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939920AbdAIG0m (ORCPT ); Mon, 9 Jan 2017 01:26:42 -0500 Received: from hazelnut (hazelnut.cc.columbia.edu [128.59.213.250]) by outprodmail01.cc.columbia.edu (8.14.4/8.14.4) with ESMTP id v096Q9Ms018083 for ; Mon, 9 Jan 2017 01:26:38 -0500 Received: from hazelnut (localhost.localdomain [127.0.0.1]) by hazelnut (Postfix) with ESMTP id A062581 for ; Mon, 9 Jan 2017 01:26:38 -0500 (EST) Received: from sendprodmail02.cc.columbia.edu (sendprodmail02.cc.columbia.edu [128.59.72.14]) by hazelnut (Postfix) with ESMTP id 8831781 for ; Mon, 9 Jan 2017 01:26:38 -0500 (EST) Received: from mail-qk0-f199.google.com (mail-qk0-f199.google.com [209.85.220.199]) by sendprodmail02.cc.columbia.edu (8.14.4/8.14.4) with ESMTP id v096QciL043192 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 9 Jan 2017 01:26:38 -0500 Received: by mail-qk0-f199.google.com with SMTP id t84so100999729qke.7 for ; Sun, 08 Jan 2017 22:26:38 -0800 (PST) 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=VvtUyNvGUfbA/g6WVdjwo1nkvsO5FTTEo/p1w/2uCa0=; b=HWk5NBhxcgpym6BnXyS1Cn3RCnQ0QwBDxHWZ0saRhwPBsBHo/y174hm5dxxTaBt2vz iDDnlXJ9WcRMhpi+NTQ5JXcVMhxlndJuQUlValki6BjkxxFStLh1/oyaqNaBX3qDh7fD dKourdog1bA6KCiHULOi5UJnp/YTnF/5oD9M9YdUOdt1RLaQSjaF/+DCgx0jnY5Meqf1 qdyBO73aXa6e92fBqwYBMQthKHUEqMP6dbcirE9p3NRRpXLtS78MznQBUkQufjcnHbgp nbg9slhf0oUH/AWzbef1WngJwZlN0zJx9H3I2Rfcu3yyPhqf7gza3F3sCH845M4mqKho sK9A== X-Gm-Message-State: AIkVDXKiO5+j+W1IRjLTir+ahM6Fz2hxw8GDdWlCMoAlD4kDQSEF0rGcRjcEZuDc/5GOnAKx1vs0apjMeacUS8aJCFEUgI3MvbgM5TK/c2Hq3RwYoll2gDgYbRbPT4YHy3ZqW22dJAeoxMc= X-Received: by 10.200.33.244 with SMTP id 49mr81161258qtz.70.1483943198208; Sun, 08 Jan 2017 22:26:38 -0800 (PST) X-Received: by 10.200.33.244 with SMTP id 49mr81161229qtz.70.1483943198068; Sun, 08 Jan 2017 22:26:38 -0800 (PST) Received: from jintack.cs.columbia.edu ([2001:18d8:ffff:16:21a:4aff:feaa:f900]) by smtp.gmail.com with ESMTPSA id h3sm8623257qtc.6.2017.01.08.22.26.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Jan 2017 22:26:37 -0800 (PST) From: Jintack Lim To: christoffer.dall@linaro.org, marc.zyngier@arm.com, pbonzini@redhat.com, rkrcmar@redhat.com, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, vladimir.murzin@arm.com, suzuki.poulose@arm.com, mark.rutland@arm.com, james.morse@arm.com, lorenzo.pieralisi@arm.com, kevin.brodsky@arm.com, wcohen@redhat.com, shankerd@codeaurora.org, geoff@infradead.org, andre.przywara@arm.com, eric.auger@redhat.com, anna-maria@linutronix.de, shihwei@cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: jintack@cs.columbia.edu Subject: [RFC 53/55] KVM: arm64: Reflect shadow VMPIDR_EL2 value to MPIDR_EL1 Date: Mon, 9 Jan 2017 01:24:49 -0500 Message-Id: <1483943091-1364-54-git-send-email-jintack@cs.columbia.edu> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483943091-1364-1-git-send-email-jintack@cs.columbia.edu> References: <1483943091-1364-1-git-send-email-jintack@cs.columbia.edu> X-No-Spam-Score: Local X-Scanned-By: MIMEDefang 2.78 on 128.59.72.14 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A non-secure EL0 or EL1 read of MPIDR_EL1 should return the value of VMPIDR_EL2. We emulate this by copying the virtual VMPIDR_EL2 value to MPIDR_EL1 when entering VM's EL0 or EL1. Signed-off-by: Jintack Lim --- arch/arm64/kvm/context.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kvm/context.c b/arch/arm64/kvm/context.c index 9ebc38f..dd79b0e 100644 --- a/arch/arm64/kvm/context.c +++ b/arch/arm64/kvm/context.c @@ -173,6 +173,12 @@ void kvm_arm_setup_shadow_state(struct kvm_vcpu *vcpu) ctxt->hw_pstate = *vcpu_cpsr(vcpu); ctxt->hw_sys_regs = ctxt->sys_regs; ctxt->hw_sp_el1 = ctxt->gp_regs.sp_el1; + + /* + * A non-secure EL0 or EL1 read of MPIDR_EL1 returns + * the value of VMPIDR_EL2. + */ + ctxt->hw_sys_regs[MPIDR_EL1] = ctxt->el2_regs[VMPIDR_EL2]; } vgic_v2_setup_shadow_state(vcpu);