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.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 4338BC388F7 for ; Tue, 10 Nov 2020 10:01:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C51B8206E3 for ; Tue, 10 Nov 2020 10:01:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="U/y1gcA/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726706AbgKJKBT (ORCPT ); Tue, 10 Nov 2020 05:01:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:59938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726428AbgKJKBT (ORCPT ); Tue, 10 Nov 2020 05:01:19 -0500 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 A6BA9205CA; Tue, 10 Nov 2020 10:01:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605002478; bh=MpYOqpfrkwMeRZHEzlIP04lGoaO0Nbgm2RSKublJQ1I=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=U/y1gcA/cMKkNo7E7KkcZpSJMwUYIzi72RorNUsPfOlEtHUk71qt+xVWr0H9C7Zcg 2bpClkgIUABwQH2O8KyHqgjv+mbxUOXpheziOOtyJWE1AO9AdMv26yLNzHyizQGdpL Og/S97nF8WVcHsPZhOvGZhCaxE7o4YLGp0iNmFPk= 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 1kcQSi-009PMa-8c; Tue, 10 Nov 2020 10:01:16 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 10 Nov 2020 10:01:16 +0000 From: Marc Zyngier To: James Morse Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Julien Thierry , Suzuki K Poulose , kernel-team@android.com Subject: Re: [PATCH 1/8] KVM: arm64: Move AArch32 exceptions over to AArch64 sysregs In-Reply-To: <58942c6b-9cf2-a0d7-3ba5-2fc42aeef779@arm.com> References: <20201102191609.265711-1-maz@kernel.org> <20201102191609.265711-2-maz@kernel.org> <58942c6b-9cf2-a0d7-3ba5-2fc42aeef779@arm.com> User-Agent: Roundcube Webmail/1.4.9 Message-ID: <99e4733efb9ec810b52662597e61b92b@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, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.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 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 2020-11-03 18:29, James Morse wrote: > Hi Marc, > > On 02/11/2020 19:16, Marc Zyngier wrote: >> The use of the AArch32-specific accessors have always been a bit >> annoying on 64bit, and it is time for a change. >> >> Let's move the AArch32 exception injection over to the AArch64 >> encoding, >> which requires us to split the two halves of FAR_EL1 into DFAR and >> IFAR. >> This enables us to drop the preempt_disable() games on VHE, and to >> kill >> the last user of the vcpu_cp15() macro. > > Hurrah! > > >> diff --git a/arch/arm64/kvm/inject_fault.c >> b/arch/arm64/kvm/inject_fault.c >> index e2a2e48ca371..975f65ba6a8b 100644 >> --- a/arch/arm64/kvm/inject_fault.c >> +++ b/arch/arm64/kvm/inject_fault.c >> @@ -100,39 +81,36 @@ static void inject_undef32(struct kvm_vcpu *vcpu) >> * Modelled after TakeDataAbortException() and >> TakePrefetchAbortException >> * pseudocode. >> */ >> -static void inject_abt32(struct kvm_vcpu *vcpu, bool is_pabt, >> - unsigned long addr) >> +static void inject_abt32(struct kvm_vcpu *vcpu, bool is_pabt, u32 >> addr) >> { >> - u32 *far, *fsr; >> - bool is_lpae; >> - bool loaded; >> + u64 far; >> + u32 fsr; > > >> + /* Give the guest an IMPLEMENTATION DEFINED exception */ >> + if (__vcpu_sys_reg(vcpu, TCR_EL1) & TTBCR_EAE) { > > With VHE, won't __vcpu_sys_reg() read the potentially stale copy in > the sys_reg array? > > vcpu_read_sys_reg()? Of course you are right. Now fixed. Thanks, M. -- Jazz is not dead. It just smells funny...