From nobody Wed May 7 17:14:52 2025
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [170.10.129.124])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79D66221D96
for <linux-kernel@vger.kernel.org>; Tue, 1 Apr 2025 16:12:05 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=170.10.129.124
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743523927; cv=none;
b=E5hmbyc82j1r+f7T8f5+hYFqDZt+SOZV/5yCwSF2hxXNP6LL5irhwcbA1z4VD1HzOAMYLbL7UFYMJ9qs3MCzRL4e0MY59UsGR/4jwOK9TgItxpENtvEQ/ZUx7v0e5HfQVIvuC5Bauzjv1+dBotZpRnVYEu67gte+blKTwX5q8p0=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743523927; c=relaxed/simple;
bh=5tt6gGijGYJr7yu5paRKM0yRgVu/D/f2JfLQVjaI0xc=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version;
b=Imqg6E0mj2m4LNKiXSwgK1RoLoohbLavt+iz+X/oYoLTn+hartN9HPwV/UAzspJ4OGwzpHbsKndRajnuQM7JCKcmE52LcSETpsdFwLHGpGQzK+T2CWs0eaYKFiSwlqcZwkp8WhNwy/xhyRxBaqnYAFDT/8vWqLoM5YEnR1Ko0Yc=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=redhat.com;
spf=pass smtp.mailfrom=redhat.com;
dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com
header.b=YRf6/fdZ; arc=none smtp.client-ip=170.10.129.124
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=redhat.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=redhat.com
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com
header.b="YRf6/fdZ"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1743523924;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=VvZ6p2WrQQTblruIVD9gbYy1bh08r8hJdsaxuYeoEEI=;
b=YRf6/fdZlmOzuZ1tk+FLjaAqDGz1twfqzvDg0uvtopLWgWSsJwZk5AsdfDQogn0FRohkOg
EMKSt5pfYf8yrRHympdx+P1kK6+ImX8TjMf5ycMcbZ0IYO+7oQrVeD3Cf1wupE6u+hWzC2
hpbr0EdK6BLzWq1lyE/pnIAgp7Dum4c=
Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com
[209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
us-mta-423-lgt7YKawPAedr5tC9m9U_A-1; Tue, 01 Apr 2025 12:12:03 -0400
X-MC-Unique: lgt7YKawPAedr5tC9m9U_A-1
X-Mimecast-MFC-AGG-ID: lgt7YKawPAedr5tC9m9U_A_1743523922
Received: by mail-wr1-f69.google.com with SMTP id
ffacd0b85a97d-3912b54611dso3080931f8f.1
for <linux-kernel@vger.kernel.org>;
Tue, 01 Apr 2025 09:12:03 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743523922; x=1744128722;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=VvZ6p2WrQQTblruIVD9gbYy1bh08r8hJdsaxuYeoEEI=;
b=FGQHb7Odzv5uSFDnryEqUv4Y37cjwq/HMMpmCOvvv56qrb0NL3TE8V3LDKG6mWNg0x
b2KXje4b1mNlgbjMuaZ9G7Vdx95BSgU7OL4a8plK7UsvxZeO5rt9poKaiU8wROOIEhLj
O4KV3YPFz540nvrf0A/SkIhGW/i69vB+DvRzBa5eb5Ie0N9XvAuhlq9M0Von8nWob3Np
O+jJs912vyZ21yCKX2XVFJHAF68b3oyc8Ay22C29fxYMjD6dPgXV7fWvEkMj/emMaNNR
4kXzRpbemZDJPYkZh/ipQcFAJRcjy9qAkF/8ABM7fMLmAhk8jjoGYdFq1JltXsIG2Ya1
GDyg==
X-Gm-Message-State: AOJu0YwuTd22hEkP8iC+DdevjyEhUw1ahUJZ3qO76XhxypzcXwY5Xq71
5a0RYvzIBUObS2BcGKWI/L3QQlYQXTGqc/H8LUn1HPsvLG96/+6sy/5DQ7wOFhZtSZNWCrW0N0z
uP9bYpfqc2VRAy1pUTepWUdP9sbAK35Y7uyBBMhBrvVrYcdMWhfsr/lpst9v82DXxSkjLbFRc0H
W4/fK2s89rdwvfqp/iMCRk/WVJFBTayNHCiOxoxwi5LDYdVQ==
X-Gm-Gg: ASbGncv6/c34kv3AqUG3fm5N0f3tuA84N1RtlgFuZIvWqrE0ybu6VLB7qhXjNSqBail
CuWPdZnC6oNOq86E2d3dyDE6m3TeST8F4gh1TX8sJ4DFHVQgptDLw1NltPKieLPVQbiiO1NWo0O
sTyH3BInyllQY2I/HOwpwQuFCQRoGspqHhevtRaMp561jEI5j6ng7e7jzJ0X0YOVwbt3bAy7Z/V
OQbH+QxCs6LqHsikOnMcHuSHtgEhpfYeXJP9kaMtj5iEmVHZGv3fACWnQSSYKl7I3QU7sgakyfo
Fy/wCDBKj1M0GHZpqOwCkg==
X-Received: by 2002:a05:6000:290f:b0:390:f552:d291 with SMTP id
ffacd0b85a97d-39c120dc53emr14114223f8f.22.1743523921499;
Tue, 01 Apr 2025 09:12:01 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IFEjZPOv67fdn5slA2kWJTIKa56TO0rlWQ9//KKstMEhjPv7ui4gb+V8jJo68vRdLNVttSIuA==
X-Received: by 2002:a05:6000:290f:b0:390:f552:d291 with SMTP id
ffacd0b85a97d-39c120dc53emr14114152f8f.22.1743523920948;
Tue, 01 Apr 2025 09:12:00 -0700 (PDT)
Received: from [192.168.10.48] ([176.206.111.201])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-39c0b79e33asm14665265f8f.66.2025.04.01.09.11.58
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 01 Apr 2025 09:11:59 -0700 (PDT)
From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org,
kvm@vger.kernel.org
Cc: roy.hopkins@suse.com,
seanjc@google.com,
thomas.lendacky@amd.com,
ashish.kalra@amd.com,
michael.roth@amd.com,
jroedel@suse.de,
nsaenz@amazon.com,
anelkz@amazon.de,
James.Bottomley@HansenPartnership.com
Subject: [PATCH 19/29] KVM: x86: move APIC map to kvm_arch_plane
Date: Tue, 1 Apr 2025 18:10:56 +0200
Message-ID: <20250401161106.790710-20-pbonzini@redhat.com>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250401161106.790710-1-pbonzini@redhat.com>
References: <20250401161106.790710-1-pbonzini@redhat.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
IRQs need to be directed to the appropriate plane (typically, but not
always, the same as the vCPU that is running). Because each plane has
a separate struct kvm_vcpu *, the map that holds the pointers to them
must be individual to the plane as well.
This works fine as long as all IRQs (even those directed at multiple CPUs)
only target a single plane.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch/x86/include/asm/kvm_host.h | 7 +--
arch/x86/kvm/lapic.c | 94 +++++++++++++++++++--------------
arch/x86/kvm/svm/sev.c | 2 +-
arch/x86/kvm/x86.c | 10 ++--
4 files changed, 67 insertions(+), 46 deletions(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_hos=
t.h
index d07ab048d7cc..f832352cf4d3 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1087,6 +1087,10 @@ struct kvm_arch_memory_slot {
};
=20
struct kvm_arch_plane {
+ struct mutex apic_map_lock;
+ struct kvm_apic_map __rcu *apic_map;
+ atomic_t apic_map_dirty;
+
unsigned long apicv_inhibit_reasons;
};
=20
@@ -1381,9 +1385,6 @@ struct kvm_arch {
struct kvm_ioapic *vioapic;
struct kvm_pit *vpit;
atomic_t vapics_in_nmi_mode;
- struct mutex apic_map_lock;
- struct kvm_apic_map __rcu *apic_map;
- atomic_t apic_map_dirty;
=20
bool apic_access_memslot_enabled;
bool apic_access_memslot_inhibited;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 4077c8d1e37e..6ed5f5b4f878 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -375,9 +375,9 @@ enum {
DIRTY
};
=20
-static void kvm_recalculate_apic_map(struct kvm *kvm)
+static void kvm_recalculate_apic_map(struct kvm_plane *plane)
{
- struct kvm_plane *plane =3D kvm->planes[0];
+ struct kvm *kvm =3D plane->kvm;
struct kvm_apic_map *new, *old =3D NULL;
struct kvm_vcpu *vcpu;
unsigned long i;
@@ -385,27 +385,27 @@ static void kvm_recalculate_apic_map(struct kvm *kvm)
bool xapic_id_mismatch;
int r;
=20
- /* Read kvm->arch.apic_map_dirty before kvm->arch.apic_map. */
- if (atomic_read_acquire(&kvm->arch.apic_map_dirty) =3D=3D CLEAN)
+ /* Read plane->arch.apic_map_dirty before plane->arch.apic_map. */
+ if (atomic_read_acquire(&plane->arch.apic_map_dirty) =3D=3D CLEAN)
return;
=20
WARN_ONCE(!irqchip_in_kernel(kvm),
"Dirty APIC map without an in-kernel local APIC");
=20
- mutex_lock(&kvm->arch.apic_map_lock);
+ mutex_lock(&plane->arch.apic_map_lock);
=20
retry:
/*
- * Read kvm->arch.apic_map_dirty before kvm->arch.apic_map (if clean)
+ * Read plane->arch.apic_map_dirty before plane->arch.apic_map (if clean)
* or the APIC registers (if dirty). Note, on retry the map may have
* not yet been marked dirty by whatever task changed a vCPU's x2APIC
* ID, i.e. the map may still show up as in-progress. In that case
* this task still needs to retry and complete its calculation.
*/
- if (atomic_cmpxchg_acquire(&kvm->arch.apic_map_dirty,
+ if (atomic_cmpxchg_acquire(&plane->arch.apic_map_dirty,
DIRTY, UPDATE_IN_PROGRESS) =3D=3D CLEAN) {
/* Someone else has updated the map. */
- mutex_unlock(&kvm->arch.apic_map_lock);
+ mutex_unlock(&plane->arch.apic_map_lock);
return;
}
=20
@@ -418,7 +418,7 @@ static void kvm_recalculate_apic_map(struct kvm *kvm)
*/
xapic_id_mismatch =3D false;
=20
- kvm_for_each_vcpu(i, vcpu, kvm)
+ kvm_for_each_plane_vcpu(i, vcpu, plane)
if (kvm_apic_present(vcpu))
max_id =3D max(max_id, kvm_x2apic_id(vcpu->arch.apic));
=20
@@ -432,7 +432,7 @@ static void kvm_recalculate_apic_map(struct kvm *kvm)
new->max_apic_id =3D max_id;
new->logical_mode =3D KVM_APIC_MODE_SW_DISABLED;
=20
- kvm_for_each_vcpu(i, vcpu, kvm) {
+ kvm_for_each_plane_vcpu(i, vcpu, plane) {
if (!kvm_apic_present(vcpu))
continue;
=20
@@ -471,21 +471,29 @@ static void kvm_recalculate_apic_map(struct kvm *kvm)
else
kvm_clear_apicv_inhibit(plane, APICV_INHIBIT_REASON_APIC_ID_MODIFIED);
=20
- old =3D rcu_dereference_protected(kvm->arch.apic_map,
- lockdep_is_held(&kvm->arch.apic_map_lock));
- rcu_assign_pointer(kvm->arch.apic_map, new);
+ old =3D rcu_dereference_protected(plane->arch.apic_map,
+ lockdep_is_held(&plane->arch.apic_map_lock));
+ rcu_assign_pointer(plane->arch.apic_map, new);
/*
- * Write kvm->arch.apic_map before clearing apic->apic_map_dirty.
+ * Write plane->arch.apic_map before clearing apic->apic_map_dirty.
* If another update has come in, leave it DIRTY.
*/
- atomic_cmpxchg_release(&kvm->arch.apic_map_dirty,
+ atomic_cmpxchg_release(&plane->arch.apic_map_dirty,
UPDATE_IN_PROGRESS, CLEAN);
- mutex_unlock(&kvm->arch.apic_map_lock);
+ mutex_unlock(&plane->arch.apic_map_lock);
=20
if (old)
kvfree_rcu(old, rcu);
=20
- kvm_make_scan_ioapic_request(kvm);
+ if (plane->plane =3D=3D 0)
+ kvm_make_scan_ioapic_request(kvm);
+}
+
+static inline void kvm_mark_apic_map_dirty(struct kvm_vcpu *vcpu)
+{
+ struct kvm_plane *plane =3D vcpu_to_plane(vcpu);
+
+ atomic_set_release(&plane->arch.apic_map_dirty, DIRTY);
}
=20
static inline void apic_set_spiv(struct kvm_lapic *apic, u32 val)
@@ -501,7 +509,7 @@ static inline void apic_set_spiv(struct kvm_lapic *apic=
, u32 val)
else
static_branch_inc(&apic_sw_disabled.key);
=20
- atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);
+ kvm_mark_apic_map_dirty(apic->vcpu);
}
=20
/* Check if there are APF page ready requests pending */
@@ -514,19 +522,19 @@ static inline void apic_set_spiv(struct kvm_lapic *ap=
ic, u32 val)
static inline void kvm_apic_set_xapic_id(struct kvm_lapic *apic, u8 id)
{
kvm_lapic_set_reg(apic, APIC_ID, id << 24);
- atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);
+ kvm_mark_apic_map_dirty(apic->vcpu);
}
=20
static inline void kvm_apic_set_ldr(struct kvm_lapic *apic, u32 id)
{
kvm_lapic_set_reg(apic, APIC_LDR, id);
- atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);
+ kvm_mark_apic_map_dirty(apic->vcpu);
}
=20
static inline void kvm_apic_set_dfr(struct kvm_lapic *apic, u32 val)
{
kvm_lapic_set_reg(apic, APIC_DFR, val);
- atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);
+ kvm_mark_apic_map_dirty(apic->vcpu);
}
=20
static inline void kvm_apic_set_x2apic_id(struct kvm_lapic *apic, u32 id)
@@ -537,7 +545,7 @@ static inline void kvm_apic_set_x2apic_id(struct kvm_la=
pic *apic, u32 id)
=20
kvm_lapic_set_reg(apic, APIC_ID, id);
kvm_lapic_set_reg(apic, APIC_LDR, ldr);
- atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);
+ kvm_mark_apic_map_dirty(apic->vcpu);
}
=20
static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type)
@@ -866,6 +874,7 @@ int kvm_pv_send_ipi(struct kvm_vcpu *source, unsigned l=
ong ipi_bitmap_low,
unsigned long ipi_bitmap_high, u32 min,
unsigned long icr, int op_64_bit)
{
+ struct kvm_plane *plane =3D vcpu_to_plane(source);
struct kvm_apic_map *map;
struct kvm_lapic_irq irq =3D {0};
int cluster_size =3D op_64_bit ? 64 : 32;
@@ -880,7 +889,7 @@ int kvm_pv_send_ipi(struct kvm_vcpu *source, unsigned l=
ong ipi_bitmap_low,
irq.trig_mode =3D icr & APIC_INT_LEVELTRIG;
=20
rcu_read_lock();
- map =3D rcu_dereference(source->kvm->arch.apic_map);
+ map =3D rcu_dereference(plane->arch.apic_map);
=20
count =3D -EOPNOTSUPP;
if (likely(map)) {
@@ -1152,7 +1161,7 @@ static bool kvm_apic_is_broadcast_dest(struct kvm *kv=
m, struct kvm_lapic **src,
* means that the interrupt should be dropped. In this case, *bitmap woul=
d be
* zero and *dst undefined.
*/
-static inline bool kvm_apic_map_get_dest_lapic(struct kvm *kvm,
+static inline bool kvm_apic_map_get_dest_lapic(struct kvm_plane *plane,
struct kvm_lapic **src, struct kvm_lapic_irq *irq,
struct kvm_apic_map *map, struct kvm_lapic ***dst,
unsigned long *bitmap)
@@ -1166,7 +1175,7 @@ static inline bool kvm_apic_map_get_dest_lapic(struct=
kvm *kvm,
} else if (irq->shorthand)
return false;
=20
- if (!map || kvm_apic_is_broadcast_dest(kvm, src, irq, map))
+ if (!map || kvm_apic_is_broadcast_dest(plane->kvm, src, irq, map))
return false;
=20
if (irq->dest_mode =3D=3D APIC_DEST_PHYSICAL) {
@@ -1207,7 +1216,7 @@ static inline bool kvm_apic_map_get_dest_lapic(struct=
kvm *kvm,
bitmap, 16);
=20
if (!(*dst)[lowest]) {
- kvm_apic_disabled_lapic_found(kvm);
+ kvm_apic_disabled_lapic_found(plane->kvm);
*bitmap =3D 0;
return true;
}
@@ -1221,6 +1230,7 @@ static inline bool kvm_apic_map_get_dest_lapic(struct=
kvm *kvm,
bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src,
struct kvm_lapic_irq *irq, int *r, struct dest_map *dest_map)
{
+ struct kvm_plane *plane =3D kvm->planes[0];
struct kvm_apic_map *map;
unsigned long bitmap;
struct kvm_lapic **dst =3D NULL;
@@ -1228,6 +1238,10 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, =
struct kvm_lapic *src,
bool ret;
=20
*r =3D -1;
+ if (KVM_BUG_ON(!plane, kvm)) {
+ *r =3D 0;
+ return true;
+ }
=20
if (irq->shorthand =3D=3D APIC_DEST_SELF) {
if (KVM_BUG_ON(!src, kvm)) {
@@ -1239,9 +1253,9 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, s=
truct kvm_lapic *src,
}
=20
rcu_read_lock();
- map =3D rcu_dereference(kvm->arch.apic_map);
+ map =3D rcu_dereference(plane->arch.apic_map);
=20
- ret =3D kvm_apic_map_get_dest_lapic(kvm, &src, irq, map, &dst, &bitmap);
+ ret =3D kvm_apic_map_get_dest_lapic(plane, &src, irq, map, &dst, &bitmap);
if (ret) {
*r =3D 0;
for_each_set_bit(i, &bitmap, 16) {
@@ -1272,6 +1286,7 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, s=
truct kvm_lapic *src,
bool kvm_intr_is_single_vcpu_fast(struct kvm *kvm, struct kvm_lapic_irq *i=
rq,
struct kvm_vcpu **dest_vcpu)
{
+ struct kvm_plane *plane =3D kvm->planes[0];
struct kvm_apic_map *map;
unsigned long bitmap;
struct kvm_lapic **dst =3D NULL;
@@ -1281,9 +1296,9 @@ bool kvm_intr_is_single_vcpu_fast(struct kvm *kvm, st=
ruct kvm_lapic_irq *irq,
return false;
=20
rcu_read_lock();
- map =3D rcu_dereference(kvm->arch.apic_map);
+ map =3D rcu_dereference(plane->arch.apic_map);
=20
- if (kvm_apic_map_get_dest_lapic(kvm, NULL, irq, map, &dst, &bitmap) &&
+ if (kvm_apic_map_get_dest_lapic(plane, NULL, irq, map, &dst, &bitmap) &&
hweight16(bitmap) =3D=3D 1) {
unsigned long i =3D find_first_bit(&bitmap, 16);
=20
@@ -1407,6 +1422,7 @@ static int __apic_accept_irq(struct kvm_lapic *apic, =
int delivery_mode,
void kvm_bitmap_or_dest_vcpus(struct kvm *kvm, struct kvm_lapic_irq *irq,
unsigned long *vcpu_bitmap)
{
+ struct kvm_plane *plane =3D kvm->planes[0];
struct kvm_lapic **dest_vcpu =3D NULL;
struct kvm_lapic *src =3D NULL;
struct kvm_apic_map *map;
@@ -1416,9 +1432,9 @@ void kvm_bitmap_or_dest_vcpus(struct kvm *kvm, struct=
kvm_lapic_irq *irq,
bool ret;
=20
rcu_read_lock();
- map =3D rcu_dereference(kvm->arch.apic_map);
+ map =3D rcu_dereference(plane->arch.apic_map);
=20
- ret =3D kvm_apic_map_get_dest_lapic(kvm, &src, irq, map, &dest_vcpu,
+ ret =3D kvm_apic_map_get_dest_lapic(plane, &src, irq, map, &dest_vcpu,
&bitmap);
if (ret) {
for_each_set_bit(i, &bitmap, 16) {
@@ -2420,7 +2436,7 @@ static int kvm_lapic_reg_write(struct kvm_lapic *apic=
, u32 reg, u32 val)
* was toggled, the APIC ID changed, etc... The maps are marked dirty
* on relevant changes, i.e. this is a nop for most writes.
*/
- kvm_recalculate_apic_map(apic->vcpu->kvm);
+ kvm_recalculate_apic_map(vcpu_to_plane(apic->vcpu));
=20
return ret;
}
@@ -2610,7 +2626,7 @@ static void __kvm_apic_set_base(struct kvm_vcpu *vcpu=
, u64 value)
kvm_make_request(KVM_REQ_APF_READY, vcpu);
} else {
static_branch_inc(&apic_hw_disabled.key);
- atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);
+ kvm_mark_apic_map_dirty(apic->vcpu);
}
}
=20
@@ -2657,7 +2673,7 @@ int kvm_apic_set_base(struct kvm_vcpu *vcpu, u64 valu=
e, bool host_initiated)
}
=20
__kvm_apic_set_base(vcpu, value);
- kvm_recalculate_apic_map(vcpu->kvm);
+ kvm_recalculate_apic_map(vcpu_to_plane(vcpu));
return 0;
}
EXPORT_SYMBOL_GPL(kvm_apic_set_base);
@@ -2823,7 +2839,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init=
_event)
vcpu->arch.apic_arb_prio =3D 0;
vcpu->arch.apic_attention =3D 0;
=20
- kvm_recalculate_apic_map(vcpu->kvm);
+ kvm_recalculate_apic_map(vcpu_to_plane(apic->vcpu));
}
=20
/*
@@ -3115,13 +3131,13 @@ int kvm_apic_set_state(struct kvm_vcpu *vcpu, struc=
t kvm_lapic_state *s)
=20
r =3D kvm_apic_state_fixup(vcpu, s, true);
if (r) {
- kvm_recalculate_apic_map(vcpu->kvm);
+ kvm_recalculate_apic_map(vcpu_to_plane(apic->vcpu));
return r;
}
memcpy(vcpu->arch.apic->regs, s->regs, sizeof(*s));
=20
- atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);
- kvm_recalculate_apic_map(vcpu->kvm);
+ kvm_mark_apic_map_dirty(apic->vcpu);
+ kvm_recalculate_apic_map(vcpu_to_plane(apic->vcpu));
kvm_apic_set_version(vcpu);
=20
apic_update_ppr(apic);
diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 130d895f1d95..9d4492862c11 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -458,7 +458,7 @@ static int __sev_guest_init(struct kvm *kvm, struct kvm=
_sev_cmd *argp,
INIT_LIST_HEAD(&sev->mirror_vms);
sev->need_init =3D false;
=20
- kvm_set_apicv_inhibit(kvm->planes[0], APICV_INHIBIT_REASON_SEV);
+ kvm_set_apicv_inhibit(kvm->planes[[0], APICV_INHIBIT_REASON_SEV);
=20
return 0;
=20
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 382d8ace131f..19e3bb33bf7d 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -10021,7 +10021,7 @@ static void kvm_sched_yield(struct kvm_vcpu *vcpu, =
unsigned long dest_id)
goto no_yield;
=20
rcu_read_lock();
- map =3D rcu_dereference(vcpu->kvm->arch.apic_map);
+ map =3D rcu_dereference(vcpu_to_plane(vcpu)->arch.apic_map);
=20
if (likely(map) && dest_id <=3D map->max_apic_id && map->phys_map[dest_id=
])
target =3D map->phys_map[dest_id]->vcpu;
@@ -12771,6 +12771,7 @@ void kvm_arch_free_vm(struct kvm *kvm)
=20
void kvm_arch_init_plane(struct kvm_plane *plane)
{
+ mutex_init(&plane->arch.apic_map_lock);
kvm_apicv_init(plane->kvm, &plane->arch.apicv_inhibit_reasons);
}
=20
@@ -12811,7 +12812,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long=
type)
=20
init_rwsem(&kvm->arch.apicv_update_lock);
raw_spin_lock_init(&kvm->arch.tsc_write_lock);
- mutex_init(&kvm->arch.apic_map_lock);
seqcount_raw_spinlock_init(&kvm->arch.pvclock_sc, &kvm->arch.tsc_write_lo=
ck);
kvm->arch.kvmclock_offset =3D -get_kvmclock_base_ns();
=20
@@ -12960,6 +12960,11 @@ void kvm_arch_pre_destroy_vm(struct kvm *kvm)
static_call_cond(kvm_x86_vm_pre_destroy)(kvm);
}
=20
+void kvm_arch_free_plane(struct kvm_plane *plane)
+{
+ kvfree(rcu_dereference_check(plane->arch.apic_map, 1));
+}
+
void kvm_arch_destroy_vm(struct kvm *kvm)
{
if (current->mm =3D=3D kvm->mm) {
@@ -12981,7 +12986,6 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
kvm_free_msr_filter(srcu_dereference_check(kvm->arch.msr_filter, &kvm->sr=
cu, 1));
kvm_pic_destroy(kvm);
kvm_ioapic_destroy(kvm);
- kvfree(rcu_dereference_check(kvm->arch.apic_map, 1));
kfree(srcu_dereference_check(kvm->arch.pmu_event_filter, &kvm->srcu, 1));
kvm_mmu_uninit_vm(kvm);
kvm_page_track_cleanup(kvm);
--=20
2.49.0