From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 1A5EA3D88E1 for ; Fri, 12 Jun 2026 06:59:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781247584; cv=none; b=mKRVUuuKHRAizGdu5mAHZimzEBcbQWYxNMd2JCP43Kub6L3TJYSIa8VvoIWkcx5HVtBzYYPvb7FdTX/IJw7BSNZXgVXHCL2a38Zzw0WORmn0cU2tGu5Yx7ym8Pxu/yU0b33V0+B/tTj4ixFS1eDYMugg5vV9mmaW9NlAkGuBp+E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781247584; c=relaxed/simple; bh=6dyUiTeSzRmFCDfL5uGb7un2oTbS1K23lFvptzrVlrg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HWVzF1gL0VT8rbGmPtV7uPC9Bh4VFc1XPFGZyGg89OXYYiEFj/Qi7qH0WqxGMjFDSSVXsaj1Ich0ZJFbNP11kCPYD+vTeaCpVvuldgHI5/8W71Re6FBFsB3xfXiV01nOoNcTjNkR5jYt2+VTRP9rOxD10QtrvPbClWCTZFC8txw= 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=qdONtRwv; arc=none smtp.client-ip=209.85.128.74 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="qdONtRwv" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-490bae3a39bso5811415e9.1 for ; Thu, 11 Jun 2026 23:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781247577; x=1781852377; 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=2Ak3jNeAkvp8IytqE3xP3zJXzhYP29jFMd9zBAcRoYc=; b=qdONtRwv0QAm5p73n7olBL8rBJR1Rhee3fjKAgvoRovBZolt4ElEvYtX4zJ1OWzf3W qBxf5BJbS8D7Ed9KCYFJ9Rl5GgqTDra2QKg8cIudPS14hhTNFxZFEpfu6hvnHfTopx0W ICh5gBvqwHBAMk5YxqPPFHi5vwXluj/CQH4NlmxPlWAURC4DF8fY/Q+LLuBGOPunIopN DdZZVosJITTYWWmjCM8UdhhdpucgbD7xAxBOVUEL/bZ4FrQ6A/YgzqZzkSaZAZmhVTVZ IFZOZB2kHVmZOFfJkZeB4lUrvEnEJfPHH7DqMtkE0bFYOcId8CvV+7GBOfnmE2WQBJdE S/Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781247577; x=1781852377; 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=2Ak3jNeAkvp8IytqE3xP3zJXzhYP29jFMd9zBAcRoYc=; b=aNXLXQMqyln9D/04BP863XtanhnOjybS94Xd3xhIOQGzVNwQYrZHzM1/GGOlW74BBR 2aeGB3/7LXl3gZJeQHV+EWWL5QuuB+SMym1CeryxKLOUNOfsE6LyNcw26S1NUyHq6I/p S/E9ZqvnZEV6vYRdHkP5m0e9ufz31ZZmRT7E029IAc+pslz8c2L2c0yD0u926LpDTbe6 aj3Nlycp1AdghPMq1yUTDbP5l90uwU9CCHXpbuLZI4Kiy2wtxDQ7MB0nb8lmEx43zBM6 1IypZjqfeADc817nQQwVOshh1G9Uocdy0NI0KqJBgYKH3yLQuwctLCjVg/HCLvXNIfz/ yL1Q== X-Forwarded-Encrypted: i=1; AFNElJ83CNOymz5AwO1G8kbK+RGPcOTBy5uCGABKz0T9frl3cZFdv76W0F6DakCeT62UnbgrfOZ4kagWnDWbuqg=@vger.kernel.org X-Gm-Message-State: AOJu0YwDpyJ58wwOSu3xEJiN4GHrjIDh0yT6svbTWk2t76mNQ/yi53HB 7Rin8KjmQnJspDdD0nHMTLHHBb0SBVKh+SJEfG8hjCGJGNmrW+m8nhMg9FQAi1faveB2ibjlx33 odg== X-Received: from wmgg21.prod.google.com ([2002:a05:600d:15:b0:491:34a2:17f7]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c16f:b0:490:6e11:c303 with SMTP id 5b1f17b1804b1-490ec4e6f22mr15551875e9.13.1781247577304; Thu, 11 Jun 2026 23:59:37 -0700 (PDT) Date: Fri, 12 Jun 2026 07:59:24 +0100 In-Reply-To: <20260612065925.755562-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: <20260612065925.755562-1-tabba@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260612065925.755562-11-tabba@google.com> Subject: [PATCH v1 10/11] KVM: arm64: Add primitives to flush/sync the VGIC state at EL2 From: tabba@google.com To: Marc Zyngier , Oliver Upton Cc: Fuad Tabba , Will Deacon , Catalin Marinas , Quentin Perret , Vincent Donnefort , Sebastian Ene , Per Larsen , Suzuki K Poulose , Zenghui Yu , Joey Gouly , Steffen Eiden , Mark Rutland , Jonathan Cameron , Hyunwoo Kim , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org 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. Signed-off-by: Marc Zyngier Co-developed-by: Fuad Tabba Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 50 +++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 2f165b6c7b07..23e644c24a03 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -99,6 +99,46 @@ 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, max_lrs, i; + + host_cpu_if = &host_vcpu->arch.vgic_cpu.vgic_v3; + hyp_cpu_if = &hyp_vcpu->vcpu.arch.vgic_cpu.vgic_v3; + + max_lrs = (read_gicreg(ICH_VTR_EL2) & ICH_VTR_EL2_ListRegs) + 1; + used_lrs = host_cpu_if->used_lrs; + used_lrs = min(used_lrs, max_lrs); + + 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; @@ -139,7 +179,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; + flush_hyp_vgic_state(hyp_vcpu); hyp_vcpu->vcpu.arch.pid = host_vcpu->arch.pid; } @@ -147,9 +187,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); @@ -162,10 +199,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.54.0.1136.gdb2ca164c4-goog