From patchwork Mon Oct 21 10:58:17 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: 1180481 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="OXSbirZw"; 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 46xYfw24jCz9sP6 for ; Mon, 21 Oct 2019 22:04:08 +1100 (AEDT) Received: from localhost ([::1]:37882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVTp-0005mL-8k for incoming@patchwork.ozlabs.org; Mon, 21 Oct 2019 07:04:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46479) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVQ2-0003fy-8S for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVQ0-00042T-4s for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:10 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21291 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 1iMVQ0-00041n-0Y for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655606; 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=Rmkutg1eWb8oKSfxmZGXg7G1V8iVJQJXx0SHheWDu4I=; b=OXSbirZwrC6TXt/6vuksl9e5ICbusf3oDnOEOV6XNAPnGXBU2cTc6ne03H2x8QbNPwzSHB 9SSU6wune2tR26inlQ4yhpcUhbUf8BLegDhkfnZxTnNi94+zDkBjrkRXjQkyy279fWc+6g Zig1TLfzuWWijeHQH+YIeQD+M9url5k= 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-305-XdaLSnIIPmCRGGsi9q3UYA-1; Mon, 21 Oct 2019 07:00:03 -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 2153B80183E; Mon, 21 Oct 2019 11:00:02 +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 BADE860619; Mon, 21 Oct 2019 10:59:57 +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 15/30] virtiofsd: Open vhost connection instead of mounting Date: Mon, 21 Oct 2019 11:58:17 +0100 Message-Id: <20191021105832.36574-16-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: XdaLSnIIPmCRGGsi9q3UYA-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: 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: , 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: "Dr. David Alan Gilbert" When run with vhost-user options we conect to the QEMU instead via a socket. Start this off by creating the socket. Signed-off-by: Dr. David Alan Gilbert --- contrib/virtiofsd/fuse_i.h | 7 ++- contrib/virtiofsd/fuse_lowlevel.c | 53 +++------------------- contrib/virtiofsd/fuse_virtio.c | 75 +++++++++++++++++++++++++++++++ contrib/virtiofsd/fuse_virtio.h | 23 ++++++++++ 4 files changed, 110 insertions(+), 48 deletions(-) create mode 100644 contrib/virtiofsd/fuse_virtio.c create mode 100644 contrib/virtiofsd/fuse_virtio.h diff --git a/contrib/virtiofsd/fuse_i.h b/contrib/virtiofsd/fuse_i.h index d65af06ff0..27fa50274d 100644 --- a/contrib/virtiofsd/fuse_i.h +++ b/contrib/virtiofsd/fuse_i.h @@ -6,9 +6,10 @@ See the file COPYING.LIB */ -#define FUSE_USE_VERSION 31 - +#ifndef FUSE_I_H +#define FUSE_I_H +#define FUSE_USE_VERSION 31 #include "fuse.h" #include "fuse_lowlevel.h" @@ -119,3 +120,5 @@ void fuse_session_process_buf_int(struct fuse_session *se, /* room needed in buffer to accommodate header */ #define FUSE_BUFFER_HEADER_SIZE 0x1000 + +#endif diff --git a/contrib/virtiofsd/fuse_lowlevel.c b/contrib/virtiofsd/fuse_lowlevel.c index d47e4438f3..247667e3f4 100644 --- a/contrib/virtiofsd/fuse_lowlevel.c +++ b/contrib/virtiofsd/fuse_lowlevel.c @@ -13,6 +13,7 @@ #include "fuse_kernel.h" #include "fuse_opt.h" #include "fuse_misc.h" +#include "fuse_virtio.h" #include #include @@ -2152,6 +2153,11 @@ 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"); + goto out4; + } + se->bufsize = FUSE_MAX_MAX_PAGES * getpagesize() + FUSE_BUFFER_HEADER_SIZE; @@ -2175,52 +2181,7 @@ out1: int fuse_session_mount(struct fuse_session *se) { - int fd; - - /* - * Make sure file descriptors 0, 1 and 2 are open, otherwise chaos - * would ensue. - */ - do { - fd = open("/dev/null", O_RDWR); - if (fd > 2) - close(fd); - } while (fd >= 0 && fd <= 2); - - /* - * To allow FUSE daemons to run without privileges, the caller may open - * /dev/fuse before launching the file system and pass on the file - * descriptor by specifying /dev/fd/N as the mount point. Note that the - * parent process takes care of performing the mount in this case. - */ - fd = fuse_mnt_parse_fuse_fd(mountpoint); - if (fd != -1) { - if (fcntl(fd, F_GETFD) == -1) { - fuse_log(FUSE_LOG_ERR, - "fuse: Invalid file descriptor /dev/fd/%u\n", - fd); - return -1; - } - se->fd = fd; - return 0; - } - - /* Open channel */ - fd = fuse_kern_mount(mountpoint, se->mo); - if (fd == -1) - return -1; - se->fd = fd; - - /* Save mountpoint */ - se->mountpoint = strdup(mountpoint); - if (se->mountpoint == NULL) - goto error_out; - - return 0; - -error_out: - fuse_kern_unmount(mountpoint, fd); - return -1; + return virtio_session_mount(se); } int fuse_session_fd(struct fuse_session *se) diff --git a/contrib/virtiofsd/fuse_virtio.c b/contrib/virtiofsd/fuse_virtio.c new file mode 100644 index 0000000000..da8451faa7 --- /dev/null +++ b/contrib/virtiofsd/fuse_virtio.c @@ -0,0 +1,75 @@ +/* + * virtio-fs glue for FUSE + * Copyright (C) 2018 Red Hat, Inc. and/or its affiliates + * + * Authors: + * Dave Gilbert + * + * Implements the glue between libfuse and libvhost-user + * + * This program can be distributed under the terms of the GNU LGPLv2. + * See the file COPYING.LIB + */ + +#include "fuse_i.h" +#include "fuse_kernel.h" +#include "fuse_misc.h" +#include "fuse_opt.h" +#include "fuse_virtio.h" + +#include +#include +#include +#include +#include +#include +#include + +/* From spec */ +struct virtio_fs_config { + char tag[36]; + uint32_t num_queues; +}; + +int virtio_session_mount(struct fuse_session *se) +{ + struct sockaddr_un un; + + 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 + */ + unlink(se->vu_socket_path); + strcpy(un.sun_path, se->vu_socket_path); + size_t addr_len = sizeof(un.sun_family) + strlen(se->vu_socket_path); + + int listen_sock = socket(AF_UNIX, SOCK_STREAM, 0); + if (listen_sock == -1) { + fuse_log(FUSE_LOG_ERR, "vhost socket creation: %m\n"); + return -1; + } + un.sun_family = AF_UNIX; + + if (bind(listen_sock, (struct sockaddr *)&un, addr_len) == -1) { + fuse_log(FUSE_LOG_ERR, "vhost socket bind: %m\n"); + return -1; + } + + if (listen(listen_sock, 1) == -1) { + fuse_log(FUSE_LOG_ERR, "vhost socket listen: %m\n"); + return -1; + } + + return -1; +} diff --git a/contrib/virtiofsd/fuse_virtio.h b/contrib/virtiofsd/fuse_virtio.h new file mode 100644 index 0000000000..6652e609e0 --- /dev/null +++ b/contrib/virtiofsd/fuse_virtio.h @@ -0,0 +1,23 @@ +/* + virtio-fs glue for FUSE + Copyright (C) 2018 Red Hat, Inc. and/or its affiliates + + Authors: + Dave Gilbert + + Implements the glue between libfuse and libvhost-user + + This program can be distributed under the terms of the GNU LGPLv2. + See the file COPYING.LIB +*/ + +#ifndef FUSE_VIRTIO_H +#define FUSE_VIRTIO_H + +#include "fuse_i.h" + +struct fuse_session; + +int virtio_session_mount(struct fuse_session *se); + +#endif