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=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 D5204C433E2 for ; Mon, 7 Sep 2020 13:30:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 7037C21481 for ; Mon, 7 Sep 2020 13:30:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="l8QIqTkF"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="pxuyyE+x" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7037C21481 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Subject: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=v4gXYeKBwq1Sww6UQXdrYOAIVDYGkNpi42aasrXzpfw=; b=l8QIqTkFfAlJ+sSduoKGlHnMB MZDhu8RWJVqd7cg1KYxIyzr7RU6iuQn8BqU8huvF6CBJtPNeB8FSNcuH0D7GMngY++EiSs5AhKCjP vOA+GIJKRB23+7CJD4yVNFN9/PvtESisBXowICp2pWvuTnNUnwHoDUCt2Q1RdFLW/WUHJnH16muHU Uc9MbPVSdUSaXB5ex8FSjcesmwVUwlhTvKwabANtLK3Rci99usv0/UcoJuPFRfOenkB8uWzlCol7l hzOvVBK8AfOSTEZ6xdNaOfttWmXXq+lOp/yt4Jancn59SeK9RdjkAwLWyXc4MuzgXHeeKrdhnCwtO /g7lm0SQA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFHCv-0001yV-PR; Mon, 07 Sep 2020 13:29:17 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFHCt-0001xr-Bn for linux-arm-kernel@lists.infradead.org; Mon, 07 Sep 2020 13:29:16 +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 5F25521481; Mon, 7 Sep 2020 13:29:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599485354; bh=Bz4JIxDO9TUHhUV5rVe97ztEbDq2ALAeJxcm5p4j9as=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=pxuyyE+x/+qsR4syobZosimZUM1Hu4Ox3vyClrTzTfb0Ne6DpOWTmVLh2repLU7c1 3rBEfv2FPqTjBO/u/D9dwtIj1ywTYpfzvi6op21RTQpF3ZmJfdm1z9nrFdIuIwENQV TJIT+ngZlJ4b0rshMSIlgZBghlaTutqa+mqpN0dU= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kFHCq-009lxw-0y; Mon, 07 Sep 2020 14:29:12 +0100 Date: Mon, 07 Sep 2020 14:29:11 +0100 Message-ID: <87sgbtlnq0.wl-maz@kernel.org> From: Marc Zyngier To: Andrew Scull Subject: Re: [PATCH v3 08/18] KVM: arm64: Introduce hyp context In-Reply-To: <20200903135307.251331-9-ascull@google.com> References: <20200903135307.251331-1-ascull@google.com> <20200903135307.251331-9-ascull@google.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 EasyPG/1.0.0 Emacs/26.3 (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: ascull@google.com, kvmarm@lists.cs.columbia.edu, james.morse@arm.com, suzuki.poulose@arm.com, julien.thierry.kdev@gmail.com, will@kernel.org, catalin.marinas@arm.com, kernel-team@android.com, sudeep.holla@arm.com, linux-arm-kernel@lists.infradead.org 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-20200907_092915_527330_C26B8124 X-CRM114-Status: GOOD ( 22.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-team@android.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, james.morse@arm.com, linux-arm-kernel@lists.infradead.org, Sudeep Holla , will@kernel.org, kvmarm@lists.cs.columbia.edu, julien.thierry.kdev@gmail.com 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, 03 Sep 2020 14:52:57 +0100, Andrew Scull wrote: > > During __guest_enter, save and restore from a new hyp context rather > than the host context. This is preparation for separation of the hyp and > host context in nVHE. > > Signed-off-by: Andrew Scull > --- > arch/arm64/include/asm/kvm_hyp.h | 3 ++- > arch/arm64/kernel/image-vars.h | 1 + > arch/arm64/kvm/arm.c | 10 ++++++++++ > arch/arm64/kvm/hyp/entry.S | 10 +++++----- > arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- > arch/arm64/kvm/hyp/nvhe/switch.c | 2 +- > arch/arm64/kvm/hyp/vhe/switch.c | 2 +- > 7 files changed, 21 insertions(+), 9 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h > index 1e2491da324e..0b525e05e5bf 100644 > --- a/arch/arm64/include/asm/kvm_hyp.h > +++ b/arch/arm64/include/asm/kvm_hyp.h > @@ -12,6 +12,7 @@ > #include > #include > > +DECLARE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); > DECLARE_PER_CPU(unsigned long, kvm_hyp_vector); > > #define read_sysreg_elx(r,nvh,vh) \ > @@ -89,7 +90,7 @@ void activate_traps_vhe_load(struct kvm_vcpu *vcpu); > void deactivate_traps_vhe_put(void); > #endif > > -u64 __guest_enter(struct kvm_vcpu *vcpu, struct kvm_cpu_context *host_ctxt); > +u64 __guest_enter(struct kvm_vcpu *vcpu); > > void __noreturn hyp_panic(void); > #ifdef __KVM_NVHE_HYPERVISOR__ > diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h > index 54bb0eb34b0f..9f419e4fc66b 100644 > --- a/arch/arm64/kernel/image-vars.h > +++ b/arch/arm64/kernel/image-vars.h > @@ -71,6 +71,7 @@ KVM_NVHE_ALIAS(kvm_update_va_mask); > /* Global kernel state accessed by nVHE hyp code. */ > KVM_NVHE_ALIAS(arm64_ssbd_callback_required); > KVM_NVHE_ALIAS(kvm_host_data); > +KVM_NVHE_ALIAS(kvm_hyp_ctxt); > KVM_NVHE_ALIAS(kvm_hyp_vector); > KVM_NVHE_ALIAS(kvm_vgic_global_state); > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index b6442c6be5ad..ae4b34f91e94 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -47,6 +47,7 @@ __asm__(".arch_extension virt"); > #endif > > DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data); > +DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); [back to this patch after having reviewed a few of the subsequent ones] Given the variety of contexts you are introducing, I wonder if the best course of action for most of this isn't simply to use the EL2 stack rather than defining ad-hoc structures. The host save/restore you are introducing in a later patch certainly could do without a separate data structure (hello, struct pt_regs) and the hyp/host churn. 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