From nobody Thu Dec 18 05:24:31 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1A621C57B2 for ; Tue, 10 Dec 2024 16:45:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849152; cv=none; b=lbx1RZa9bChnQd2pNjqaCqJnGb99iEc8Y6WA6+gbtXzedTF2twMJvAPyRxPGbGqM2kBacv0gz/h+IEI9enQgRy5fxxEDIZlo7MMEWAmJt7ZxRKcsd8VuE/CdRm+IYFKpIP+Ml2bk7JCZ8UHEs/qIJvByKdDRfALPSCsi82GHc2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849152; c=relaxed/simple; bh=4B0ZpVZ34G6urTCswIW4fjE7WC33IuSy9G1WhtjJ4oc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RYljVcCrPvh7nJzaRYlvuFfHlSpLIQk9KvnH6KxPH5e7U/0sWtvCbVYxXwTLyJu69E6cMjUq6KHmixFLuLI/CoH25mHR3PG9Yx4mSV5DwENRosVVdh3B9048W6IdlSOHEh0tAG7rz5Hfac7UwlABHMEaFGvU6BffkmIzz4d2IzQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=K/+R2g88; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="K/+R2g88" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1733849149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OjpO7WFrcW5swnLsneWZbZdM229f02z/cjRoCQsUlIs=; b=K/+R2g880fLxbqXpTIbxQAxVcBBNqpQsbJbxYGeIjLmcLPlOMI6u+RDyK0GguaDq2aDEof 095c9XoZANFWXvajDfBI9iwuqayIPH8fqsIXxcQsS7aAaxHWbXMNpoNb35pauYz/nUX7zV uGxE6NvVKJK5W4AyNfbxH5pJguZMkIY= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-97-r9atTP5WPIGP6PDHxbghFQ-1; Tue, 10 Dec 2024 11:45:48 -0500 X-MC-Unique: r9atTP5WPIGP6PDHxbghFQ-1 X-Mimecast-MFC-AGG-ID: r9atTP5WPIGP6PDHxbghFQ Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 95B8719541BA; Tue, 10 Dec 2024 16:45:47 +0000 (UTC) Received: from server.redhat.com (unknown [10.72.112.152]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2556019560A7; Tue, 10 Dec 2024 16:45:42 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com, michael.christie@oracle.com, sgarzare@redhat.com, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH v4 4/8] vhost: Add kthread support in function vhost_worker_create Date: Wed, 11 Dec 2024 00:41:43 +0800 Message-ID: <20241210164456.925060-5-lulu@redhat.com> In-Reply-To: <20241210164456.925060-1-lulu@redhat.com> References: <20241210164456.925060-1-lulu@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" Restored the previous functions kthread_wakeup and kthread_stop. Also add 2 new function pointer. The function vhost_worker_create Will initializes this pointer based on the value of inherit_owner. Signed-off-by: Cindy Lu --- drivers/vhost/vhost.c | 84 +++++++++++++++++++++++++++++++++++-------- drivers/vhost/vhost.h | 3 ++ 2 files changed, 73 insertions(+), 14 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 812dfd218bc2..0175bbf4d8b3 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -721,14 +721,38 @@ static void vhost_workers_free(struct vhost_dev *dev) xa_destroy(&dev->worker_xa); } =20 +static int vhost_task_wakeup_fn(struct vhost_worker *worker) +{ + vhost_task_wake(worker->vtsk); + return 0; +} + +static int vhost_kthread_wakeup_fn(struct vhost_worker *worker) +{ + return wake_up_process(worker->kthread_task); +} + +static int vhost_task_stop_fn(struct vhost_worker *worker) +{ + vhost_task_stop(worker->vtsk); + return 0; +} + +static int vhost_kthread_stop_fn(struct vhost_worker *worker) +{ + return kthread_stop(worker->kthread_task); +} + static struct vhost_worker *vhost_worker_create(struct vhost_dev *dev) { struct vhost_worker *worker; - struct vhost_task *vtsk; + struct vhost_task *vtsk =3D NULL; + struct task_struct *task =3D NULL; char name[TASK_COMM_LEN]; int ret; u32 id; =20 + /* Allocate resources for the worker */ worker =3D kzalloc(sizeof(*worker), GFP_KERNEL_ACCOUNT); if (!worker) return NULL; @@ -736,27 +760,59 @@ static struct vhost_worker *vhost_worker_create(struc= t vhost_dev *dev) worker->dev =3D dev; snprintf(name, sizeof(name), "vhost-%d", current->pid); =20 - vtsk =3D vhost_task_create(vhost_run_work_list, vhost_worker_killed, - worker, name); - if (!vtsk) - goto free_worker; - mutex_init(&worker->mutex); init_llist_head(&worker->work_list); worker->kcov_handle =3D kcov_common_handle(); - worker->vtsk =3D vtsk; =20 - vhost_task_start(vtsk); + if (dev->inherit_owner) { + /* + * If inherit_owner is true we use vhost_tasks to create + * the worker so all settings/limits like cgroups, NPROC, + * scheduler, etc are inherited from the owner. If false, + * we use kthreads and only attach to the same cgroups + * as the owner for compat with older kernels. + */ + vtsk =3D vhost_task_create(vhost_run_work_list, + vhost_worker_killed, worker, name); + if (!vtsk) + goto free_worker; + + worker->vtsk =3D vtsk; + worker->task_wakeup =3D vhost_task_wakeup_fn; + worker->task_stop =3D vhost_task_stop_fn; + + vhost_task_start(vtsk); + ret =3D xa_alloc(&dev->worker_xa, &id, worker, xa_limit_32b, + GFP_KERNEL); + if (ret < 0) + goto stop_worker; + } else { + /* Create and start a kernel thread */ + task =3D kthread_create(vhost_run_work_kthread_list, worker, + "vhost-%d", current->pid); + if (IS_ERR(task)) { + ret =3D PTR_ERR(task); + goto free_worker; + } + worker->kthread_task =3D task; + worker->task_wakeup =3D vhost_kthread_wakeup_fn; + worker->task_stop =3D vhost_kthread_stop_fn; =20 - ret =3D xa_alloc(&dev->worker_xa, &id, worker, xa_limit_32b, GFP_KERNEL); - if (ret < 0) - goto stop_worker; - worker->id =3D id; + wake_up_process(task); + ret =3D xa_alloc(&dev->worker_xa, &id, worker, xa_limit_32b, + GFP_KERNEL); + if (ret < 0) + goto stop_worker; =20 - return worker; + ret =3D vhost_attach_task_to_cgroups(worker); + if (ret) + goto stop_worker; + } =20 + worker->id =3D id; + return worker; stop_worker: - vhost_task_stop(vtsk); + worker->task_stop(worker); free_worker: kfree(worker); return NULL; diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index c650c4506c70..a7dc6e168753 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -27,6 +27,7 @@ struct vhost_work { }; =20 struct vhost_worker { + struct task_struct *kthread_task; struct vhost_task *vtsk; struct vhost_dev *dev; /* Used to serialize device wide flushing with worker swapping. */ @@ -36,6 +37,8 @@ struct vhost_worker { u32 id; int attachment_cnt; bool killed; + int (*task_wakeup)(struct vhost_worker *worker); + int (*task_stop)(struct vhost_worker *worker); }; =20 /* Poll a file (eventfd or socket) */ --=20 2.45.0