From patchwork Thu Apr 30 17:18:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Goyal X-Patchwork-Id: 11521045 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8107092C for ; Thu, 30 Apr 2020 17:18:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B29524955 for ; Thu, 30 Apr 2020 17:18:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="F6QvKfRC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726625AbgD3RS1 (ORCPT ); Thu, 30 Apr 2020 13:18:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:50790 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726574AbgD3RS0 (ORCPT ); Thu, 30 Apr 2020 13:18:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588267104; 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; bh=lm0meTC48Xqk4MR2ipNi5CyVVUmDLhqwj6oe6rcezhg=; b=F6QvKfRCq3hht63GrosIB35kqCrjpm5/o6sOpBVjC+kyQKbUTZWaRlGvyBTee1KO5uBxqF +IL2BmMs9d6u3KDlBuWXdIO/xGQGmCeUzu0bFYfa3q4gGR5dwmvhw2R6nUC/KzBK1wPSsf GGBpQzJNxaiHGwPy6z6n901N9iNl5LY= 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-139-XEOutslJN1qVJ6TJjXItpQ-1; Thu, 30 Apr 2020 13:18:22 -0400 X-MC-Unique: XEOutslJN1qVJ6TJjXItpQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90C4FEC1A0; Thu, 30 Apr 2020 17:18:21 +0000 (UTC) Received: from horse.redhat.com (ovpn-115-229.rdu2.redhat.com [10.10.115.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3D451002392; Thu, 30 Apr 2020 17:18:14 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 440FE223620; Thu, 30 Apr 2020 13:18:14 -0400 (EDT) Date: Thu, 30 Apr 2020 13:18:14 -0400 From: Vivek Goyal To: linux-fsdevel@vger.kernel.org, miklos@szeredi.hu Cc: Chirantan Ekbote , virtio-fs-list , Stefan Hajnoczi Subject: [PATCH][v2] fuse, virtiofs: Do not alloc/install fuse device in fuse_fill_super_common() Message-ID: <20200430171814.GA275398@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org As of now fuse_fill_super_common() allocates and installs one fuse device. Filesystems like virtiofs can have more than one filesystem queues and can have one fuse device per queue. Give, fuse_fill_super_common() only handles one device, virtiofs allocates and installes fuse devices for all queues except one. This makes logic little twisted and hard to understand. It probably is better to not do any device allocation/installation in fuse_fill_super_common() and let caller take care of it instead. v2: Removed fuse_dev_alloc_install() call from fuse_fill_super_common(). Signed-off-by: Vivek Goyal Reviewed-by: Stefan Hajnoczi Signed-off-by: Vivek Goyal --- fs/fuse/fuse_i.h | 3 --- fs/fuse/inode.c | 30 ++++++++++++++---------------- fs/fuse/virtio_fs.c | 9 +-------- 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index ca344bf71404..df0a62f963a8 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -485,9 +485,6 @@ struct fuse_fs_context { unsigned int max_read; unsigned int blksize; const char *subtype; - - /* fuse_dev pointer to fill in, should contain NULL on entry */ - void **fudptr; }; /** diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 95d712d44ca1..6b38e0391c96 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1113,7 +1113,6 @@ EXPORT_SYMBOL_GPL(fuse_dev_free); int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) { - struct fuse_dev *fud; struct fuse_conn *fc = get_fuse_conn_super(sb); struct inode *root; struct dentry *root_dentry; @@ -1155,15 +1154,11 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) if (sb->s_user_ns != &init_user_ns) sb->s_xattr = fuse_no_acl_xattr_handlers; - fud = fuse_dev_alloc_install(fc); - if (!fud) - goto err; - fc->dev = sb->s_dev; fc->sb = sb; err = fuse_bdi_init(fc, sb); if (err) - goto err_dev_free; + goto err; /* Handle umasking inside the fuse code */ if (sb->s_flags & SB_POSIXACL) @@ -1185,30 +1180,24 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) sb->s_d_op = &fuse_root_dentry_operations; root_dentry = d_make_root(root); if (!root_dentry) - goto err_dev_free; + goto err; /* Root dentry doesn't have .d_revalidate */ sb->s_d_op = &fuse_dentry_operations; mutex_lock(&fuse_mutex); err = -EINVAL; - if (*ctx->fudptr) - goto err_unlock; - err = fuse_ctl_add_conn(fc); if (err) goto err_unlock; list_add_tail(&fc->entry, &fuse_conn_list); sb->s_root = root_dentry; - *ctx->fudptr = fud; mutex_unlock(&fuse_mutex); return 0; err_unlock: mutex_unlock(&fuse_mutex); dput(root_dentry); - err_dev_free: - fuse_dev_free(fud); err: return err; } @@ -1220,6 +1209,7 @@ static int fuse_fill_super(struct super_block *sb, struct fs_context *fsc) struct file *file; int err; struct fuse_conn *fc; + struct fuse_dev *fud; err = -EINVAL; file = fget(ctx->fd); @@ -1233,13 +1223,16 @@ static int fuse_fill_super(struct super_block *sb, struct fs_context *fsc) if ((file->f_op != &fuse_dev_operations) || (file->f_cred->user_ns != sb->s_user_ns)) goto err_fput; - ctx->fudptr = &file->private_data; - fc = kmalloc(sizeof(*fc), GFP_KERNEL); err = -ENOMEM; - if (!fc) + fud = fuse_dev_alloc(); + if (!fud) goto err_fput; + fc = kmalloc(sizeof(*fc), GFP_KERNEL); + if (!fc) + goto err_free_dev; + fuse_conn_init(fc, sb->s_user_ns, &fuse_dev_fiq_ops, NULL); fc->release = fuse_free_conn; sb->s_fs_info = fc; @@ -1247,6 +1240,9 @@ static int fuse_fill_super(struct super_block *sb, struct fs_context *fsc) err = fuse_fill_super_common(sb, ctx); if (err) goto err_put_conn; + + fuse_dev_install(fud, fc); + file->private_data = fud; /* * atomic_dec_and_test() in fput() provides the necessary * memory barrier for file->private_data to be visible on all @@ -1259,6 +1255,8 @@ static int fuse_fill_super(struct super_block *sb, struct fs_context *fsc) err_put_conn: fuse_conn_put(fc); sb->s_fs_info = NULL; + err_free_dev: + fuse_dev_free(fud); err_fput: fput(file); err: diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index bade74768903..87a7bc0f193c 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -1066,8 +1066,7 @@ static int virtio_fs_fill_super(struct super_block *sb) } err = -ENOMEM; - /* Allocate fuse_dev for hiprio and notification queues */ - for (i = 0; i < VQ_REQUEST; i++) { + for (i = 0; i < fs->nvqs; i++) { struct virtio_fs_vq *fsvq = &fs->vqs[i]; fsvq->fud = fuse_dev_alloc(); @@ -1075,18 +1074,12 @@ static int virtio_fs_fill_super(struct super_block *sb) goto err_free_fuse_devs; } - ctx.fudptr = (void **)&fs->vqs[VQ_REQUEST].fud; err = fuse_fill_super_common(sb, &ctx); if (err < 0) goto err_free_fuse_devs; - fc = fs->vqs[VQ_REQUEST].fud->fc; - for (i = 0; i < fs->nvqs; i++) { struct virtio_fs_vq *fsvq = &fs->vqs[i]; - - if (i == VQ_REQUEST) - continue; /* already initialized */ fuse_dev_install(fsvq->fud, fc); }