From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: virtualization@lists.linux.dev
Cc: "Richard Weinberger" <richard@nod.at>,
"Anton Ivanov" <anton.ivanov@cambridgegreys.com>,
"Johannes Berg" <johannes@sipsolutions.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Vadim Pasternak" <vadimp@nvidia.com>,
"Bjorn Andersson" <andersson@kernel.org>,
"Mathieu Poirier" <mathieu.poirier@linaro.org>,
"Cornelia Huck" <cohuck@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Eric Farman" <farman@linux.ibm.com>,
"Heiko Carstens" <hca@linux.ibm.com>,
"Vasily Gorbik" <gor@linux.ibm.com>,
"Alexander Gordeev" <agordeev@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Sven Schnelle" <svens@linux.ibm.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Jesper Dangaard Brouer" <hawk@kernel.org>,
"John Fastabend" <john.fastabend@gmail.com>,
"Benjamin Berg" <benjamin.berg@intel.com>,
"Yang Li" <yang.lee@linux.alibaba.com>,
linux-um@lists.infradead.org, netdev@vger.kernel.org,
platform-driver-x86@vger.kernel.org,
linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org,
kvm@vger.kernel.org, bpf@vger.kernel.org
Subject: [PATCH vhost 09/17] virtio_ring: reuse the parameter struct of find_vqs()
Date: Tue, 30 Jan 2024 19:42:16 +0800 [thread overview]
Message-ID: <20240130114224.86536-10-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20240130114224.86536-1-xuanzhuo@linux.alibaba.com>
As the refactor of find_vqs()/vring_new_virtqueue(),
the cfg/tp_cfg are passed to vring.
This patch refactors the vring by this structure.
This can simplify the code.
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/virtio/virtio_ring.c | 162 ++++++++++++-----------------------
1 file changed, 53 insertions(+), 109 deletions(-)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index d87b80a5b9df..769ec6360d7f 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -237,15 +237,11 @@ struct vring_virtqueue {
#endif
};
-static struct virtqueue *__vring_new_virtqueue(unsigned int index,
+static struct virtqueue *__vring_new_virtqueue(struct virtio_device *vdev,
+ unsigned int index,
struct vring_virtqueue_split *vring_split,
- struct virtio_device *vdev,
- bool weak_barriers,
- bool context,
- bool (*notify)(struct virtqueue *),
- void (*callback)(struct virtqueue *),
- const char *name,
- struct device *dma_dev);
+ struct transport_vq_config *tp_cfg,
+ struct virtio_vq_config *cfg);
static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num);
static void vring_free(struct virtqueue *_vq);
@@ -254,6 +250,8 @@ static void vring_free(struct virtqueue *_vq);
*/
#define to_vvq(_vq) container_of_const(_vq, struct vring_virtqueue, vq)
+#define cfg_vq_val(cfg, key) (cfg->key[cfg->cfg_idx])
+#define cfg_vq_get(cfg, key) (cfg->key ? cfg_vq_val(cfg, key) : false)
static bool virtqueue_use_indirect(const struct vring_virtqueue *vq,
unsigned int total_sg)
@@ -1184,32 +1182,29 @@ static int vring_alloc_queue_split(struct vring_virtqueue_split *vring_split,
return 0;
}
-static struct virtqueue *vring_create_virtqueue_split(
- unsigned int index,
- unsigned int num,
- unsigned int vring_align,
- struct virtio_device *vdev,
- bool weak_barriers,
- bool may_reduce_num,
- bool context,
- bool (*notify)(struct virtqueue *),
- void (*callback)(struct virtqueue *),
- const char *name,
- struct device *dma_dev)
+static struct virtqueue *vring_create_virtqueue_split(struct virtio_device *vdev,
+ unsigned int index,
+ struct transport_vq_config *tp_cfg,
+ struct virtio_vq_config *cfg)
{
struct vring_virtqueue_split vring_split = {};
struct virtqueue *vq;
int err;
- err = vring_alloc_queue_split(&vring_split, vdev, num, vring_align,
- may_reduce_num, dma_dev);
+ if (!tp_cfg->dma_dev)
+ tp_cfg->dma_dev = vdev->dev.parent;
+
+ err = vring_alloc_queue_split(&vring_split, vdev,
+ tp_cfg->num,
+ tp_cfg->vring_align,
+ tp_cfg->may_reduce_num,
+ tp_cfg->dma_dev);
if (err)
return NULL;
- vq = __vring_new_virtqueue(index, &vring_split, vdev, weak_barriers,
- context, notify, callback, name, dma_dev);
+ vq = __vring_new_virtqueue(vdev, index, &vring_split, tp_cfg, cfg);
if (!vq) {
- vring_free_split(&vring_split, vdev, dma_dev);
+ vring_free_split(&vring_split, vdev, tp_cfg->dma_dev);
return NULL;
}
@@ -2113,38 +2108,35 @@ static void virtqueue_reinit_packed(struct vring_virtqueue *vq)
virtqueue_vring_init_packed(&vq->packed, !!vq->vq.callback);
}
-static struct virtqueue *vring_create_virtqueue_packed(
- unsigned int index,
- unsigned int num,
- unsigned int vring_align,
- struct virtio_device *vdev,
- bool weak_barriers,
- bool may_reduce_num,
- bool context,
- bool (*notify)(struct virtqueue *),
- void (*callback)(struct virtqueue *),
- const char *name,
- struct device *dma_dev)
+static struct virtqueue *vring_create_virtqueue_packed(struct virtio_device *vdev,
+ unsigned int index,
+ struct transport_vq_config *tp_cfg,
+ struct virtio_vq_config *cfg)
{
struct vring_virtqueue_packed vring_packed = {};
struct vring_virtqueue *vq;
+ struct device *dma_dev;
int err;
- if (vring_alloc_queue_packed(&vring_packed, vdev, num, dma_dev))
+ dma_dev = tp_cfg->dma_dev;
+ if (!dma_dev)
+ dma_dev = vdev->dev.parent;
+
+ if (vring_alloc_queue_packed(&vring_packed, vdev, tp_cfg->num, dma_dev))
goto err_ring;
vq = kmalloc(sizeof(*vq), GFP_KERNEL);
if (!vq)
goto err_vq;
- vq->vq.callback = callback;
+ vq->vq.callback = cfg_vq_val(cfg, callbacks);
vq->vq.vdev = vdev;
- vq->vq.name = name;
+ vq->vq.name = cfg_vq_val(cfg, names);
vq->vq.index = index;
vq->vq.reset = false;
vq->we_own_ring = true;
- vq->notify = notify;
- vq->weak_barriers = weak_barriers;
+ vq->notify = tp_cfg->notify;
+ vq->weak_barriers = tp_cfg->weak_barriers;
#ifdef CONFIG_VIRTIO_HARDEN_NOTIFICATION
vq->broken = true;
#else
@@ -2156,7 +2148,7 @@ static struct virtqueue *vring_create_virtqueue_packed(
vq->premapped = false;
vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
- !context;
+ !cfg_vq_get(cfg, ctx);
vq->event = virtio_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX);
if (virtio_has_feature(vdev, VIRTIO_F_ORDER_PLATFORM))
@@ -2167,9 +2159,9 @@ static struct virtqueue *vring_create_virtqueue_packed(
if (err)
goto err_state_extra;
- virtqueue_vring_init_packed(&vring_packed, !!callback);
+ virtqueue_vring_init_packed(&vring_packed, !!cfg_vq_val(cfg, callbacks));
- virtqueue_init(vq, num);
+ virtqueue_init(vq, tp_cfg->num);
virtqueue_vring_attach_packed(vq, &vring_packed);
spin_lock(&vdev->vqs_list_lock);
@@ -2663,15 +2655,11 @@ irqreturn_t vring_interrupt(int irq, void *_vq)
EXPORT_SYMBOL_GPL(vring_interrupt);
/* Only available for split ring */
-static struct virtqueue *__vring_new_virtqueue(unsigned int index,
+static struct virtqueue *__vring_new_virtqueue(struct virtio_device *vdev,
+ unsigned int index,
struct vring_virtqueue_split *vring_split,
- struct virtio_device *vdev,
- bool weak_barriers,
- bool context,
- bool (*notify)(struct virtqueue *),
- void (*callback)(struct virtqueue *),
- const char *name,
- struct device *dma_dev)
+ struct transport_vq_config *tp_cfg,
+ struct virtio_vq_config *cfg)
{
struct vring_virtqueue *vq;
int err;
@@ -2684,25 +2672,25 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index,
return NULL;
vq->packed_ring = false;
- vq->vq.callback = callback;
+ vq->vq.callback = cfg_vq_val(cfg, callbacks);
vq->vq.vdev = vdev;
- vq->vq.name = name;
+ vq->vq.name = cfg_vq_val(cfg, names);
vq->vq.index = index;
vq->vq.reset = false;
vq->we_own_ring = false;
- vq->notify = notify;
- vq->weak_barriers = weak_barriers;
+ vq->notify = tp_cfg->notify;
+ vq->weak_barriers = tp_cfg->weak_barriers;
#ifdef CONFIG_VIRTIO_HARDEN_NOTIFICATION
vq->broken = true;
#else
vq->broken = false;
#endif
- vq->dma_dev = dma_dev;
+ vq->dma_dev = tp_cfg->dma_dev;
vq->use_dma_api = vring_use_dma_api(vdev);
vq->premapped = false;
vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
- !context;
+ !cfg_vq_get(cfg, ctx);
vq->event = virtio_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX);
if (virtio_has_feature(vdev, VIRTIO_F_ORDER_PLATFORM))
@@ -2731,38 +2719,10 @@ struct virtqueue *vring_create_virtqueue(struct virtio_device *vdev,
struct transport_vq_config *tp_cfg,
struct virtio_vq_config *cfg)
{
- struct device *dma_dev;
- unsigned int num;
- unsigned int vring_align;
- bool weak_barriers;
- bool may_reduce_num;
- bool context;
- bool (*notify)(struct virtqueue *_);
- void (*callback)(struct virtqueue *_);
- const char *name;
-
- dma_dev = tp_cfg->dma_dev;
- if (!dma_dev)
- dma_dev = vdev->dev.parent;
-
- num = tp_cfg->num;
- vring_align = tp_cfg->vring_align;
- weak_barriers = tp_cfg->weak_barriers;
- may_reduce_num = tp_cfg->may_reduce_num;
- 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 vring_create_virtqueue_packed(index, num, vring_align,
- vdev, weak_barriers, may_reduce_num,
- context, notify, callback, name, dma_dev);
+ return vring_create_virtqueue_packed(vdev, index, tp_cfg, cfg);
- return vring_create_virtqueue_split(index, num, vring_align,
- vdev, weak_barriers, may_reduce_num,
- context, notify, callback, name, dma_dev);
+ return vring_create_virtqueue_split(vdev, index, tp_cfg, cfg);
}
EXPORT_SYMBOL_GPL(vring_create_virtqueue);
@@ -2915,30 +2875,14 @@ struct virtqueue *vring_new_virtqueue(struct virtio_device *vdev,
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;
- vring_init(&vring_split.vring, num, pages, vring_align);
- return __vring_new_virtqueue(index, &vring_split, vdev, weak_barriers,
- context, notify, callback, name,
- vdev->dev.parent);
+ tp_cfg->dma_dev = vdev->dev.parent;
+
+ vring_init(&vring_split.vring, tp_cfg->num, pages, tp_cfg->vring_align);
+ return __vring_new_virtqueue(vdev, index, &vring_split, tp_cfg, cfg);
}
EXPORT_SYMBOL_GPL(vring_new_virtqueue);
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2024-01-30 11:42 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-30 11:42 [PATCH vhost 00/17] virtio: drivers maintain dma info for premapped vq Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 01/17] virtio_ring: introduce vring_need_unmap_buffer Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-01-30 11:42 ` [PATCH vhost 02/17] virtio_ring: packed: remove double check of the unmap ops Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-01-31 9:58 ` Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 03/17] virtio_ring: packed: structure the indirect desc table Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-01-31 10:00 ` Xuan Zhuo
2024-02-01 0:41 ` Jason Wang
2024-01-30 11:42 ` [PATCH vhost 04/17] virtio_ring: split: remove double check of the unmap ops Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-01-31 9:43 ` Michael S. Tsirkin
2024-02-01 5:47 ` Jason Wang
2024-02-01 6:43 ` Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 05/17] virtio_ring: split: structure the indirect desc table Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-01-30 11:42 ` [PATCH vhost 06/17] virtio_ring: no store dma info when unmap is not needed Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-02-01 6:04 ` Xuan Zhuo
2024-02-02 3:04 ` Jason Wang
2024-01-30 11:42 ` [PATCH vhost 07/17] virtio: find_vqs: pass struct instead of multi parameters Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-02-01 3:00 ` Xuan Zhuo
2024-02-20 14:18 ` Halil Pasic
2024-02-21 2:03 ` Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 08/17] virtio: vring_new_virtqueue(): " Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-01-31 11:03 ` Ilpo Järvinen
2024-02-01 2:24 ` Xuan Zhuo
2024-01-30 11:42 ` Xuan Zhuo [this message]
2024-01-30 11:42 ` [PATCH vhost 10/17] virtio: find_vqs: add new parameter premapped Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 11/17] virtio_ring: export premapped to driver by struct virtqueue Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-02-01 3:17 ` Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 12/17] virtio_net: set premapped mode by find_vqs() Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 13/17] virtio_ring: remove api of setting vq premapped Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 14/17] virtio_ring: introduce dma map api for page Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 15/17] virtio_net: unify the code for recycling the xmit ptr Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 16/17] virtio_net: rename free_old_xmit_skbs to free_old_xmit Xuan Zhuo
2024-01-30 11:42 ` [PATCH vhost 17/17] virtio_net: sq support premapped mode Xuan Zhuo
2024-01-31 9:12 ` Jason Wang
2024-02-01 3:21 ` Xuan Zhuo
2024-02-01 5:36 ` Jason Wang
2024-02-01 5:56 ` Xuan Zhuo
2024-02-02 3:06 ` Jason Wang
2024-02-01 7:43 ` [PATCH vhost 00/17] virtio: drivers maintain dma info for premapped vq Zhu Yanjun
2024-02-01 9:57 ` Xuan Zhuo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240130114224.86536-10-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@linux.alibaba.com \
--cc=agordeev@linux.ibm.com \
--cc=andersson@kernel.org \
--cc=anton.ivanov@cambridgegreys.com \
--cc=ast@kernel.org \
--cc=benjamin.berg@intel.com \
--cc=borntraeger@linux.ibm.com \
--cc=bpf@vger.kernel.org \
--cc=cohuck@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=farman@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hawk@kernel.org \
--cc=hca@linux.ibm.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jasowang@redhat.com \
--cc=johannes@sipsolutions.net \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=mathieu.poirier@linaro.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=richard@nod.at \
--cc=svens@linux.ibm.com \
--cc=vadimp@nvidia.com \
--cc=virtualization@lists.linux.dev \
--cc=yang.lee@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).