From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2738D35F185 for ; Fri, 19 Jun 2026 07:07:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781852852; cv=none; b=mcE3LYebKkaMExIai/e7fAZb9lIuPvCkWQK+pzpj04C3OS6GCpen+KAiucdi8Yd6Sh1dTGx5EWFniWC+qwAX2QHYhI51coPKS4wne1RTxHjiFmsurr84hz57bUi8N7tTjb7UWxEboFAPSECQjYlUtqydDr4wzTkzo/JGSM0NjDY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781852852; c=relaxed/simple; bh=zWB5u1idfA4AdPs7jMtePhO4jDSl0x0MhXVkrlpo+94=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Y9r5F0HF6QavL7XFYpWfk5VEojFJ9OuDJwCdOODBLT+aRYcr5U1SSu6fSARybhH5hfLoazUzzIcifPnCiz62EnbCgEY+OyqbMTnHhBO2TjrOkAD/TC+Rmqsswmn07kDicyJiMkxVPw14CJt2vh+ET0yT7IEHtzg4wpM37AqbO7M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=R1z8ZnBs; arc=none smtp.client-ip=209.85.218.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="R1z8ZnBs" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-bec44ccbbd0so135391066b.2 for ; Fri, 19 Jun 2026 00:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781852849; x=1782457649; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=HiUT5ABfb1SzLS+/NM78To0mA4a5Z1HMNy+YIWkerC4=; b=R1z8ZnBstKPIeTSrRVSdxt70sPD0Vi2KUvU5/d8lIeXxYFJmEzQiK5apoqoJaROpnC pfmNB4OBflRWXWyGP+DOkvP1NzoCf//BiM/+9U7i0h1uRVxbscKu8iaDdr18v4sv0qD2 Wn2MPirJ8F8IFoQ5I7hW5wLkeYAVcRxRzp5Am9xdTzNCIYjAUxqIbBtnsRrmvNEq8ywn B+Rlzv8q/3nbRKSB49qt1vpkL/8L/m6YWo0siPIOhsDRwg8ZQIjm3gTI1YnkP2uBaV2X Lu4qbZReUnorNzhoF753zBNjFllFevCoxRI5EjuYv5AHJ41uqirfQ4wRfObp7nI20Wwq dFDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781852849; x=1782457649; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HiUT5ABfb1SzLS+/NM78To0mA4a5Z1HMNy+YIWkerC4=; b=VfRkJK0RbkRXs+/IMeUaauQ0S7w76h9qtv3SalsHl4p+fuBRwuzDAqNJsj4734VTno r4pKsTnZL9CKbI+9miSeJSrpNyqcL+AJyaaFx6Rz069e3F56h9tVQ2hQRzHVLeKX27HM zGyw3tWfWzAwcL/Dx10KkKDMtCGxcRjcSRrK6BMPWU7PKe5fBF9vikR92tUaGcVJiU6O F+ZpMBK42WvFN9L5+1pqrcAHOU0Cn2m1v1a7nhLRzp7Sgiag71erWGeOB3ZQdjh8qzI1 2G23pfNjI6yRRAlXvueF211wd/1kYv49bjmV08hNw750HXanUO2AFyItYOL1MtRLtoaO fRmQ== X-Forwarded-Encrypted: i=1; AFNElJ9NKoHD82mLwEc3MvP1z86iSNJleoubOsX/x3VHK6U3hNi6kGwp4WaEzMv7nvTPdof0PTtYot/jRwAg2D8=@vger.kernel.org X-Gm-Message-State: AOJu0YzmLPom+W4kxpzq4Hi5iYvItUVTNbP4wwdoR4ZYyJSIFoLnFYE8 JkO0ZAhMUD21OMI8RERsOP9YJQB7+ACL7iwq4MCDrP1kTJw8gNqzvfAc/Uss1PSrlZPUAh3QC2u 2bg== X-Received: from educ22.prod.google.com ([2002:a05:6402:1016:b0:682:c351:20ad]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:a088:b0:c08:484e:d943 with SMTP id a640c23a62f3a-c0b60a30b75mr57861766b.3.1781852849329; Fri, 19 Jun 2026 00:07:29 -0700 (PDT) Date: Fri, 19 Jun 2026 08:07:18 +0100 In-Reply-To: <20260619070719.812227-1-tabba@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260619070719.812227-1-tabba@google.com> X-Mailer: git-send-email 2.55.0.rc0.738.g0c8ab3ebcc-goog Message-ID: <20260619070719.812227-8-tabba@google.com> Subject: [PATCH v2 7/8] KVM: arm64: Add primitives to flush/sync the VGIC state at EL2 From: Fuad Tabba To: Marc Zyngier , Oliver Upton , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Catalin Marinas , Will Deacon , Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Vincent Donnefort , Quentin Perret , Sebastian Ene , Hyunwoo Kim , Fuad Tabba Content-Type: text/plain; charset="UTF-8" From: Marc Zyngier pKVM performs its own world switch for protected VMs but has no primitives to move the per-vCPU VGIC state between the host and hypervisor vCPU contexts. Add flush_hyp_vgic_state() and sync_hyp_vgic_state(). Flush copies vgic_hcr, the in-use list registers and used_lrs from the host into the hyp vCPU and pins vgic_sre to a fixed value; sync copies vgic_hcr, vgic_vmcr and the in-use list registers back. The active priority registers are handled separately by the save/restore-aprs path. Bound used_lrs by hyp_gicv3_nr_lr, the cached implemented-LR count, instead of reading ICH_VTR_EL2 on each entry. That clamps the host-supplied value and avoids a per-entry sysreg read that is costly under NV. Signed-off-by: Marc Zyngier Co-developed-by: Fuad Tabba Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 55 ++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index f25ee3971528..0194965930e6 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -102,6 +102,45 @@ static void fpsimd_sve_sync(struct kvm_vcpu *vcpu) *host_data_ptr(fp_owner) = FP_STATE_HOST_OWNED; } +static void flush_hyp_vgic_state(struct pkvm_hyp_vcpu *hyp_vcpu) +{ + struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu; + struct vgic_v3_cpu_if *host_cpu_if, *hyp_cpu_if; + unsigned int used_lrs, i; + + host_cpu_if = &host_vcpu->arch.vgic_cpu.vgic_v3; + hyp_cpu_if = &hyp_vcpu->vcpu.arch.vgic_cpu.vgic_v3; + + used_lrs = host_cpu_if->used_lrs; + used_lrs = min(used_lrs, hyp_gicv3_nr_lr); + + hyp_cpu_if->vgic_hcr = host_cpu_if->vgic_hcr; + /* Should be a one-off */ + hyp_cpu_if->vgic_sre = (ICC_SRE_EL1_DIB | + ICC_SRE_EL1_DFB | + ICC_SRE_EL1_SRE); + hyp_cpu_if->used_lrs = used_lrs; + + for (i = 0; i < used_lrs; i++) + hyp_cpu_if->vgic_lr[i] = host_cpu_if->vgic_lr[i]; +} + +static void sync_hyp_vgic_state(struct pkvm_hyp_vcpu *hyp_vcpu) +{ + struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu; + struct vgic_v3_cpu_if *host_cpu_if, *hyp_cpu_if; + unsigned int i; + + host_cpu_if = &host_vcpu->arch.vgic_cpu.vgic_v3; + hyp_cpu_if = &hyp_vcpu->vcpu.arch.vgic_cpu.vgic_v3; + + host_cpu_if->vgic_hcr = hyp_cpu_if->vgic_hcr; + host_cpu_if->vgic_vmcr = hyp_cpu_if->vgic_vmcr; + + for (i = 0; i < hyp_cpu_if->used_lrs; i++) + host_cpu_if->vgic_lr[i] = hyp_cpu_if->vgic_lr[i]; +} + static void flush_debug_state(struct pkvm_hyp_vcpu *hyp_vcpu) { struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu; @@ -150,13 +189,7 @@ static void flush_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) hyp_vcpu->vcpu.arch.vsesr_el2 = host_vcpu->arch.vsesr_el2; - hyp_vcpu->vcpu.arch.vgic_cpu.vgic_v3 = host_vcpu->arch.vgic_cpu.vgic_v3; - - /* Bound used_lrs by the number of implemented list registers. */ - hyp_vcpu->vcpu.arch.vgic_cpu.vgic_v3.used_lrs = - min_t(unsigned int, - hyp_vcpu->vcpu.arch.vgic_cpu.vgic_v3.used_lrs, - hyp_gicv3_nr_lr); + flush_hyp_vgic_state(hyp_vcpu); hyp_vcpu->vcpu.arch.pid = host_vcpu->arch.pid; } @@ -164,9 +197,6 @@ static void flush_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) static void sync_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) { struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu; - struct vgic_v3_cpu_if *hyp_cpu_if = &hyp_vcpu->vcpu.arch.vgic_cpu.vgic_v3; - struct vgic_v3_cpu_if *host_cpu_if = &host_vcpu->arch.vgic_cpu.vgic_v3; - unsigned int i; fpsimd_sve_sync(&hyp_vcpu->vcpu); sync_debug_state(hyp_vcpu); @@ -179,10 +209,7 @@ static void sync_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) host_vcpu->arch.iflags = hyp_vcpu->vcpu.arch.iflags; - host_cpu_if->vgic_hcr = hyp_cpu_if->vgic_hcr; - host_cpu_if->vgic_vmcr = hyp_cpu_if->vgic_vmcr; - for (i = 0; i < hyp_cpu_if->used_lrs; ++i) - host_cpu_if->vgic_lr[i] = hyp_cpu_if->vgic_lr[i]; + sync_hyp_vgic_state(hyp_vcpu); } static void handle___pkvm_vcpu_load(struct kvm_cpu_context *host_ctxt) -- 2.55.0.rc0.738.g0c8ab3ebcc-goog