From: "Cédric Le Goater" <clg@redhat.com>
To: Zhenzhong Duan <zhenzhong.duan@intel.com>, qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, jgg@nvidia.com, nicolinc@nvidia.com,
joao.m.martins@oracle.com, eric.auger@redhat.com,
peterx@redhat.com, jasowang@redhat.com, kevin.tian@intel.com,
yi.l.liu@intel.com, yi.y.sun@intel.com, chao.p.peng@intel.com
Subject: Re: [PATCH v3 12/37] vfio/container: Move per container device list in base container
Date: Fri, 27 Oct 2023 17:03:06 +0200 [thread overview]
Message-ID: <d4b331ba-593a-454a-bb34-1d30ae603eb8@redhat.com> (raw)
In-Reply-To: <20231026103104.1686921-13-zhenzhong.duan@intel.com>
On 10/26/23 12:30, Zhenzhong Duan wrote:
> VFIO Device is also changed to point to base container instead of
> legacy container.
>
> No fucntional change intended.
>
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
> [ clg: context changes ]
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
Please drop my SoB.
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> include/hw/vfio/vfio-common.h | 3 +--
> include/hw/vfio/vfio-container-base.h | 1 +
> hw/vfio/common.c | 23 +++++++++++++++--------
> hw/vfio/container.c | 12 ++++++------
> 4 files changed, 23 insertions(+), 16 deletions(-)
>
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index d053c61872..f7a84dc8d0 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -90,7 +90,6 @@ typedef struct VFIOContainer {
> QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
> QLIST_HEAD(, VFIOGroup) group_list;
> QLIST_HEAD(, VFIORamDiscardListener) vrdl_list;
> - QLIST_HEAD(, VFIODevice) device_list;
> GList *iova_ranges;
> } VFIOContainer;
>
> @@ -118,7 +117,7 @@ typedef struct VFIODevice {
> QLIST_ENTRY(VFIODevice) container_next;
> QLIST_ENTRY(VFIODevice) global_next;
> struct VFIOGroup *group;
> - VFIOContainer *container;
> + VFIOContainerBase *bcontainer;
> char *sysfsdev;
> char *name;
> DeviceState *dev;
> diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container-base.h
> index ea8436a064..f1de1ef120 100644
> --- a/include/hw/vfio/vfio-container-base.h
> +++ b/include/hw/vfio/vfio-container-base.h
> @@ -53,6 +53,7 @@ typedef struct VFIOContainerBase {
> bool dirty_pages_supported;
> QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
> QLIST_ENTRY(VFIOContainerBase) next;
> + QLIST_HEAD(, VFIODevice) device_list;
> } VFIOContainerBase;
>
> typedef struct VFIOGuestIOMMU {
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index 7d9b87fc67..f8475348ad 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -145,7 +145,7 @@ void vfio_unblock_multiple_devices_migration(void)
>
> bool vfio_viommu_preset(VFIODevice *vbasedev)
> {
> - return vbasedev->container->bcontainer.space->as != &address_space_memory;
> + return vbasedev->bcontainer->space->as != &address_space_memory;
> }
>
> static void vfio_set_migration_error(int err)
> @@ -179,6 +179,7 @@ bool vfio_device_state_is_precopy(VFIODevice *vbasedev)
>
> static bool vfio_devices_all_dirty_tracking(VFIOContainer *container)
> {
> + VFIOContainerBase *bcontainer = &container->bcontainer;
> VFIODevice *vbasedev;
> MigrationState *ms = migrate_get_current();
>
> @@ -187,7 +188,7 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer *container)
> return false;
> }
>
> - QLIST_FOREACH(vbasedev, &container->device_list, container_next) {
> + QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
> VFIOMigration *migration = vbasedev->migration;
>
> if (!migration) {
> @@ -205,9 +206,10 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer *container)
>
> bool vfio_devices_all_device_dirty_tracking(VFIOContainer *container)
> {
> + VFIOContainerBase *bcontainer = &container->bcontainer;
> VFIODevice *vbasedev;
>
> - QLIST_FOREACH(vbasedev, &container->device_list, container_next) {
> + QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
> if (!vbasedev->dirty_pages_supported) {
> return false;
> }
> @@ -222,13 +224,14 @@ bool vfio_devices_all_device_dirty_tracking(VFIOContainer *container)
> */
> bool vfio_devices_all_running_and_mig_active(VFIOContainer *container)
> {
> + VFIOContainerBase *bcontainer = &container->bcontainer;
> VFIODevice *vbasedev;
>
> if (!migration_is_active(migrate_get_current())) {
> return false;
> }
>
> - QLIST_FOREACH(vbasedev, &container->device_list, container_next) {
> + QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
> VFIOMigration *migration = vbasedev->migration;
>
> if (!migration) {
> @@ -835,12 +838,13 @@ static bool vfio_section_is_vfio_pci(MemoryRegionSection *section,
> VFIOContainer *container)
> {
> VFIOPCIDevice *pcidev;
> + VFIOContainerBase *bcontainer = &container->bcontainer;
> VFIODevice *vbasedev;
> Object *owner;
>
> owner = memory_region_owner(section->mr);
>
> - QLIST_FOREACH(vbasedev, &container->device_list, container_next) {
> + QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
> if (vbasedev->type != VFIO_DEVICE_TYPE_PCI) {
> continue;
> }
> @@ -941,13 +945,14 @@ static void vfio_devices_dma_logging_stop(VFIOContainer *container)
> uint64_t buf[DIV_ROUND_UP(sizeof(struct vfio_device_feature),
> sizeof(uint64_t))] = {};
> struct vfio_device_feature *feature = (struct vfio_device_feature *)buf;
> + VFIOContainerBase *bcontainer = &container->bcontainer;
> VFIODevice *vbasedev;
>
> feature->argsz = sizeof(buf);
> feature->flags = VFIO_DEVICE_FEATURE_SET |
> VFIO_DEVICE_FEATURE_DMA_LOGGING_STOP;
>
> - QLIST_FOREACH(vbasedev, &container->device_list, container_next) {
> + QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
> if (!vbasedev->dirty_tracking) {
> continue;
> }
> @@ -1038,6 +1043,7 @@ static int vfio_devices_dma_logging_start(VFIOContainer *container)
> {
> struct vfio_device_feature *feature;
> VFIODirtyRanges ranges;
> + VFIOContainerBase *bcontainer = &container->bcontainer;
> VFIODevice *vbasedev;
> int ret = 0;
>
> @@ -1048,7 +1054,7 @@ static int vfio_devices_dma_logging_start(VFIOContainer *container)
> return -errno;
> }
>
> - QLIST_FOREACH(vbasedev, &container->device_list, container_next) {
> + QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
> if (vbasedev->dirty_tracking) {
> continue;
> }
> @@ -1141,10 +1147,11 @@ int vfio_devices_query_dirty_bitmap(VFIOContainer *container,
> VFIOBitmap *vbmap, hwaddr iova,
> hwaddr size)
> {
> + VFIOContainerBase *bcontainer = &container->bcontainer;
> VFIODevice *vbasedev;
> int ret;
>
> - QLIST_FOREACH(vbasedev, &container->device_list, container_next) {
> + QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
> ret = vfio_device_dma_logging_report(vbasedev, iova, size,
> vbmap->bitmap);
> if (ret) {
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index 6f02ca133e..3228dd2109 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -889,7 +889,7 @@ int vfio_attach_device(char *name, VFIODevice *vbasedev,
> int groupid = vfio_device_groupid(vbasedev, errp);
> VFIODevice *vbasedev_iter;
> VFIOGroup *group;
> - VFIOContainer *container;
> + VFIOContainerBase *bcontainer;
> int ret;
>
> if (groupid < 0) {
> @@ -916,9 +916,9 @@ int vfio_attach_device(char *name, VFIODevice *vbasedev,
> return ret;
> }
>
> - container = group->container;
> - vbasedev->container = container;
> - QLIST_INSERT_HEAD(&container->device_list, vbasedev, container_next);
> + bcontainer = &group->container->bcontainer;
> + vbasedev->bcontainer = bcontainer;
> + QLIST_INSERT_HEAD(&bcontainer->device_list, vbasedev, container_next);
> QLIST_INSERT_HEAD(&vfio_device_list, vbasedev, global_next);
>
> return ret;
> @@ -928,13 +928,13 @@ void vfio_detach_device(VFIODevice *vbasedev)
> {
> VFIOGroup *group = vbasedev->group;
>
> - if (!vbasedev->container) {
> + if (!vbasedev->bcontainer) {
> return;
> }
>
> QLIST_REMOVE(vbasedev, global_next);
> QLIST_REMOVE(vbasedev, container_next);
> - vbasedev->container = NULL;
> + vbasedev->bcontainer = NULL;
> trace_vfio_detach_device(vbasedev->name, group->groupid);
> vfio_put_base_device(vbasedev);
> vfio_put_group(group);
next prev parent reply other threads:[~2023-10-27 15:03 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-26 10:30 [PATCH v3 00/37] vfio: Adopt iommufd Zhenzhong Duan
2023-10-26 10:30 ` [PATCH v3 01/37] vfio/container: Move IBM EEH related functions into spapr_pci_vfio.c Zhenzhong Duan
2023-10-26 14:23 ` Eric Farman
2023-10-27 9:19 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 02/37] vfio/container: Move vfio_container_add/del_section_window into spapr.c Zhenzhong Duan
2023-10-27 9:19 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 03/37] vfio/container: Move spapr specific init/deinit " Zhenzhong Duan
2023-10-27 9:27 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 04/37] vfio/spapr: Make vfio_spapr_create/remove_window static Zhenzhong Duan
2023-10-27 9:27 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 05/37] vfio/common: Move vfio_host_win_add/del into spapr.c Zhenzhong Duan
2023-10-27 9:30 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 06/37] vfio: Introduce base object for VFIOContainer and targetted interface Zhenzhong Duan
2023-10-27 14:02 ` Cédric Le Goater
2023-10-30 2:40 ` Duan, Zhenzhong
2023-10-31 7:57 ` Cédric Le Goater
2023-10-31 8:31 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 07/37] vfio/container: Introduce a empty VFIOIOMMUOps Zhenzhong Duan
2023-10-27 14:20 ` Cédric Le Goater
2023-10-30 2:43 ` Duan, Zhenzhong
2023-10-31 8:21 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 08/37] vfio/container: Switch to dma_map|unmap API Zhenzhong Duan
2023-10-27 14:26 ` Cédric Le Goater
2023-10-30 2:48 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 09/37] vfio/common: Move giommu_list in base container Zhenzhong Duan
2023-10-27 14:38 ` Cédric Le Goater
2023-10-30 2:48 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 10/37] vfio/container: Move space field to " Zhenzhong Duan
2023-10-27 14:46 ` Cédric Le Goater
2023-10-30 2:51 ` Duan, Zhenzhong
2023-10-31 8:24 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 11/37] vfio/container: Switch to IOMMU BE set_dirty_page_tracking/query_dirty_bitmap API Zhenzhong Duan
2023-10-27 14:53 ` Cédric Le Goater
2023-10-30 2:53 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 12/37] vfio/container: Move per container device list in base container Zhenzhong Duan
2023-10-27 15:03 ` Cédric Le Goater [this message]
2023-10-26 10:30 ` [PATCH v3 13/37] vfio/container: Convert functions to " Zhenzhong Duan
2023-10-27 15:03 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 14/37] vfio/container: Move vrdl_list, pgsizes and dma_max_mappings " Zhenzhong Duan
2023-10-27 15:52 ` Cédric Le Goater
2023-10-30 3:14 ` Duan, Zhenzhong
2023-10-31 8:26 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 15/37] vfio/container: Move listener " Zhenzhong Duan
2023-10-26 10:30 ` [PATCH v3 16/37] vfio/container: Move dirty_pgsizes and max_dirty_bitmap_size " Zhenzhong Duan
2023-10-27 16:01 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 17/37] vfio/container: Move iova_ranges " Zhenzhong Duan
2023-10-26 10:30 ` [PATCH v3 18/37] vfio/container: Implement attach/detach_device Zhenzhong Duan
2023-10-27 16:04 ` Cédric Le Goater
2023-10-27 16:06 ` Cédric Le Goater
2023-10-30 3:20 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 19/37] vfio/spapr: Introduce spapr backend and target interface Zhenzhong Duan
2023-10-27 16:04 ` Cédric Le Goater
2023-10-30 3:15 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 20/37] vfio/spapr: switch to spapr IOMMU BE add/del_section_window Zhenzhong Duan
2023-10-26 10:30 ` [PATCH v3 21/37] vfio/spapr: Move prereg_listener into spapr container Zhenzhong Duan
2023-10-26 10:30 ` [PATCH v3 22/37] vfio/spapr: Move hostwin_list " Zhenzhong Duan
2023-10-26 10:30 ` [PATCH v3 23/37] Add iommufd configure option Zhenzhong Duan
2023-10-31 8:58 ` Cédric Le Goater
2023-10-31 10:52 ` Duan, Zhenzhong
2023-10-31 11:25 ` Cédric Le Goater
2023-10-26 10:30 ` [PATCH v3 24/37] backends/iommufd: Introduce the iommufd object Zhenzhong Duan
2023-10-26 13:27 ` Markus Armbruster
2023-10-27 7:50 ` Duan, Zhenzhong
2023-10-27 8:30 ` Markus Armbruster
2023-10-27 9:41 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 25/37] util/char_dev: Add open_cdev() Zhenzhong Duan
2023-10-30 14:53 ` Cédric Le Goater
2023-10-31 1:59 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 26/37] vfio/iommufd: Implement the iommufd backend Zhenzhong Duan
2023-10-26 10:30 ` [PATCH v3 27/37] vfio/iommufd: Switch to manual hwpt allocation Zhenzhong Duan
2023-10-30 13:52 ` Cédric Le Goater
2023-10-31 2:02 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 28/37] vfio/iommufd: Add support for iova_ranges Zhenzhong Duan
2023-10-26 10:30 ` [PATCH v3 29/37] vfio/iommufd: Bypass EEH if iommufd backend Zhenzhong Duan
2023-10-30 13:56 ` Cédric Le Goater
2023-10-31 2:26 ` Duan, Zhenzhong
2023-10-31 9:01 ` Cédric Le Goater
2023-10-31 9:06 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 30/37] vfio/pci: Extract out a helper vfio_pci_get_pci_hot_reset_info Zhenzhong Duan
2023-10-30 13:59 ` Cédric Le Goater
2023-10-31 2:30 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 31/37] vfio/pci: Adapt vfio pci hot reset support with iommufd BE Zhenzhong Duan
2023-10-30 14:04 ` Cédric Le Goater
2023-10-31 2:27 ` Duan, Zhenzhong
2023-10-26 10:30 ` [PATCH v3 32/37] vfio/pci: Allow the selection of a given iommu backend Zhenzhong Duan
2023-10-26 10:31 ` [PATCH v3 33/37] vfio/pci: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-10-26 10:31 ` [PATCH v3 34/37] vfio: Allow the selection of a given iommu backend for platform ap and ccw Zhenzhong Duan
2023-10-26 10:31 ` [PATCH v3 35/37] vfio/platform: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-10-26 10:31 ` [PATCH v3 36/37] vfio/ap: " Zhenzhong Duan
2023-10-26 10:31 ` [PATCH v3 37/37] vfio/ccw: " Zhenzhong Duan
2023-10-26 13:27 ` [PATCH v3 00/37] vfio: Adopt iommufd Markus Armbruster
2023-10-27 6:17 ` Duan, Zhenzhong
2023-10-27 7:45 ` Cédric Le Goater
2023-10-27 8:16 ` Duan, Zhenzhong
2023-10-27 13:43 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d4b331ba-593a-454a-bb34-1d30ae603eb8@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=chao.p.peng@intel.com \
--cc=eric.auger@redhat.com \
--cc=jasowang@redhat.com \
--cc=jgg@nvidia.com \
--cc=joao.m.martins@oracle.com \
--cc=kevin.tian@intel.com \
--cc=nicolinc@nvidia.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=yi.l.liu@intel.com \
--cc=yi.y.sun@intel.com \
--cc=zhenzhong.duan@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).