From patchwork Mon Oct 21 10:58:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 1180506 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=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="QOOqmsOK"; 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 46xZ8r09QBz9sNw for ; Mon, 21 Oct 2019 22:26:35 +1100 (AEDT) Received: from localhost ([::1]:38258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVpY-00076X-Hz for incoming@patchwork.ozlabs.org; Mon, 21 Oct 2019 07:26:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46658) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVQm-00049E-FS for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVQh-0004Kg-7C for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:56 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41621 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMVQf-0004Ji-8P for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=odTervbFDCIvOq5Harp/KNndlPNyJwrH2yrMIn2Mut0=; b=QOOqmsOKSNlHP86Su0J7HcVoLMiuUMVKKUnUj0XJx8hNqBQYFmIWRrQMpx3TYq98P8v1e+ g1EcHd2ZGZzPjAGy7bm5W5jgsCfk+8BGo6LfApekh4h2Cox6nMS12jrYG84uTzcVOr8lc8 lBNm2f50lXEJeBUAdJlLFEQO3Z+q2MU= 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-184-fFZLHi8cOyivb3ew2MZRwQ-1; Mon, 21 Oct 2019 07:00:45 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 194BB80183E; Mon, 21 Oct 2019 11:00:44 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C5376060D; Mon, 21 Oct 2019 11:00:42 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, mst@redhat.com, marcandre.lureau@redhat.com, stefanha@redhat.com Subject: [PATCH 26/30] virtiofsd: add --fd=FDNUM fd passing option Date: Mon, 21 Oct 2019 11:58:28 +0100 Message-Id: <20191021105832.36574-27-dgilbert@redhat.com> In-Reply-To: <20191021105832.36574-1-dgilbert@redhat.com> References: <20191021105832.36574-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: fFZLHi8cOyivb3ew2MZRwQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: , Cc: piaojun@huawei.com, eguan@linux.alibaba.com, vgoyal@Redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Stefan Hajnoczi Although --socket-path=PATH is useful for manual invocations, management tools typically create the UNIX domain socket themselves and pass it to the vhost-user device backend. This way QEMU can be launched immediately with a valid socket. No waiting for the vhost-user device backend is required when fd passing is used. Signed-off-by: Stefan Hajnoczi Reviewed-by: Dr. David Alan Gilbert --- contrib/virtiofsd/fuse_i.h | 1 + contrib/virtiofsd/fuse_lowlevel.c | 13 ++++++++--- contrib/virtiofsd/fuse_virtio.c | 39 +++++++++++++++++++++++-------- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/contrib/virtiofsd/fuse_i.h b/contrib/virtiofsd/fuse_i.h index 5b6ef09df5..4b718f1aec 100644 --- a/contrib/virtiofsd/fuse_i.h +++ b/contrib/virtiofsd/fuse_i.h @@ -68,6 +68,7 @@ struct fuse_session { size_t bufsize; int error; char *vu_socket_path; + int vu_listen_fd; int vu_socketfd; struct fv_VuDev *virtio_dev; }; diff --git a/contrib/virtiofsd/fuse_lowlevel.c b/contrib/virtiofsd/fuse_lowlevel.c index b1f44ca17e..da2f151927 100644 --- a/contrib/virtiofsd/fuse_lowlevel.c +++ b/contrib/virtiofsd/fuse_lowlevel.c @@ -2077,6 +2077,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("vhost_user_socket=%s", vu_socket_path, 0), + LL_OPTION("--fd=%d", vu_listen_fd, 0), FUSE_OPT_END }; @@ -2095,6 +2096,7 @@ void fuse_lowlevel_help(void) " -o allow_root allow access by root\n" " --socket-path=PATH path for the vhost-user socket\n" " -o vhost_user_socket=PATH path for the vhost-user socket\n" +" --fd=FDNUM fd number of vhost-user socket\n" " -o auto_unmount auto unmount on process termination\n"); } @@ -2134,6 +2136,7 @@ struct fuse_session *fuse_session_new(struct fuse_args *args, goto out1; } se->fd = -1; + se->vu_listen_fd = -1; se->conn.max_write = UINT_MAX; se->conn.max_readahead = UINT_MAX; @@ -2163,8 +2166,12 @@ struct fuse_session *fuse_session_new(struct fuse_args *args, goto out4; } - if (!se->vu_socket_path) { - fprintf(stderr, "fuse: missing -o vhost_user_socket option\n"); + if (!se->vu_socket_path && se->vu_listen_fd < 0) { + fuse_log(FUSE_LOG_ERR, "fuse: missing --socket-path or --fd option\n"); + goto out4; + } + if (se->vu_socket_path && se->vu_listen_fd >= 0) { + fuse_log(FUSE_LOG_ERR, "fuse: --socket-path and --fd cannot be given together\n"); goto out4; } @@ -2205,7 +2212,7 @@ void fuse_session_unmount(struct fuse_session *se) int fuse_lowlevel_is_virtio(struct fuse_session *se) { - return se->vu_socket_path != NULL; + return !!se->virtio_dev; } #ifdef linux diff --git a/contrib/virtiofsd/fuse_virtio.c b/contrib/virtiofsd/fuse_virtio.c index f52d815596..cc393c3cac 100644 --- a/contrib/virtiofsd/fuse_virtio.c +++ b/contrib/virtiofsd/fuse_virtio.c @@ -635,21 +635,20 @@ int virtio_loop(struct fuse_session *se) return 0; } -int virtio_session_mount(struct fuse_session *se) +static int fv_create_listen_socket(struct fuse_session *se) { struct sockaddr_un un; + /* Nothing to do if fd is already initialized */ + if (se->vu_listen_fd >= 0) { + return 0; + } + if (strlen(se->vu_socket_path) >= sizeof(un.sun_path)) { fuse_log(FUSE_LOG_ERR, "Socket path too long\n"); return -1; } - /* - * Poison the fuse FD so we spot if we accidentally use it; - * DO NOT check for this value, check for fuse_lowlevel_is_virtio() - */ - se->fd = 0xdaff0d11; - /* * Create the Unix socket to communicate with qemu * based on QEMU's vhost-user-bridge @@ -675,15 +674,35 @@ int virtio_session_mount(struct fuse_session *se) return -1; } + se->vu_listen_fd = listen_sock; + return 0; +} + +int virtio_session_mount(struct fuse_session *se) +{ + int ret; + + ret = fv_create_listen_socket(se); + if (ret < 0) { + return ret; + } + + /* + * Poison the fuse FD so we spot if we accidentally use it; + * DO NOT check for this value, check fuse_lowlevel_is_virtio() + */ + se->fd = 0xdaff0d11; + fuse_log(FUSE_LOG_INFO, "%s: Waiting for vhost-user socket connection...\n", __func__); - int data_sock = accept(listen_sock, NULL, NULL); + int data_sock = accept(se->vu_listen_fd, NULL, NULL); if (data_sock == -1) { fuse_log(FUSE_LOG_ERR, "vhost socket accept: %m\n"); - close(listen_sock); + close(se->vu_listen_fd); return -1; } - close(listen_sock); + close(se->vu_listen_fd); + se->vu_listen_fd = -1; fuse_log(FUSE_LOG_INFO, "%s: Received vhost-user socket connection\n", __func__); se->vu_socketfd = data_sock;