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=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 4EB5FC433DB for ; Mon, 22 Mar 2021 18:39:05 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 C2ADD61992 for ; Mon, 22 Mar 2021 18:39:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2ADD61992 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Subject:Cc:To: From:Message-ID:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1lmWbRRKpKKtPuFw7Z9hPxe9VlaeoFNXqgA3Oz4Oj70=; b=W01dbvNSIEwQtiZm5Ol//pjyP uW/bm1R6wvHkssPGkE60+3f2PxEK2y7ALmZ5G1KC81omipeB0wepZECnMp7KrzjiesrdfCtvaaRi5 ON+sb/w0PsDMBWAWY5hYA07xryXDkChdLpDiYEnJ25poMn5RxX+mRrPUIpVFMaLwWqwgTe0txuZW5 A4V4QSlTcPh4jDiL+zKvebIxsmknD6dUdv6VCotSH6P81bBT/nP7yDCt0OdDGWjN+LyxJ9g9E2bO4 SdcmHJnVtk9w3C4R88gDC/m30Vlh+ddjB6d0NQzi92NpIt9z2EBVakm/r5/JTkqurvhgHPuKJ7Lfp lE3+Ob5rg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lOPQc-00CH8G-50; Mon, 22 Mar 2021 18:37:26 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lOPQV-00CH73-Lf for linux-arm-kernel@lists.infradead.org; Mon, 22 Mar 2021 18:37:22 +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 A325561992; Mon, 22 Mar 2021 18:37:17 +0000 (UTC) Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1lOPQR-0038iZ-My; Mon, 22 Mar 2021 18:37:15 +0000 Date: Mon, 22 Mar 2021 18:37:14 +0000 Message-ID: <87k0pzghlx.wl-maz@kernel.org> From: Marc Zyngier To: Quentin Perret Cc: catalin.marinas@arm.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, android-kvm@google.com, seanjc@google.com, mate.toth-pal@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, tabba@google.com, ardb@kernel.org, mark.rutland@arm.com, dbrazdil@google.com Subject: Re: [PATCH 2/3] KVM: arm64: Generate final CTR_EL0 value when running in Protected mode In-Reply-To: References: <20210322164828.800662-1-maz@kernel.org> <20210322164828.800662-3-maz@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: qperret@google.com, catalin.marinas@arm.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, android-kvm@google.com, seanjc@google.com, mate.toth-pal@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, tabba@google.com, ardb@kernel.org, mark.rutland@arm.com, dbrazdil@google.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-20210322_183720_123284_58EBF371 X-CRM114-Status: GOOD ( 26.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, 22 Mar 2021 17:40:40 +0000, Quentin Perret wrote: > > Hey Marc, > > On Monday 22 Mar 2021 at 16:48:27 (+0000), Marc Zyngier wrote: > > In protected mode, late CPUs are not allowed to boot (enforced by > > the PSCI relay). We can thus specialise the read_ctr macro to > > always return a pre-computed, sanitised value. > > > > Signed-off-by: Marc Zyngier > > --- > > arch/arm64/include/asm/assembler.h | 9 +++++++++ > > arch/arm64/kernel/image-vars.h | 1 + > > arch/arm64/kvm/va_layout.c | 7 +++++++ > > 3 files changed, 17 insertions(+) > > > > diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h > > index fb651c1f26e9..1a4cee7eb3c9 100644 > > --- a/arch/arm64/include/asm/assembler.h > > +++ b/arch/arm64/include/asm/assembler.h > > @@ -270,12 +270,21 @@ alternative_endif > > * provide the system wide safe value from arm64_ftr_reg_ctrel0.sys_val > > */ > > .macro read_ctr, reg > > +#ifndef __KVM_NVHE_HYPERVISOR__ > > alternative_if_not ARM64_MISMATCHED_CACHE_TYPE > > mrs \reg, ctr_el0 // read CTR > > nop > > alternative_else > > ldr_l \reg, arm64_ftr_reg_ctrel0 + ARM64_FTR_SYSVAL > > alternative_endif > > +#else > > +alternative_cb kvm_compute_final_ctr_el0 > > + movz \reg, #0 > > + movk \reg, #0, lsl #16 > > + movk \reg, #0, lsl #32 > > + movk \reg, #0, lsl #48 > > +alternative_cb_end > > +#endif > > .endm > > So, FWIW, if we wanted to make _this_ macro BUG in non-protected mode > (and drop patch 01), I think we could do something like: > > alternative_cb kvm_compute_final_ctr_el0 > movz \reg, #0 > ASM_BUG() > nop > nop > alternative_cb_end > > and then make kvm_compute_final_ctr_el0() check that we're in protected > mode before patching. That would be marginally better as that would > cover _all_ users of read_ctr and not just __flush_dcache_area, but that > first movz is a bit yuck (but necessary to keep generate_mov_q() happy I > think?), so I'll leave the decision to you. Can't say I'm keen on the yucky bit, but here's an alternative (ha!) for you: diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 1a4cee7eb3c9..7582c3bd2f05 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -278,6 +278,9 @@ alternative_else ldr_l \reg, arm64_ftr_reg_ctrel0 + ARM64_FTR_SYSVAL alternative_endif #else +alternative_if_not ARM64_KVM_PROTECTED_MODE + ASM_BUG() +alternative_else_nop_endif alternative_cb kvm_compute_final_ctr_el0 movz \reg, #0 movk \reg, #0, lsl #16 Yes, it is one more instruction, but it is cleaner and allows us to from the first patch of the series. What do you think? M. -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel