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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 D1196C433ED for ; Thu, 8 Apr 2021 14:45:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7CBE7610F9 for ; Thu, 8 Apr 2021 14:45:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7CBE7610F9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 14BD08D0005; Thu, 8 Apr 2021 10:45:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0FE508D0002; Thu, 8 Apr 2021 10:45:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EDF318D0005; Thu, 8 Apr 2021 10:45:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0068.hostedemail.com [216.40.44.68]) by kanga.kvack.org (Postfix) with ESMTP id D05228D0002 for ; Thu, 8 Apr 2021 10:45:56 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 8E38A1830EE73 for ; Thu, 8 Apr 2021 14:45:56 +0000 (UTC) X-FDA: 78009474312.20.BDB826C Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by imf18.hostedemail.com (Postfix) with ESMTP id 0A2532000263 for ; Thu, 8 Apr 2021 14:45:55 +0000 (UTC) Received: by mail-ed1-f52.google.com with SMTP id ba6so2762976edb.1 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=b57Lwet6WBJjuOwenoy8eaQD6In0kxcfIckz1rUYbog07Y34azwax8fc/UK3XVd6Es 554RjbStQoV0PUgosVAamhizmWfnBMpFoTxS9DBB1NMfnnKzwzJh40QQ9LMW0b48vj4W uQyPTB52A+MvRQ0M7j/8KpxeHHUx2EyilLAKJ3ZzmBbrA8mLm92HofqH3m6KuUbv9XoX ccOpMevqTrzk3B9OZOqdZKjgRQiLMbjWkpw/IpA+VHmdhk4AezVoAGF1xc+KTmqQLkGx nhm2+wxsWHPvSn90IFFC1OKpo9ZcOQS66GuAumgw4f9nSZJqqLFLH5P98hj2OG8SCzys 3idw== X-Gm-Message-State: AOAM5308N3rVLS/j0cLy9fnL2SOsmNBDJ7jn9flSveKR06w1fzxwUMN2 PFIiAZ3husN6HLR6y/HbFvGenEmBK/gvndXmjYErFg== 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 Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: zy3bmfdmd7jbn6afncgz5xz9prrsbaii X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 0A2532000263 Received-SPF: none (soleen.com>: No applicable sender policy available) receiver=imf18; identity=mailfrom; envelope-from=""; helo=mail-ed1-f52.google.com; client-ip=209.85.208.52 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617893155-670444 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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...