From: Cindy Lu <lulu@redhat.com>
To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com,
maxime.coquelin@redhat.com, xieyongji@bytedance.com,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: [RFC v2 1/4] vduse: Add function to get/free the pages for reconnection
Date: Tue, 12 Sep 2023 11:00:05 +0800 [thread overview]
Message-ID: <20230912030008.3599514-2-lulu@redhat.com> (raw)
In-Reply-To: <20230912030008.3599514-1-lulu@redhat.com>
Add the function vduse_alloc_reconnnect_info_mem
and vduse_alloc_reconnnect_info_mem
In this 2 function, vduse will get/free (vq_num + 1)*page
Page 0 will be used to save the reconnection information, The
Userspace App will maintain this. Page 1 ~ vq_num + 1 will save
the reconnection information for vqs.
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
drivers/vdpa/vdpa_user/vduse_dev.c | 86 ++++++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index 26b7e29cb900..4c256fa31fc4 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -30,6 +30,10 @@
#include <uapi/linux/virtio_blk.h>
#include <linux/mod_devicetable.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
+
#include "iova_domain.h"
#define DRV_AUTHOR "Yongji Xie <xieyongji@bytedance.com>"
@@ -41,6 +45,23 @@
#define VDUSE_IOVA_SIZE (128 * 1024 * 1024)
#define VDUSE_MSG_DEFAULT_TIMEOUT 30
+/* struct vdpa_reconnect_info save the page information for reconnection
+ * kernel will init these information while alloc the pages
+ * and use these information to free the pages
+ */
+struct vdpa_reconnect_info {
+ /* Offset (within vm_file) in PAGE_SIZE,
+ * this just for check, not using
+ */
+ u32 index;
+ /* physical address for this page*/
+ phys_addr_t addr;
+ /* virtual address for this page*/
+ unsigned long vaddr;
+ /* memory size, here always page_size*/
+ phys_addr_t size;
+};
+
struct vduse_virtqueue {
u16 index;
u16 num_max;
@@ -57,6 +78,7 @@ struct vduse_virtqueue {
struct vdpa_callback cb;
struct work_struct inject;
struct work_struct kick;
+ struct vdpa_reconnect_info reconnect_info;
};
struct vduse_dev;
@@ -106,6 +128,7 @@ struct vduse_dev {
u32 vq_align;
struct vduse_umem *umem;
struct mutex mem_lock;
+ struct vdpa_reconnect_info reconnect_status;
};
struct vduse_dev_msg {
@@ -1030,6 +1053,65 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev,
return ret;
}
+int vduse_alloc_reconnnect_info_mem(struct vduse_dev *dev)
+{
+ struct vdpa_reconnect_info *info;
+ struct vduse_virtqueue *vq;
+ void *addr;
+
+ /*page 0 is use to save status,dpdk will use this to save the information
+ *needed in reconnection,kernel don't need to maintain this
+ */
+ info = &dev->reconnect_status;
+ addr = (void *)get_zeroed_page(GFP_KERNEL);
+ if (!addr)
+ return -1;
+
+ info->addr = virt_to_phys(addr);
+ info->vaddr = (unsigned long)(addr);
+ info->size = PAGE_SIZE;
+ /* index is vm Offset in PAGE_SIZE */
+ info->index = 0;
+
+ /*page 1~ vq_num + 1 save the reconnect info for vqs*/
+ for (int i = 0; i < dev->vq_num + 1; i++) {
+ vq = &dev->vqs[i];
+ info = &vq->reconnect_info;
+ addr = (void *)get_zeroed_page(GFP_KERNEL);
+ if (!addr)
+ return -1;
+
+ info->addr = virt_to_phys(addr);
+ info->vaddr = (unsigned long)(addr);
+ info->size = PAGE_SIZE;
+ info->index = i + 1;
+ }
+
+ return 0;
+}
+
+int vduse_free_reconnnect_info_mem(struct vduse_dev *dev)
+{
+ struct vdpa_reconnect_info *info;
+ struct vduse_virtqueue *vq;
+
+ info = &dev->reconnect_status;
+ free_page(info->vaddr);
+ info->size = 0;
+ info->addr = 0;
+ info->vaddr = 0;
+ for (int i = 0; i < dev->vq_num + 1; i++) {
+ vq = &dev->vqs[i];
+ info = &vq->reconnect_info;
+ free_page(info->vaddr);
+ info->size = 0;
+ info->addr = 0;
+ info->vaddr = 0;
+ }
+
+ return 0;
+}
+
static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
@@ -1390,6 +1472,8 @@ static int vduse_destroy_dev(char *name)
mutex_unlock(&dev->lock);
return -EBUSY;
}
+ vduse_free_reconnnect_info_mem(dev);
+
dev->connected = true;
mutex_unlock(&dev->lock);
@@ -1542,6 +1626,8 @@ static int vduse_create_dev(struct vduse_dev_config *config,
ret = PTR_ERR(dev->dev);
goto err_dev;
}
+
+ vduse_alloc_reconnnect_info_mem(dev);
__module_get(THIS_MODULE);
return 0;
--
2.34.3
next prev parent reply other threads:[~2023-09-12 3:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-12 3:00 [RFC v2 0/4] Support reconnection in vduse Cindy Lu
2023-09-12 3:00 ` Cindy Lu [this message]
2023-09-12 3:01 ` [RFC v2 1/4] vduse: Add function to get/free the pages for reconnection kernel test robot
2023-09-18 8:41 ` Jason Wang
2023-09-21 14:06 ` Cindy Lu
2023-09-12 3:00 ` [RFC v2 2/4] vduse: Add file operation for mmap Cindy Lu
2023-09-18 8:46 ` Jason Wang
2023-09-12 3:00 ` [RFC v2 3/4] vduse: update the vq_info in ioctl Cindy Lu
2023-09-12 7:39 ` Jason Wang
2023-09-25 4:15 ` Cindy Lu
2023-09-29 9:08 ` Maxime Coquelin
2023-09-29 9:12 ` Maxime Coquelin
2023-10-08 5:17 ` Jason Wang
2023-09-12 3:00 ` [RFC v2 4/4] vduse: Add new ioctl VDUSE_GET_RECONNECT_INFO Cindy Lu
2023-09-18 8:48 ` Jason Wang
2023-09-21 14:01 ` Cindy Lu
2023-09-25 2:57 ` Jason Wang
2023-09-25 3:19 ` Cindy Lu
2023-09-29 9:08 ` Maxime Coquelin
2023-10-09 3:00 ` 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=20230912030008.3599514-2-lulu@redhat.com \
--to=lulu@redhat.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.coquelin@redhat.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--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