From patchwork Tue Oct 3 03:10:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 114649 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1388810qgn; Mon, 2 Oct 2017 20:18:12 -0700 (PDT) X-Received: by 10.84.199.194 with SMTP id d2mr16222328plh.346.1507000691940; Mon, 02 Oct 2017 20:18:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507000691; cv=none; d=google.com; s=arc-20160816; b=IwA9atb/nXPzroMuDUEyzmKU7U/gT4wC9O+lrxkWRwE3mAioQIetLFCfmRe6r4dZQM Y4Cg2sdMXSeizfZn1KJpGBdV06lHVvpMEQuaL8YuwgWtGkOiS9GADFieKE+WfZXy+waU couwmac3M4tKGFSrF+46idxYBZpBRs+KIQF4BHOMx3ogGZdGsk1XzNxMP2lajrs1v2mw xy5n7wKFn3rY3HrnGvqQzzhKexD/C8JjTfJw8Ded0dq3QVgEHyQ1Bwp3sYU38y4ahkB0 VD0lrbMD5Ng1qv3zFJhPxoqcfWyXnBS/X6shoxTPfRJaDUGKbfBla75oE2rjrz+Ghyfd CeAA== 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=xS0UTzPa5rAUSRFYeXyRrNnLF/7hbYHNe7PYTIOBDV4=; b=t/Ium4wP1+UYvrO/Ofy1qzzxom8ZomGkBikM+RjClppYyttkm/L5Ml3NZmrBEG7eTc 3+rDL3XMagL1FDQMxIIABiQ4QTYq4K8vPQERN+iPPd2FfWCBIuGcIw1xqcy5mjw5WS3R NwuCti2qmtj/PhdArdXbK283V+7IKUGutvmtp2LFHjXuuBH33wSK2TJv2/drbzR/q6jU mJCVF2hMXc7Xw03RTBvawZsSMQXEEiumyJvFxTG5pVV5Kr8vqzOIpJ2TeSDdNovEtY4r OM8Nqk7q/d5NA44KC0BywNf7R78wVe/qmfqI9VSX24MJKI4Qr0zVUS83YZ3b0XK9Ud3i v8zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JbaGGV7m; 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 z61si6938684plb.575.2017.10.02.20.18.11; Mon, 02 Oct 2017 20:18:11 -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.s=google header.b=JbaGGV7m; 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 S1751921AbdJCDRi (ORCPT + 26 others); Mon, 2 Oct 2017 23:17:38 -0400 Received: from mail-it0-f54.google.com ([209.85.214.54]:50813 "EHLO mail-it0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751911AbdJCDLx (ORCPT ); Mon, 2 Oct 2017 23:11:53 -0400 Received: by mail-it0-f54.google.com with SMTP id y138so10005533itc.5 for ; Mon, 02 Oct 2017 20:11:53 -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=xS0UTzPa5rAUSRFYeXyRrNnLF/7hbYHNe7PYTIOBDV4=; b=JbaGGV7mk/KLEw0fSyPR20HWiBbc5K8iEb+wT5hFDx70vhiYRxiZsFuzMmZFUBm2CQ HyTSF4rI9sD9iJqA8ZFxFHUbf1Zp74u2BjHUNCuB6UKZYgPCwdEElDF5zgNiwxKQiUl/ 8oWnzPgJHODO0rxWBvkM1C5Utny7fipW0cfA8= 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=xS0UTzPa5rAUSRFYeXyRrNnLF/7hbYHNe7PYTIOBDV4=; b=CoQB4b8Vh4tZRYqk4lhWsd2oAHxm5H7IuWTu/SpQ8zhd+d+bQyHM1do7TxVHTdtK1c dY5ToS66rfRLQdzE+SsCqA+4JmPsfXUj6sm8XpYG5bdE9BgijvTJJRz4ZcRN8NrUq605 /o1dFACl2vd0//j3EiRysz2rRhHxRr+ES67B/eJHpAhgRFF5r6NJsK2QZv/KqTYGordE Kbycv/yn6yDAypNOL7/3L7iZM7OojAo3oz2/ITYhh2nU3fwK1QEIrzrD+RYZghvwnOfh JPTRuLkEX309V80r9Sw/sDMMU0xEqJTOylSK4xNR8IxEPKmuRLC+VdOZ9UK2/ZTZ/F9R lMug== X-Gm-Message-State: AHPjjUhfURJyxjcY63oBxGut8aBj3dDgpaMTEQEu8Gt5QVZeMWUL9Vfu Far3TWpDGswZE0Eky8mvGbstdw== X-Google-Smtp-Source: AOwi7QDgcbJeOhys7JB5rg1UlzB/NOMLyzsIjVEvQuhQfoo5ZhtKMiszmHcjHULca9wKinueaROdmw== X-Received: by 10.36.61.21 with SMTP id n21mr22637144itn.121.1507000312785; Mon, 02 Oct 2017 20:11:52 -0700 (PDT) Received: from node.jintackl-qv28633.kvmarm-pg0.wisc.cloudlab.us (c220g1-031126.wisc.cloudlab.us. [128.104.222.76]) by smtp.gmail.com with ESMTPSA id h84sm5367193iod.72.2017.10.02.20.11.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Oct 2017 20:11:52 -0700 (PDT) From: Jintack Lim To: christoffer.dall@linaro.org, marc.zyngier@arm.com, kvmarm@lists.cs.columbia.edu Cc: jintack@cs.columbia.edu, pbonzini@redhat.com, rkrcmar@redhat.com, catalin.marinas@arm.com, will.deacon@arm.com, linux@armlinux.org.uk, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v2 13/31] KVM: arm/arm64: Move kvm_is_write_fault to header file Date: Mon, 2 Oct 2017 22:10:55 -0500 Message-Id: <1507000273-3735-11-git-send-email-jintack.lim@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507000273-3735-1-git-send-email-jintack.lim@linaro.org> References: <1507000273-3735-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 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 --- arch/arm/include/asm/kvm_emulate.h | 8 ++++++++ arch/arm64/include/asm/kvm_emulate.h | 8 ++++++++ virt/kvm/arm/mmu.c | 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 8136464..9b745d9 100644 --- a/arch/arm/include/asm/kvm_emulate.h +++ b/arch/arm/include/asm/kvm_emulate.h @@ -223,6 +223,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/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index c66554b..4c47bc7 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -307,6 +307,14 @@ static inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu) return (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT; } +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; diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c index 25d3d73..74941ad 100644 --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c @@ -1141,14 +1141,6 @@ static bool transparent_hugepage_adjust(kvm_pfn_t *pfnp, phys_addr_t *ipap, 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