The commit is pushed to "branch-rh9-5.14.0-70.22.1.vz9.17.x-ovz" and will
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-70.22.1.vz9.17.9
------>
commit 185e2d980bf1feba6f025ed09919f3e71fc68cfb
Author: Konstantin Khorenko <khore...@virtuozzo.com>
Date: Wed Nov 16 15:56:05 2022 +0300
Revert "drivers/vhost: add API to queue work at virtqueue worker"
This reverts commit f45287479ce42a65b2f6de4bff903112d75d4a3b.
Will apply v5 of the patchset.
https://jira.sw.ru/browse/PSBM-139414
Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com>
---
drivers/vhost/vhost.c | 22 ----------------------
drivers/vhost/vhost.h | 5 -----
2 files changed, 27 deletions(-)
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 3c79f6abdc13..750f17afa47a 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -272,17 +272,6 @@ static void vhost_worker_flush(struct vhost_worker *w)
wait_for_completion(&flush.wait_event);
}
-void vhost_work_flush_vq(struct vhost_virtqueue *vq)
-{
- struct vhost_worker *w = READ_ONCE(vq->worker);
-
- if (!w)
- return;
-
- vhost_worker_flush(w);
-}
-EXPORT_SYMBOL_GPL(vhost_work_flush_vq);
-
/* Flush any work that has been scheduled. When calling this, don't hold any
* locks that are also used by the callback. */
void vhost_poll_flush(struct vhost_poll *poll)
@@ -302,17 +291,6 @@ void vhost_work_queue(struct vhost_dev *dev, struct
vhost_work *work)
}
EXPORT_SYMBOL_GPL(vhost_work_queue);
-void vhost_work_queue_vq(struct vhost_virtqueue *vq, struct vhost_work *work)
-{
- struct vhost_worker *w = READ_ONCE(vq->worker);
-
- if (!w)
- return;
-
- vhost_work_queue_at_worker(w, work);
-}
-EXPORT_SYMBOL_GPL(vhost_work_queue_vq);
-
/* A lockless hint for busy polling code to exit the loop */
bool vhost_has_work(struct vhost_dev *dev)
{
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index dc7428c26cbe..9632f6501617 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -142,11 +142,6 @@ struct vhost_virtqueue {
struct vhost_worker *worker;
};
-/* Queue the work on virtqueue assigned worker */
-void vhost_work_queue_vq(struct vhost_virtqueue *vq, struct vhost_work *work);
-/* Flush virtqueue assigned worker */
-void vhost_work_flush_vq(struct vhost_virtqueue *vq);
-
struct vhost_msg_node {
union {
struct vhost_msg msg;
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
