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=-16.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 E6269C432BE for ; Thu, 26 Aug 2021 18:14:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC08160FC1 for ; Thu, 26 Aug 2021 18:14:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243269AbhHZSP0 (ORCPT ); Thu, 26 Aug 2021 14:15:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38573 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232729AbhHZSP0 (ORCPT ); Thu, 26 Aug 2021 14:15:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630001678; 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=mKuXA5C1tkhddWflOthgNW1oVGOdYS70sWw8jUqE81M=; b=RJUCBOsc0P+wJKSoSKM6EGqrsV6C1WCcDeeTHeWBgiuuQ08LFTWUPwyu2QLVOVQQdbznwr dyakXnipUaXR209d5H0bO25R1Jiq/drKJzr935S67n3ngl6nEx/gQCZMFZzz9eMw5JC9OC isA5jHnHUJtGqNJdRJqmghD818XAEIs= 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-497-udgaQkDjPTmgJgZsyGy62w-1; Thu, 26 Aug 2021 14:14:34 -0400 X-MC-Unique: udgaQkDjPTmgJgZsyGy62w-1 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 C9EA71026200; Thu, 26 Aug 2021 18:14:33 +0000 (UTC) Received: from redhat.com (unknown [10.22.10.105]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4352560877; Thu, 26 Aug 2021 18:14:33 +0000 (UTC) Date: Thu, 26 Aug 2021 13:14:31 -0500 From: Bill O'Donnell To: "Darrick J. Wong" Cc: Bill O'Donnell , linux-xfs@vger.kernel.org Subject: Re: [PATCH] xfs: dax: facilitate EXPERIMENTAL warning for dax=inode case Message-ID: <20210826181431.ceecicrvpbxcl7p4@redhat.com> References: <20210826173012.273932-1-bodonnel@redhat.com> <20210826180947.GL12640@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210826180947.GL12640@magnolia> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Thu, Aug 26, 2021 at 11:09:47AM -0700, Darrick J. Wong wrote: > On Thu, Aug 26, 2021 at 12:30:12PM -0500, Bill O'Donnell wrote: > > When dax-mode was tri-stated by adding dax=inode case, the EXPERIMENTAL > > warning on mount was missed for the case. Add logic to handle the > > warning similar to that of the 'dax=always' case. > > > > Signed-off-by: Bill O'Donnell > > --- > > fs/xfs/xfs_mount.h | 2 ++ > > fs/xfs/xfs_super.c | 8 +++++--- > > 2 files changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h > > index e091f3b3fa15..c9243a1b8d05 100644 > > --- a/fs/xfs/xfs_mount.h > > +++ b/fs/xfs/xfs_mount.h > > @@ -277,6 +277,7 @@ typedef struct xfs_mount { > > #define XFS_FEAT_NEEDSREPAIR (1ULL << 25) /* needs xfs_repair */ > > > > /* Mount features */ > > +#define XFS_FEAT_DAX_INODE (1ULL << 47) /* DAX enabled */ > > #define XFS_FEAT_NOATTR2 (1ULL << 48) /* disable attr2 creation */ > > #define XFS_FEAT_NOALIGN (1ULL << 49) /* ignore alignment */ > > #define XFS_FEAT_ALLOCSIZE (1ULL << 50) /* user specified allocation size */ > > @@ -359,6 +360,7 @@ __XFS_HAS_FEAT(swalloc, SWALLOC) > > __XFS_HAS_FEAT(filestreams, FILESTREAMS) > > __XFS_HAS_FEAT(dax_always, DAX_ALWAYS) > > __XFS_HAS_FEAT(dax_never, DAX_NEVER) > > +__XFS_HAS_FEAT(dax_inode, DAX_INODE) > > __XFS_HAS_FEAT(norecovery, NORECOVERY) > > __XFS_HAS_FEAT(nouuid, NOUUID) > > > > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > > index 5e73ac78bf2f..f73f3687f0a8 100644 > > --- a/fs/xfs/xfs_super.c > > +++ b/fs/xfs/xfs_super.c > > @@ -84,15 +84,16 @@ xfs_mount_set_dax_mode( > > { > > switch (mode) { > > case XFS_DAX_INODE: > > + mp->m_features |= XFS_FEAT_DAX_INODE; > > mp->m_features &= ~(XFS_FEAT_DAX_ALWAYS | XFS_FEAT_DAX_NEVER); > > break; > > case XFS_DAX_ALWAYS: > > mp->m_features |= XFS_FEAT_DAX_ALWAYS; > > - mp->m_features &= ~XFS_FEAT_DAX_NEVER; > > + mp->m_features &= ~(XFS_FEAT_DAX_NEVER | XFS_FEAT_DAX_INODE); > > break; > > case XFS_DAX_NEVER: > > mp->m_features |= XFS_FEAT_DAX_NEVER; > > - mp->m_features &= ~XFS_FEAT_DAX_ALWAYS; > > + mp->m_features &= ~(XFS_FEAT_DAX_ALWAYS | XFS_FEAT_DAX_INODE); > > break; > > } > > } > > @@ -189,6 +190,7 @@ xfs_fs_show_options( > > { XFS_FEAT_LARGE_IOSIZE, ",largeio" }, > > { XFS_FEAT_DAX_ALWAYS, ",dax=always" }, > > { XFS_FEAT_DAX_NEVER, ",dax=never" }, > > + { XFS_FEAT_DAX_INODE, ",dax=inode" }, > > { 0, NULL } > > }; > > struct xfs_mount *mp = XFS_M(root->d_sb); > > @@ -1584,7 +1586,7 @@ xfs_fs_fill_super( > > if (xfs_has_crc(mp)) > > sb->s_flags |= SB_I_VERSION; > > > > - if (xfs_has_dax_always(mp)) { > > + if (xfs_has_dax_always(mp) || xfs_has_dax_inode(mp)) { > > Er... can't this be done without burning another feature bit by: > > if (xfs_has_dax_always(mp) || (!xfs_has_dax_always(mp) && > !xfs_has_dax_never(mp))) { > ... > xfs_warn(mp, "DAX IS EXPERIMENTAL"); > } > Good idea. I'll send a v2. Thanks- Bill > --D > > > bool rtdev_is_dax = false, datadev_is_dax; > > > > xfs_warn(mp, > > -- > > 2.31.1 > > >