From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: virtualization@lists.linux-foundation.org
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>,
"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>,
Mark Gross <markgross@kernel.org>,
Vadim Pasternak <vadimp@nvidia.com>,
Bjorn Andersson <bjorn.andersson@linaro.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>,
Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
Vincent Whitchurch <vincent.whitchurch@axis.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,
kangjie.xu@linux.alibaba.com
Subject: [PATCH v14 06/42] virtio_ring: introduce virtqueue_init()
Date: Mon, 1 Aug 2022 14:38:26 +0800 [thread overview]
Message-ID: <20220801063902.129329-7-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220801063902.129329-1-xuanzhuo@linux.alibaba.com>
Separate the logic of virtqueue initialization. These variables should
be reset during reset.
This logic can be called independently when implementing resize/reset
later.
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
drivers/virtio/virtio_ring.c | 38 +++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 1bc5794e9739..a63ef2d99955 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -368,6 +368,24 @@ static int vring_mapping_error(const struct vring_virtqueue *vq,
return dma_mapping_error(vring_dma_dev(vq), addr);
}
+static void virtqueue_init(struct vring_virtqueue *vq, u32 num)
+{
+ vq->vq.num_free = num;
+
+ if (vq->packed_ring)
+ vq->last_used_idx = 0 | (1 << VRING_PACKED_EVENT_F_WRAP_CTR);
+ else
+ vq->last_used_idx = 0;
+
+ vq->event_triggered = false;
+ vq->num_added = 0;
+
+#ifdef DEBUG
+ vq->in_use = false;
+ vq->last_add_time_valid = false;
+#endif
+}
+
/*
* Split ring specific functions - *_split().
@@ -1706,7 +1724,6 @@ static struct virtqueue *vring_create_virtqueue_packed(
vq->vq.callback = callback;
vq->vq.vdev = vdev;
vq->vq.name = name;
- vq->vq.num_free = num;
vq->vq.index = index;
vq->we_own_ring = true;
vq->notify = notify;
@@ -1716,15 +1733,8 @@ static struct virtqueue *vring_create_virtqueue_packed(
#else
vq->broken = false;
#endif
- vq->last_used_idx = 0 | (1 << VRING_PACKED_EVENT_F_WRAP_CTR);
- vq->event_triggered = false;
- vq->num_added = 0;
vq->packed_ring = true;
vq->use_dma_api = vring_use_dma_api(vdev);
-#ifdef DEBUG
- vq->in_use = false;
- vq->last_add_time_valid = false;
-#endif
vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
!context;
@@ -1773,6 +1783,8 @@ static struct virtqueue *vring_create_virtqueue_packed(
cpu_to_le16(vq->packed.event_flags_shadow);
}
+ virtqueue_init(vq, num);
+
spin_lock(&vdev->vqs_list_lock);
list_add_tail(&vq->vq.list, &vdev->vqs);
spin_unlock(&vdev->vqs_list_lock);
@@ -2205,7 +2217,6 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index,
vq->vq.callback = callback;
vq->vq.vdev = vdev;
vq->vq.name = name;
- vq->vq.num_free = vring.num;
vq->vq.index = index;
vq->we_own_ring = false;
vq->notify = notify;
@@ -2215,14 +2226,7 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index,
#else
vq->broken = false;
#endif
- vq->last_used_idx = 0;
- vq->event_triggered = false;
- vq->num_added = 0;
vq->use_dma_api = vring_use_dma_api(vdev);
-#ifdef DEBUG
- vq->in_use = false;
- vq->last_add_time_valid = false;
-#endif
vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
!context;
@@ -2260,6 +2264,8 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index,
memset(vq->split.desc_state, 0, vring.num *
sizeof(struct vring_desc_state_split));
+ virtqueue_init(vq, vring.num);
+
spin_lock(&vdev->vqs_list_lock);
list_add_tail(&vq->vq.list, &vdev->vqs);
spin_unlock(&vdev->vqs_list_lock);
--
2.31.0
next prev parent reply other threads:[~2022-08-01 6:39 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-01 6:38 [PATCH v14 00/42] virtio pci support VIRTIO_F_RING_RESET Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 01/42] virtio: record the maximum queue num supported by the device Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 02/42] virtio: struct virtio_config_ops add callbacks for queue_reset Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 03/42] virtio_ring: update the document of the virtqueue_detach_unused_buf for queue reset Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 04/42] virtio_ring: extract the logic of freeing vring Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 05/42] virtio_ring: split vring_virtqueue Xuan Zhuo
2022-08-01 6:38 ` Xuan Zhuo [this message]
2022-08-01 6:38 ` [PATCH v14 07/42] virtio_ring: split: stop __vring_new_virtqueue as export symbol Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 08/42] virtio_ring: split: __vring_new_virtqueue() accept struct vring_virtqueue_split Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 09/42] virtio_ring: split: introduce vring_free_split() Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 10/42] virtio_ring: split: extract the logic of alloc queue Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 11/42] virtio_ring: split: extract the logic of alloc state and extra Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 12/42] virtio_ring: split: extract the logic of vring init Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 13/42] virtio_ring: split: extract the logic of attach vring Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 14/42] virtio_ring: split: introduce virtqueue_reinit_split() Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 15/42] virtio_ring: split: reserve vring_align, may_reduce_num Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 16/42] virtio_ring: split: introduce virtqueue_resize_split() Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 17/42] virtio_ring: packed: introduce vring_free_packed Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 18/42] virtio_ring: packed: extract the logic of alloc queue Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 19/42] virtio_ring: packed: extract the logic of alloc state and extra Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 20/42] virtio_ring: packed: extract the logic of vring init Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 21/42] virtio_ring: packed: extract the logic of attach vring Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 22/42] virtio_ring: packed: introduce virtqueue_reinit_packed() Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 23/42] virtio_ring: packed: introduce virtqueue_resize_packed() Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 24/42] virtio_ring: introduce virtqueue_resize() Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 25/42] virtio_pci: struct virtio_pci_common_cfg add queue_notify_data Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 26/42] virtio: allow to unbreak/break virtqueue individually Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 27/42] virtio: queue_reset: add VIRTIO_F_RING_RESET Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 28/42] virtio_ring: struct virtqueue introduce reset Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 29/42] virtio_pci: struct virtio_pci_common_cfg add queue_reset Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 30/42] virtio_pci: introduce helper to get/set queue reset Xuan Zhuo
2022-08-15 6:07 ` Michael S. Tsirkin
2023-09-21 14:02 ` Michael S. Tsirkin
2023-09-22 1:49 ` Xuan Zhuo
2023-09-22 10:46 ` Michael S. Tsirkin
2023-09-25 2:02 ` Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 31/42] virtio_pci: extract the logic of active vq for modern pci Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 32/42] virtio_pci: support VIRTIO_F_RING_RESET Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 33/42] virtio: find_vqs() add arg sizes Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 34/42] virtio_pci: support the arg sizes of find_vqs() Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 35/42] virtio_mmio: " Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 36/42] virtio: add helper virtio_find_vqs_ctx_size() Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 37/42] virtio_net: set the default max ring size by find_vqs() Xuan Zhuo
2022-08-15 6:00 ` Michael S. Tsirkin
2022-08-15 6:35 ` Xuan Zhuo
2022-08-15 7:14 ` Michael S. Tsirkin
2022-08-15 7:28 ` Xuan Zhuo
2022-08-15 7:39 ` Michael S. Tsirkin
2022-08-01 6:38 ` [PATCH v14 38/42] virtio_net: get ringparam by virtqueue_get_vring_max_size() Xuan Zhuo
2022-08-01 6:38 ` [PATCH v14 39/42] virtio_net: split free_unused_bufs() Xuan Zhuo
2022-08-01 6:39 ` [PATCH v14 40/42] virtio_net: support rx queue resize Xuan Zhuo
2022-08-01 6:39 ` [PATCH v14 41/42] virtio_net: support tx " Xuan Zhuo
2022-08-01 6:39 ` [PATCH v14 42/42] virtio_net: support set_ringparam 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=20220801063902.129329-7-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@linux.alibaba.com \
--cc=agordeev@linux.ibm.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=ast@kernel.org \
--cc=bjorn.andersson@linaro.org \
--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=jasowang@redhat.com \
--cc=johannes@sipsolutions.net \
--cc=john.fastabend@gmail.com \
--cc=kangjie.xu@linux.alibaba.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=markgross@kernel.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=vincent.whitchurch@axis.com \
--cc=virtualization@lists.linux-foundation.org \
/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).