From patchwork Thu Feb 1 20:32:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 10195993 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 89D9D605F5 for ; Thu, 1 Feb 2018 21:15:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F3E72841E for ; Thu, 1 Feb 2018 21:15:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C2E328788; Thu, 1 Feb 2018 21:15:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D111828935 for ; Thu, 1 Feb 2018 20:36:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755146AbeBAUcr (ORCPT ); Thu, 1 Feb 2018 15:32:47 -0500 Received: from mga07.intel.com ([134.134.136.100]:51119 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755145AbeBAUcn (ORCPT ); Thu, 1 Feb 2018 15:32:43 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2018 12:32:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,444,1511856000"; d="scan'208";a="16299107" Received: from djiang5-desk3.ch.intel.com ([143.182.136.93]) by fmsmga002.fm.intel.com with ESMTP; 01 Feb 2018 12:32:41 -0800 Subject: [PATCH 2] xfs: fix rt_dev usage for DAX From: Dave Jiang To: darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, ross.zwisler@linux.intel.com, linux-ext4@vger.kernel.org, dan.j.williams@intel.com, linux-nvdimm@lists.01.org Date: Thu, 01 Feb 2018 13:32:41 -0700 Message-ID: <151751716161.69821.14826493123161323243.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When using realtime device (rtdev) with xfs where the data device is not DAX capable, two issues arise. One is when data device is not DAX but the realtime device is DAX capable, we currently disable DAX. After passing this check, we are also not marking the inode as DAX capable. This change will allow DAX enabled if the data device or the realtime device is DAX capable. S_DAX will be marked for the inode if the file is residing on a DAX capable device. This will prevent the case of rtdev is not DAX and data device is DAX to create realtime files. Signed-off-by: Dave Jiang Reported-by: Darrick Wong --- fs/xfs/xfs_iops.c | 3 ++- fs/xfs/xfs_super.c | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 56475fcd76f2..ab352c325301 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1204,7 +1204,8 @@ xfs_diflags_to_iflags( ip->i_mount->m_sb.sb_blocksize == PAGE_SIZE && !xfs_is_reflink_inode(ip) && (ip->i_mount->m_flags & XFS_MOUNT_DAX || - ip->i_d.di_flags2 & XFS_DIFLAG2_DAX)) + ip->i_d.di_flags2 & XFS_DIFLAG2_DAX) && + blk_queue_dax(bdev_get_queue(inode->i_sb->s_bdev))) inode->i_flags |= S_DAX; } diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index e8a687232614..5ac478924dce 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1649,11 +1649,18 @@ xfs_fs_fill_super( sb->s_flags |= SB_I_VERSION; if (mp->m_flags & XFS_MOUNT_DAX) { + bool rtdev_is_dax = false; + xfs_warn(mp, "DAX enabled. Warning: EXPERIMENTAL, use at your own risk"); + if (mp->m_rtdev_targp->bt_daxdev) + if (bdev_dax_supported(mp->m_rtdev_targp->bt_bdev, + sb->s_blocksize) == 0) + rtdev_is_dax = true; + error = bdev_dax_supported(sb->s_bdev, sb->s_blocksize); - if (error) { + if (error && !rtdev_is_dax) { xfs_alert(mp, "DAX unsupported by block device. Turning off DAX."); mp->m_flags &= ~XFS_MOUNT_DAX;