From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2AC4C636C9 for ; Mon, 19 Jul 2021 18:02:45 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EB6461248 for ; Mon, 19 Jul 2021 18:02:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EB6461248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=virtualization-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E35BA823F4; Mon, 19 Jul 2021 18:02:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hWBjXDU1s785; Mon, 19 Jul 2021 18:02:44 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 717068249C; Mon, 19 Jul 2021 18:02:43 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 08E55C001A; Mon, 19 Jul 2021 18:02:43 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id EDEE0C000E for ; Mon, 19 Jul 2021 18:02:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DC0B5403BE for ; Mon, 19 Jul 2021 18:02:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B9QbKpdmkpN3 for ; Mon, 19 Jul 2021 18:02:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id CC8F4403BB for ; Mon, 19 Jul 2021 18:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626717759; 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: in-reply-to:in-reply-to:references:references; bh=x8yd+DRZO8vTRPuL5X35e3D3WtSixgW0f5O77HlkSTw=; b=A/R6aKmqV09HJvHKftjSlTlIILBfFl7a6cypWQN8vk0S4ca0Q5mzk9Xb2WQmW9tYbkbmt+ w8F/l/c/ClJpNYSR4Rtan8h2b1S8z+uRztE/nz9urA0LDkP3OoZH3PWmNwYBsbg6VvZIOd ED5KfGrDOx0UahwMREAm8/FjdfpWTmY= 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-290-cf8_p-lDPE2TGk-vKS33-w-1; Mon, 19 Jul 2021 14:02:36 -0400 X-MC-Unique: cf8_p-lDPE2TGk-vKS33-w-1 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 DBBE0192D785; Mon, 19 Jul 2021 18:02:34 +0000 (UTC) Received: from horse.redhat.com (ovpn-118-17.rdu2.redhat.com [10.10.118.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE3066E0B7; Mon, 19 Jul 2021 18:02:30 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 7F9B7223E4F; Mon, 19 Jul 2021 14:02:30 -0400 (EDT) Date: Mon, 19 Jul 2021 14:02:30 -0400 From: Vivek Goyal To: Jeffle Xu Subject: Re: [PATCH v2 2/4] fuse: Make DAX mount option a tri-state Message-ID: References: <20210716104753.74377-1-jefflexu@linux.alibaba.com> <20210716104753.74377-3-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210716104753.74377-3-jefflexu@linux.alibaba.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Cc: miklos@szeredi.hu, virtualization@lists.linux-foundation.org, joseph.qi@linux.alibaba.com, bo.liu@linux.alibaba.com, stefanha@redhat.com, linux-fsdevel@vger.kernel.org X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On Fri, Jul 16, 2021 at 06:47:51PM +0800, Jeffle Xu wrote: > We add 'always', 'never', and 'inode' (default). '-o dax' continues to > operate the same which is equivalent to 'always'. > > By the time this patch is applied, 'inode' mode is actually equal to > 'always' mode, before the per-file DAX flag is introduced in the > following patch. > > Signed-off-by: Jeffle Xu > --- > fs/fuse/dax.c | 13 ++++++++++++- > fs/fuse/fuse_i.h | 11 +++++++++-- > fs/fuse/inode.c | 2 +- > fs/fuse/virtio_fs.c | 16 ++++++++++++++-- > 4 files changed, 36 insertions(+), 6 deletions(-) > > diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c > index c6f4e82e65f3..a478e824c2d0 100644 > --- a/fs/fuse/dax.c > +++ b/fs/fuse/dax.c > @@ -70,6 +70,9 @@ struct fuse_inode_dax { > }; > > struct fuse_conn_dax { > + /** dax mode: FUSE_DAX_MOUNT_* (always, never or per-file) **/ > + unsigned int mode; Why "/**" ? How about make it something like "enum fuse_dax_mode mode" instead? enum fuse_dax_mode dax_mode; > + > /* DAX device */ > struct dax_device *dev; > > @@ -1288,7 +1291,8 @@ static int fuse_dax_mem_range_init(struct fuse_conn_dax *fcd) > return ret; > } > > -int fuse_dax_conn_alloc(struct fuse_conn *fc, struct dax_device *dax_dev) > +int fuse_dax_conn_alloc(struct fuse_conn *fc, unsigned int mode, > + struct dax_device *dax_dev) > { > struct fuse_conn_dax *fcd; > int err; > @@ -1301,6 +1305,7 @@ int fuse_dax_conn_alloc(struct fuse_conn *fc, struct dax_device *dax_dev) > return -ENOMEM; > > spin_lock_init(&fcd->lock); > + fcd->mode = mode; > fcd->dev = dax_dev; > err = fuse_dax_mem_range_init(fcd); > if (err) { > @@ -1339,10 +1344,16 @@ static const struct address_space_operations fuse_dax_file_aops = { > static bool fuse_should_enable_dax(struct inode *inode) > { > struct fuse_conn *fc = get_fuse_conn(inode); > + unsigned int mode; > > if (!fc->dax) > return false; > > + mode = fc->dax->mode; > + > + if (mode == FUSE_DAX_MOUNT_NEVER) > + return false; > + > return true; > } > > diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h > index 07829ce78695..f29018323845 100644 > --- a/fs/fuse/fuse_i.h > +++ b/fs/fuse/fuse_i.h > @@ -487,6 +487,12 @@ struct fuse_dev { > struct list_head entry; > }; > > +enum { And this becomes. enum fuse_dax_mode { }; > + FUSE_DAX_MOUNT_INODE, > + FUSE_DAX_MOUNT_ALWAYS, > + FUSE_DAX_MOUNT_NEVER, > +}; How about getting rid of "MOUNT" and just do. FUSE_DAX_INODE, FUSE_DAX_ALWAYS, FUSE_DAX_NEVER, > + > struct fuse_fs_context { > int fd; > unsigned int rootmode; > @@ -503,7 +509,7 @@ struct fuse_fs_context { > bool no_control:1; > bool no_force_umount:1; > bool legacy_opts_show:1; > - bool dax:1; > + unsigned int dax; enum fuse_dax_mode dax_mode; > unsigned int max_read; > unsigned int blksize; > const char *subtype; > @@ -1242,7 +1248,8 @@ ssize_t fuse_dax_read_iter(struct kiocb *iocb, struct iov_iter *to); > ssize_t fuse_dax_write_iter(struct kiocb *iocb, struct iov_iter *from); > int fuse_dax_mmap(struct file *file, struct vm_area_struct *vma); > int fuse_dax_break_layouts(struct inode *inode, u64 dmap_start, u64 dmap_end); > -int fuse_dax_conn_alloc(struct fuse_conn *fc, struct dax_device *dax_dev); > +int fuse_dax_conn_alloc(struct fuse_conn *fc, unsigned int mode, ^^ enum fuse_dax_mode dax_mode > + struct dax_device *dax_dev); > void fuse_dax_conn_free(struct fuse_conn *fc); > bool fuse_dax_inode_alloc(struct super_block *sb, struct fuse_inode *fi); > void fuse_dax_inode_init(struct inode *inode); > diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c > index b9beb39a4a18..f6b46395edb2 100644 > --- a/fs/fuse/inode.c > +++ b/fs/fuse/inode.c > @@ -1434,7 +1434,7 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) > sb->s_subtype = ctx->subtype; > ctx->subtype = NULL; > if (IS_ENABLED(CONFIG_FUSE_DAX)) { > - err = fuse_dax_conn_alloc(fc, ctx->dax_dev); > + err = fuse_dax_conn_alloc(fc, ctx->dax, ctx->dax_dev); > if (err) > goto err; > } > diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c > index 8f52cdaa8445..561f711d1945 100644 > --- a/fs/fuse/virtio_fs.c > +++ b/fs/fuse/virtio_fs.c > @@ -88,12 +88,21 @@ struct virtio_fs_req_work { > static int virtio_fs_enqueue_req(struct virtio_fs_vq *fsvq, > struct fuse_req *req, bool in_flight); > > +static const struct constant_table dax_param_enums[] = { > + {"inode", FUSE_DAX_MOUNT_INODE }, > + {"always", FUSE_DAX_MOUNT_ALWAYS }, > + {"never", FUSE_DAX_MOUNT_NEVER }, > + {} > +}; > + > enum { > OPT_DAX, > + OPT_DAX_ENUM, > }; > > static const struct fs_parameter_spec virtio_fs_parameters[] = { > fsparam_flag("dax", OPT_DAX), > + fsparam_enum("dax", OPT_DAX_ENUM, dax_param_enums), > {} > }; > > @@ -110,7 +119,10 @@ static int virtio_fs_parse_param(struct fs_context *fc, > > switch (opt) { > case OPT_DAX: > - ctx->dax = 1; > + ctx->dax = FUSE_DAX_MOUNT_ALWAYS; > + break; > + case OPT_DAX_ENUM: > + ctx->dax = result.uint_32; Do we want to check here if result.uint_32 has one of the allowed values. FUSE_DAX_MOUNT_INODE, FUSE_DAX_MOUNT_ALWAYS or FUSE_DAX_MOUNT_NEVER. Or VFS has already taken care of that? Vivek > break; > default: > return -EINVAL; > @@ -1326,7 +1338,7 @@ static int virtio_fs_fill_super(struct super_block *sb, struct fs_context *fsc) > > /* virtiofs allocates and installs its own fuse devices */ > ctx->fudptr = NULL; > - if (ctx->dax) { > + if (ctx->dax != FUSE_DAX_MOUNT_NEVER) { > if (!fs->dax_dev) { > err = -EINVAL; > pr_err("virtio-fs: dax can't be enabled as filesystem" > -- > 2.27.0 > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization