From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Murray Subject: Re: [PATCH v7 2/5] arm64: KVM: encapsulate kvm_cpu_context in kvm_host_data Date: Tue, 11 Dec 2018 13:11:50 +0000 Message-ID: <20181211131149.GF13393@e119886-lin.cambridge.arm.com> References: <1544530420-1477-1-git-send-email-andrew.murray@arm.com> <1544530420-1477-3-git-send-email-andrew.murray@arm.com> <525c5c2f-5d09-6e36-8802-457791f93ac5@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 04D3B4A1FA for ; Tue, 11 Dec 2018 08:11:59 -0500 (EST) Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4Dz+lpKQVuKy for ; Tue, 11 Dec 2018 08:11:53 -0500 (EST) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by mm01.cs.columbia.edu (Postfix) with ESMTP id DC6854A1DE for ; Tue, 11 Dec 2018 08:11:52 -0500 (EST) Content-Disposition: inline In-Reply-To: <525c5c2f-5d09-6e36-8802-457791f93ac5@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: Suzuki K Poulose Cc: Marc Zyngier , Catalin Marinas , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org List-Id: kvmarm@lists.cs.columbia.edu On Tue, Dec 11, 2018 at 12:40:51PM +0000, Suzuki K Poulose wrote: > > > On 11/12/2018 12:13, Andrew Murray wrote: > > The virt/arm core allocates a percpu structure as per the kvm_cpu_context_t > > type, at present this is typedef'd to kvm_cpu_context and used to store > > host cpu context. The kvm_cpu_context structure is also used elsewhere to > > hold vcpu context. In order to use the percpu to hold additional future > > host information we encapsulate kvm_cpu_context in a new structure. > > > > Signed-off-by: Andrew Murray > > --- > > arch/arm64/include/asm/kvm_host.h | 8 ++++++-- > > arch/arm64/kernel/asm-offsets.c | 3 ++- > > virt/kvm/arm/arm.c | 4 +++- > > 3 files changed, 11 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index 1550192..bcf9d60 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -205,7 +205,11 @@ struct kvm_cpu_context { > > struct kvm_vcpu *__hyp_running_vcpu; > > }; > > -typedef struct kvm_cpu_context kvm_cpu_context_t; > > +struct kvm_host_data { > > + struct kvm_cpu_context __kvm_cpu_state; > > +}; > > + > > +typedef struct kvm_host_data kvm_cpu_context_t; > > struct kvm_vcpu_arch { > > struct kvm_cpu_context ctxt; > > @@ -241,7 +245,7 @@ struct kvm_vcpu_arch { > > struct kvm_guest_debug_arch external_debug_state; > > /* Pointer to host CPU context */ > > - kvm_cpu_context_t *host_cpu_context; > > + struct kvm_cpu_context *host_cpu_context; > > struct thread_info *host_thread_info; /* hyp VA */ > > struct user_fpsimd_state *host_fpsimd_state; /* hyp VA */ > > diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c > > index 323aeb5..da34022 100644 > > --- a/arch/arm64/kernel/asm-offsets.c > > +++ b/arch/arm64/kernel/asm-offsets.c > > @@ -142,7 +142,8 @@ int main(void) > > DEFINE(CPU_FP_REGS, offsetof(struct kvm_regs, fp_regs)); > > DEFINE(VCPU_FPEXC32_EL2, offsetof(struct kvm_vcpu, arch.ctxt.sys_regs[FPEXC32_EL2])); > > DEFINE(VCPU_HOST_CONTEXT, offsetof(struct kvm_vcpu, arch.host_cpu_context)); > > - DEFINE(HOST_CONTEXT_VCPU, offsetof(struct kvm_cpu_context, __hyp_running_vcpu)); > > + DEFINE(HOST_CONTEXT_VCPU, offsetof(struct kvm_cpu_context, __hyp_running_vcpu) > > + + offsetof(struct kvm_host_data, __kvm_cpu_state)); > > nit: You could fold the member field in the offsetof(). i.e, > DEFINE(HOST_CONTEXT_VCPU, offsetof(struct kvm_host_data, > __kvm_cpu_state.__hyp_running_vcpu) > > like the VCPU_HOST_CONTEXT above ? Ah yes thanks for this. Andrew Murray > > Cheers > Suzuki 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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 0E528C07E85 for ; Tue, 11 Dec 2018 13:12:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D3A7F20811 for ; Tue, 11 Dec 2018 13:12:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HY2HNgzJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3A7F20811 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cHwyczkZqLvBEquDUj2p7q8yVZo9VNFQ/fHdyzpbkBE=; b=HY2HNgzJumvTyU /ToXm0jtDZRTSISlwswwFX8Iic/Uqxo/ORkyF8SlFBwQ/gK5rqVKX4tUck2FIqs+GjyU9Pw6kPIVK 8QP0As4KdBDab1D3OPPYeCe/XOw6hsqAKuTORZZGYpN2oxnEwtn0/Om/vHu+AezYcFHW3ioKukzK1 rikk0b1heEJT+miv0gDIXUfnewpQdMG49HirhEXs3XigvBpvIPmE6eM6xT0L8u2BW3vEZ56Ou8Sgc 1yZFaIjmXRsV2GwkL0kHM8nscnlTjVyAIaKHb4/NNXf81+77nuKFQcUUkWV6WGgS9n9jLbSzuYEog 1u4utn4DsTE9tXKBxu8A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gWhpY-0002Ui-1f; Tue, 11 Dec 2018 13:12:08 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gWhpS-0002FW-Mn for linux-arm-kernel@lists.infradead.org; Tue, 11 Dec 2018 13:12:05 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5AD89EBD; Tue, 11 Dec 2018 05:11:52 -0800 (PST) Received: from localhost (unknown [10.37.6.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BC3B23F59C; Tue, 11 Dec 2018 05:11:51 -0800 (PST) Date: Tue, 11 Dec 2018 13:11:50 +0000 From: Andrew Murray To: Suzuki K Poulose Subject: Re: [PATCH v7 2/5] arm64: KVM: encapsulate kvm_cpu_context in kvm_host_data Message-ID: <20181211131149.GF13393@e119886-lin.cambridge.arm.com> References: <1544530420-1477-1-git-send-email-andrew.murray@arm.com> <1544530420-1477-3-git-send-email-andrew.murray@arm.com> <525c5c2f-5d09-6e36-8802-457791f93ac5@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <525c5c2f-5d09-6e36-8802-457791f93ac5@arm.com> User-Agent: Mutt/1.10.1+81 (426a6c1) (2018-08-26) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181211_051203_105062_6FDB75DB X-CRM114-Status: GOOD ( 20.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Julien Thierry , Marc Zyngier , Catalin Marinas , Will Deacon , Christoffer Dall , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Dec 11, 2018 at 12:40:51PM +0000, Suzuki K Poulose wrote: > > > On 11/12/2018 12:13, Andrew Murray wrote: > > The virt/arm core allocates a percpu structure as per the kvm_cpu_context_t > > type, at present this is typedef'd to kvm_cpu_context and used to store > > host cpu context. The kvm_cpu_context structure is also used elsewhere to > > hold vcpu context. In order to use the percpu to hold additional future > > host information we encapsulate kvm_cpu_context in a new structure. > > > > Signed-off-by: Andrew Murray > > --- > > arch/arm64/include/asm/kvm_host.h | 8 ++++++-- > > arch/arm64/kernel/asm-offsets.c | 3 ++- > > virt/kvm/arm/arm.c | 4 +++- > > 3 files changed, 11 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index 1550192..bcf9d60 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -205,7 +205,11 @@ struct kvm_cpu_context { > > struct kvm_vcpu *__hyp_running_vcpu; > > }; > > -typedef struct kvm_cpu_context kvm_cpu_context_t; > > +struct kvm_host_data { > > + struct kvm_cpu_context __kvm_cpu_state; > > +}; > > + > > +typedef struct kvm_host_data kvm_cpu_context_t; > > struct kvm_vcpu_arch { > > struct kvm_cpu_context ctxt; > > @@ -241,7 +245,7 @@ struct kvm_vcpu_arch { > > struct kvm_guest_debug_arch external_debug_state; > > /* Pointer to host CPU context */ > > - kvm_cpu_context_t *host_cpu_context; > > + struct kvm_cpu_context *host_cpu_context; > > struct thread_info *host_thread_info; /* hyp VA */ > > struct user_fpsimd_state *host_fpsimd_state; /* hyp VA */ > > diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c > > index 323aeb5..da34022 100644 > > --- a/arch/arm64/kernel/asm-offsets.c > > +++ b/arch/arm64/kernel/asm-offsets.c > > @@ -142,7 +142,8 @@ int main(void) > > DEFINE(CPU_FP_REGS, offsetof(struct kvm_regs, fp_regs)); > > DEFINE(VCPU_FPEXC32_EL2, offsetof(struct kvm_vcpu, arch.ctxt.sys_regs[FPEXC32_EL2])); > > DEFINE(VCPU_HOST_CONTEXT, offsetof(struct kvm_vcpu, arch.host_cpu_context)); > > - DEFINE(HOST_CONTEXT_VCPU, offsetof(struct kvm_cpu_context, __hyp_running_vcpu)); > > + DEFINE(HOST_CONTEXT_VCPU, offsetof(struct kvm_cpu_context, __hyp_running_vcpu) > > + + offsetof(struct kvm_host_data, __kvm_cpu_state)); > > nit: You could fold the member field in the offsetof(). i.e, > DEFINE(HOST_CONTEXT_VCPU, offsetof(struct kvm_host_data, > __kvm_cpu_state.__hyp_running_vcpu) > > like the VCPU_HOST_CONTEXT above ? Ah yes thanks for this. Andrew Murray > > Cheers > Suzuki _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel