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.0 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 DB09AC433ED for ; Thu, 8 Apr 2021 10:25:56 +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 66BCF61164 for ; Thu, 8 Apr 2021 10:25:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66BCF61164 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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To:Subject:Cc: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=+Tme4q9AW22y3aF9VHiEEcFHuCEUGqDfOemugRp7ZBw=; b=NdvwTVYBKMVntmK+NkNWRL1dB LebaRTfRuOfo8MGAxSW9Mec6TPzlKrYLqrKuMOA1CJUtwxmwO3/VJgDYuK0H6N6zw1PEozBPouCfy OGdETrSyIq+fSxzmT6bSjEhy2Ozlfl1mcyvubZB/YzGYQdq82qJh05iAIkPUawALgVT/B3+dgnJml tc/Wh3x9WaTucSyXAJB5bimfZcsdcBER2qiVTHk3rEtLir01EKA7j8B6l4a7aHC+kBcNLWO39d0df 5cVtcNQxY88XwZop/L52jLkKzkbAAnR6t4RKfNE5F1mhybyuOWcDK5fLHFYHvpj+LQON460UVvJMB w3ihuo6WQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lURpj-007cwb-Bt; Thu, 08 Apr 2021 10:24:19 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lURpZ-007ctZ-PW; Thu, 08 Apr 2021 10:24:12 +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 0E7456115B; Thu, 8 Apr 2021 10:24:08 +0000 (UTC) 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 1lURpW-006HDf-1m; Thu, 08 Apr 2021 11:24:06 +0100 MIME-Version: 1.0 Date: Thu, 08 Apr 2021 11:24:05 +0100 From: Marc Zyngier To: Pavel Tatashin Cc: jmorris@namei.org, sashal@kernel.org, ebiederm@xmission.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, corbet@lwn.net, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, vladimir.murzin@arm.com, matthias.bgg@gmail.com, linux-mm@kvack.org, mark.rutland@arm.com, steve.capper@arm.com, rfontana@redhat.com, tglx@linutronix.de, selindag@gmail.com, tyhicks@linux.microsoft.com, kernelfans@gmail.com Subject: Re: [PATCH v13 03/18] arm64: hyp-stub: Move el1_sync into the vectors In-Reply-To: <20210408040537.2703241-4-pasha.tatashin@soleen.com> References: <20210408040537.2703241-1-pasha.tatashin@soleen.com> <20210408040537.2703241-4-pasha.tatashin@soleen.com> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <480272f8fb3e46d24a0ee1418fb85809@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: pasha.tatashin@soleen.com, jmorris@namei.org, sashal@kernel.org, ebiederm@xmission.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, corbet@lwn.net, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, vladimir.murzin@arm.com, matthias.bgg@gmail.com, linux-mm@kvack.org, mark.rutland@arm.com, steve.capper@arm.com, rfontana@redhat.com, tglx@linutronix.de, selindag@gmail.com, tyhicks@linux.microsoft.com, kernelfans@gmail.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-20210408_112410_713505_E674E5C5 X-CRM114-Status: GOOD ( 17.60 ) 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-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 On 2021-04-08 05:05, Pavel Tatashin wrote: > From: James Morse > > The hyp-stub's el1_sync code doesn't do very much, this can easily fit > in the vectors. > > With this, all of the hyp-stubs behaviour is contained in its vectors. > This lets kexec and hibernate copy the hyp-stub when they need its > behaviour, instead of re-implementing it. > > Signed-off-by: James Morse > > [Fixed merging issues] That's a pretty odd fix IMO. > > Signed-off-by: Pavel Tatashin > --- > arch/arm64/kernel/hyp-stub.S | 59 ++++++++++++++++++------------------ > 1 file changed, 29 insertions(+), 30 deletions(-) > > diff --git a/arch/arm64/kernel/hyp-stub.S > b/arch/arm64/kernel/hyp-stub.S > index ff329c5c074d..d1a73d0f74e0 100644 > --- a/arch/arm64/kernel/hyp-stub.S > +++ b/arch/arm64/kernel/hyp-stub.S > @@ -21,6 +21,34 @@ SYM_CODE_START_LOCAL(\label) > .align 7 > b \label > SYM_CODE_END(\label) > +.endm > + > +.macro hyp_stub_el1_sync > +SYM_CODE_START_LOCAL(hyp_stub_el1_sync) > + .align 7 > + cmp x0, #HVC_SET_VECTORS > + b.ne 2f > + msr vbar_el2, x1 > + b 9f > + > +2: cmp x0, #HVC_SOFT_RESTART > + b.ne 3f > + mov x0, x2 > + mov x2, x4 > + mov x4, x1 > + mov x1, x3 > + br x4 // no return > + > +3: cmp x0, #HVC_RESET_VECTORS > + beq 9f // Nothing to reset! > + > + /* Someone called kvm_call_hyp() against the hyp-stub... */ > + mov_q x0, HVC_STUB_ERR > + eret > + > +9: mov x0, xzr > + eret > +SYM_CODE_END(hyp_stub_el1_sync) You said you tested this on a TX2. I guess you don't care whether it runs VHE or not... M. > .endm > > .text > @@ -39,7 +67,7 @@ SYM_CODE_START(__hyp_stub_vectors) > invalid_vector hyp_stub_el2h_fiq_invalid // FIQ EL2h > invalid_vector hyp_stub_el2h_error_invalid // Error EL2h > > - ventry el1_sync // Synchronous 64-bit EL1 > + hyp_stub_el1_sync // Synchronous 64-bit EL1 > invalid_vector hyp_stub_el1_irq_invalid // IRQ 64-bit EL1 > invalid_vector hyp_stub_el1_fiq_invalid // FIQ 64-bit EL1 > invalid_vector hyp_stub_el1_error_invalid // Error 64-bit EL1 > @@ -55,35 +83,6 @@ SYM_CODE_END(__hyp_stub_vectors) > # Check the __hyp_stub_vectors didn't overflow > .org . - (__hyp_stub_vectors_end - __hyp_stub_vectors) + SZ_2K > > - > -SYM_CODE_START_LOCAL(el1_sync) > - cmp x0, #HVC_SET_VECTORS > - b.ne 1f > - msr vbar_el2, x1 > - b 9f > - > -1: cmp x0, #HVC_VHE_RESTART > - b.eq mutate_to_vhe > - > -2: cmp x0, #HVC_SOFT_RESTART > - b.ne 3f > - mov x0, x2 > - mov x2, x4 > - mov x4, x1 > - mov x1, x3 > - br x4 // no return > - > -3: cmp x0, #HVC_RESET_VECTORS > - beq 9f // Nothing to reset! > - > - /* Someone called kvm_call_hyp() against the hyp-stub... */ > - mov_q x0, HVC_STUB_ERR > - eret > - > -9: mov x0, xzr > - eret > -SYM_CODE_END(el1_sync) > - > // nVHE? No way! Give me the real thing! > SYM_CODE_START_LOCAL(mutate_to_vhe) > // Sanity check: MMU *must* be off -- 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