From nobody Mon Feb 9 07:07:46 2026 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 8B08917C9E for ; Mon, 9 Sep 2024 01:36:06 +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=1725845768; cv=none; b=n5IM6EbUhtHOEKvcxt2URhYnkkAddDGz2XsvdA3N2Uc46St3bDhnJa9dKUGXhR0pErbn4oIqxPNOq2E6OpwUO9PdHKrQQxhtlb4aOZnsHSwj03PLYNa5YaGt7NTZmJNHeXFK+vn3XQFZIYh4MbQ/nbQ7A6+n68ykeLgY/xKgdVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725845768; c=relaxed/simple; bh=1pQYSVQ05pRenwCfIRIlQbmmJntgrvPfEVVFvpU5lOA=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=baw7WQef5nh8AyG3vLoBli+Z2pGncOLkS7v0WHNDdWwlRcWXZdzJJEHUi/8CbTzTIvPdcLXmtRZ8vpTg5dyhOV20IfoBfka6ekla2PdyK6ly6jmXDL9g2sReWMLuyLxcpE5zJb9a3xjP0XJ4vZ5EMlyQoTZYopkhggSwHW8Fr1Q= 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=O9hA8H1j; 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="O9hA8H1j" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725845765; 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=yyzWZkYitAKw0qInqxUPaOkmkxHh1NGFvAqmvdgzGAs=; b=O9hA8H1jaVME1xjqt/+DY561qKamoRSN6HxMoHHwv4+YsX1uiD+wVJCKRAarHN52tjEQmP z4vo+lsB5fqpFjBFUyDGIwPjKZ0EsJbdC7F99MVVQ3CbtJBqkbRMnWkNwRwGE7yZLXUfln dyVfDX7vEMpRamXg57YLniltdD08xzI= Received: from mx-prod-mc-01.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-623-inPuApwzPCSEM7r8GuOZxA-1; Sun, 08 Sep 2024 21:36:01 -0400 X-MC-Unique: inPuApwzPCSEM7r8GuOZxA-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A2BDB193E8CE; Mon, 9 Sep 2024 01:36:00 +0000 (UTC) Received: from server.redhat.com (unknown [10.72.112.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7E6EC1956086; Mon, 9 Sep 2024 01:35:56 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com, michael.christie@oracle.com, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [PATCH v1 3/7] vhost: Add kthread support in function vhost_workers_free() Date: Mon, 9 Sep 2024 09:33:42 +0800 Message-ID: <20240909013531.1243525-4-lulu@redhat.com> In-Reply-To: <20240909013531.1243525-1-lulu@redhat.com> References: <20240909013531.1243525-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.15 Content-Type: text/plain; charset="utf-8" Added back the previously removed function vhost_workers_free() and renamed it to vhost_workers_free_khtread(). The new vhost_workers_free() will select the different mode based on the value of the parameter. The old function vhost_workers_free was change to support task in commit 6e890c5d5021 ('vhost: use vhost_tasks for worker threads') also changed in commit a284f09effe ('vhost: Fix crash during early vhost_transport_send_pkt= calls') change to xarray in commit 1cdaafa1b8b ('vhost: replace single worker pointer with xarray') Signed-off-by: Cindy Lu --- drivers/vhost/vhost.c | 52 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 6198c165ab15..411e81a2925a 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -647,8 +647,21 @@ static void vhost_detach_mm(struct vhost_dev *dev) dev->mm =3D NULL; } =20 -static void vhost_worker_destroy(struct vhost_dev *dev, - struct vhost_worker *worker) +static void vhost_worker_destroy_kthread(struct vhost_dev *dev, + struct vhost_worker *worker) +{ + if (!worker) + return; + + WARN_ON(!llist_empty(&worker->work_list)); + + xa_erase(&dev->worker_xa, worker->id); + kthread_stop(worker->task); + kfree(worker); +} + +static void vhost_worker_destroy_task(struct vhost_dev *dev, + struct vhost_worker *worker) { if (!worker) return; @@ -659,7 +672,7 @@ static void vhost_worker_destroy(struct vhost_dev *dev, kfree(worker); } =20 -static void vhost_workers_free(struct vhost_dev *dev) +static void vhost_workers_free_task(struct vhost_dev *dev) { struct vhost_worker *worker; unsigned long i; @@ -674,10 +687,36 @@ static void vhost_workers_free(struct vhost_dev *dev) * created but couldn't clean up (it forgot or crashed). */ xa_for_each(&dev->worker_xa, i, worker) - vhost_worker_destroy(dev, worker); + vhost_worker_destroy_task(dev, worker); xa_destroy(&dev->worker_xa); } =20 +static void vhost_workers_free_kthread(struct vhost_dev *dev) +{ + struct vhost_worker *worker; + unsigned long i; + + if (!dev->use_worker) + return; + + for (i =3D 0; i < dev->nvqs; i++) + rcu_assign_pointer(dev->vqs[i]->worker, NULL); + /* + * Free the default worker we created and cleanup workers userspace + * created but couldn't clean up (it forgot or crashed). + */ + xa_for_each(&dev->worker_xa, i, worker) + vhost_worker_destroy_kthread(dev, worker); + xa_destroy(&dev->worker_xa); +} + +static void vhost_workers_free(struct vhost_dev *dev) +{ + if (use_kthread) + vhost_workers_free_kthread(dev); + else + vhost_workers_free_task(dev); +} static struct vhost_worker *vhost_worker_create(struct vhost_dev *dev) { struct vhost_worker *worker; @@ -845,7 +884,10 @@ static int vhost_free_worker(struct vhost_dev *dev, __vhost_worker_flush(worker); mutex_unlock(&worker->mutex); =20 - vhost_worker_destroy(dev, worker); + if (use_kthread) + vhost_worker_destroy_kthread(dev, worker); + else + vhost_worker_destroy_task(dev, worker); return 0; } =20 --=20 2.45.0