112 lines
3.9 KiB
Diff
112 lines
3.9 KiB
Diff
From fdf8d168adeac8e91bb61d4940756af0df3b8d2c Mon Sep 17 00:00:00 2001
|
|
From: Si-Wei Liu <si-wei.liu@oracle.com>
|
|
Date: Fri, 6 May 2022 19:28:17 -0700
|
|
Subject: [PATCH] vhost-vdpa: change name and polarity for
|
|
vhost_vdpa_one_time_request()
|
|
|
|
The name vhost_vdpa_one_time_request() was confusing. No
|
|
matter whatever it returns, its typical occurrence had
|
|
always been at requests that only need to be applied once.
|
|
And the name didn't suggest what it actually checks for.
|
|
Change it to vhost_vdpa_first_dev() with polarity flipped
|
|
for better readibility of code. That way it is able to
|
|
reflect what the check is really about.
|
|
|
|
This call is applicable to request which performs operation
|
|
only once, before queues are set up, and usually at the beginning
|
|
of the caller function. Document the requirement for it in place.
|
|
|
|
Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
|
|
Message-Id: <1651890498-24478-7-git-send-email-si-wei.liu@oracle.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
|
---
|
|
hw/virtio/vhost-vdpa.c | 23 +++++++++++++++--------
|
|
1 file changed, 15 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
|
|
index cb74d71b80..73ff599f2b 100644
|
|
--- a/hw/virtio/vhost-vdpa.c
|
|
+++ b/hw/virtio/vhost-vdpa.c
|
|
@@ -370,11 +370,18 @@ static void vhost_vdpa_get_iova_range(struct vhost_vdpa *v)
|
|
v->iova_range.last);
|
|
}
|
|
|
|
-static bool vhost_vdpa_one_time_request(struct vhost_dev *dev)
|
|
+/*
|
|
+ * The use of this function is for requests that only need to be
|
|
+ * applied once. Typically such request occurs at the beginning
|
|
+ * of operation, and before setting up queues. It should not be
|
|
+ * used for request that performs operation until all queues are
|
|
+ * set, which would need to check dev->vq_index_end instead.
|
|
+ */
|
|
+static bool vhost_vdpa_first_dev(struct vhost_dev *dev)
|
|
{
|
|
struct vhost_vdpa *v = dev->opaque;
|
|
|
|
- return v->index != 0;
|
|
+ return v->index == 0;
|
|
}
|
|
|
|
static int vhost_vdpa_get_dev_features(struct vhost_dev *dev,
|
|
@@ -455,7 +462,7 @@ static int vhost_vdpa_init(struct vhost_dev *dev, void *opaque, Error **errp)
|
|
|
|
vhost_vdpa_get_iova_range(v);
|
|
|
|
- if (vhost_vdpa_one_time_request(dev)) {
|
|
+ if (!vhost_vdpa_first_dev(dev)) {
|
|
return 0;
|
|
}
|
|
|
|
@@ -598,7 +605,7 @@ static int vhost_vdpa_memslots_limit(struct vhost_dev *dev)
|
|
static int vhost_vdpa_set_mem_table(struct vhost_dev *dev,
|
|
struct vhost_memory *mem)
|
|
{
|
|
- if (vhost_vdpa_one_time_request(dev)) {
|
|
+ if (!vhost_vdpa_first_dev(dev)) {
|
|
return 0;
|
|
}
|
|
|
|
@@ -627,7 +634,7 @@ static int vhost_vdpa_set_features(struct vhost_dev *dev,
|
|
struct vhost_vdpa *v = dev->opaque;
|
|
int ret;
|
|
|
|
- if (vhost_vdpa_one_time_request(dev)) {
|
|
+ if (!vhost_vdpa_first_dev(dev)) {
|
|
return 0;
|
|
}
|
|
|
|
@@ -669,7 +676,7 @@ static int vhost_vdpa_set_backend_cap(struct vhost_dev *dev)
|
|
|
|
features &= f;
|
|
|
|
- if (!vhost_vdpa_one_time_request(dev)) {
|
|
+ if (vhost_vdpa_first_dev(dev)) {
|
|
r = vhost_vdpa_call(dev, VHOST_SET_BACKEND_FEATURES, &features);
|
|
if (r) {
|
|
return -EFAULT;
|
|
@@ -1122,7 +1129,7 @@ static int vhost_vdpa_set_log_base(struct vhost_dev *dev, uint64_t base,
|
|
struct vhost_log *log)
|
|
{
|
|
struct vhost_vdpa *v = dev->opaque;
|
|
- if (v->shadow_vqs_enabled || vhost_vdpa_one_time_request(dev)) {
|
|
+ if (v->shadow_vqs_enabled || !vhost_vdpa_first_dev(dev)) {
|
|
return 0;
|
|
}
|
|
|
|
@@ -1244,7 +1251,7 @@ static int vhost_vdpa_get_features(struct vhost_dev *dev,
|
|
|
|
static int vhost_vdpa_set_owner(struct vhost_dev *dev)
|
|
{
|
|
- if (vhost_vdpa_one_time_request(dev)) {
|
|
+ if (!vhost_vdpa_first_dev(dev)) {
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|