Skip to content

Commit 06c6a65

Browse files
Steve Sistarelegoater
authored andcommitted
vfio/iommufd: register container for cpr
Register a vfio iommufd container and device for CPR, replacing the generic CPR register call with a more specific iommufd register call. Add a blocker if the kernel does not support IOMMU_IOAS_CHANGE_PROCESS. This is mostly boiler plate. The fields to to saved and restored are added in subsequent patches. Signed-off-by: Steve Sistare <steven.sistare@oracle.com> Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com> Link: https://lore.kernel.org/qemu-devel/1751493538-202042-13-git-send-email-steven.sistare@oracle.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
1 parent a434fd8 commit 06c6a65

File tree

6 files changed

+114
-2
lines changed

6 files changed

+114
-2
lines changed

backends/iommufd.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,13 @@ bool iommufd_backend_connect(IOMMUFDBackend *be, Error **errp)
108108
}
109109
be->fd = fd;
110110
}
111+
if (!be->users && !vfio_iommufd_cpr_register_iommufd(be, errp)) {
112+
if (be->owned) {
113+
close(be->fd);
114+
be->fd = -1;
115+
}
116+
return false;
117+
}
111118
be->users++;
112119

113120
trace_iommufd_backend_connect(be->fd, be->owned, be->users);
@@ -125,6 +132,9 @@ void iommufd_backend_disconnect(IOMMUFDBackend *be)
125132
be->fd = -1;
126133
}
127134
out:
135+
if (!be->users) {
136+
vfio_iommufd_cpr_unregister_iommufd(be);
137+
}
128138
trace_iommufd_backend_disconnect(be->fd, be->users);
129139
}
130140

hw/vfio/cpr-iommufd.c

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
* Copyright (c) 2024-2025 Oracle and/or its affiliates.
3+
*
4+
* SPDX-License-Identifier: GPL-2.0-or-later
5+
*/
6+
7+
#include "qemu/osdep.h"
8+
#include "qapi/error.h"
9+
#include "hw/vfio/vfio-cpr.h"
10+
#include "migration/blocker.h"
11+
#include "migration/cpr.h"
12+
#include "migration/migration.h"
13+
#include "migration/vmstate.h"
14+
#include "system/iommufd.h"
15+
#include "vfio-iommufd.h"
16+
17+
static bool vfio_cpr_supported(IOMMUFDBackend *be, Error **errp)
18+
{
19+
if (!iommufd_change_process_capable(be)) {
20+
if (errp) {
21+
error_setg(errp, "vfio iommufd backend does not support "
22+
"IOMMU_IOAS_CHANGE_PROCESS");
23+
}
24+
return false;
25+
}
26+
return true;
27+
}
28+
29+
static const VMStateDescription iommufd_cpr_vmstate = {
30+
.name = "iommufd",
31+
.version_id = 0,
32+
.minimum_version_id = 0,
33+
.needed = cpr_incoming_needed,
34+
.fields = (VMStateField[]) {
35+
VMSTATE_END_OF_LIST()
36+
}
37+
};
38+
39+
bool vfio_iommufd_cpr_register_iommufd(IOMMUFDBackend *be, Error **errp)
40+
{
41+
Error **cpr_blocker = &be->cpr_blocker;
42+
43+
if (!vfio_cpr_supported(be, cpr_blocker)) {
44+
return migrate_add_blocker_modes(cpr_blocker, errp,
45+
MIG_MODE_CPR_TRANSFER, -1) == 0;
46+
}
47+
48+
vmstate_register(NULL, -1, &iommufd_cpr_vmstate, be);
49+
50+
return true;
51+
}
52+
53+
void vfio_iommufd_cpr_unregister_iommufd(IOMMUFDBackend *be)
54+
{
55+
vmstate_unregister(NULL, &iommufd_cpr_vmstate, be);
56+
migrate_del_blocker(&be->cpr_blocker);
57+
}
58+
59+
bool vfio_iommufd_cpr_register_container(VFIOIOMMUFDContainer *container,
60+
Error **errp)
61+
{
62+
VFIOContainerBase *bcontainer = &container->bcontainer;
63+
64+
migration_add_notifier_mode(&bcontainer->cpr_reboot_notifier,
65+
vfio_cpr_reboot_notifier,
66+
MIG_MODE_CPR_REBOOT);
67+
68+
vfio_cpr_add_kvm_notifier();
69+
70+
return true;
71+
}
72+
73+
void vfio_iommufd_cpr_unregister_container(VFIOIOMMUFDContainer *container)
74+
{
75+
VFIOContainerBase *bcontainer = &container->bcontainer;
76+
77+
migration_remove_notifier(&bcontainer->cpr_reboot_notifier);
78+
}
79+
80+
void vfio_iommufd_cpr_register_device(VFIODevice *vbasedev)
81+
{
82+
}
83+
84+
void vfio_iommufd_cpr_unregister_device(VFIODevice *vbasedev)
85+
{
86+
}

