From nobody Wed May 7 04:03:36 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 4018B2165E4
for <linux-kernel@vger.kernel.org>; Tue, 1 Apr 2025 16:11:37 +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=1743523899; cv=none;
b=KfgUB1WOrq5xOt5hml8S9hqJXLyP15rSOtQgTs+5b6CAlJkhOfpUxZ6qT0Vev4M9UPXN5jwwi6saq2oZMNWJRmk/98pJQc76oOzYD0jaOU/hjSZxabhUhdwgq81a3OM1y2Xt9NbPAXgkLO7uPSi+9C1rup7qGhdztYFG+q2Njbc=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743523899; c=relaxed/simple;
bh=pIyJCdOg5EfnYtvOavzOlQjVJCjnaMJWsL07IXTnXPc=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version;
b=l2BJ8ij4aM18ntr0x04FqertmSsX4Tqir/z6bOMTShzMKqvyqXl0Yb1jCpG8HZ7UwjWxQJF5EWvuPXuGgQ1npTdUb0giN4vjVmF++ZFD2w9gO0oJWSJ4bAAPCoaQD75j6b3bxGHJj4hQ6V9tLV7kcWu0txW5FAjXuPbl7MrQs0M=
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=DEM2U3/U; 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="DEM2U3/U"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1743523896;
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=P25Au7R1dwmJRVWNgpsYsEFXlIeAhOMlbUwIILW5U9Q=;
b=DEM2U3/U3eeO8QNjncAjrysgyTNYgHeOrpTGxDqd6pK0BRwng0Rq3n2qsUdUVMtcZKDi0L
dhf1iTzfdS9S2x7TlX/+E2CaItBXve0E8ncpQa8uCO33THRiIoRgWFOMElxd+jppAFJe+p
paMtNMaeSKTsd+0CALb4j4cnqjK4xTs=
Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com
[209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
us-mta-113-R1Ko05RoNO-PCmOXPOiWQQ-1; Tue, 01 Apr 2025 12:11:35 -0400
X-MC-Unique: R1Ko05RoNO-PCmOXPOiWQQ-1
X-Mimecast-MFC-AGG-ID: R1Ko05RoNO-PCmOXPOiWQQ_1743523894
Received: by mail-wr1-f71.google.com with SMTP id
ffacd0b85a97d-3978ef9a284so2694248f8f.3
for <linux-kernel@vger.kernel.org>;
Tue, 01 Apr 2025 09:11:35 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743523893; x=1744128693;
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=P25Au7R1dwmJRVWNgpsYsEFXlIeAhOMlbUwIILW5U9Q=;
b=RuJiqMhWIUW2mRy7Jv3sFcrIgGYO54JzDF4ir2qGvcdbYjUJUnJ2Kz4HvH7/DFiz1u
R2oSEnz5JPXwqp9AjXKZ+vm86+JYKAzMgBaRuIfBDhWj/w2l6n0lPADObkyi+a7rQqqt
a/aKnyKE3GWTP4ESqkazLkifvK+TerRBUca31uBxw5FgmSnRBzBqZhyBJkFI3EiJdycR
eJEBTDLwEQWTlhrN+t8lB6eFe7bvXckFXLM+6qznIAkfjOx8buIr328J1K/IRQPHMGy/
3qHN4dRbpDV0GEgPKHwte8W2zbcf78FduE7MQuKE/OjcEgguGwtq72Z+f9mo/aWLuApt
bJqA==
X-Gm-Message-State: AOJu0Yw4jRLlYMkieDlXMYv+J0PUujNyZnQuqQ19aVdraLOFw/JQt21J
dPb78+z3MsrzFEQxMV1AjLW9Imf3H6PLHT93NtzT6Ef2VSSvDOVfEKh6VWpfjc1DvJjjevNLl4J
2QtrYcmqbPvushbMeUWZmqiZ1NnQEAAepJ26AEKobdz0UhQgPO3qbueZguyMwpQk+MccVe/nqlg
5ki6hJ822Zy6kLFyvAA+p/FhjU8cloU8xNrP8ENGPuvsjv5w==
X-Gm-Gg: ASbGnctH8dLvd5UpaRO2+82euSki0bOrD5DUiH6Z8FdfzxooV2Nxr2fFI/fzyrM+rSt
aTGIhUHXxFSOccalNgU/NjdS1SN731lGmRaEqWpKL0nHOHLX6b4PDOyU7F7hq/N6bKyi1bbwIIa
H1zo7Ctm7LHAMjODskt1Fwg/IY9EK8gVwdn6nHMxiIRSLnVNxBWQCohGSZoGLWDeBIj/+KiPodk
VUo2x7P0t4zPykkN4IQsgz2YrRK44n59oM1zJxOexjrNvGL43S3p1f7mJ6/4U85Zb54Fr1ec0MX
G62n4brKFvyIw3yu5Ke7KA==
X-Received: by 2002:a05:6000:2913:b0:391:4ca:490 with SMTP id
ffacd0b85a97d-39c120e35d1mr10486580f8f.29.1743523893070;
Tue, 01 Apr 2025 09:11:33 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IHRUznHPy00F+DVXJZ81FziQ7RotBaykrjs+9d/ucxw73LPo+iiCJX9scu8bMnyNgr21RT/Iw==
X-Received: by 2002:a05:6000:2913:b0:391:4ca:490 with SMTP id
ffacd0b85a97d-39c120e35d1mr10486516f8f.29.1743523892530;
Tue, 01 Apr 2025 09:11:32 -0700 (PDT)
Received: from [192.168.10.48] ([176.206.111.201])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-43d82efeacasm203836695e9.23.2025.04.01.09.11.30
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 01 Apr 2025 09:11:30 -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 09/29] KVM: implement plane file descriptors ioctl and
creation
Date: Tue, 1 Apr 2025 18:10:46 +0200
Message-ID: <20250401161106.790710-10-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"
Add the file_operations for planes, the means to create new file
descriptors for them, and the KVM_CHECK_EXTENSION implementation for
the two new capabilities.
KVM_SIGNAL_MSI and KVM_SET_MEMORY_ATTRIBUTES are now available
through both vm and plane file descriptors, forward them to the
same function that is used by the file_operations for planes.
KVM_CHECK_EXTENSION instead remains separate, because it only
advertises a very small subset of capabilities when applied to
plane file descriptors.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/linux/kvm_host.h | 19 +++++
include/uapi/linux/kvm.h | 2 +
virt/kvm/kvm_main.c | 154 +++++++++++++++++++++++++++++++++------
3 files changed, 154 insertions(+), 21 deletions(-)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 0a91b556767e..dbca418d64f5 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -342,6 +342,8 @@ struct kvm_vcpu {
unsigned long guest_debug;
=20
struct mutex mutex;
+
+ /* Shared for all planes */
struct kvm_run *run;
=20
#ifndef __KVM_HAVE_ARCH_WQP
@@ -922,6 +924,23 @@ static inline void kvm_vm_bugged(struct kvm *kvm)
}
=20
=20
+#if KVM_MAX_VCPU_PLANES =3D=3D 1
+static inline int kvm_arch_nr_vcpu_planes(struct kvm *kvm)
+{
+ return KVM_MAX_VCPU_PLANES;
+}
+
+static inline struct kvm_plane *vcpu_to_plane(struct kvm_vcpu *vcpu)
+{
+ return vcpu->kvm->planes[0];
+}
+#else
+static inline struct kvm_plane *vcpu_to_plane(struct kvm_vcpu *vcpu)
+{
+ return vcpu->kvm->planes[vcpu->plane_id];
+}
+#endif
+
#define KVM_BUG(cond, kvm, fmt...) \
({ \
bool __ret =3D !!(cond); \
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index b0cca93ebcb3..96d25c7fa18f 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1690,4 +1690,6 @@ struct kvm_pre_fault_memory {
__u64 padding[5];
};
=20
+#define KVM_CREATE_PLANE _IO(KVMIO, 0xd6)
+
#endif /* __LINUX_KVM_H */
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index cd4dfc399cad..b08fea91dc74 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -4388,6 +4388,80 @@ static int kvm_wait_for_vcpu_online(struct kvm_vcpu =
*vcpu)
return 0;
}
=20
+static int kvm_plane_ioctl_check_extension(struct kvm_plane *plane, long a=
rg)
+{
+ switch (arg) {
+#ifdef CONFIG_HAVE_KVM_MSI
+ case KVM_CAP_SIGNAL_MSI:
+#endif
+ case KVM_CAP_CHECK_EXTENSION_VM:
+ return 1;
+#ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES
+ case KVM_CAP_MEMORY_ATTRIBUTES:
+ return kvm_supported_mem_attributes(plane);
+#endif
+ default:
+ return 0;
+ }
+}
+
+static long __kvm_plane_ioctl(struct kvm_plane *plane, unsigned int ioctl,
+ unsigned long arg)
+{
+ void __user *argp =3D (void __user *)arg;
+
+ switch (ioctl) {
+#ifdef CONFIG_HAVE_KVM_MSI
+ case KVM_SIGNAL_MSI: {
+ struct kvm_msi msi;
+
+ if (copy_from_user(&msi, argp, sizeof(msi)))
+ return -EFAULT;
+ return kvm_send_userspace_msi(plane, &msi);
+ }
+#endif
+#ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES
+ case KVM_SET_MEMORY_ATTRIBUTES: {
+ struct kvm_memory_attributes attrs;
+
+ if (copy_from_user(&attrs, argp, sizeof(attrs)))
+ return -EFAULT;
+ return kvm_vm_ioctl_set_mem_attributes(plane, &attrs);
+ }
+#endif
+ case KVM_CHECK_EXTENSION:
+ return kvm_plane_ioctl_check_extension(plane, arg);
+ default:
+ return -ENOTTY;
+ }
+}
+
+static long kvm_plane_ioctl(struct file *filp, unsigned int ioctl,
+ unsigned long arg)
+{
+ struct kvm_plane *plane =3D filp->private_data;
+
+ if (plane->kvm->mm !=3D current->mm || plane->kvm->vm_dead)
+ return -EIO;
+
+ return __kvm_plane_ioctl(plane, ioctl, arg);
+}
+
+static int kvm_plane_release(struct inode *inode, struct file *filp)
+{
+ struct kvm_plane *plane =3D filp->private_data;
+
+ kvm_put_kvm(plane->kvm);
+ return 0;
+}
+
+static struct file_operations kvm_plane_fops =3D {
+ .unlocked_ioctl =3D kvm_plane_ioctl,
+ .release =3D kvm_plane_release,
+ KVM_COMPAT(kvm_plane_ioctl),
+};
+
+
static long kvm_vcpu_ioctl(struct file *filp,
unsigned int ioctl, unsigned long arg)
{
@@ -4878,6 +4952,14 @@ static int kvm_vm_ioctl_check_extension_generic(stru=
ct kvm *kvm, long arg)
if (kvm)
return kvm_arch_nr_memslot_as_ids(kvm);
return KVM_MAX_NR_ADDRESS_SPACES;
+#endif
+#if KVM_MAX_VCPU_PLANES > 1
+ case KVM_CAP_PLANES:
+ if (kvm)
+ return kvm_arch_nr_vcpu_planes(kvm);
+ return KVM_MAX_PLANES;
+ case KVM_CAP_PLANES_FPU:
+ return kvm_arch_planes_share_fpu(kvm);
#endif
case KVM_CAP_NR_MEMSLOTS:
return KVM_USER_MEM_SLOTS;
@@ -5112,6 +5194,48 @@ static int kvm_vm_ioctl_get_stats_fd(struct kvm *kvm)
return fd;
}
=20
+static int kvm_vm_ioctl_create_plane(struct kvm *kvm, unsigned id)
+{
+ struct kvm_plane *plane;
+ struct file *file;
+ int r, fd;
+
+ if (id >=3D KVM_MAX_VCPU_PLANES)
+ return -EINVAL;
+
+ guard(mutex)(&kvm->lock);
+ if (kvm->planes[id])
+ return -EEXIST;
+
+ fd =3D get_unused_fd_flags(O_CLOEXEC);
+ if (fd < 0)
+ return fd;
+
+ plane =3D kvm_create_vm_plane(kvm, id);
+ if (IS_ERR(plane)) {
+ r =3D PTR_ERR(plane);
+ goto put_fd;
+ }
+
+ kvm_get_kvm(kvm);
+ file =3D anon_inode_getfile("kvm-plane", &kvm_plane_fops, plane, O_RDWR);
+ if (IS_ERR(file)) {
+ r =3D PTR_ERR(file);
+ goto put_kvm;
+ }
+
+ kvm->planes[id] =3D plane;
+ fd_install(fd, file);
+ return fd;
+
+put_kvm:
+ kvm_put_kvm(kvm);
+ kfree(plane);
+put_fd:
+ put_unused_fd(fd);
+ return r;
+}
+
#define SANITY_CHECK_MEM_REGION_FIELD(field) \
do { \
BUILD_BUG_ON(offsetof(struct kvm_userspace_memory_region, field) !=3D \
@@ -5130,6 +5254,9 @@ static long kvm_vm_ioctl(struct file *filp,
if (kvm->mm !=3D current->mm || kvm->vm_dead)
return -EIO;
switch (ioctl) {
+ case KVM_CREATE_PLANE:
+ r =3D kvm_vm_ioctl_create_plane(kvm, arg);
+ break;
case KVM_CREATE_VCPU:
r =3D kvm_vm_ioctl_create_vcpu(kvm, arg);
break;
@@ -5236,16 +5363,12 @@ static long kvm_vm_ioctl(struct file *filp,
break;
}
#ifdef CONFIG_HAVE_KVM_MSI
- case KVM_SIGNAL_MSI: {
- struct kvm_msi msi;
-
- r =3D -EFAULT;
- if (copy_from_user(&msi, argp, sizeof(msi)))
- goto out;
- r =3D kvm_send_userspace_msi(kvm->planes[0], &msi);
- break;
- }
+ case KVM_SIGNAL_MSI:
#endif
+#ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES
+ case KVM_SET_MEMORY_ATTRIBUTES:
+#endif /* CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES */
+ return __kvm_plane_ioctl(kvm->planes[0], ioctl, arg);
#ifdef __KVM_HAVE_IRQ_LINE
case KVM_IRQ_LINE_STATUS:
case KVM_IRQ_LINE: {
@@ -5301,18 +5424,6 @@ static long kvm_vm_ioctl(struct file *filp,
break;
}
#endif /* CONFIG_HAVE_KVM_IRQ_ROUTING */
-#ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES
- case KVM_SET_MEMORY_ATTRIBUTES: {
- struct kvm_memory_attributes attrs;
-
- r =3D -EFAULT;
- if (copy_from_user(&attrs, argp, sizeof(attrs)))
- goto out;
-
- r =3D kvm_vm_ioctl_set_mem_attributes(kvm->planes[0], &attrs);
- break;
- }
-#endif /* CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES */
case KVM_CREATE_DEVICE: {
struct kvm_create_device cd;
=20
@@ -6467,6 +6578,7 @@ int kvm_init(unsigned vcpu_size, unsigned vcpu_align,=
struct module *module)
kvm_chardev_ops.owner =3D module;
kvm_vm_fops.owner =3D module;
kvm_vcpu_fops.owner =3D module;
+ kvm_plane_fops.owner =3D module;
kvm_device_fops.owner =3D module;
=20
kvm_preempt_ops.sched_in =3D kvm_sched_in;
--=20
2.49.0