mirror of
https://github.com/Motorhead1991/qemu.git
synced 2026-02-26 22:25:12 -07:00
vfio-user: connect vfio proxy to remote server
Introduce the vfio-user "proxy": this is the client code responsible for sending and receiving vfio-user messages across the control socket. The new files hw/vfio-user/proxy.[ch] contain some basic plumbing for managing the proxy; initialize the proxy during realization of the VFIOUserPCIDevice instance. Originally-by: John Johnson <john.g.johnson@oracle.com> Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com> Signed-off-by: Jagannathan Raman <jag.raman@oracle.com> Signed-off-by: John Levon <john.levon@nutanix.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Link: https://lore.kernel.org/qemu-devel/20250625193012.2316242-3-john.levon@nutanix.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
parent
9fca2b7d70
commit
438d863f1f
5 changed files with 266 additions and 0 deletions
|
|
@ -4,6 +4,7 @@ vfio_user_ss = ss.source_set()
|
|||
vfio_user_ss.add(files(
|
||||
'container.c',
|
||||
'pci.c',
|
||||
'proxy.c',
|
||||
))
|
||||
|
||||
system_ss.add_all(when: 'CONFIG_VFIO_USER', if_true: vfio_user_ss)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "hw/vfio/pci.h"
|
||||
#include "hw/vfio-user/proxy.h"
|
||||
|
||||
#define TYPE_VFIO_USER_PCI "vfio-user-pci"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(VFIOUserPCIDevice, VFIO_USER_PCI)
|
||||
|
|
@ -54,6 +55,8 @@ static void vfio_user_pci_realize(PCIDevice *pdev, Error **errp)
|
|||
VFIODevice *vbasedev = &vdev->vbasedev;
|
||||
const char *sock_name;
|
||||
AddressSpace *as;
|
||||
SocketAddress addr;
|
||||
VFIOUserProxy *proxy;
|
||||
|
||||
if (!udev->socket) {
|
||||
error_setg(errp, "No socket specified");
|
||||
|
|
@ -69,6 +72,15 @@ static void vfio_user_pci_realize(PCIDevice *pdev, Error **errp)
|
|||
|
||||
vbasedev->name = g_strdup_printf("vfio-user:%s", sock_name);
|
||||
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
addr.type = SOCKET_ADDRESS_TYPE_UNIX;
|
||||
addr.u.q_unix.path = (char *)sock_name;
|
||||
proxy = vfio_user_connect_dev(&addr, errp);
|
||||
if (!proxy) {
|
||||
return;
|
||||
}
|
||||
vbasedev->proxy = proxy;
|
||||
|
||||
/*
|
||||
* vfio-user devices are effectively mdevs (don't use a host iommu).
|
||||
*/
|
||||
|
|
@ -112,8 +124,13 @@ static void vfio_user_instance_init(Object *obj)
|
|||
static void vfio_user_instance_finalize(Object *obj)
|
||||
{
|
||||
VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj);
|
||||
VFIODevice *vbasedev = &vdev->vbasedev;
|
||||
|
||||
vfio_pci_put_device(vdev);
|
||||
|
||||
if (vbasedev->proxy != NULL) {
|
||||
vfio_user_disconnect(vbasedev->proxy);
|
||||
}
|
||||
}
|
||||
|
||||
static const Property vfio_user_pci_dev_properties[] = {
|
||||
|
|
@ -133,6 +150,11 @@ static void vfio_user_pci_set_socket(Object *obj, Visitor *v, const char *name,
|
|||
VFIOUserPCIDevice *udev = VFIO_USER_PCI(obj);
|
||||
bool success;
|
||||
|
||||
if (udev->device.vbasedev.proxy) {
|
||||
error_setg(errp, "Proxy is connected");
|
||||
return;
|
||||
}
|
||||
|
||||
qapi_free_SocketAddress(udev->socket);
|
||||
|
||||
udev->socket = NULL;
|
||||
|
|
|
|||
162
hw/vfio-user/proxy.c
Normal file
162
hw/vfio-user/proxy.c
Normal file
|
|
@ -0,0 +1,162 @@
|
|||
/*
|
||||
* vfio protocol over a UNIX socket.
|
||||
*
|
||||
* Copyright © 2018, 2021 Oracle and/or its affiliates.
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
#include "hw/vfio/vfio-device.h"
|
||||
#include "hw/vfio-user/proxy.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/lockable.h"
|
||||
#include "system/iothread.h"
|
||||
|
||||
static IOThread *vfio_user_iothread;
|
||||
|
||||
static void vfio_user_shutdown(VFIOUserProxy *proxy);
|
||||
|
||||
|
||||
/*
|
||||
* Functions called by main, CPU, or iothread threads
|
||||
*/
|
||||
|
||||
static void vfio_user_shutdown(VFIOUserProxy *proxy)
|
||||
{
|
||||
qio_channel_shutdown(proxy->ioc, QIO_CHANNEL_SHUTDOWN_READ, NULL);
|
||||
qio_channel_set_aio_fd_handler(proxy->ioc, proxy->ctx, NULL,
|
||||
proxy->ctx, NULL, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Functions only called by iothread
|
||||
*/
|
||||
|
||||
static void vfio_user_cb(void *opaque)
|
||||
{
|
||||
VFIOUserProxy *proxy = opaque;
|
||||
|
||||
QEMU_LOCK_GUARD(&proxy->lock);
|
||||
|
||||
proxy->state = VFIO_PROXY_CLOSED;
|
||||
qemu_cond_signal(&proxy->close_cv);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Functions called by main or CPU threads
|
||||
*/
|
||||
|
||||
static QLIST_HEAD(, VFIOUserProxy) vfio_user_sockets =
|
||||
QLIST_HEAD_INITIALIZER(vfio_user_sockets);
|
||||
|
||||
VFIOUserProxy *vfio_user_connect_dev(SocketAddress *addr, Error **errp)
|
||||
{
|
||||
VFIOUserProxy *proxy;
|
||||
QIOChannelSocket *sioc;
|
||||
QIOChannel *ioc;
|
||||
char *sockname;
|
||||
|
||||
if (addr->type != SOCKET_ADDRESS_TYPE_UNIX) {
|
||||
error_setg(errp, "vfio_user_connect - bad address family");
|
||||
return NULL;
|
||||
}
|
||||
sockname = addr->u.q_unix.path;
|
||||
|
||||
sioc = qio_channel_socket_new();
|
||||
ioc = QIO_CHANNEL(sioc);
|
||||
if (qio_channel_socket_connect_sync(sioc, addr, errp)) {
|
||||
object_unref(OBJECT(ioc));
|
||||
return NULL;
|
||||
}
|
||||
qio_channel_set_blocking(ioc, false, NULL);
|
||||
|
||||
proxy = g_malloc0(sizeof(VFIOUserProxy));
|
||||
proxy->sockname = g_strdup_printf("unix:%s", sockname);
|
||||
proxy->ioc = ioc;
|
||||
proxy->flags = VFIO_PROXY_CLIENT;
|
||||
proxy->state = VFIO_PROXY_CONNECTED;
|
||||
|
||||
qemu_mutex_init(&proxy->lock);
|
||||
qemu_cond_init(&proxy->close_cv);
|
||||
|
||||
if (vfio_user_iothread == NULL) {
|
||||
vfio_user_iothread = iothread_create("VFIO user", errp);
|
||||
}
|
||||
|
||||
proxy->ctx = iothread_get_aio_context(vfio_user_iothread);
|
||||
|
||||
QTAILQ_INIT(&proxy->outgoing);
|
||||
QTAILQ_INIT(&proxy->incoming);
|
||||
QTAILQ_INIT(&proxy->free);
|
||||
QTAILQ_INIT(&proxy->pending);
|
||||
QLIST_INSERT_HEAD(&vfio_user_sockets, proxy, next);
|
||||
|
||||
return proxy;
|
||||
}
|
||||
|
||||
void vfio_user_disconnect(VFIOUserProxy *proxy)
|
||||
{
|
||||
VFIOUserMsg *r1, *r2;
|
||||
|
||||
qemu_mutex_lock(&proxy->lock);
|
||||
|
||||
/* our side is quitting */
|
||||
if (proxy->state == VFIO_PROXY_CONNECTED) {
|
||||
vfio_user_shutdown(proxy);
|
||||
if (!QTAILQ_EMPTY(&proxy->pending)) {
|
||||
error_printf("vfio_user_disconnect: outstanding requests\n");
|
||||
}
|
||||
}
|
||||
object_unref(OBJECT(proxy->ioc));
|
||||
proxy->ioc = NULL;
|
||||
|
||||
proxy->state = VFIO_PROXY_CLOSING;
|
||||
QTAILQ_FOREACH_SAFE(r1, &proxy->outgoing, next, r2) {
|
||||
qemu_cond_destroy(&r1->cv);
|
||||
QTAILQ_REMOVE(&proxy->outgoing, r1, next);
|
||||
g_free(r1);
|
||||
}
|
||||
QTAILQ_FOREACH_SAFE(r1, &proxy->incoming, next, r2) {
|
||||
qemu_cond_destroy(&r1->cv);
|
||||
QTAILQ_REMOVE(&proxy->incoming, r1, next);
|
||||
g_free(r1);
|
||||
}
|
||||
QTAILQ_FOREACH_SAFE(r1, &proxy->pending, next, r2) {
|
||||
qemu_cond_destroy(&r1->cv);
|
||||
QTAILQ_REMOVE(&proxy->pending, r1, next);
|
||||
g_free(r1);
|
||||
}
|
||||
QTAILQ_FOREACH_SAFE(r1, &proxy->free, next, r2) {
|
||||
qemu_cond_destroy(&r1->cv);
|
||||
QTAILQ_REMOVE(&proxy->free, r1, next);
|
||||
g_free(r1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Make sure the iothread isn't blocking anywhere
|
||||
* with a ref to this proxy by waiting for a BH
|
||||
* handler to run after the proxy fd handlers were
|
||||
* deleted above.
|
||||
*/
|
||||
aio_bh_schedule_oneshot(proxy->ctx, vfio_user_cb, proxy);
|
||||
qemu_cond_wait(&proxy->close_cv, &proxy->lock);
|
||||
|
||||
/* we now hold the only ref to proxy */
|
||||
qemu_mutex_unlock(&proxy->lock);
|
||||
qemu_cond_destroy(&proxy->close_cv);
|
||||
qemu_mutex_destroy(&proxy->lock);
|
||||
|
||||
QLIST_REMOVE(proxy, next);
|
||||
if (QLIST_EMPTY(&vfio_user_sockets)) {
|
||||
iothread_destroy(vfio_user_iothread);
|
||||
vfio_user_iothread = NULL;
|
||||
}
|
||||
|
||||
g_free(proxy->sockname);
|
||||
g_free(proxy);
|
||||
}
|
||||
79
hw/vfio-user/proxy.h
Normal file
79
hw/vfio-user/proxy.h
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
#ifndef VFIO_USER_PROXY_H
|
||||
#define VFIO_USER_PROXY_H
|
||||
|
||||
/*
|
||||
* vfio protocol over a UNIX socket.
|
||||
*
|
||||
* Copyright © 2018, 2021 Oracle and/or its affiliates.
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include "io/channel.h"
|
||||
#include "io/channel-socket.h"
|
||||
|
||||
typedef struct {
|
||||
int send_fds;
|
||||
int recv_fds;
|
||||
int *fds;
|
||||
} VFIOUserFDs;
|
||||
|
||||
enum msg_type {
|
||||
VFIO_MSG_NONE,
|
||||
VFIO_MSG_ASYNC,
|
||||
VFIO_MSG_WAIT,
|
||||
VFIO_MSG_NOWAIT,
|
||||
VFIO_MSG_REQ,
|
||||
};
|
||||
|
||||
typedef struct VFIOUserMsg {
|
||||
QTAILQ_ENTRY(VFIOUserMsg) next;
|
||||
VFIOUserFDs *fds;
|
||||
uint32_t rsize;
|
||||
uint32_t id;
|
||||
QemuCond cv;
|
||||
bool complete;
|
||||
enum msg_type type;
|
||||
} VFIOUserMsg;
|
||||
|
||||
|
||||
enum proxy_state {
|
||||
VFIO_PROXY_CONNECTED = 1,
|
||||
VFIO_PROXY_ERROR = 2,
|
||||
VFIO_PROXY_CLOSING = 3,
|
||||
VFIO_PROXY_CLOSED = 4,
|
||||
};
|
||||
|
||||
typedef QTAILQ_HEAD(VFIOUserMsgQ, VFIOUserMsg) VFIOUserMsgQ;
|
||||
|
||||
typedef struct VFIOUserProxy {
|
||||
QLIST_ENTRY(VFIOUserProxy) next;
|
||||
char *sockname;
|
||||
struct QIOChannel *ioc;
|
||||
void (*request)(void *opaque, VFIOUserMsg *msg);
|
||||
void *req_arg;
|
||||
int flags;
|
||||
QemuCond close_cv;
|
||||
AioContext *ctx;
|
||||
QEMUBH *req_bh;
|
||||
|
||||
/*
|
||||
* above only changed when BQL is held
|
||||
* below are protected by per-proxy lock
|
||||
*/
|
||||
QemuMutex lock;
|
||||
VFIOUserMsgQ free;
|
||||
VFIOUserMsgQ pending;
|
||||
VFIOUserMsgQ incoming;
|
||||
VFIOUserMsgQ outgoing;
|
||||
VFIOUserMsg *last_nowait;
|
||||
enum proxy_state state;
|
||||
} VFIOUserProxy;
|
||||
|
||||
/* VFIOProxy flags */
|
||||
#define VFIO_PROXY_CLIENT 0x1
|
||||
|
||||
VFIOUserProxy *vfio_user_connect_dev(SocketAddress *addr, Error **errp);
|
||||
void vfio_user_disconnect(VFIOUserProxy *proxy);
|
||||
|
||||
#endif /* VFIO_USER_PROXY_H */
|
||||
|
|
@ -47,6 +47,7 @@ typedef struct VFIOMigration VFIOMigration;
|
|||
|
||||
typedef struct IOMMUFDBackend IOMMUFDBackend;
|
||||
typedef struct VFIOIOASHwpt VFIOIOASHwpt;
|
||||
typedef struct VFIOUserProxy VFIOUserProxy;
|
||||
|
||||
typedef struct VFIODevice {
|
||||
QLIST_ENTRY(VFIODevice) next;
|
||||
|
|
@ -88,6 +89,7 @@ typedef struct VFIODevice {
|
|||
struct vfio_region_info **reginfo;
|
||||
int *region_fds;
|
||||
VFIODeviceCPR cpr;
|
||||
VFIOUserProxy *proxy;
|
||||
} VFIODevice;
|
||||
|
||||
struct VFIODeviceOps {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue