From patchwork Thu Jan 23 11:58:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 1228082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LVvRxe/d; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 483Q0x5rjNz9sSL for ; Fri, 24 Jan 2020 01:40:17 +1100 (AEDT) Received: from localhost ([::1]:58252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iudeZ-00040E-55 for incoming@patchwork.ozlabs.org; Thu, 23 Jan 2020 09:40:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41784) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iubAo-0004Ie-Jf for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:01:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iubAn-0006iI-Br for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:01:22 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22468 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iubAn-0006hu-7q for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:01:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YrSgQYkhcU4kRkGHIjoT5DICb+mHjWZQdwrkOwGUhaA=; b=LVvRxe/deWIQXrkYxwu/e1EHca2v0ENEJuM71pmP1Hzo192rvZHJk1iuwQu2/0K9nldSgs kBb+T44NEdQ8FGmMsisbeBLXZcgbrC+fdlOyO8rChN5fxQHlH8WWvSrflDYDsiKzP0S2G7 yCRJGXKjIZhMmC0Hs+XG22hyeeIYSEo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-129-ek3I9QnMNAOP1EWQhS96iA-1; Thu, 23 Jan 2020 07:01:19 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 286FE18A6ED6 for ; Thu, 23 Jan 2020 12:01:18 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D0F31CB; Thu, 23 Jan 2020 12:01:17 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 107/111] virtiofsd: add --thread-pool-size=NUM option Date: Thu, 23 Jan 2020 11:58:37 +0000 Message-Id: <20200123115841.138849-108-dgilbert@redhat.com> In-Reply-To: <20200123115841.138849-1-dgilbert@redhat.com> References: <20200123115841.138849-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ek3I9QnMNAOP1EWQhS96iA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Stefan Hajnoczi Add an option to control the size of the thread pool. Requests are now processed in parallel by default. Signed-off-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_i.h | 1 + tools/virtiofsd/fuse_lowlevel.c | 7 ++++++- tools/virtiofsd/fuse_virtio.c | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h index 1447d86866..4e47e5880d 100644 --- a/tools/virtiofsd/fuse_i.h +++ b/tools/virtiofsd/fuse_i.h @@ -72,6 +72,7 @@ struct fuse_session { int vu_listen_fd; int vu_socketfd; struct fv_VuDev *virtio_dev; + int thread_pool_size; }; struct fuse_chan { diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c index 79a4031266..de2e2e0c65 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -28,6 +28,7 @@ #include #include +#define THREAD_POOL_SIZE 64 #define OFFSET_MAX 0x7fffffffffffffffLL @@ -2519,6 +2520,7 @@ static const struct fuse_opt fuse_ll_opts[] = { LL_OPTION("allow_root", deny_others, 1), LL_OPTION("--socket-path=%s", vu_socket_path, 0), LL_OPTION("--fd=%d", vu_listen_fd, 0), + LL_OPTION("--thread-pool-size=%d", thread_pool_size, 0), FUSE_OPT_END }; @@ -2537,7 +2539,9 @@ void fuse_lowlevel_help(void) printf( " -o allow_root allow access by root\n" " --socket-path=PATH path for the vhost-user socket\n" - " --fd=FDNUM fd number of vhost-user socket\n"); + " --fd=FDNUM fd number of vhost-user socket\n" + " --thread-pool-size=NUM thread pool size limit (default %d)\n", + THREAD_POOL_SIZE); } void fuse_session_destroy(struct fuse_session *se) @@ -2591,6 +2595,7 @@ struct fuse_session *fuse_session_new(struct fuse_args *args, } se->fd = -1; se->vu_listen_fd = -1; + se->thread_pool_size = THREAD_POOL_SIZE; se->conn.max_write = UINT_MAX; se->conn.max_readahead = UINT_MAX; diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 0dcf2ef57a..9f6582343c 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -572,10 +572,11 @@ static void *fv_queue_thread(void *opaque) struct fv_QueueInfo *qi = opaque; struct VuDev *dev = &qi->virtio_dev->dev; struct VuVirtq *q = vu_get_queue(dev, qi->qidx); + struct fuse_session *se = qi->virtio_dev->se; GThreadPool *pool; - pool = g_thread_pool_new(fv_queue_worker, qi, 1 /* TODO max_threads */, - TRUE, NULL); + pool = g_thread_pool_new(fv_queue_worker, qi, se->thread_pool_size, TRUE, + NULL); if (!pool) { fuse_log(FUSE_LOG_ERR, "%s: g_thread_pool_new failed\n", __func__); return NULL;