mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 v3 6/7] vduse: Update the vq_info in ioctl VDUSE_VQ_GET_INFO
Date: Tue,  5 Dec 2023 16:34:43 +0800	[thread overview]
Message-ID: <20231205083444.3029239-7-lulu@redhat.com> (raw)
In-Reply-To: <20231205083444.3029239-1-lulu@redhat.com>

Once the reconnect memory pages are mapped to userspace, the userspace
application will update the "reconnected" bit in the
"struct vduse_dev_reconnect_data".
The kernel will then check this bit. If it is not set to
"VDUSE_NOT_RECONNECT", it means that the application has been
reconnected, and the kernel will synchronize the vq information.

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 f55f415629de..422f1aedebac 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -1193,6 +1193,9 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
 		struct vduse_vq_info vq_info;
 		struct vduse_virtqueue *vq;
 		u32 index;
+		unsigned long vaddr;
+		struct vduse_vq_state *vq_reconnect;
+		struct vduse_dev_reconnect_data *dev_reconnect;
 
 		ret = -EFAULT;
 		if (copy_from_user(&vq_info, argp, sizeof(vq_info)))
@@ -1209,6 +1212,12 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
 		vq_info.device_addr = vq->device_addr;
 		vq_info.num = vq->num;
 
+		vaddr = dev->vdpa_reconnect_vaddr;
+		dev_reconnect = (struct vduse_dev_reconnect_data *)vaddr;
+
+		vaddr = vq->vdpa_reconnect_vaddr;
+		vq_reconnect = (struct vduse_vq_state *)vaddr;
+
 		if (dev->driver_features & BIT_ULL(VIRTIO_F_RING_PACKED)) {
 			vq_info.packed.last_avail_counter =
 				vq->state.packed.last_avail_counter;
@@ -1218,9 +1227,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 info*/
+			if (dev_reconnect->reconnected != VDUSE_NOT_RECONNECT) {
+				vq_info.packed.last_avail_idx =
+					vq_reconnect->packed.last_avail_idx;
+				vq_info.packed.last_avail_counter =
+					vq_reconnect->packed.last_avail_counter;
+			}
+		} else {
 			vq_info.split.avail_index =
 				vq->state.split.avail_index;
+			/*check if the vq is reconnect, if yes then update the info*/
+			if (dev_reconnect->reconnected != VDUSE_NOT_RECONNECT) {
+				vq_info.split.avail_index =
+					vq_reconnect->split.avail_index;
+			}
+		}
 
 		vq_info.ready = vq->ready;
 
-- 
2.34.3


  parent reply	other threads:[~2023-12-05  8:36 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-05  8:34 [PATCH v3 0/7] vduse: Add support for reconnection Cindy Lu
2023-12-05  8:34 ` [PATCH v3 1/7] vdpa: Move struct vdpa_vq_state to uAPI Cindy Lu
2023-12-05  8:34 ` [PATCH v3 2/7] vduse: Add new uAPI for vduse reconnection Cindy Lu
2023-12-07  8:46   ` Jason Wang
2023-12-05  8:34 ` [PATCH v3 3/7] vduse: Add new ioctl VDUSE_DEV_GET_CONFIG Cindy Lu
2023-12-05  8:34 ` [PATCH v3 4/7] vduse: Add function to get/free the pages for reconnection Cindy Lu
2023-12-07  8:46   ` Jason Wang
2023-12-05  8:34 ` [PATCH v3 5/7] vduse: Add file operation for mmap Cindy Lu
2023-12-07  8:46   ` Jason Wang
2023-12-05  8:34 ` Cindy Lu [this message]
2023-12-07  8:46   ` [PATCH v3 6/7] vduse: Update the vq_info in ioctl VDUSE_VQ_GET_INFO Jason Wang
2023-12-05  8:34 ` [PATCH v3 7/7] Documentation: Add reconnect process for VDUSE Cindy Lu
2023-12-07  8:46   ` Jason Wang

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=20231205083444.3029239-7-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®