From patchwork Mon Jan 9 06:24:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 90349 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp707963qgi; Sun, 8 Jan 2017 22:31:12 -0800 (PST) X-Received: by 10.98.21.131 with SMTP id 125mr10664212pfv.110.1483943472013; Sun, 08 Jan 2017 22:31:12 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f22si61785946pli.197.2017.01.08.22.31.11; Sun, 08 Jan 2017 22:31:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162796AbdAIGav (ORCPT + 25 others); Mon, 9 Jan 2017 01:30:51 -0500 Received: from outprodmail01.cc.columbia.edu ([128.59.72.39]:38609 "EHLO outprodmail01.cc.columbia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939812AbdAIG0l (ORCPT ); Mon, 9 Jan 2017 01:26:41 -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 v096PXM9017324 for ; Mon, 9 Jan 2017 01:26:29 -0500 Received: from hazelnut (localhost.localdomain [127.0.0.1]) by hazelnut (Postfix) with ESMTP id 652AC80 for ; Mon, 9 Jan 2017 01:26:29 -0500 (EST) Received: from sendprodmail03.cc.columbia.edu (sendprodmail03.cc.columbia.edu [128.59.72.15]) by hazelnut (Postfix) with ESMTP id 416CF81 for ; Mon, 9 Jan 2017 01:26:29 -0500 (EST) Received: from mail-qk0-f197.google.com (mail-qk0-f197.google.com [209.85.220.197]) by sendprodmail03.cc.columbia.edu (8.14.4/8.14.4) with ESMTP id v096QTHl057809 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 9 Jan 2017 01:26:29 -0500 Received: by mail-qk0-f197.google.com with SMTP id 11so31135044qkl.4 for ; Sun, 08 Jan 2017 22:26:29 -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=mPuURSuqMcG09Yi5RmOYfHMhwUHpgEoeW+Ah1Qv19C8=; b=huOBZFRYVNTu7fhMxVVE+dccvQQpgCyEFhDkrXCaDJLJw90Z5dBsPBOby0/FCzqAhY bkdasmAbYlG6B0k4+PM/JTJMaL0VVcPxZoM2kzEe2eNspJxctJUC9PHu0miWqvfYY5Re zvGFy3CuhAXF8Kz/3hFfiwA8ssnW1x98cOYdNu9rPderuNdNtkzCVKK3GN3jxqe+HO84 xbHhsE6FfzSzH7Wx5psgLrp2SjEhRpMr3jaO37ZBN39VpCZPu1TzL4U7aIRUUVjaUMRG xJTR23ivzy3Cx929Z5LjeQgSdCBBS3p2foHezonxhVZNgjxlvSOiKBUwDMhwwzsXHBTG Rfjg== X-Gm-Message-State: AIkVDXJQYSJUWnayor7h0L4B9J4NSNqEyp1kA9qjGCeusnNI/og/Z+qRHAvDDEhEfL2bsb8HBxZfAHw2bZmROmLTYyOKUp6zp712FW7fC3gJXeOGzTB4YJJ0t/7iqepKluoLsyZYt6MV9Wsa2kBDUlJH7dw= X-Received: by 10.55.142.194 with SMTP id q185mr82356978qkd.82.1483943188542; Sun, 08 Jan 2017 22:26:28 -0800 (PST) X-Received: by 10.55.142.194 with SMTP id q185mr82356953qkd.82.1483943188380; Sun, 08 Jan 2017 22:26:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Jan 2017 22:26:27 -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 45/55] KVM: arm64: KVM: Inject stage-2 page faults Date: Mon, 9 Jan 2017 01:24:41 -0500 Message-Id: <1483943091-1364-46-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.15 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoffer Dall Inject stage-2 page faults to the guest hypervisor. Signed-off-by: Christoffer Dall Signed-off-by: Jintack Lim --- arch/arm64/include/asm/esr.h | 1 + arch/arm64/kvm/mmu-nested.c | 30 ++++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index f32e3a7..6104e31 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -107,6 +107,7 @@ #define ESR_ELx_CM (UL(1) << 8) /* ISS field definitions for exceptions taken in to Hyp */ +#define ESR_ELx_FSC_ADDRSZ (0x00) #define ESR_ELx_CV (UL(1) << 24) #define ESR_ELx_COND_SHIFT (20) #define ESR_ELx_COND_MASK (UL(0xF) << ESR_ELx_COND_SHIFT) diff --git a/arch/arm64/kvm/mmu-nested.c b/arch/arm64/kvm/mmu-nested.c index a2fab41..b161b55 100644 --- a/arch/arm64/kvm/mmu-nested.c +++ b/arch/arm64/kvm/mmu-nested.c @@ -55,22 +55,40 @@ static unsigned int pa_max(void) static int vcpu_inject_s2_trans_fault(struct kvm_vcpu *vcpu, gpa_t ipa, int level) { - /* TODO: Implement */ - return -EFAULT; + u32 esr; + + vcpu->arch.ctxt.el2_regs[FAR_EL2] = vcpu->arch.fault.far_el2; + vcpu->arch.ctxt.el2_regs[HPFAR_EL2] = vcpu->arch.fault.hpfar_el2; + esr = kvm_vcpu_get_hsr(vcpu) & ~ESR_ELx_FSC; + esr |= ESR_ELx_FSC_FAULT; + esr |= level & 0x3; + return kvm_inject_nested_sync(vcpu, esr); } static int vcpu_inject_s2_addr_sz_fault(struct kvm_vcpu *vcpu, gpa_t ipa, int level) { - /* TODO: Implement */ - return -EFAULT; + u32 esr; + + vcpu->arch.ctxt.el2_regs[FAR_EL2] = vcpu->arch.fault.far_el2; + vcpu->arch.ctxt.el2_regs[HPFAR_EL2] = vcpu->arch.fault.hpfar_el2; + esr = kvm_vcpu_get_hsr(vcpu) & ~ESR_ELx_FSC; + esr |= ESR_ELx_FSC_ADDRSZ; + esr |= level & 0x3; + return kvm_inject_nested_sync(vcpu, esr); } static int vcpu_inject_s2_access_flag_fault(struct kvm_vcpu *vcpu, gpa_t ipa, int level) { - /* TODO: Implement */ - return -EFAULT; + u32 esr; + + vcpu->arch.ctxt.el2_regs[FAR_EL2] = vcpu->arch.fault.far_el2; + vcpu->arch.ctxt.el2_regs[HPFAR_EL2] = vcpu->arch.fault.hpfar_el2; + esr = kvm_vcpu_get_hsr(vcpu) & ~ESR_ELx_FSC; + esr |= ESR_ELx_FSC_ACCESS; + esr |= level & 0x3; + return kvm_inject_nested_sync(vcpu, esr); } static int check_base_s2_limits(struct kvm_vcpu *vcpu, struct s2_walk_info *wi,