hw/vfio/iommufd.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ static void iommufd_cdev_container_destroy(VFIOIOMMUFDContainer *container)
446446
if (!QLIST_EMPTY(&bcontainer->device_list)) {
447447
return;
448448
}
449-
vfio_cpr_unregister_container(bcontainer);
449+
vfio_iommufd_cpr_unregister_container(container);
450450
vfio_listener_unregister(bcontainer);
451451
iommufd_backend_free_id(container->be, container->ioas_id);
452452
object_unref(container);
@@ -592,7 +592,7 @@ static bool iommufd_cdev_attach(const char *name, VFIODevice *vbasedev,
592592
goto err_listener_register;
593593
}
594594

595-
if (!vfio_cpr_register_container(bcontainer, errp)) {
595+
if (!vfio_iommufd_cpr_register_container(container, errp)) {
596596
goto err_listener_register;
597597
}
598598

@@ -623,6 +623,7 @@ static bool iommufd_cdev_attach(const char *name, VFIODevice *vbasedev,
623623
}
624624

625625
vfio_device_prepare(vbasedev, bcontainer, &dev_info);
626+
vfio_iommufd_cpr_register_device(vbasedev);
626627

627628
trace_iommufd_cdev_device_info(vbasedev->name, devfd, vbasedev->num_irqs,
628629
vbasedev->num_regions, vbasedev->flags);
@@ -660,6 +661,7 @@ static void iommufd_cdev_detach(VFIODevice *vbasedev)
660661
iommufd_cdev_container_destroy(container);
661662
vfio_address_space_put(space);
662663

664+
vfio_iommufd_cpr_unregister_device(vbasedev);
663665
iommufd_cdev_unbind_and_disconnect(vbasedev);
664666
close(vbasedev->fd);
665667
}

hw/vfio/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files(
3131
))
3232
system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files(
3333
'iommufd.c',
34+
'cpr-iommufd.c',
3435
))
3536
system_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files(
3637
'display.c',

include/hw/vfio/vfio-cpr.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
struct VFIOContainer;
1616
struct VFIOContainerBase;
1717
struct VFIOGroup;
18+
struct VFIODevice;
1819
struct VFIOPCIDevice;
20+
struct VFIOIOMMUFDContainer;
21+
struct IOMMUFDBackend;
1922

2023
typedef int (*dma_map_fn)(const struct VFIOContainerBase *bcontainer,
2124
hwaddr iova, ram_addr_t size, void *vaddr,
@@ -44,6 +47,15 @@ bool vfio_cpr_register_container(struct VFIOContainerBase *bcontainer,
4447
Error **errp);
4548
void vfio_cpr_unregister_container(struct VFIOContainerBase *bcontainer);
4649

50+
bool vfio_iommufd_cpr_register_container(struct VFIOIOMMUFDContainer *container,
51+
Error **errp);
52+
void vfio_iommufd_cpr_unregister_container(
53+
struct VFIOIOMMUFDContainer *container);
54+
bool vfio_iommufd_cpr_register_iommufd(struct IOMMUFDBackend *be, Error **errp);
55+
void vfio_iommufd_cpr_unregister_iommufd(struct IOMMUFDBackend *be);
56+
void vfio_iommufd_cpr_register_device(struct VFIODevice *vbasedev);
57+
void vfio_iommufd_cpr_unregister_device(struct VFIODevice *vbasedev);
58+
4759
int vfio_cpr_group_get_device_fd(int d, const char *name);
4860

4961
bool vfio_cpr_container_match(struct VFIOContainer *container,

include/system/iommufd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ struct IOMMUFDBackend {
3232
/*< protected >*/
3333
int fd; /* /dev/iommu file descriptor */
3434
bool owned; /* is the /dev/iommu opened internally */
35+
Error *cpr_blocker;/* set if be does not support CPR */
3536
uint32_t users;
3637

3738
/*< public >*/

0 commit comments

Comments
 (0)