[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v7 12/25] vdpa: Extract get features part from vhost_vdpa_get
From: |
Eugenio Pérez |
Subject: |
[RFC PATCH v7 12/25] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs |
Date: |
Wed, 13 Apr 2022 18:31:53 +0200 |
To know the device features is also needed for CVQ SVQ. Extract from
vhost_vdpa_get_max_queue_pairs so we can reuse it.
Report errno in case of failure getting them while we're at it.
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 9261101af2..a8dde49198 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -236,20 +236,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 (ret) {
+ 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 {
@@ -279,10 +283,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;
g_autoptr(VhostIOVATree) iova_tree = NULL;
assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
@@ -297,7 +302,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 (r) {
+ 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.27.0
- [RFC PATCH v7 08/25] vdpa: Add x-svq to NetdevVhostVDPAOptions, (continued)
- [RFC PATCH v7 08/25] vdpa: Add x-svq to NetdevVhostVDPAOptions, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 09/25] vhost: move descriptor translation to vhost_svq_vring_write_descs, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 10/25] vdpa: Fix index calculus at vhost_vdpa_svqs_start, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 07/25] vhost: Add reference counting to vhost_iova_tree, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 11/25] virtio-net: Expose ctrl virtqueue logic, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 12/25] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs,
Eugenio Pérez <=
- [RFC PATCH v7 13/25] virtio: Make virtqueue_alloc_element non-static, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 03/25] vdpa: Fix bad index calculus at vhost_vdpa_get_vring_base, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 15/25] vhost: Add custom used buffer callback, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 14/25] vhost: Add SVQElement, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 16/25] vdpa: control virtqueue support on shadow virtqueue, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 17/25] vhost: Add vhost_iova_tree_find, Eugenio Pérez, 2022/04/13
- [RFC PATCH v7 18/25] vdpa: Add map/unmap operation callback to SVQ, Eugenio Pérez, 2022/04/13