[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL V2 19/25] vdpa: Extract get features part from vhost_vdpa_get_max_
From: |
Jason Wang |
Subject: |
[PULL V2 19/25] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs |
Date: |
Wed, 20 Jul 2022 17:03:07 +0800 |
From: Eugenio Pérez <eperezma@redhat.com>
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>
---
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 502f6f9..6e3e9f3 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.7.4
- [PULL V2 04/25] vdpa: Avoid compiler to squash reads to used idx, (continued)
- [PULL V2 04/25] vdpa: Avoid compiler to squash reads to used idx, Jason Wang, 2022/07/20
- [PULL V2 06/25] vhost: Move vhost_svq_kick call to vhost_svq_add, Jason Wang, 2022/07/20
- [PULL V2 07/25] vhost: Check for queue full at vhost_svq_add, Jason Wang, 2022/07/20
- [PULL V2 08/25] vhost: Decouple vhost_svq_add from VirtQueueElement, Jason Wang, 2022/07/20
- [PULL V2 09/25] vhost: Add SVQDescState, Jason Wang, 2022/07/20
- [PULL V2 10/25] vhost: Track number of descs in SVQDescState, Jason Wang, 2022/07/20
- [PULL V2 11/25] vhost: add vhost_svq_push_elem, Jason Wang, 2022/07/20
- [PULL V2 05/25] vhost: Reorder vhost_svq_kick, Jason Wang, 2022/07/20
- [PULL V2 17/25] vdpa: manual forward CVQ buffers, Jason Wang, 2022/07/20
- [PULL V2 15/25] vdpa: Export vhost_vdpa_dma_map and unmap calls, Jason Wang, 2022/07/20
- [PULL V2 19/25] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs,
Jason Wang <=
- [PULL V2 22/25] softmmu/runstate.c: add RunStateTransition support form COLO to PRELAUNCH, Jason Wang, 2022/07/20
- [PULL V2 12/25] vhost: Expose vhost_svq_add, Jason Wang, 2022/07/20
- [PULL V2 14/25] vhost: Add svq avail_handler callback, Jason Wang, 2022/07/20
- [PULL V2 13/25] vhost: add vhost_svq_poll, Jason Wang, 2022/07/20
- [PULL V2 16/25] vhost-net-vdpa: add stubs for when no virtio-net device is present, Jason Wang, 2022/07/20
- [PULL V2 18/25] vdpa: Buffer CVQ support on shadow virtqueue, Jason Wang, 2022/07/20
- [PULL V2 20/25] vdpa: Add device migration blocker, Jason Wang, 2022/07/20
- [PULL V2 21/25] vdpa: Add x-svq to NetdevVhostVDPAOptions, Jason Wang, 2022/07/20