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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 A7EF6C433ED for ; Thu, 8 Apr 2021 14:47:47 +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 33EE5610F7 for ; Thu, 8 Apr 2021 14:47:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33EE5610F7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com 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:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/yv03mKUcuDJV8Gn6WYHG8Ad+SwPQwntPf5/yH2VHYQ=; b=rPrYPJqs3VY+waJkhDX0XdPfn 0sHwTo+m6RNdFIfNv8hFHxHWg9TYPDIUvrVuhU23Nrnn5UhDjkwbiSU+m2hGyMBVBeVBCss+kPsci sC5lyHC9FRy0Wx24Fu4s6wJ0FP0hwTqd1NDrZ1L5jJHT2RkYQmX01ciIv5WlKIDxFZG7MXrNGvBPY TDkC2h5cyqdOvCRZMInRtYtiJ+ue5nku90pvKrk5q0dcL/intRyIIUV85RS41LXjIjZEavS5l05U1 4ICgkovEAvXipO93Ij908K7UE8Eo1L2zUhRiIvz55hCsdAeJ4A0aqTMM4Qf5vc/7kwe68HcykPc40 Vbi1uoRhA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lUVuz-008HC8-Du; Thu, 08 Apr 2021 14:46:01 +0000 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lUVut-008HB6-Cy for linux-arm-kernel@lists.infradead.org; Thu, 08 Apr 2021 14:45:57 +0000 Received: by mail-ed1-x531.google.com with SMTP id s15so2758809edd.4 for ; Thu, 08 Apr 2021 07:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=aP4+/wgY+aHLdP7WVG3wUuA56ODwMI83uK1g26CTxS8=; b=F1ivaxkHYK3YNvEyXAkkE8EKfxCD4mHzwhZR3636bMbnjNCLztUSKrxvIQ3Az1Nn6p +7KsTVnHIXWeKT/lFk6SZ68OJI2D77xsEtuCQthGOjtYqayd7ZAOazdA3z1Cg7z7YSKQ fYWV+k/o2b/P7GbNKxMrNuvqYQl1zEnwl85OQbek0neUVu2dPqfzEOWiWkcd44kKyArJ U3PrSDDMPLqNb10qWyaIe693BjDKwI3GBEQohd9lyOaGid2Oo/QWQZ9bnMgACofMc3Yt U14uVl8d1YHsjph5Ppr2yHdzKRpM8xl5X8RbOS+qkJXYsD1poMUUh/okTM9rTIRxSDRB aNKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=aP4+/wgY+aHLdP7WVG3wUuA56ODwMI83uK1g26CTxS8=; b=aJJ3UlPG/mQNaPVbJjU3doNnkxIu5ekspsuRZbIMyaBC+EziXPVjfh2teb3EN39Iwx nyiJ64j3fq4CHOxOds8bEd+wuywCslE1i+5RAd5lUpw2qDiRWvFBTNbDSksTuSAZ5xqR Hojf0ahl5A4jpezeoLDik4U1aofd4G2W/PRAFigJRF+DLu5aBElMXGyvGCnbCV0MK3sO JkXtObgG4H4Xj2q4m5cRbO0z8V2kzARFWMwugx4BSb1q+BFk7biomluEgp/xXAK2HceJ 1Db1b5KXnNz2FvVULRnmn3Hj0fubuPznRVRqZyCaqwuLgtjvxEbSHG5DzrQloQgb28Nh Eftw== X-Gm-Message-State: AOAM530u2jH3xlUUPYn6GG64AVEoSQ1pm2QH9m/FJKLi4tzyF3MB6QRV d71ygXwe2QuVK+1+EFcRuiQT0144UHnWZCdTKV4DLA== X-Google-Smtp-Source: ABdhPJyLURUxZtiZnGe6SwWCgmcGWMa/94o5nttbjueSVkPKwhjmuYlwF2DAd125IPHmumPkvW62Dys0w+LVTnB9KF0= X-Received: by 2002:a05:6402:68a:: with SMTP id f10mr11938928edy.26.1617893154596; Thu, 08 Apr 2021 07:45:54 -0700 (PDT) MIME-Version: 1.0 References: <20210408040537.2703241-1-pasha.tatashin@soleen.com> <20210408040537.2703241-4-pasha.tatashin@soleen.com> <480272f8fb3e46d24a0ee1418fb85809@kernel.org> In-Reply-To: <480272f8fb3e46d24a0ee1418fb85809@kernel.org> From: Pavel Tatashin Date: Thu, 8 Apr 2021 10:45:18 -0400 Message-ID: Subject: Re: [PATCH v13 03/18] arm64: hyp-stub: Move el1_sync into the vectors To: Marc Zyngier 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210408_154555_813571_E1DDB1B7 X-CRM114-Status: GOOD ( 25.75 ) 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, 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. Thanks, Pasha > > 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