From: Jagannathan Raman <jag.ra...@oracle.com>
Originally-by: John Johnson <john.g.john...@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimts...@oracle.com>
Signed-off-by: Jagannathan Raman <jag.ra...@oracle.com>
Signed-off-by: John Levon <john.le...@nutanix.com>
---
hw/vfio/container.c | 4 +++-
hw/vfio/user-container.c | 43 +++++++++++++++++++++++++++--------
hw/vfio/user-protocol.h | 2 ++
hw/vfio/user.c | 3 +++
hw/vfio/user.h | 10 ++++++++
include/hw/vfio/vfio-common.h | 1 +
6 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index e017cd4b08..5f8d949beb 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -911,7 +911,9 @@ void vfio_put_base_device(VFIODevice *vbasedev)
QLIST_REMOVE(vbasedev, next);
vbasedev->group = NULL;
trace_vfio_put_base_device(vbasedev->fd);
- close(vbasedev->fd);
+ if (vbasedev->fd != -1) {
+ close(vbasedev->fd);
+ }
}
static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp)
diff --git a/hw/vfio/user-container.c b/hw/vfio/user-container.c
index 201755e3d1..99839edeed 100644
--- a/hw/vfio/user-container.c
+++ b/hw/vfio/user-container.c
@@ -55,15 +55,28 @@ static int vfio_user_query_dirty_bitmap(const
VFIOContainerBase *bcontainer,
static bool vfio_user_setup(VFIOContainerBase *bcontainer, Error **errp)
{
- error_setg_errno(errp, ENOTSUP, "Not supported");
- return -ENOTSUP;
+ VFIOUserContainer *container = container_of(bcontainer, VFIOUserContainer,
+ bcontainer);
+
+ assert(container->proxy->dma_pgsizes != 0);
+ bcontainer->pgsizes = container->proxy->dma_pgsizes;
+ bcontainer->dma_max_mappings = container->proxy->max_dma;
+
+ /* No live migration support yet. */
+ bcontainer->dirty_pages_supported = false;
+ bcontainer->max_dirty_bitmap_size = container->proxy->max_bitmap;
+ bcontainer->dirty_pgsizes = container->proxy->migr_pgsize;
+
+ return true;
}
-static VFIOUserContainer *vfio_create_user_container(Error **errp)
+static VFIOUserContainer *vfio_create_user_container(VFIODevice *vbasedev,
+ Error **errp)
{
VFIOUserContainer *container;
container = VFIO_IOMMU_USER(object_new(TYPE_VFIO_IOMMU_USER));
+ container->proxy = vbasedev->proxy;
return container;
}
@@ -71,16 +84,18 @@ static VFIOUserContainer *vfio_create_user_container(Error
**errp)
* Try to mirror vfio_connect_container() as much as possible.
*/
static VFIOUserContainer *
-vfio_connect_user_container(AddressSpace *as, Error **errp)
+vfio_connect_user_container(AddressSpace *as, VFIODevice *vbasedev,
+ Error **errp)
{
VFIOContainerBase *bcontainer;
VFIOUserContainer *container;
VFIOAddressSpace *space;
VFIOIOMMUClass *vioc;
+ int ret;
space = vfio_get_address_space(as);
- container = vfio_create_user_container(errp);
+ container = vfio_create_user_container(vbasedev, errp);
if (!container) {
goto put_space_exit;
}
@@ -91,11 +106,17 @@ vfio_connect_user_container(AddressSpace *as, Error **errp)
goto free_container_exit;
}
+ ret = ram_block_uncoordinated_discard_disable(true);
+ if (ret) {
+ error_setg_errno(errp, -ret, "Cannot set discarding of RAM broken");
+ goto unregister_container_exit;
+ }
+
vioc = VFIO_IOMMU_GET_CLASS(bcontainer);
assert(vioc->setup);
if (!vioc->setup(bcontainer, errp)) {
- goto unregister_container_exit;
+ goto enable_discards_exit;
}
vfio_address_space_insert(space, bcontainer);
@@ -120,6 +141,9 @@ listener_release_exit:
vioc->release(bcontainer);
}
+enable_discards_exit:
+ ram_block_uncoordinated_discard_disable(false);
+
unregister_container_exit:
vfio_cpr_unregister_container(bcontainer);
@@ -136,14 +160,15 @@ static void
vfio_disconnect_user_container(VFIOUserContainer *container)
{
VFIOContainerBase *bcontainer = &container->bcontainer;
VFIOIOMMUClass *vioc = VFIO_IOMMU_GET_CLASS(bcontainer);
+ VFIOAddressSpace *space = bcontainer->space;
+
+ ram_block_uncoordinated_discard_disable(false);
memory_listener_unregister(&bcontainer->listener);
if (vioc->release) {
vioc->release(bcontainer);
}
- VFIOAddressSpace *space = bcontainer->space;
-
vfio_cpr_unregister_container(bcontainer);
object_unref(container);
@@ -177,7 +202,7 @@ static bool vfio_user_attach_device(const char *name,
VFIODevice *vbasedev,
{
VFIOUserContainer *container;
- container = vfio_connect_user_container(as, errp);
+ container = vfio_connect_user_container(as, vbasedev, errp);
if (container == NULL) {
error_prepend(errp, "failed to connect proxy");
return false;
diff --git a/hw/vfio/user-protocol.h b/hw/vfio/user-protocol.h
index 48dd475ab3..87e43ddc72 100644
--- a/hw/vfio/user-protocol.h
+++ b/hw/vfio/user-protocol.h
@@ -16,6 +16,8 @@
* region and offset info for read and write commands.
*/
+#include <stdint.h>
+
typedef struct {
uint16_t id;
uint16_t command;
diff --git a/hw/vfio/user.c b/hw/vfio/user.c
index be2fba522d..4b1549cf8e 100644
--- a/hw/vfio/user.c
+++ b/hw/vfio/user.c
@@ -18,6 +18,9 @@
#include "qemu/lockable.h"
#include "hw/hw.h"
#include "hw/vfio/vfio-common.h"
+#include "exec/address-spaces.h"
+#include "exec/memory.h"
+#include "exec/ram_addr.h"
#include "qemu/sockets.h"
#include "io/channel.h"
#include "io/channel-socket.h"
diff --git a/hw/vfio/user.h b/hw/vfio/user.h
index 1f99a976d6..9039e96069 100644
--- a/hw/vfio/user.h
+++ b/hw/vfio/user.h
@@ -11,7 +11,17 @@
*
*/
+#include <stdbool.h>
+
+#include "glib-compat.h"
#include "user-protocol.h"
+#include "qemu/osdep.h"
+#include "qemu/typedefs.h"
+#include "qemu/queue.h"
+#include "qemu/sockets.h"
+#include "qemu/thread.h"
+
+typedef struct VFIODevice VFIODevice;
typedef struct {
int send_fds;
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 593e304ee0..06cdf05c61 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -123,6 +123,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(VFIOIOMMUFDContainer,
VFIO_IOMMU_IOMMUFD);
/* MMU container sub-class for vfio-user. */
typedef struct VFIOUserContainer {
VFIOContainerBase bcontainer;
+ VFIOUserProxy *proxy;
} VFIOUserContainer;
OBJECT_DECLARE_SIMPLE_TYPE(VFIOUserContainer, VFIO_IOMMU_USER);
--
2.34.1
