On 10.10.2022 17:56, Andrey Zhadchenko wrote:
Add worker pointer to every virtqueue. Add routine to assing
workers to virtqueues and call it after any worker creation
https://jira.sw.ru/browse/PSBM-139414
Signed-off-by: Andrey Zhadchenko <andrey.zhadche...@virtuozzo.com>
---
drivers/vhost/vhost.c | 13 +++++++++++++
drivers/vhost/vhost.h | 2 ++
2 files changed, 15 insertions(+)
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index be184adcdbe5..1b17d8dd0202 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -676,6 +676,17 @@ static int vhost_set_workers(struct vhost_dev *dev, int n)
return ret;
}
+static void vhost_assign_workers(struct vhost_dev *dev)
+{
+ int i, j = 0;
+
+ for (i = 0; i < dev->nvqs; i++) {
+ dev->vqs[i]->worker = &dev->workers[j];
+ if (++j == dev->nworkers)
I'd rather use ">=" to make it more rebase-safe.
+ j = 0;
+ }
+}
+
/* Caller should have device mutex */
long vhost_dev_set_owner(struct vhost_dev *dev)
{
@@ -698,6 +709,7 @@ long vhost_dev_set_owner(struct vhost_dev *dev)
if (err)
goto err_worker;
+ vhost_assign_workers(dev);
return 0;
err_worker:
vhost_cleanup_workers(dev);
@@ -1896,6 +1908,7 @@ long vhost_dev_ioctl(struct vhost_dev *d, unsigned int
ioctl, void __user *argp)
}
r = vhost_set_workers(d, n);
+ vhost_assign_workers(d);
break;
default:
r = -ENOIOCTLCMD;
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index 634ea828cbba..9632f6501617 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -138,6 +138,8 @@ struct vhost_virtqueue {
bool user_be;
#endif
u32 busyloop_timeout;
+
+ struct vhost_worker *worker;
};
struct vhost_msg_node {
--
Best regards, Tikhomirov Pavel
Software Developer, Virtuozzo.
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
