Just like find_vqs(), it is time to refactor the
vring_new_virtqueue(). We pass the similar struct to
vring_new_virtqueue.
Signed-off-by: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx>
---
drivers/platform/mellanox/mlxbf-tmfifo.c | 12 ++++---
drivers/remoteproc/remoteproc_virtio.c | 11 ++++---
drivers/virtio/virtio_ring.c | 29 +++++++++++-----
include/linux/virtio_ring.h | 42 +++++++++++++++++++-----
tools/virtio/virtio_test.c | 4 +--
tools/virtio/vringh_test.c | 32 +++++++++---------
6 files changed, 86 insertions(+), 44 deletions(-)
diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c
index 1b5593965068..765f54a16bf7 100644
--- a/drivers/platform/mellanox/mlxbf-tmfifo.c
+++ b/drivers/platform/mellanox/mlxbf-tmfifo.c
@@ -992,6 +992,7 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
struct virtio_vq_config *cfg)
{
struct mlxbf_tmfifo_vdev *tm_vdev = mlxbf_vdev_to_tmfifo(vdev);
+ struct transport_vq_config tp_cfg = {};
struct virtqueue **vqs = cfg->vqs;
struct mlxbf_tmfifo_vring *vring;
unsigned int nvqs = cfg->nvqs;
@@ -1012,10 +1013,13 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
size = vring_size(vring->num, vring->align);
memset(vring->va, 0, size);
- vq = vring_new_virtqueue(i, vring->num, vring->align, vdev,
- false, false, vring->va,
- mlxbf_tmfifo_virtio_notify,
- cfg->callbacks[i], cfg->names[i]);
+ tp_cfg.num = vring->num;
+ tp_cfg.vring_align = vring->align;
+ tp_cfg.weak_barriers = false;
+ tp_cfg.notify = mlxbf_tmfifo_virtio_notify;
+
+ cfg->cfg_idx = i;
+ vq = vring_new_virtqueue(vdev, i, vring->va, &tp_cfg, cfg);
if (!vq) {
dev_err(&vdev->dev, "vring_new_virtqueue failed\n");
ret = -ENOMEM;
diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 57d51c9c7b63..d1212361da30 100644
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -106,6 +106,7 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev,
{
struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
struct rproc *rproc = vdev_to_rproc(vdev);
+ struct transport_vq_config tp_cfg;
struct device *dev = &rproc->dev;
struct rproc_mem_entry *mem;
struct rproc_vring *rvring;
@@ -138,14 +139,16 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev,
dev_dbg(dev, "vring%d: va %pK qsz %d notifyid %d\n",
id, addr, num, rvring->notifyid);
+ tp_cfg.num = num;
+ tp_cfg.vring_align = rvring->align;
+ tp_cfg.weak_barriers = false;
+ tp_cfg.notify = rproc_virtio_notify;
+
/*
* Create the new vq, and tell virtio we're not interested in
* the 'weak' smp barriers, since we're talking with a real device.
*/
- vq = vring_new_virtqueue(id, num, rvring->align, vdev, false,
- cfg->ctx ? cfg->ctx[cfg->cfg_idx] : false,
- addr, rproc_virtio_notify, cfg->callbacks[cfg->cfg_idx],
- cfg->names[cfg->cfg_idx]);
+ vq = vring_new_virtqueue(vdev, id, addr, &tp_cfg, cfg);
if (!vq) {
dev_err(dev, "vring_new_virtqueue %s failed\n", cfg->names[cfg->cfg_idx]);
rproc_free_vring(rvring);
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 5652ff91c6f9..d87b80a5b9df 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -2908,18 +2908,29 @@ int virtqueue_reset(struct virtqueue *_vq,
EXPORT_SYMBOL_GPL(virtqueue_reset);
/* Only available for split ring */
-struct virtqueue *vring_new_virtqueue(unsigned int index,
- unsigned int num,
- unsigned int vring_align,
- struct virtio_device *vdev,
- bool weak_barriers,
- bool context,
+struct virtqueue *vring_new_virtqueue(struct virtio_device *vdev,
+ unsigned int index,
void *pages,
- bool (*notify)(struct virtqueue *vq),
- void (*callback)(struct virtqueue *vq),
- const char *name)
+ struct transport_vq_config *tp_cfg,
+ struct virtio_vq_config *cfg)
{
struct vring_virtqueue_split vring_split = {};
+ unsigned int num;
+ unsigned int vring_align;
+ bool weak_barriers;
+ bool context;
+ bool (*notify)(struct virtqueue *_);
+ void (*callback)(struct virtqueue *_);
+ const char *name;
+
+ num = tp_cfg->num;
+ vring_align = tp_cfg->vring_align;
+ weak_barriers = tp_cfg->weak_barriers;
+ notify = tp_cfg->notify;
+
+ name = cfg->names[cfg->cfg_idx];
+ callback = cfg->callbacks[cfg->cfg_idx];
+ context = cfg->ctx ? cfg->ctx[cfg->cfg_idx] : false;
if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED))
return NULL;
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index 0de46ed17cc0..316dadcde47a 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -85,16 +85,40 @@ struct virtqueue *vring_create_virtqueue(struct virtio_device *vdev,
* Creates a virtqueue with a standard layout but a caller-allocated
* ring.
*/
-struct virtqueue *vring_new_virtqueue(unsigned int index,
- unsigned int num,
- unsigned int vring_align,
- struct virtio_device *vdev,
- bool weak_barriers,
- bool ctx,
+struct virtqueue *vring_new_virtqueue(struct virtio_device *vdev,
+ unsigned int index,
void *pages,
- bool (*notify)(struct virtqueue *vq),
- void (*callback)(struct virtqueue *vq),
- const char *name);
+ struct transport_vq_config *tp_cfg,
+ struct virtio_vq_config *cfg);
+
+static inline struct virtqueue *vring_new_virtqueue_one(unsigned int index,
+ unsigned int num,
+ unsigned int vring_align,
+ struct virtio_device *vdev,
+ bool weak_barriers,
+ bool context,
+ void *pages,
+ bool (*notify)(struct virtqueue *vq),
+ void (*callback)(struct virtqueue *vq),
+ const char *name)
+{
+ struct transport_vq_config tp_cfg = {};
+ struct virtio_vq_config cfg = {};
+ vq_callback_t *callbacks[] = { callback };
+ const char *names[] = { name };
+
+ tp_cfg.num = num;
+ tp_cfg.vring_align = vring_align;
+ tp_cfg.weak_barriers = weak_barriers;
+ tp_cfg.notify = notify;
+
+ cfg.nvqs = 1;
+ cfg.callbacks = callbacks;
+ cfg.names = names;
+ cfg.ctx = &context;
+
+ return vring_new_virtqueue(vdev, index, pages, &tp_cfg, &cfg);
+}
/*
* Destroys a virtqueue. If created with vring_create_virtqueue, this
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index 028f54e6854a..e41300d71d5e 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -102,8 +102,8 @@ static void vq_reset(struct vq_info *info, int num, struct virtio_device *vdev)
memset(info->ring, 0, vring_size(num, 4096));
vring_init(&info->vring, num, info->ring, 4096);
- info->vq = vring_new_virtqueue(info->idx, num, 4096, vdev, true, false,
- info->ring, vq_notify, vq_callback, "test");
+ info->vq = vring_new_virtqueue_one(info->idx, num, 4096, vdev, true, false,
+ info->ring, vq_notify, vq_callback, "test");
assert(info->vq);
info->vq->priv = info;
}
diff --git a/tools/virtio/vringh_test.c b/tools/virtio/vringh_test.c
index 98ff808d6f0c..37f8c5d34285 100644
--- a/tools/virtio/vringh_test.c
+++ b/tools/virtio/vringh_test.c
@@ -316,11 +316,11 @@ static int parallel_test(u64 features,
if (sched_setaffinity(getpid(), sizeof(cpu_set), &cpu_set))
err(1, "Could not set affinity to cpu %u", first_cpu);
- vq = vring_new_virtqueue(0, RINGSIZE, ALIGN, &gvdev.vdev, true,
- false, guest_map,
- fast_vringh ? no_notify_host
- : parallel_notify_host,
- never_callback_guest, "guest vq");
+ vq = vring_new_virtqueue_one(0, RINGSIZE, ALIGN, &gvdev.vdev, true,
+ false, guest_map,
+ fast_vringh ? no_notify_host
+ : parallel_notify_host,
+ never_callback_guest, "guest vq");
/* Don't kfree indirects. */
__kfree_ignore_start = indirects;
@@ -391,7 +391,7 @@ static int parallel_test(u64 features,
/* Swallow all notifies at once. */
if (read(to_guest[0], buf, sizeof(buf)) < 1)
break;
-
+
receives++;
virtqueue_disable_cb(vq);
continue;
@@ -424,7 +424,7 @@ static int parallel_test(u64 features,
continue;
if (read(to_guest[0], buf, sizeof(buf)) < 1)
break;
-
+
receives++;
virtqueue_disable_cb(vq);
}
@@ -485,10 +485,10 @@ int main(int argc, char *argv[])
memset(__user_addr_min, 0, vring_size(RINGSIZE, ALIGN));
/* Set up guest side. */
- vq = vring_new_virtqueue(0, RINGSIZE, ALIGN, &vdev, true, false,
- __user_addr_min,
- never_notify_host, never_callback_guest,
- "guest vq");
+ vq = vring_new_virtqueue_one(0, RINGSIZE, ALIGN, &vdev, true, false,
+ __user_addr_min,
+ never_notify_host, never_callback_guest,
+ "guest vq");
/* Set up host side. */
vring_init(&vrh.vring, RINGSIZE, __user_addr_min, ALIGN);
@@ -668,11 +668,11 @@ int main(int argc, char *argv[])
/* Force creation of direct, which we modify. */
__virtio_clear_bit(&vdev, VIRTIO_RING_F_INDIRECT_DESC);
- vq = vring_new_virtqueue(0, RINGSIZE, ALIGN, &vdev, true,
- false, __user_addr_min,
- never_notify_host,
- never_callback_guest,
- "guest vq");
+ vq = vring_new_virtqueue_one(0, RINGSIZE, ALIGN, &vdev, true,
+ false, __user_addr_min,
+ never_notify_host,
+ never_callback_guest,
+ "guest vq");
sg_init_table(guest_sg, 4);
sg_set_buf(&guest_sg[0], d, sizeof(*d)*2);
--
2.32.0.3.g01195cf9f
