| Message ID | 20241105072642.898710-6-lulu@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | vhost: Add support of kthread API | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Tue, Nov 5, 2024 at 3:27 PM Cindy Lu <lulu@redhat.com> wrote: > > The function vhost_worker_queue() uses vhost_task_fn and > selects the different mode based on the value of inherit_owner. > > Signed-off-by: Cindy Lu <lulu@redhat.com> > --- > drivers/vhost/vhost.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > index 603b146fccc1..8b7ddfb33c61 100644 > --- a/drivers/vhost/vhost.c > +++ b/drivers/vhost/vhost.c > @@ -238,13 +238,18 @@ EXPORT_SYMBOL_GPL(vhost_poll_stop); > static void vhost_worker_queue(struct vhost_worker *worker, > struct vhost_work *work) > { > + if (!worker && !worker->fn) > + return; > + > if (!test_and_set_bit(VHOST_WORK_QUEUED, &work->flags)) { > /* We can only add the work to the list after we're > * sure it was not in the list. > * test_and_set_bit() implies a memory barrier. > */ > llist_add(&work->node, &worker->work_list); > - vhost_task_wake(worker->vtsk); > + worker->fn->wakeup(worker->dev->inherit_owner ? > + (void *)worker->vtsk : > + (void *)worker->task); Logically, it looks better to introduce the ops before introducing back the kthread behaviour? Thanks > } > } > > -- > 2.45.0 >
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 603b146fccc1..8b7ddfb33c61 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -238,13 +238,18 @@ EXPORT_SYMBOL_GPL(vhost_poll_stop); static void vhost_worker_queue(struct vhost_worker *worker, struct vhost_work *work) { + if (!worker && !worker->fn) + return; + if (!test_and_set_bit(VHOST_WORK_QUEUED, &work->flags)) { /* We can only add the work to the list after we're * sure it was not in the list. * test_and_set_bit() implies a memory barrier. */ llist_add(&work->node, &worker->work_list); - vhost_task_wake(worker->vtsk); + worker->fn->wakeup(worker->dev->inherit_owner ? + (void *)worker->vtsk : + (void *)worker->task); } }
The function vhost_worker_queue() uses vhost_task_fn and selects the different mode based on the value of inherit_owner. Signed-off-by: Cindy Lu <lulu@redhat.com> --- drivers/vhost/vhost.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)