From patchwork Wed Sep 11 14:34:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fares Mehanna X-Patchwork-Id: 13800692 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76709EE49BC for ; Wed, 11 Sep 2024 14:36:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D090940049; Wed, 11 Sep 2024 10:36:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 080E4940021; Wed, 11 Sep 2024 10:36:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6273940049; Wed, 11 Sep 2024 10:36:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C7B6E940021 for ; Wed, 11 Sep 2024 10:36:41 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 84A14A9F30 for ; Wed, 11 Sep 2024 14:36:41 +0000 (UTC) X-FDA: 82552708602.12.0DB7FBF Received: from smtp-fw-9102.amazon.com (smtp-fw-9102.amazon.com [207.171.184.29]) by imf14.hostedemail.com (Postfix) with ESMTP id 6675A100004 for ; Wed, 11 Sep 2024 14:36:39 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=amazon.de header.s=amazon201209 header.b=MVcorqqc; spf=pass (imf14.hostedemail.com: domain of "prvs=97728e23b=faresx@amazon.de" designates 207.171.184.29 as permitted sender) smtp.mailfrom="prvs=97728e23b=faresx@amazon.de"; dmarc=pass (policy=quarantine) header.from=amazon.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1726065296; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=rCn+xTWUjnpsWnBBnpI3iR0NNWrWMHIE+UutE4x6c8o=; b=n/sw+IS+F1AokT2lWc1TvKAJGTwJ9+Ph0Q3IGEsP5iYnCCC90UQotK+VpeV0XO2eeKqG00 AK25NBktHYI7TxhHJylB9YJWXwDWWkFREHJ/6weegOXEgiOqrIBzFlHEDYpVXutwM/G+3B qoclE0iCkCWjhwm2BA3nnDcYMdE80l8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1726065296; a=rsa-sha256; cv=none; b=P8Ne8FlFSe6sVwtZgd0lOERiGwyjcE8m5xRW8vWLfVub43SUahHftQih2lCRwP/aLDrfoP vQi98K7eh0SUYQDSuqkoqPE2APFn+KJdfuE69XqbWBYNJ4WfX+sucryOAofBWDyk6xpX+n pdfw9K8PHkhax5KLd07CLjKv2e3l1Ag= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=amazon.de header.s=amazon201209 header.b=MVcorqqc; spf=pass (imf14.hostedemail.com: domain of "prvs=97728e23b=faresx@amazon.de" designates 207.171.184.29 as permitted sender) smtp.mailfrom="prvs=97728e23b=faresx@amazon.de"; dmarc=pass (policy=quarantine) header.from=amazon.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1726065400; x=1757601400; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rCn+xTWUjnpsWnBBnpI3iR0NNWrWMHIE+UutE4x6c8o=; b=MVcorqqchM3HnXSUsp2s1aN7/33Eox2UNj53Bas+gQV9CXeXgdeJPHqK 5+0mRRkD2ypxv5uzhkEugjm7JaQ7XhPtr5AGcly1lszkXrOxYy7JP8tKG coiiwN4OHVDlfNYMEdOpxYLwqnX6iN2qhHqw+bywMHggtgF92ClsTJrZP c=; X-IronPort-AV: E=Sophos;i="6.10,220,1719878400"; d="scan'208";a="452953260" Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO smtpout.prod.us-east-1.prod.farcaster.email.amazon.dev) ([10.25.36.214]) by smtp-border-fw-9102.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2024 14:36:30 +0000 Received: from EX19MTAEUC001.ant.amazon.com [10.0.17.79:20048] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.13.80:2525] with esmtp (Farcaster) id 337e7469-1cf4-42a1-a92c-28b8d968fd53; Wed, 11 Sep 2024 14:36:28 +0000 (UTC) X-Farcaster-Flow-ID: 337e7469-1cf4-42a1-a92c-28b8d968fd53 Received: from EX19D007EUB001.ant.amazon.com (10.252.51.82) by EX19MTAEUC001.ant.amazon.com (10.252.51.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34; Wed, 11 Sep 2024 14:36:22 +0000 Received: from EX19MTAUEC001.ant.amazon.com (10.252.135.222) by EX19D007EUB001.ant.amazon.com (10.252.51.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.35; Wed, 11 Sep 2024 14:36:21 +0000 Received: from dev-dsk-faresx-1b-27755bf1.eu-west-1.amazon.com (10.253.79.181) by mail-relay.amazon.com (10.252.135.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34 via Frontend Transport; Wed, 11 Sep 2024 14:36:19 +0000 From: Fares Mehanna To: CC: , Fares Mehanna , "Marc Zyngier" , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , "Will Deacon" , Andrew Morton , "Kemeng Shi" , =?utf-8?q?Pierre-Cl=C3=A9ment_Tos?= =?utf-8?q?i?= , Ard Biesheuvel , Mark Rutland , Javier Martinez Canillas , "Arnd Bergmann" , Fuad Tabba , Mark Brown , Joey Gouly , Kristina Martsenko , Randy Dunlap , "Bjorn Helgaas" , Jean-Philippe Brucker , "Mike Rapoport (IBM)" , "David Hildenbrand" , Roman Kagan , "moderated list:KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)" , "open list:KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)" , open list , "open list:MEMORY MANAGEMENT" Subject: [RFC PATCH 3/7] arm64: KVM: Refactor C-code to access vCPU gp-registers through macros Date: Wed, 11 Sep 2024 14:34:02 +0000 Message-ID: <20240911143421.85612-4-faresx@amazon.de> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240911143421.85612-1-faresx@amazon.de> References: <20240911143421.85612-1-faresx@amazon.de> MIME-Version: 1.0 X-Rspamd-Queue-Id: 6675A100004 X-Stat-Signature: rr3qeo3nmnw9gtbgkr5sqpgihgumy7sz X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1726065399-34643 X-HE-Meta: U2FsdGVkX1/0056xJA7wA8/nx4kUnpGsBIKwyhgZlTQYWllqg/dFc5ShoSXtzgQ5r2d9Mf8Un4diIk/tN+T2WrIUz/qk2ZlmbqTD8CONP9UYIcs111Z3n2g4AoMuRfVVJncQv/wPNgywnNK1E3tgzv7LyqlC3scgfDbNF50+O5eLObpwdP5Vwo4Jn6/4SFN6LY1JDjrBmPfk/QLrGftCg1alXZwiuDQFwUfzzY/cPiZZuo3S1Q2/6N3Kk+alTi+lXVjGk70JLR3fW1vSETYp3WLuROi1lvUjRYiw465+tsbVm63fIHCZxVA8M9Gf1I1LUhTzNv8sAvj2rgAKGG5/njBQ2shDTUyPcBFO+/sbnNlo9ydaTQDGXnKFicIo9R71gb3Rhj5g6V38HFLcH9pL6UOaB9cWx32nWAdzCm9M6wvrQzMgCP46BpaSPFDjbOHQwWobkyk4UwE+A8TBYEDKsgV/axg4a98XjcDN+0UfycTObJxjNh6Y456OHKT+1ZhJ2JWxkdRUbEXT47i7XObGzd7/VLbRZC8FMGElh3kWfMpS3EMprdrIWjDkdzx3uAMBeU1Llq1xfxWVDS7rVXst7Vpp42BPAB7VPvhPVUDP7gP9eE65wnlM/rm8Dcq6a75uqkzcs5Y+gJvrnymU2pd7HH9XaP8wM/ZlfuN0zctA6bOI31PRKuNMecce6NJ3YZ9BvULWVnKG6PEO/FhVAjPrhuhDJl7/JBheZa29saC94uM9vk3Zo9/QylImgY7w8rGUfSVq1IAE1oV2I4WP7MndYobpDUnjMUYVaD90SQd738zSvBcFwWsg9uiAcYn57EwxfPVn7mxhJNVa6FARGS2VMJb5UYx8sArYQIqbLCWmcy5YyKuOPsQagzqx/aZh3ICOo0kzSiztlnzzp8IUooAe9qOe4PI7sw+76ib1wYbNxrbqzCl3XPXAsb68dYOhaFRcQC8PFVX3pd6gX/WG0pB wBL+cjoz 328A/kJ2e3GPi1vGMiCRBOIcGCTlcGcewuH3ysQmzf93VzDISI+O97yfMG0uPazUDIzr0dyhGBMTR4Z7ByBv5ldHTUysq6iBmf+ziodIkmJ2RK5MSmg61qeftXqPN1H5oQifrQwo0k5PFkCs3AhRm+ce8hmCXLeqTpXDnEPBhVqf9Mb35jq17+ig710w7E4omNLhFtF5uMZV7oB5fnuuVfWG0ZOUeoBaCzO8pVMnKqkJUJYWpYMnUG8u5hkdI5szJEzF06AEkT8ItmUZ47E4Su0LyHWuwlXRuR5YzlE6zf5yaQYFxZOjQoPGYkyOKjtKw4+hzpQhhosyTj+NzKtdQnFYRpuKeFVG7gVPEXD8YrN7K1SL5WS4gwT5B9h0GBNF3+/CL0++m7e0VNjoQyaU5NcjxBg== 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: List-Subscribe: List-Unsubscribe: Unify how KVM accesses vCPU gp-regs by using two macros vcpu_gp_regs() and ctxt_gp_regs(). This is prerequisite to move the gp-regs later to be dynamically allocated for vCPUs. Signed-off-by: Fares Mehanna --- arch/arm64/include/asm/kvm_emulate.h | 2 +- arch/arm64/include/asm/kvm_host.h | 3 ++- arch/arm64/kvm/guest.c | 8 ++++---- arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 10 +++++----- arch/arm64/kvm/hyp/include/nvhe/trap_handler.h | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index a601a9305b10..cabfb76ca514 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -170,7 +170,7 @@ static __always_inline void vcpu_set_reg(struct kvm_vcpu *vcpu, u8 reg_num, static inline bool vcpu_is_el2_ctxt(const struct kvm_cpu_context *ctxt) { - switch (ctxt->regs.pstate & (PSR_MODE32_BIT | PSR_MODE_MASK)) { + switch (ctxt_gp_regs(ctxt)->pstate & (PSR_MODE32_BIT | PSR_MODE_MASK)) { case PSR_MODE_EL2h: case PSR_MODE_EL2t: return true; diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index a33f5996ca9f..31cbd62a5d06 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -946,7 +946,8 @@ struct kvm_vcpu_arch { #define vcpu_clear_on_unsupported_cpu(vcpu) \ vcpu_clear_flag(vcpu, ON_UNSUPPORTED_CPU) -#define vcpu_gp_regs(v) (&(v)->arch.ctxt.regs) +#define ctxt_gp_regs(ctxt) (&(ctxt)->regs) +#define vcpu_gp_regs(v) (ctxt_gp_regs(&(v)->arch.ctxt)) /* * Only use __vcpu_sys_reg/ctxt_sys_reg if you know you want the diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index 11098eb7eb44..821a2b7de388 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -134,16 +134,16 @@ static void *core_reg_addr(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) KVM_REG_ARM_CORE_REG(regs.regs[30]): off -= KVM_REG_ARM_CORE_REG(regs.regs[0]); off /= 2; - return &vcpu->arch.ctxt.regs.regs[off]; + return &vcpu_gp_regs(vcpu)->regs[off]; case KVM_REG_ARM_CORE_REG(regs.sp): - return &vcpu->arch.ctxt.regs.sp; + return &vcpu_gp_regs(vcpu)->sp; case KVM_REG_ARM_CORE_REG(regs.pc): - return &vcpu->arch.ctxt.regs.pc; + return &vcpu_gp_regs(vcpu)->pc; case KVM_REG_ARM_CORE_REG(regs.pstate): - return &vcpu->arch.ctxt.regs.pstate; + return &vcpu_gp_regs(vcpu)->pstate; case KVM_REG_ARM_CORE_REG(sp_el1): return __ctxt_sys_reg(&vcpu->arch.ctxt, SP_EL1); diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index 37ff87d782b6..d2ed0938fc90 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -649,7 +649,7 @@ static inline void synchronize_vcpu_pstate(struct kvm_vcpu *vcpu, u64 *exit_code ESR_ELx_EC(read_sysreg_el2(SYS_ESR)) == ESR_ELx_EC_PAC) write_sysreg_el2(*vcpu_cpsr(vcpu), SYS_SPSR); - vcpu->arch.ctxt.regs.pstate = read_sysreg_el2(SYS_SPSR); + vcpu_gp_regs(vcpu)->pstate = read_sysreg_el2(SYS_SPSR); } /* diff --git a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h index 4c0fdabaf8ae..d17033766010 100644 --- a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h +++ b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h @@ -105,13 +105,13 @@ static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt) static inline void __sysreg_save_el2_return_state(struct kvm_cpu_context *ctxt) { - ctxt->regs.pc = read_sysreg_el2(SYS_ELR); + ctxt_gp_regs(ctxt)->pc = read_sysreg_el2(SYS_ELR); /* * Guest PSTATE gets saved at guest fixup time in all * cases. We still need to handle the nVHE host side here. */ if (!has_vhe() && ctxt->__hyp_running_vcpu) - ctxt->regs.pstate = read_sysreg_el2(SYS_SPSR); + ctxt_gp_regs(ctxt)->pstate = read_sysreg_el2(SYS_SPSR); if (cpus_have_final_cap(ARM64_HAS_RAS_EXTN)) ctxt_sys_reg(ctxt, DISR_EL1) = read_sysreg_s(SYS_VDISR_EL2); @@ -202,7 +202,7 @@ static inline void __sysreg_restore_el1_state(struct kvm_cpu_context *ctxt) /* Read the VCPU state's PSTATE, but translate (v)EL2 to EL1. */ static inline u64 to_hw_pstate(const struct kvm_cpu_context *ctxt) { - u64 mode = ctxt->regs.pstate & (PSR_MODE_MASK | PSR_MODE32_BIT); + u64 mode = ctxt_gp_regs(ctxt)->pstate & (PSR_MODE_MASK | PSR_MODE32_BIT); switch (mode) { case PSR_MODE_EL2t: @@ -213,7 +213,7 @@ static inline u64 to_hw_pstate(const struct kvm_cpu_context *ctxt) break; } - return (ctxt->regs.pstate & ~(PSR_MODE_MASK | PSR_MODE32_BIT)) | mode; + return (ctxt_gp_regs(ctxt)->pstate & ~(PSR_MODE_MASK | PSR_MODE32_BIT)) | mode; } static inline void __sysreg_restore_el2_return_state(struct kvm_cpu_context *ctxt) @@ -235,7 +235,7 @@ static inline void __sysreg_restore_el2_return_state(struct kvm_cpu_context *ctx if (!(mode & PSR_MODE32_BIT) && mode >= PSR_MODE_EL2t) pstate = PSR_MODE_EL2h | PSR_IL_BIT; - write_sysreg_el2(ctxt->regs.pc, SYS_ELR); + write_sysreg_el2(ctxt_gp_regs(ctxt)->pc, SYS_ELR); write_sysreg_el2(pstate, SYS_SPSR); if (cpus_have_final_cap(ARM64_HAS_RAS_EXTN)) diff --git a/arch/arm64/kvm/hyp/include/nvhe/trap_handler.h b/arch/arm64/kvm/hyp/include/nvhe/trap_handler.h index 45a84f0ade04..dfe5be0d70ef 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/trap_handler.h +++ b/arch/arm64/kvm/hyp/include/nvhe/trap_handler.h @@ -11,7 +11,7 @@ #include -#define cpu_reg(ctxt, r) (ctxt)->regs.regs[r] +#define cpu_reg(ctxt, r) (ctxt_gp_regs((ctxt))->regs[r]) #define DECLARE_REG(type, name, ctxt, reg) \ type name = (type)cpu_reg(ctxt, (reg))