From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6FB6C4363A for ; Tue, 27 Oct 2020 18:49:49 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8707B207C4 for ; Tue, 27 Oct 2020 18:49:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EcFQntuK"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="S0kIH8+b" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8707B207C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To:Subject:To:From: Date:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sJg6CqXXVIkm1Fc6dMkGe4al+nwGjbc/yHuFSbpay/I=; b=EcFQntuKXJov2BFYznjaZsHWN tMBAzhBHuhApF4KozgHrPHAHa9pf8IhsmKdjPCqKYwlxgOGOOBkPqoc3eR/rmUAnc27mH8WuN7BsO A7m9TGsQthC1zFfWv2InYmJXMO5po5Md/CWt6q+06Nt1fV9rNb5NrFk9XrrmBma8ymH1hgK2uGHc3 HU9BcWyzU0r7JSoD+mCQ80STkpN8r4ie0CWWU0AWqUOsEAVdcBrsTMY8aoj22rvYLKwBzzwjPquP3 xzrqQR0j5auajaF3u+1WaoSs4Y8VkGtVxeP26TRGd6tu0hnb9/FtOAvAQjf7cij7+ev+kgT4rl3yf WaJ6gz19g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXU25-0008Cr-B2; Tue, 27 Oct 2020 18:49:21 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXU22-0008CB-QO for linux-arm-kernel@lists.infradead.org; Tue, 27 Oct 2020 18:49:19 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0140E207DE; Tue, 27 Oct 2020 18:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603824558; bh=LLymolsV5F+QRaC0FUrOgoIM2iN9acO1HLn3U7GULqo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=S0kIH8+bpUOP2U6vMAP5XdSfhj8o1rc//xLX5Ob5XSAF320XeyJzGX52t+s111mcV nQTHeLiSyu1Jt1UNSKkOCEsI8RLquSH9Stc5m1f1SpqZOaCCo5B9KyRjPzrkvdyULp GYe/SGjoB0u3P7NwdvBHl/qEbEq2sBSWAY2D1jlo= Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94) (envelope-from ) id 1kXU1z-004ueD-PK; Tue, 27 Oct 2020 18:49:15 +0000 MIME-Version: 1.0 Date: Tue, 27 Oct 2020 18:49:15 +0000 From: Marc Zyngier To: James Morse Subject: Re: [PATCH 07/11] KVM: arm64: Inject AArch64 exceptions from HYP In-Reply-To: References: <20201026133450.73304-1-maz@kernel.org> <20201026133450.73304-8-maz@kernel.org> User-Agent: Roundcube Webmail/1.4.9 Message-ID: <6ce42c66606e3d41a30fafbf66aa49a5@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: james.morse@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, ascull@google.com, will@kernel.org, qperret@google.com, dbrazdil@google.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201027_144919_001332_FF5C7E72 X-CRM114-Status: GOOD ( 19.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Suzuki K Poulose , kernel-team@android.com, Quentin Perret , Andrew Scull , David Brazdil , Will Deacon , kvmarm@lists.cs.columbia.edu, Julien Thierry Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi James, On 2020-10-27 17:41, James Morse wrote: > Hi Marc, > > On 26/10/2020 13:34, Marc Zyngier wrote: >> Move the AArch64 exception injection code from EL1 to HYP, leaving >> only the ESR_EL1 updates to EL1. In order to come with the differences > > (cope with the differences?) Yes, much better! >> between VHE and nVHE, two set of system register accessors are >> provided. >> >> SPSR, ELR, PC and PSTATE are now completely handled in the hypervisor. > > >> diff --git a/arch/arm64/kvm/hyp/exception.c >> b/arch/arm64/kvm/hyp/exception.c >> index 6533a9270850..cd6e643639e8 100644 >> --- a/arch/arm64/kvm/hyp/exception.c >> +++ b/arch/arm64/kvm/hyp/exception.c >> @@ -11,7 +11,167 @@ >> */ >> >> #include >> +#include >> +#include >> + >> +#if defined (__KVM_NVHE_HYPERVISOR__) >> +/* >> + * System registers are never loaded on the CPU until we actually >> + * restore them. >> + */ >> +static inline u64 __vcpu_read_sys_reg(const struct kvm_vcpu *vcpu, >> int reg) >> +{ >> + return __vcpu_sys_reg(vcpu, reg); >> +} >> + >> +static inline void __vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 >> val, int reg) >> +{ >> + __vcpu_sys_reg(vcpu, reg) = val; >> +} >> + >> +static void __vcpu_write_spsr(struct kvm_vcpu *vcpu, u64 val) >> +{ >> + write_sysreg_el1(val, SYS_SPSR); >> +} >> +#elif defined (__KVM_VHE_HYPERVISOR__) >> +/* On VHE, all the registers are already loaded on the CPU */ >> +static inline u64 __vcpu_read_sys_reg(const struct kvm_vcpu *vcpu, >> int reg) >> +{ >> + u64 val; > >> + if (__vcpu_read_sys_reg_from_cpu(reg, &val)) >> + return val; > > As has_vhe()'s behaviour changes based on these KVM preprocessor > symbols, would: > | if (has_vhe() && __vcpu_read_sys_reg_from_cpu(reg, &val)) > | return val; > > let you do both of these with only one copy of the function? Indeed that's better. Even better, let's move the has_vhe() into __vcpu_read_sys_reg_from_cpu(), as that's the only case this is used for. Further cleanup could involve a new helper that would gate the test of vcpu->sysregs_loaded_on_cpu with has_vhe() too, as this definitely is a VHE-only feature. > > >> + return __vcpu_sys_reg(vcpu, reg); >> +} >> + >> +static inline void __vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 >> val, int reg) >> +{ >> + if (__vcpu_write_sys_reg_to_cpu(val, reg)) >> + return; >> + >> + __vcpu_sys_reg(vcpu, reg) = val; >> +} > > >> +static void __vcpu_write_spsr(struct kvm_vcpu *vcpu, u64 val) >> +{ >> + write_sysreg_el1(val, SYS_SPSR); >> +} > > This one doesn't look like it needs duplicating. Spot on again, thanks! M. -- Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel