From: Cindy Lu <lulu@redhat.com>
To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com,
xieyongji@bytedance.com, linux-kernel@vger.kernel.org,
maxime.coquelin@redhat.com
Subject: [PATCH v2 4/5] vduse: update the vq_info in ioctl
Date: Tue, 21 Nov 2023 15:30:49 +0800 [thread overview]
Message-ID: <20231121073050.287080-5-lulu@redhat.com> (raw)
In-Reply-To: <20231121073050.287080-1-lulu@redhat.com>
In VDUSE_VQ_GET_INFO, the driver will sync the last_avail_idx
with reconnect info, After mapping the reconnect pages to userspace
The userspace App will update the reconnect_time in
struct vhost_reconnect_vring, If this is not 0 then it means this
vq is reconnected and will update the last_avail_idx
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
drivers/vdpa/vdpa_user/vduse_dev.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index d0fe9a7e86ab..6bc5fc2b88cc 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -1209,6 +1209,9 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
struct vduse_vq_info vq_info;
struct vduse_virtqueue *vq;
u32 index;
+ struct vdpa_reconnect_info *area;
+ struct vhost_reconnect_vring *vq_reconnect;
+ struct vhost_reconnect_data *dev_reconnect;
ret = -EFAULT;
if (copy_from_user(&vq_info, argp, sizeof(vq_info)))
@@ -1225,6 +1228,12 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
vq_info.device_addr = vq->device_addr;
vq_info.num = vq->num;
+ area = &dev->reconnect_info;
+ dev_reconnect = (struct vhost_reconnect_data *)area->vaddr;
+
+ area = &vq->reconnect_info;
+ vq_reconnect = (struct vhost_reconnect_vring *)area->vaddr;
+
if (dev->driver_features & BIT_ULL(VIRTIO_F_RING_PACKED)) {
vq_info.packed.last_avail_counter =
vq->state.packed.last_avail_counter;
@@ -1234,9 +1243,22 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
vq->state.packed.last_used_counter;
vq_info.packed.last_used_idx =
vq->state.packed.last_used_idx;
- } else
+ /*check if the vq is reconnect, if yes then update the last_avail_idx*/
+ if (dev_reconnect->reconnected != 0) {
+ vq_info.packed.last_avail_idx =
+ vq_reconnect->last_avail_idx;
+ vq_info.packed.last_avail_counter =
+ vq_reconnect->avail_wrap_counter;
+ }
+ } else {
vq_info.split.avail_index =
vq->state.split.avail_index;
+ /*check if the vq is reconnect, if yes then update the last_avail_idx*/
+ if (dev_reconnect->reconnected != 0) {
+ vq_info.split.avail_index =
+ vq_reconnect->last_avail_idx;
+ }
+ }
vq_info.ready = vq->ready;
--
2.34.3
next prev parent reply other threads:[~2023-11-21 7:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 7:30 [PATCH v2 0/5] vduse: Add support for reconnection Cindy Lu
2023-11-21 7:30 ` [PATCH v2 1/5] vduse: Add function to get/free the pages " Cindy Lu
2023-11-22 6:23 ` Jason Wang
2023-11-25 15:54 ` Cindy Lu
2023-11-21 7:30 ` [PATCH v2 2/5] vduse: Add file operation for mmap Cindy Lu
2023-11-21 7:40 ` Jason Wang
2023-11-22 6:14 ` Jason Wang
2023-11-25 13:46 ` Cindy Lu
2023-11-21 7:30 ` [PATCH v2 3/5] vduse: Add new ioctl VDUSE_GET_RECONNECT_INFO Cindy Lu
2023-11-22 6:28 ` Jason Wang
2023-11-25 15:52 ` Cindy Lu
2023-11-21 7:30 ` Cindy Lu [this message]
2023-11-22 7:12 ` [PATCH v2 4/5] vduse: update the vq_info in ioctl Jason Wang
2023-11-25 7:43 ` Cindy Lu
2023-11-21 7:30 ` [PATCH v2 5/5] Documentation: Add reconnect process for VDUSE Cindy Lu
2023-11-22 6:11 ` [PATCH v2 0/5] vduse: Add support for reconnection Jason Wang
2023-11-25 15:55 ` Cindy Lu
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=20231121073050.287080-5-lulu@redhat.com \
--to=lulu@redhat.com \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.coquelin@redhat.com \
--cc=mst@redhat.com \
--cc=xieyongji@bytedance.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
all inboxes | Powered by JetHome®