109 lines
3.7 KiB
Diff
109 lines
3.7 KiB
Diff
From 9a290bd74f983f3a65aa9ec5df2da9aa94bfdecd Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
|
Date: Thu, 21 Jul 2022 16:05:42 +0200
|
|
Subject: [PATCH 25/32] vdpa: Extract get features part from
|
|
vhost_vdpa_get_max_queue_pairs
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Eugenio Pérez <eperezma@redhat.com>
|
|
RH-MergeRequest: 108: Net Control Virtqueue shadow Support
|
|
RH-Commit: [25/27] 654ad68e10a4df84cced923c64e72d500721ad67 (eperezmartin/qemu-kvm)
|
|
RH-Bugzilla: 1939363
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/1939363
|
|
|
|
Upstream Status: git://git.qemu.org/qemu.git
|
|
|
|
commit 8170ab3f43989680491d00f1017f60b25d346114
|
|
Author: Eugenio Pérez <eperezma@redhat.com>
|
|
Date: Wed Jul 20 08:59:44 2022 +0200
|
|
|
|
vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs
|
|
|
|
To know the device features is needed for CVQ SVQ, so SVQ knows if it
|
|
can handle all commands or not. Extract from
|
|
vhost_vdpa_get_max_queue_pairs so we can reuse it.
|
|
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
---
|
|
net/vhost-vdpa.c | 30 ++++++++++++++++++++----------
|
|
1 file changed, 20 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
|
|
index df42822463..8b76dac966 100644
|
|
--- a/net/vhost-vdpa.c
|
|
+++ b/net/vhost-vdpa.c
|
|
@@ -474,20 +474,24 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
|
|
return nc;
|
|
}
|
|
|
|
-static int vhost_vdpa_get_max_queue_pairs(int fd, int *has_cvq, Error **errp)
|
|
+static int vhost_vdpa_get_features(int fd, uint64_t *features, Error **errp)
|
|
+{
|
|
+ int ret = ioctl(fd, VHOST_GET_FEATURES, features);
|
|
+ if (unlikely(ret < 0)) {
|
|
+ error_setg_errno(errp, errno,
|
|
+ "Fail to query features from vhost-vDPA device");
|
|
+ }
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int vhost_vdpa_get_max_queue_pairs(int fd, uint64_t features,
|
|
+ int *has_cvq, Error **errp)
|
|
{
|
|
unsigned long config_size = offsetof(struct vhost_vdpa_config, buf);
|
|
g_autofree struct vhost_vdpa_config *config = NULL;
|
|
__virtio16 *max_queue_pairs;
|
|
- uint64_t features;
|
|
int ret;
|
|
|
|
- ret = ioctl(fd, VHOST_GET_FEATURES, &features);
|
|
- if (ret) {
|
|
- error_setg(errp, "Fail to query features from vhost-vDPA device");
|
|
- return ret;
|
|
- }
|
|
-
|
|
if (features & (1 << VIRTIO_NET_F_CTRL_VQ)) {
|
|
*has_cvq = 1;
|
|
} else {
|
|
@@ -517,10 +521,11 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
|
|
NetClientState *peer, Error **errp)
|
|
{
|
|
const NetdevVhostVDPAOptions *opts;
|
|
+ uint64_t features;
|
|
int vdpa_device_fd;
|
|
g_autofree NetClientState **ncs = NULL;
|
|
NetClientState *nc;
|
|
- int queue_pairs, i, has_cvq = 0;
|
|
+ int queue_pairs, r, i, has_cvq = 0;
|
|
|
|
assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
|
|
opts = &netdev->u.vhost_vdpa;
|
|
@@ -534,7 +539,12 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
|
|
return -errno;
|
|
}
|
|
|
|
- queue_pairs = vhost_vdpa_get_max_queue_pairs(vdpa_device_fd,
|
|
+ r = vhost_vdpa_get_features(vdpa_device_fd, &features, errp);
|
|
+ if (unlikely(r < 0)) {
|
|
+ return r;
|
|
+ }
|
|
+
|
|
+ queue_pairs = vhost_vdpa_get_max_queue_pairs(vdpa_device_fd, features,
|
|
&has_cvq, errp);
|
|
if (queue_pairs < 0) {
|
|
qemu_close(vdpa_device_fd);
|
|
--
|
|
2.31.1
|
|
|