From patchwork Tue Jul 18 16:58: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: 108172 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp6188501qge; Tue, 18 Jul 2017 10:08:57 -0700 (PDT) X-Received: by 10.98.95.67 with SMTP id t64mr2712315pfb.127.1500397737631; Tue, 18 Jul 2017 10:08:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500397737; cv=none; d=google.com; s=arc-20160816; b=EdsHYUEg9kiNJnDqfNUKIjrnRGapKTCv6r3tU2Vhm8HWnw3s8ssMXTXwpjI8QAAcSf FESEVXhuIieArUDTx/Zr/ByTvVW/iZ9/J74wicdD2y9MlIWnGZcdsSCFKgcEwrJUM0MX vKC2D2coWnIU8xqe4+U6CDTHkzGTFhZQmyMqZ3B+278ka3HQHt/aFvKwsWo7bU8InlKy 4NL44Whbv4KkfnYIqdmB92FwUfYcN9H/oZ0oF+XIF996M3rrBqkdXsyyEwZhIiU0cBuz Y9X7SkS7PvOu1cHbBaNpnTeLPNtwyOQFJvn50m/XuD04I5ULJ+/+5g6CxXXBX61hKEtn u34Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=OPr+27sfCY8QxeijpDIPuXpRRNcpRZOCse2LXlKzKMg=; b=nyjD2ShYMqSXUeBTgZV+dblxtcwQjJ1n+5gRiWWAWjmfyzxAAaG5DxGmThGOZSTwWR htu0hAVR2NzeyUwqVc032tYXw4MrA2YcsZWWjfqtdYzlA2F6428wR/PocUiaIxUjmKgE sXwf/eqbIkr+VS8zx+UX8d3J+kSL9WIIIsqb2FEXATP05sG0uk+9uIGViR+EjbdlcovV duVvSmkZ3KdLBjbZ0ewTjy3qpv+WDj2MDcMmknic/FrniCE9F6oqrYdaAqtcdjiaR4rj MKv/zqgfGOnJHNESnyBME+oZ9qVTQ3JP7oCZc+kYUNAuiu0ievtkY7cY0cU45TPlORIV FVQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=M8LvUZ14; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e66si2143744pfd.60.2017.07.18.10.08.57; Tue, 18 Jul 2017 10:08:57 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.b=M8LvUZ14; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752599AbdGRRIz (ORCPT + 25 others); Tue, 18 Jul 2017 13:08:55 -0400 Received: from mail-it0-f41.google.com ([209.85.214.41]:36822 "EHLO mail-it0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751715AbdGRRAB (ORCPT ); Tue, 18 Jul 2017 13:00:01 -0400 Received: by mail-it0-f41.google.com with SMTP id a62so23794478itd.1 for ; Tue, 18 Jul 2017 10:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OPr+27sfCY8QxeijpDIPuXpRRNcpRZOCse2LXlKzKMg=; b=M8LvUZ14t8Eeb4+HZ7wzOpQ7t8vK+di5RFXOFYXTNuUo1F2JNpACWy00YO3ywxZB6d KzivGXizvEb1DyZHXmsU9DuNWXdxg6e8IdQwLoyPOsCqXBgtvZytNBK5uCn9giBEusro QRd6PjzZ30znr6hdptekKT5DhwTPdSzD3bjec= 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=OPr+27sfCY8QxeijpDIPuXpRRNcpRZOCse2LXlKzKMg=; b=t5DH9DL8/GZMnFOW+jQlil34EeSSUiJOYyPBHDHXW1C4EGmCG7ppgl8pZ7FG7eiaRX XptgqB3B/gBAquQC1W1ZDNm+a5QjvfQWxG2NKH7BesAlqDAzfutweHAnCfOAqhH4bBYO ftVZ4vlGtR87wLWMF8GwNVXXuEBfoyTP2YawWqL+4pQ7iIeqHkpg5f/le/uqklyJmQnh Gqybx2rQ3P+5qnZdmQlKg7jegtSqJwRmUGYBiwMsPOF1DRy8kgzaKPzU8UUkZtJWZwum +oBb7SvhPQh5RgDaD73eYMD7yKHbh7g4ef+NreUda7invjD/hDCzOk5W8KuoXdivJ+SK xjvA== X-Gm-Message-State: AIVw111v8wqnSAVbHwqIbnH5lps3PrY/wDd0afymk41WkHhBdKOTnT3o FEYYwk2QIfI6EhuH X-Received: by 10.36.209.196 with SMTP id w187mr2812859itg.70.1500397200351; Tue, 18 Jul 2017 10:00:00 -0700 (PDT) Received: from node.jintackl-qv26972.kvmarm-pg0.wisc.cloudlab.us (c220g1-030822.wisc.cloudlab.us. [128.104.222.82]) by smtp.gmail.com with ESMTPSA id j96sm1413075ioo.49.2017.07.18.09.59.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 09:59:59 -0700 (PDT) From: Jintack Lim To: kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com Cc: corbet@lwn.net, pbonzini@redhat.com, rkrcmar@redhat.com, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, akpm@linux-foundation.org, mchehab@kernel.org, cov@codeaurora.org, daniel.lezcano@linaro.org, david.daney@cavium.com, mark.rutland@arm.com, suzuki.poulose@arm.com, stefan@hello-penguin.com, andy.gross@linaro.org, wcohen@redhat.com, ard.biesheuvel@linaro.org, shankerd@codeaurora.org, vladimir.murzin@arm.com, james.morse@arm.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jintack Lim Subject: [RFC PATCH v2 15/38] KVM: arm64: Move exception macros and enums to a common file Date: Tue, 18 Jul 2017 11:58:41 -0500 Message-Id: <1500397144-16232-16-git-send-email-jintack.lim@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500397144-16232-1-git-send-email-jintack.lim@linaro.org> References: <1500397144-16232-1-git-send-email-jintack.lim@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These macros and enums can be reused to inject exceptions for nested virtualization. Signed-off-by: Jintack Lim --- arch/arm64/include/asm/kvm_emulate.h | 12 ++++++++++++ arch/arm64/kvm/inject_fault.c | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) -- 1.9.1 diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 14c4ce9..94f98cc 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -31,6 +31,18 @@ #include #include +#define CURRENT_EL_SP_EL0_VECTOR 0x0 +#define CURRENT_EL_SP_ELx_VECTOR 0x200 +#define LOWER_EL_AArch64_VECTOR 0x400 +#define LOWER_EL_AArch32_VECTOR 0x600 + +enum exception_type { + except_type_sync = 0, + except_type_irq = 0x80, + except_type_fiq = 0x100, + except_type_serror = 0x180, +}; + unsigned long *vcpu_reg32(const struct kvm_vcpu *vcpu, u8 reg_num); unsigned long *vcpu_spsr32(const struct kvm_vcpu *vcpu); diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c index da6a8cf..94679fb 100644 --- a/arch/arm64/kvm/inject_fault.c +++ b/arch/arm64/kvm/inject_fault.c @@ -28,11 +28,6 @@ #define PSTATE_FAULT_BITS_64 (PSR_MODE_EL1h | PSR_A_BIT | PSR_F_BIT | \ PSR_I_BIT | PSR_D_BIT) -#define CURRENT_EL_SP_EL0_VECTOR 0x0 -#define CURRENT_EL_SP_ELx_VECTOR 0x200 -#define LOWER_EL_AArch64_VECTOR 0x400 -#define LOWER_EL_AArch32_VECTOR 0x600 - static void prepare_fault32(struct kvm_vcpu *vcpu, u32 mode, u32 vect_offset) { unsigned long cpsr; @@ -101,13 +96,6 @@ static void inject_abt32(struct kvm_vcpu *vcpu, bool is_pabt, *fsr = 0x14; } -enum exception_type { - except_type_sync = 0, - except_type_irq = 0x80, - except_type_fiq = 0x100, - except_type_serror = 0x180, -}; - static u64 get_except_vector(struct kvm_vcpu *vcpu, enum exception_type type) { u64 exc_offset;