From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1664C3ABBC for ; Fri, 9 May 2025 10:15:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDKl3-0007xa-2w; Fri, 09 May 2025 06:15:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uDKl1-0007wS-K1 for qemu-devel@nongnu.org; Fri, 09 May 2025 06:15:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uDKkz-00021O-3i for qemu-devel@nongnu.org; Fri, 09 May 2025 06:15:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746785704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=8v/oX3df1V34QV6hsnXKyvAFQ2J4WuV+7D9IhovwpEU=; b=dNC8We2kL2rAVnnVYSfVR6NPuhhAWnxWrDeO5HZYf+XUab2g/HSiILhlg4tRUhxoI3Gaer SZX7KkfaMUywtDB6HUaT7VWP08SpKlsOgSV47EoMqUj/LvkCf3oAsHDQLPpD6gLgVJvBiU OniXQFIJKFE62CpCyGx/WCZqeA9ZuvQ= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-464-DbvXILjzNpOVteuZE_X6YQ-1; Fri, 09 May 2025 06:15:02 -0400 X-MC-Unique: DbvXILjzNpOVteuZE_X6YQ-1 X-Mimecast-MFC-AGG-ID: DbvXILjzNpOVteuZE_X6YQ_1746785701 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43ea256f039so14860325e9.0 for ; Fri, 09 May 2025 03:15:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746785701; x=1747390501; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=8v/oX3df1V34QV6hsnXKyvAFQ2J4WuV+7D9IhovwpEU=; b=uK7ESILbTInW7beWMGtDaOI4sDcDCmH73UmAS91iU53+KkSPITKZwdyDZwRLeSX2EO DLW1R6lAisMk6q+2AO/pcVNEjIC2WRGR4cmMJTd6xu3n13yxGtxS5bxBRYprYUF5jWbg y6hHMJZw9Bid95qE8XdzcSZaMtGTHadYVCSxHXyYHA2meQsO8vp2n9Bgp8r0YpvVsq3Q l3s8d64JWR2PmMi4FbqpVUqVI6iH91QvFn3GVklHa0YHzXu7yTAyc0mC9OOqJNLUoYWS +BuNt+ePqFOpwD23nfsEvsW70UI1bJCYr5Id2lN48nFx2ucYIzYLJIZqwTs6nEh1zIab 7vYQ== X-Forwarded-Encrypted: i=1; AJvYcCWuyMndHWe4NX1zqoFKLODwVaSklCKTkBAczvje/KlkWXlG2FNw8t7+0Xy06NSLy3ShZWPJrHtMpWzX@nongnu.org X-Gm-Message-State: AOJu0YzU6qrg67qR9wz+l+jfZQYsa+N7iJ3GJsv86kiz7Tpb+kO607Yu uEZX77WLvUUCGi2f3FyQq2t+/9gYIIeusx1oI8gQRj4wM99yLapsfvKbVEhvfS2zxk5MhdwvmcU i4jWiR1hqqv6fQHkvmieqTAsp7WBTJXJIoXA9XoRZzAeOLQlt5hGi X-Gm-Gg: ASbGncuI0JKwRg0YRMaPWc1dzhOKea7EGL9JZAcab631RNF5Fio57HTT7akeq8SEcad dTtSZXvx6tTSwRwApNw+AkTkWScMTxsj7smJlhpOw3E86KxcsLeqGuw+n62plJhvZasED9tC3IV NEJ1uamfTQdwGUjtB7pE/5APEENbAf+JYpxv3NEkcSMRjLIRYQxdkRoZ8u0mfUCPE53FVlEGkeL BBlThie3fHjZKWXHjrJkiwvIW7iP/dmR+whRWLC1XN9/CPRZiDzNg6uJNQSaRgiaEOK81lcoaBU T/yNu62yL7EB5Ltne3sY5gw+DVOhMcFSNnKH7AYjKpwJqulOSabdUBC1 X-Received: by 2002:a05:600c:4e8f:b0:43c:ef55:f1e8 with SMTP id 5b1f17b1804b1-442d6d44d0fmr24397935e9.13.1746785700901; Fri, 09 May 2025 03:15:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHu9OrR4/h9dQNpgbPjzM9fmRaGSlpZSYkPE3HQRhWCVZ0UoF7vEVGCdtkNMGQPxyrjNKhRtw== X-Received: by 2002:a05:600c:4e8f:b0:43c:ef55:f1e8 with SMTP id 5b1f17b1804b1-442d6d44d0fmr24397135e9.13.1746785699147; Fri, 09 May 2025 03:14:59 -0700 (PDT) Received: from ?IPV6:2a01:cb1d:89d7:6e00:da58:edc2:d8ef:4b9f? ([2a01:cb1d:89d7:6e00:da58:edc2:d8ef:4b9f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58f33b5sm2826759f8f.54.2025.05.09.03.14.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 May 2025 03:14:58 -0700 (PDT) Message-ID: <474c1db8-8ba9-46d3-90c8-b99d677e56a7@redhat.com> Date: Fri, 9 May 2025 12:14:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 13/15] vfio: add vfio-pci-base class To: John Levon , qemu-devel@nongnu.org Cc: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Halil Pasic , Tomita Moeko , Matthew Rosato , Stefano Garzarella , Alex Williamson , Peter Xu , Thomas Huth , Tony Krowiak , "Michael S. Tsirkin" , Paolo Bonzini , Eric Farman , David Hildenbrand , qemu-s390x@nongnu.org, Jason Herne , John Johnson , Elena Ufimtseva , Jagannathan Raman References: <20250507152020.1254632-1-john.levon@nutanix.com> <20250507152020.1254632-14-john.levon@nutanix.com> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= Autocrypt: addr=clg@redhat.com; keydata= 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 uVKe8BVz4atMOoktmt0GWTOC8P4= In-Reply-To: <20250507152020.1254632-14-john.levon@nutanix.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.416, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 5/7/25 17:20, John Levon wrote: > Split out parts of TYPE_VFIO_PCI into a base TYPE_VFIO_PCI_BASE, > although we have not yet introduced another subclass, so all the > properties have remained in TYPE_VFIO_PCI. > > Note that currently there is no need for additional data for > TYPE_VFIO_PCI, so it shares the same C struct type as > TYPE_VFIO_PCI_BASE, VFIOPCIDevice. > > Originally-by: John Johnson > Signed-off-by: Elena Ufimtseva > Signed-off-by: Jagannathan Raman > Signed-off-by: John Levon Reviewed-by: Cédric Le Goater Thanks, C. > --- > hw/vfio/pci.h | 10 +++++++- > hw/vfio/device.c | 2 +- > hw/vfio/pci.c | 62 +++++++++++++++++++++++++++++++----------------- > 3 files changed, 50 insertions(+), 24 deletions(-) > > diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h > index f835b1dbc2..5ce0fb916f 100644 > --- a/hw/vfio/pci.h > +++ b/hw/vfio/pci.h > @@ -118,8 +118,16 @@ typedef struct VFIOMSIXInfo { > bool noresize; > } VFIOMSIXInfo; > > +/* > + * TYPE_VFIO_PCI_BASE is an abstract type used to share code > + * between VFIO implementations that use a kernel driver > + * with those that use user sockets. > + */ > +#define TYPE_VFIO_PCI_BASE "vfio-pci-base" > +OBJECT_DECLARE_SIMPLE_TYPE(VFIOPCIDevice, VFIO_PCI_BASE) > + > #define TYPE_VFIO_PCI "vfio-pci" > -OBJECT_DECLARE_SIMPLE_TYPE(VFIOPCIDevice, VFIO_PCI) > +/* TYPE_VFIO_PCI shares struct VFIOPCIDevice. */ > > struct VFIOPCIDevice { > PCIDevice pdev; > diff --git a/hw/vfio/device.c b/hw/vfio/device.c > index 0b2cd90d64..9fba2c7272 100644 > --- a/hw/vfio/device.c > +++ b/hw/vfio/device.c > @@ -392,7 +392,7 @@ bool vfio_device_hiod_create_and_realize(VFIODevice *vbasedev, > VFIODevice *vfio_get_vfio_device(Object *obj) > { > if (object_dynamic_cast(obj, TYPE_VFIO_PCI)) { > - return &VFIO_PCI(obj)->vbasedev; > + return &VFIO_PCI_BASE(obj)->vbasedev; > } else { > return NULL; > } > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index 1236de315d..a1bfdfe375 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -241,7 +241,7 @@ static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route) > > static void vfio_intx_routing_notifier(PCIDevice *pdev) > { > - VFIOPCIDevice *vdev = VFIO_PCI(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); > PCIINTxRoute route; > > if (vdev->interrupt != VFIO_INT_INTx) { > @@ -514,7 +514,7 @@ static void vfio_update_kvm_msi_virq(VFIOMSIVector *vector, MSIMessage msg, > static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, > MSIMessage *msg, IOHandler *handler) > { > - VFIOPCIDevice *vdev = VFIO_PCI(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); > VFIOMSIVector *vector; > int ret; > bool resizing = !!(vdev->nr_vectors < nr + 1); > @@ -620,7 +620,7 @@ static int vfio_msix_vector_use(PCIDevice *pdev, > > static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr) > { > - VFIOPCIDevice *vdev = VFIO_PCI(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); > VFIOMSIVector *vector = &vdev->msi_vectors[nr]; > > trace_vfio_msix_vector_release(vdev->vbasedev.name, nr); > @@ -1196,7 +1196,7 @@ static const MemoryRegionOps vfio_vga_ops = { > */ > static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar) > { > - VFIOPCIDevice *vdev = VFIO_PCI(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); > VFIORegion *region = &vdev->bars[bar].region; > MemoryRegion *mmap_mr, *region_mr, *base_mr; > PCIIORegion *r; > @@ -1242,7 +1242,7 @@ static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar) > */ > uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len) > { > - VFIOPCIDevice *vdev = VFIO_PCI(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); > VFIODevice *vbasedev = &vdev->vbasedev; > uint32_t emu_bits = 0, emu_val = 0, phys_val = 0, val; > > @@ -1276,7 +1276,7 @@ uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len) > void vfio_pci_write_config(PCIDevice *pdev, > uint32_t addr, uint32_t val, int len) > { > - VFIOPCIDevice *vdev = VFIO_PCI(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); > VFIODevice *vbasedev = &vdev->vbasedev; > uint32_t val_le = cpu_to_le32(val); > int ret; > @@ -3129,7 +3129,7 @@ static bool vfio_interrupt_setup(VFIOPCIDevice *vdev, Error **errp) > static void vfio_realize(PCIDevice *pdev, Error **errp) > { > ERRP_GUARD(); > - VFIOPCIDevice *vdev = VFIO_PCI(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); > VFIODevice *vbasedev = &vdev->vbasedev; > int i, ret; > char uuid[UUID_STR_LEN]; > @@ -3300,7 +3300,7 @@ error: > > static void vfio_instance_finalize(Object *obj) > { > - VFIOPCIDevice *vdev = VFIO_PCI(obj); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj); > > vfio_display_finalize(vdev); > vfio_bars_finalize(vdev); > @@ -3318,7 +3318,7 @@ static void vfio_instance_finalize(Object *obj) > > static void vfio_exitfn(PCIDevice *pdev) > { > - VFIOPCIDevice *vdev = VFIO_PCI(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); > VFIODevice *vbasedev = &vdev->vbasedev; > > vfio_unregister_req_notifier(vdev); > @@ -3342,7 +3342,7 @@ static void vfio_exitfn(PCIDevice *pdev) > > static void vfio_pci_reset(DeviceState *dev) > { > - VFIOPCIDevice *vdev = VFIO_PCI(dev); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(dev); > > trace_vfio_pci_reset(vdev->vbasedev.name); > > @@ -3382,7 +3382,7 @@ post_reset: > static void vfio_instance_init(Object *obj) > { > PCIDevice *pci_dev = PCI_DEVICE(obj); > - VFIOPCIDevice *vdev = VFIO_PCI(obj); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj); > VFIODevice *vbasedev = &vdev->vbasedev; > > device_add_bootindex_property(obj, &vdev->bootindex, > @@ -3403,6 +3403,31 @@ static void vfio_instance_init(Object *obj) > pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; > } > > +static void vfio_pci_base_dev_class_init(ObjectClass *klass, const void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + PCIDeviceClass *pdc = PCI_DEVICE_CLASS(klass); > + > + dc->desc = "VFIO PCI base device"; > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > + pdc->exit = vfio_exitfn; > + pdc->config_read = vfio_pci_read_config; > + pdc->config_write = vfio_pci_write_config; > +} > + > +static const TypeInfo vfio_pci_base_dev_info = { > + .name = TYPE_VFIO_PCI_BASE, > + .parent = TYPE_PCI_DEVICE, > + .instance_size = 0, > + .abstract = true, > + .class_init = vfio_pci_base_dev_class_init, > + .interfaces = (const InterfaceInfo[]) { > + { INTERFACE_PCIE_DEVICE }, > + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > + { } > + }, > +}; > + > static PropertyInfo vfio_pci_migration_multifd_transfer_prop; > > static const Property vfio_pci_dev_properties[] = { > @@ -3473,7 +3498,8 @@ static const Property vfio_pci_dev_properties[] = { > #ifdef CONFIG_IOMMUFD > static void vfio_pci_set_fd(Object *obj, const char *str, Error **errp) > { > - vfio_device_set_fd(&VFIO_PCI(obj)->vbasedev, str, errp); > + VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj); > + vfio_device_set_fd(&vdev->vbasedev, str, errp); > } > #endif > > @@ -3488,11 +3514,7 @@ static void vfio_pci_dev_class_init(ObjectClass *klass, const void *data) > object_class_property_add_str(klass, "fd", NULL, vfio_pci_set_fd); > #endif > dc->desc = "VFIO-based PCI device assignment"; > - set_bit(DEVICE_CATEGORY_MISC, dc->categories); > pdc->realize = vfio_realize; > - pdc->exit = vfio_exitfn; > - pdc->config_read = vfio_pci_read_config; > - pdc->config_write = vfio_pci_write_config; > > object_class_property_set_description(klass, /* 1.3 */ > "host", > @@ -3617,16 +3639,11 @@ static void vfio_pci_dev_class_init(ObjectClass *klass, const void *data) > > static const TypeInfo vfio_pci_dev_info = { > .name = TYPE_VFIO_PCI, > - .parent = TYPE_PCI_DEVICE, > + .parent = TYPE_VFIO_PCI_BASE, > .instance_size = sizeof(VFIOPCIDevice), > .class_init = vfio_pci_dev_class_init, > .instance_init = vfio_instance_init, > .instance_finalize = vfio_instance_finalize, > - .interfaces = (const InterfaceInfo[]) { > - { INTERFACE_PCIE_DEVICE }, > - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > - { } > - }, > }; > > static const Property vfio_pci_dev_nohotplug_properties[] = { > @@ -3673,6 +3690,7 @@ static void register_vfio_pci_dev_type(void) > vfio_pci_migration_multifd_transfer_prop = qdev_prop_on_off_auto; > vfio_pci_migration_multifd_transfer_prop.realized_set_allowed = true; > > + type_register_static(&vfio_pci_base_dev_info); > type_register_static(&vfio_pci_dev_info); > type_register_static(&vfio_pci_nohotplug_dev_info); > }