From patchwork Mon Jan 9 06:24:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 90350 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp707968qgi; Sun, 8 Jan 2017 22:31:12 -0800 (PST) X-Received: by 10.99.8.133 with SMTP id 127mr162148996pgi.76.1483943472704; 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.12; 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 S1162877AbdAIGaz (ORCPT + 25 others); Mon, 9 Jan 2017 01:30:55 -0500 Received: from outprodmail02.cc.columbia.edu ([128.59.72.51]:52381 "EHLO outprodmail02.cc.columbia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939796AbdAIG0l (ORCPT ); Mon, 9 Jan 2017 01:26:41 -0500 Received: from hazelnut (hazelnut.cc.columbia.edu [128.59.213.250]) by outprodmail02.cc.columbia.edu (8.14.4/8.14.4) with ESMTP id v096Q5hI006221 for ; Mon, 9 Jan 2017 01:26:27 -0500 Received: from hazelnut (localhost.localdomain [127.0.0.1]) by hazelnut (Postfix) with ESMTP id D508882 for ; Mon, 9 Jan 2017 01:26:27 -0500 (EST) Received: from sendprodmail03.cc.columbia.edu (sendprodmail03.cc.columbia.edu [128.59.72.15]) by hazelnut (Postfix) with ESMTP id B228082 for ; Mon, 9 Jan 2017 01:26:27 -0500 (EST) Received: from mail-qk0-f199.google.com (mail-qk0-f199.google.com [209.85.220.199]) by sendprodmail03.cc.columbia.edu (8.14.4/8.14.4) with ESMTP id v096QR3S057759 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 9 Jan 2017 01:26:27 -0500 Received: by mail-qk0-f199.google.com with SMTP id x64so109020005qkb.5 for ; Sun, 08 Jan 2017 22:26:27 -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=O3rd3BqEvaWD6P2jfqAIDAfd0HauL6WDOi2Goau/+gA=; b=r5oZi4ub8QlL4WwzHq4/clLqXt8ZUvDmAYSz6+pV4yYCv4D4pgrMYJ5kQYIqG54K+X sn9oGLrwKJQnc/ocX9H0BPbnLIAvPtBkgtD7wyRhXq1tcg/BGX5NVqtlqLHqzZdTdG5w YiNIBFokmEF4nqXmtem9ZZ2ZxGNMJOSz1uFcqZsGk1GW6HEuIvKERoM4ucRc5jZiNOch XUkzeGdgxFRSaqOKDCVtVOgCHsUEvDwZV+J/rrWjijBE9rmUZ6LuH/mxw1Sib4opOt8P 5jnZyh7HpBs0s092MAK2okNCRK8bp9wZi/82PLzdlQUR0l0PnL26DI8eMHWOsYQUOLyv M6/g== X-Gm-Message-State: AIkVDXL/Gj3r+C3rJCuEdt0qlORkTOvvDyJsGoTOOoceZqs8MBoBFtcUeKYpau90fz8nwzG+y7Jjp5fOkrtjdLflcSpsqQl8IouWrpQUkgl9N16Ju0Oj4TQi5Qo1fAWZvlZd4SSTV5iSfD9xOgIBoBfH7Vc= X-Received: by 10.55.39.193 with SMTP id n184mr20780462qkn.315.1483943187342; Sun, 08 Jan 2017 22:26:27 -0800 (PST) X-Received: by 10.55.39.193 with SMTP id n184mr20780431qkn.315.1483943187194; Sun, 08 Jan 2017 22:26:27 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Jan 2017 22:26:26 -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 44/55] KVM: arm/arm64: Move kvm_is_write_fault to header file Date: Mon, 9 Jan 2017 01:24:40 -0500 Message-Id: <1483943091-1364-45-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 Move this little function to the header files for arm/arm64 so other code can make use of it directly. Signed-off-by: Christoffer Dall Signed-off-by: Jintack Lim --- arch/arm/include/asm/kvm_emulate.h | 8 ++++++++ arch/arm/kvm/mmu.c | 8 -------- arch/arm64/include/asm/kvm_emulate.h | 8 ++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h index dfc53ce..dde5335 100644 --- a/arch/arm/include/asm/kvm_emulate.h +++ b/arch/arm/include/asm/kvm_emulate.h @@ -235,6 +235,14 @@ static inline u8 kvm_vcpu_trap_get_fault_type(struct kvm_vcpu *vcpu) return kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE; } +static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu) +{ + if (kvm_vcpu_trap_is_iabt(vcpu)) + return false; + + return kvm_vcpu_dabt_iswrite(vcpu); +} + static inline u32 kvm_vcpu_hvc_get_imm(struct kvm_vcpu *vcpu) { return kvm_vcpu_get_hsr(vcpu) & HSR_HVC_IMM_MASK; diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 710ae60..abdf345 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -1113,14 +1113,6 @@ static bool transparent_hugepage_adjust(kvm_pfn_t *pfnp, gfn_t gfn, return false; } -static bool kvm_is_write_fault(struct kvm_vcpu *vcpu) -{ - if (kvm_vcpu_trap_is_iabt(vcpu)) - return false; - - return kvm_vcpu_dabt_iswrite(vcpu); -} - /** * stage2_wp_ptes - write protect PMD range * @pmd: pointer to pmd entry diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 2994410..17f4855 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -285,6 +285,14 @@ static inline u8 kvm_vcpu_trap_get_fault_type(const struct kvm_vcpu *vcpu) return kvm_vcpu_get_hsr(vcpu) & ESR_ELx_FSC_TYPE; } +static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu) +{ + if (kvm_vcpu_trap_is_iabt(vcpu)) + return false; + + return kvm_vcpu_dabt_iswrite(vcpu); +} + static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu) { return vcpu_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;