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 90A04C433B4 for ; Thu, 8 Apr 2021 15:03:40 +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 26C02610F9 for ; Thu, 8 Apr 2021 15:03:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26C02610F9 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=JEH1BxakAc5TVJxGn6m4WXZbRVYzBfLHQduo9vKJey0=; b=oC7aNKdpgIF9x8ILcOGQdLU8O tFD/p/5ZvkmYK3p9xhCu0RKNlq7Q2f/IIk9dCubJ3H2zgPX99dC54qFVDgu2iZCzk5551rwOQ65Wo T/iGSBvnxCpCo06028BJ2rsdfoAXZmuN1C0KmCcpUUZcRvD4As9KMgITLzm/pPQ60W6mxkdQ+BRa0 ME0vCwHoVDtnYmFV2ERnerhGKVwgm9LT884WmfzwCIdTXwAosPocApqNX7ydqsiUfBWZtmmiahuak 1jj0ndD5SUKGtHLT4x7tbrXwvTa9O7+qrDwtD1vUekYWIipr7JgOWPZMs4BjFxLSMSjuN0tT1JFUY /89/Bsffw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lUWAK-008Jov-B3; Thu, 08 Apr 2021 15:01:52 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lUWAD-008Jnb-2z; Thu, 08 Apr 2021 15:01:47 +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 76F7A61002; Thu, 8 Apr 2021 15:01:43 +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 1lUWA9-006Kqn-8u; Thu, 08 Apr 2021 16:01:41 +0100 Date: Thu, 08 Apr 2021 16:01:40 +0100 Message-ID: <87v98wom5n.wl-maz@kernel.org> From: Marc Zyngier To: Pavel Tatashin Cc: James Morris , Sasha Levin , "Eric W. Biederman" , kexec mailing list , LKML , Jonathan Corbet , Catalin Marinas , Will Deacon , Linux ARM , James Morse , Vladimir Murzin , Matthias Brugger , linux-mm , Mark Rutland , steve.capper@arm.com, rfontana@redhat.com, Thomas Gleixner , Selin Dag , Tyler Hicks , Pingfan Liu Subject: Re: [PATCH v13 03/18] arm64: hyp-stub: Move el1_sync into the vectors In-Reply-To: References: <20210408040537.2703241-1-pasha.tatashin@soleen.com> <20210408040537.2703241-4-pasha.tatashin@soleen.com> <480272f8fb3e46d24a0ee1418fb85809@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: 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_160145_465568_E14206E7 X-CRM114-Status: GOOD ( 30.79 ) 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 Thu, 08 Apr 2021 15:45:18 +0100, Pavel Tatashin wrote: > > On Thu, Apr 8, 2021 at 6:24 AM Marc Zyngier wrote: > > > > 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... > > Hi Marc, > > Thank you for noticing this. Not sure how this missmerge happened. I > have added the missing case, and VHE is initialized correctly during > boot. > [ 14.698175] kvm [1]: VHE mode initialized successfully > > During normal boot, kexec reboot, and kdump reboot. I will respin the > series and send the version 14 soon. Please give people a chance to review this lot first. This isn't code that is easy to digest, and immediate re-spinning does more harm than good (this isn't targeting 5.13, I would assume). Thanks, 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