From patchwork Fri Feb 17 14:48:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 13144845 Received: from mail1.bemta37.messagelabs.com (mail1.bemta37.messagelabs.com [85.158.142.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D3777474 for ; Fri, 17 Feb 2023 14:49:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1676645342; i=@fujitsu.com; bh=1Iu3u5+frabq+ciV1X7SE3/U2Roif2mChYvCwrIUtnA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Av6mfMrFVUfHI5GVDJmpx/viKNG+rVkvMpN2k4ClfAKkbULLSEiuoQKKhlajxui9f fEiIPv72Ljgf0NlBGoxZCTwPoIsQfZjpYokBY4VGBvdGVUGq1upS63pT5e6+jHqEdl hKd58UH7f9+5De7pls8Hf93VeY1IeqjDvoHkFeLWVYOE9gwxbBSraj+p6rCsq7m35M OAIb+DGYvzQ9rI2CiRyeJ1a/vASRM3F7HsSwm+mNp55MMyarBSwkleixqg7kPakjBz WgBof1RljjpdAUNyVwXf/JvE6z4gaG5WvHfymvApEQRf7TNBlpL+Wa+kJ/aq2QUGGT jVVyqhSyNPr3A== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJKsWRWlGSWpSXmKPExsViZ8ORpHt18vt kg/u3JSzmrF/DZjF96gVGiy3H7jFaXH7CZ3F6wiImi92vb7JZ7Nl7ksXi3pr/rBa7/uxgt1j5 4w+rxe8fc9gcuD1OLZLw2LxCy2PxnpdMHptWdbJ5bPo0id3jxIzfLB4vNs9k9Pj49BaLx+dNc gGcUayZeUn5FQmsGbPvX2Ap6OKpeP1mN3MDYydXFyMXh5DARkaJvR0z2SCcpUwSB7auZYJw9j FKbJq8kLmLkZODTUBH4sKCv6wgtohAocSKU0dZQIqYBY4zSmxZvgmsSFjAWeLV7U1gRSwCqhK Lbt0DKuLg4BVwkdh1XxYkLCGgIDHl4Xuwck4BV4mlk0+ygdhCQCUH2k4wgti8AoISJ2c+YQGx mQUkJA6+eMEMMkZCQEliZnc8xJhKidYPv1ggbDWJq+c2MU9gFJyFpHsWku4FjEyrGM2LU4vKU ot0DU30kooy0zNKchMzc/QSq3QT9VJLdfPyi0oydA31EsuL9VKLi/WKK3OTc1L08lJLNjECYy 2lOPH4DsZXfX/1DjFKcjApifIaJrxPFuJLyk+pzEgszogvKs1JLT7EKMPBoSTBe7ofKCdYlJq eWpGWmQOMe5i0BAePkgjv5HygNG9xQWJucWY6ROoUoy7H2oYDe5mFWPLy81KlxHlnTAIqEgAp yijNgxsBS0GXGGWlhHkZGRgYhHgKUotyM0tQ5V8xinMwKgnzPp8INIUnM68EbtMroCOYgI5Yw PwW5IiSRISUVAOTaTRfr+IfkaSwtZzfHON+bF5quHnjy4Aty7ZKihmLduyO1tzwxtt/tmV3Kb 9d7sej9/+VcsoyzLX9q26v/uS80CGnXhfrDMNWeWNn5xieOcpS/5q2Ne6r2tUTLC88bduxsuu CjKxzN69rfjV79QfWt0VnmP5qf/V83vJkkikfg5Nu/PdFH20LdmZeYX+c16N6RFNy0bVdeZFr zcOkWzUT7RiPb573tI37l9fbrtnzDt37WG10cdXFlp+cG65d/VfE+kJpc/L18pwoBeurLaVf+ LltxdtnmIlMaLiVpWjIc/eM0FSPxE6uuYfCzO6U36jkla3l1XfmEWl/mLHscH7/D87nk9UWMj 2S6r/ZbaDEUpyRaKjFXFScCAD6qMFzvAMAAA== X-Env-Sender: ruansy.fnst@fujitsu.com X-Msg-Ref: server-17.tower-728.messagelabs.com!1676645332!261550!1 X-Originating-IP: [62.60.8.98] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.102.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6204 invoked from network); 17 Feb 2023 14:48:53 -0000 Received: from unknown (HELO n03ukasimr03.n03.fujitsu.local) (62.60.8.98) by server-17.tower-728.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Feb 2023 14:48:53 -0000 Received: from n03ukasimr03.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTP id C36931B5; Fri, 17 Feb 2023 14:48:52 +0000 (GMT) Received: from R01UKEXCASM223.r01.fujitsu.local (R01UKEXCASM223 [10.182.185.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTPS id B55641AC; Fri, 17 Feb 2023 14:48:52 +0000 (GMT) Received: from localhost.localdomain (10.167.225.141) by R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 17 Feb 2023 14:48:48 +0000 From: Shiyang Ruan To: , , , CC: , , , , , , , Subject: [PATCH v10 1/3] xfs: fix the calculation of length and end Date: Fri, 17 Feb 2023 14:48:30 +0000 Message-ID: <1676645312-13-2-git-send-email-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1676645312-13-1-git-send-email-ruansy.fnst@fujitsu.com> References: <1676645312-13-1-git-send-email-ruansy.fnst@fujitsu.com> Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Originating-IP: [10.167.225.141] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) X-Virus-Scanned: ClamAV using ClamSMTP The end should be start + length - 1. Also fix the calculation of the length when seeking for intersection of notify range and device. Signed-off-by: Shiyang Ruan Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_notify_failure.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_notify_failure.c b/fs/xfs/xfs_notify_failure.c index c4078d0ec108..7d46a7e4980f 100644 --- a/fs/xfs/xfs_notify_failure.c +++ b/fs/xfs/xfs_notify_failure.c @@ -114,7 +114,7 @@ xfs_dax_notify_ddev_failure( int error = 0; xfs_fsblock_t fsbno = XFS_DADDR_TO_FSB(mp, daddr); xfs_agnumber_t agno = XFS_FSB_TO_AGNO(mp, fsbno); - xfs_fsblock_t end_fsbno = XFS_DADDR_TO_FSB(mp, daddr + bblen); + xfs_fsblock_t end_fsbno = XFS_DADDR_TO_FSB(mp, daddr + bblen - 1); xfs_agnumber_t end_agno = XFS_FSB_TO_AGNO(mp, end_fsbno); error = xfs_trans_alloc_empty(mp, &tp); @@ -210,7 +210,7 @@ xfs_dax_notify_failure( ddev_end = ddev_start + bdev_nr_bytes(mp->m_ddev_targp->bt_bdev) - 1; /* Ignore the range out of filesystem area */ - if (offset + len < ddev_start) + if (offset + len - 1 < ddev_start) return -ENXIO; if (offset > ddev_end) return -ENXIO; @@ -222,8 +222,8 @@ xfs_dax_notify_failure( len -= ddev_start - offset; offset = 0; } - if (offset + len > ddev_end) - len -= ddev_end - offset; + if (offset + len - 1 > ddev_end) + len = ddev_end - offset + 1; return xfs_dax_notify_ddev_failure(mp, BTOBB(offset), BTOBB(len), mf_flags); From patchwork Fri Feb 17 14:48:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 13144847 Received: from mail1.bemta37.messagelabs.com (mail1.bemta37.messagelabs.com [85.158.142.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 683417475 for ; Fri, 17 Feb 2023 14:49:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1676645347; i=@fujitsu.com; bh=INlLG2eFV3uujOkd6ZNxPXwHuXCi55rS88mcPFlZilQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WfrfGMfot7nIs64TT9/DTrQXXNG7NiPQ8B14HONhxnom8dbZi0xxQRaWavm3VAnwQ xCU++A5+IIETgEteq8KcfIEWrZ4l2JWMbbtoR1a8hetJAw2aWvQSF4zovhGl53RaCz CoFMGRmRck7fW2IBq+P2OUiQD3ZGRZ/6YOxYQsrTi8TPjQXQc2vemzsyVeNj6DBtmd zFRIE29MJI3aBBTV7ptls/eKGV2AnXBUlXbfA3q2O1/aPzcTutS6N3b0WJ0i7DTZ2C ZeiPWXOQM+fPrULcqj1mBT/1PbXSxop/s0V4zlocoFIkchttfAlCjsXNf/q0NpzLFZ VPq9auGUGvxiA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDKsWRWlGSWpSXmKPExsViZ8MxSffm5Pf JBps2GFnMWb+GzWL61AuMFluO3WO0uPyEz+L0hEVMFrtf32Sz2LP3JIvFvTX/WS12/dnBbrHy xx9Wi98/5rA5cHucWiThsXmFlsfiPS+ZPDat6mTz2PRpErvHiRm/WTxebJ7J6PHx6S0Wj8+b5 AI4o1gz85LyKxJYMx6e3clSsNm44krDHZYGxkfaXYxcHEICWxglLkw6wwzhrGCSeLSrjQnC2c coMeFkF2MXIycHm4COxIUFf1lBbBGBQokVp46ygBQxCxxnlNiyfBNQOweHsICtxOQv1SA1LAK qEqefNoPV8wq4SKw80MUOYksIKEhMefieGcTmFHCVWDr5JBuILQRUc6DtBCNEvaDEyZlPWEBs ZgEJiYMvXoCNlxBQkpjZHQ8xplKi9cMvFghbTeLquU3MExgFZyHpnoWkewEj0ypGs+LUorLUI l1DvaSizPSMktzEzBy9xCrdRL3UUt28/KKSDKBUYnmxXmpxsV5xZW5yTopeXmrJJkZgpKUUJ9 7ewbi896/eIUZJDiYlUV7DhPfJQnxJ+SmVGYnFGfFFpTmpxYcYZTg4lCR4T/cD5QSLUtNTK9I yc4BRD5OW4OBREuGdnA+U5i0uSMwtzkyHSJ1iVJQS550xCSghAJLIKM2Da4MlmkuMslLCvIwM DAxCPAWpRbmZJajyrxjFORiVhHmfTwSawpOZVwI3/RXQYiagxQuY34IsLklESEk1MPFsULF/n J+c28drqJinKzvRY+FSa8fVPVEeN+xWOUS1eyyLbDviKDPFek2Lucl1k+NvPviuque+ECvy5+ N6++udviy1WT/W/3rAztHP3CTU93HHkX2/f8w0ya9tf7zPVPPHPtUZ0w7UXA2dkrc4dtb+k6c kNWoUje7ZCx9o8VA223g1sOV+Rhnzs933nk3yeTp11YlVi9I88vROrClnTTq7KrN1nfUd+7Iz zy8Fvdlkkrx0ewu32dw1f3P/23ceFDnqZPtgQd2OZ+1y+9x/cMzIDrxes0VDYMbOySmLEgLP6 5Qm3Fn9/L/pxGseSjqJu0IYJ2d+Xd2ZwCzk9M1oqfKE+sVzCp+9qd2orfr02Q0lluKMREMt5q LiRABaE7XprwMAAA== X-Env-Sender: ruansy.fnst@fujitsu.com X-Msg-Ref: server-15.tower-732.messagelabs.com!1676645337!10103!1 X-Originating-IP: [62.60.8.146] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.102.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24964 invoked from network); 17 Feb 2023 14:48:57 -0000 Received: from unknown (HELO n03ukasimr02.n03.fujitsu.local) (62.60.8.146) by server-15.tower-732.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Feb 2023 14:48:57 -0000 Received: from n03ukasimr02.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTP id 2DB181000DB; Fri, 17 Feb 2023 14:48:57 +0000 (GMT) Received: from R01UKEXCASM223.r01.fujitsu.local (R01UKEXCASM223 [10.182.185.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTPS id 210781000C1; Fri, 17 Feb 2023 14:48:57 +0000 (GMT) Received: from localhost.localdomain (10.167.225.141) by R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 17 Feb 2023 14:48:52 +0000 From: Shiyang Ruan To: , , , CC: , , , , , , , Subject: [PATCH v10 2/3] fs: introduce super_drop_pagecache() Date: Fri, 17 Feb 2023 14:48:31 +0000 Message-ID: <1676645312-13-3-git-send-email-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1676645312-13-1-git-send-email-ruansy.fnst@fujitsu.com> References: <1676645312-13-1-git-send-email-ruansy.fnst@fujitsu.com> Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Originating-IP: [10.167.225.141] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) X-Virus-Scanned: ClamAV using ClamSMTP xfs_notify_failure.c requires a method to invalidate all dax mappings. drop_pagecache_sb() can do this but it is a static function and only build with CONFIG_SYSCTL. Now, move its implementation into super.c and call it super_drop_pagecache(). Use its second argument as invalidator so that we can choose which invalidate method to use. Signed-off-by: Shiyang Ruan --- fs/drop_caches.c | 29 +-------------------------- fs/super.c | 43 +++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 2 ++ include/linux/pagemap.h | 1 + mm/truncate.c | 20 +++++++++++++++++-- 5 files changed, 65 insertions(+), 30 deletions(-) diff --git a/fs/drop_caches.c b/fs/drop_caches.c index e619c31b6bd9..f88ce339b635 100644 --- a/fs/drop_caches.c +++ b/fs/drop_caches.c @@ -17,34 +17,7 @@ int sysctl_drop_caches; static void drop_pagecache_sb(struct super_block *sb, void *unused) { - struct inode *inode, *toput_inode = NULL; - - spin_lock(&sb->s_inode_list_lock); - list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { - spin_lock(&inode->i_lock); - /* - * We must skip inodes in unusual state. We may also skip - * inodes without pages but we deliberately won't in case - * we need to reschedule to avoid softlockups. - */ - if ((inode->i_state & (I_FREEING|I_WILL_FREE|I_NEW)) || - (mapping_empty(inode->i_mapping) && !need_resched())) { - spin_unlock(&inode->i_lock); - continue; - } - __iget(inode); - spin_unlock(&inode->i_lock); - spin_unlock(&sb->s_inode_list_lock); - - invalidate_mapping_pages(inode->i_mapping, 0, -1); - iput(toput_inode); - toput_inode = inode; - - cond_resched(); - spin_lock(&sb->s_inode_list_lock); - } - spin_unlock(&sb->s_inode_list_lock); - iput(toput_inode); + super_drop_pagecache(sb, invalidate_inode_pages); } int drop_caches_sysctl_handler(struct ctl_table *table, int write, diff --git a/fs/super.c b/fs/super.c index 12c08cb20405..a403243b5513 100644 --- a/fs/super.c +++ b/fs/super.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include "internal.h" @@ -678,6 +679,48 @@ void drop_super_exclusive(struct super_block *sb) } EXPORT_SYMBOL(drop_super_exclusive); +/** + * super_drop_pagecache - drop all page caches of a filesystem + * @sb: superblock to invalidate + * @arg: invalidate method, such as invalidate_inode_pages(), + * invalidate_inode_pages2() + * + * Scans the inodes of a filesystem, drop all page caches. + */ +void super_drop_pagecache(struct super_block *sb, + int (*invalidator)(struct address_space *)) +{ + struct inode *inode, *toput_inode = NULL; + + spin_lock(&sb->s_inode_list_lock); + list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { + spin_lock(&inode->i_lock); + /* + * We must skip inodes in unusual state. We may also skip + * inodes without pages but we deliberately won't in case + * we need to reschedule to avoid softlockups. + */ + if ((inode->i_state & (I_FREEING|I_WILL_FREE|I_NEW)) || + (mapping_empty(inode->i_mapping) && !need_resched())) { + spin_unlock(&inode->i_lock); + continue; + } + __iget(inode); + spin_unlock(&inode->i_lock); + spin_unlock(&sb->s_inode_list_lock); + + invalidator(inode->i_mapping); + iput(toput_inode); + toput_inode = inode; + + cond_resched(); + spin_lock(&sb->s_inode_list_lock); + } + spin_unlock(&sb->s_inode_list_lock); + iput(toput_inode); +} +EXPORT_SYMBOL(super_drop_pagecache); + static void __iterate_supers(void (*f)(struct super_block *)) { struct super_block *sb, *p = NULL; diff --git a/include/linux/fs.h b/include/linux/fs.h index c1769a2c5d70..fdcaa9bf85dd 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3308,6 +3308,8 @@ extern struct super_block *get_super(struct block_device *); extern struct super_block *get_active_super(struct block_device *bdev); extern void drop_super(struct super_block *sb); extern void drop_super_exclusive(struct super_block *sb); +void super_drop_pagecache(struct super_block *sb, + int (*invalidator)(struct address_space *)); extern void iterate_supers(void (*)(struct super_block *, void *), void *); extern void iterate_supers_type(struct file_system_type *, void (*)(struct super_block *, void *), void *); diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 29e1f9e76eb6..d0a180268baa 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -27,6 +27,7 @@ static inline void invalidate_remote_inode(struct inode *inode) S_ISLNK(inode->i_mode)) invalidate_mapping_pages(inode->i_mapping, 0, -1); } +int invalidate_inode_pages(struct address_space *mapping); int invalidate_inode_pages2(struct address_space *mapping); int invalidate_inode_pages2_range(struct address_space *mapping, pgoff_t start, pgoff_t end); diff --git a/mm/truncate.c b/mm/truncate.c index 7b4ea4c4a46b..131f2ab2d566 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -540,12 +540,13 @@ unsigned long invalidate_mapping_pagevec(struct address_space *mapping, } /** - * invalidate_mapping_pages - Invalidate all clean, unlocked cache of one inode + * invalidate_mapping_pages - Invalidate range of clean, unlocked cache of one + * inode * @mapping: the address_space which holds the cache to invalidate * @start: the offset 'from' which to invalidate * @end: the offset 'to' which to invalidate (inclusive) * - * This function removes pages that are clean, unmapped and unlocked, + * This function removes range of pages that are clean, unmapped and unlocked, * as well as shadow entries. It will not block on IO activity. * * If you want to remove all the pages of one inode, regardless of @@ -560,6 +561,21 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping, } EXPORT_SYMBOL(invalidate_mapping_pages); +/** + * invalidate_inode_pages - Invalidate all clean, unlocked cache of one inode + * @mapping: the address_space which holds the cache to invalidate + * + * This function removes all pages that are clean, unmapped and unlocked, + * as well as shadow entries. It will not block on IO activity. + */ +int invalidate_inode_pages(struct address_space *mapping) +{ + invalidate_mapping_pages(mapping, 0, -1); + + return 0; +} +EXPORT_SYMBOL(invalidate_inode_pages); + /* * This is like invalidate_inode_page(), except it ignores the page's * refcount. We do this because invalidate_inode_pages2() needs stronger From patchwork Fri Feb 17 14:48:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 13144846 Received: from mail1.bemta37.messagelabs.com (mail1.bemta37.messagelabs.com [85.158.142.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E07E97475 for ; Fri, 17 Feb 2023 14:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1676645343; i=@fujitsu.com; bh=A2wAW+QXyIH1Dyff7tecUiExycjpgnQWjt6WHBG3wNQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ji0uCx/Zhz36NWi/Lm2xY2Wrzxh9bC6giHlydN1BJicaEVwD+b6ixwx18s0xHKZh5 g2tZu78f0j6AojtVlECNTkBLP8jjP1AgyyVPFxLTddQOp6qJSjfXiyV0Cd5bwZPMrz +aHQpBcF2fN7iL3SkBDN6+zG68Y4vSiUKAVUrihkFK6nK6vaBQoDwMcHc/3oVOiShA xTTA+p+69bfjR9RNY9S52bf3jgvkA0+ynFs7S96HtTXXCeOH1+HjABDydUejLbJI6n fYzwWI+XpwFjnoEwbH+XE5c02KJU0S0uLopeKSEdGR9ZxofxTgY/X4nhkrFvAD8T/3 BWuHfeX6ChZmg== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBKsWRWlGSWpSXmKPExsViZ8OxWffe5Pf JBpdm8VnMWb+GzWL61AuMFluO3WO0uPyEz+L0hEVMFrtf32Sz2LP3JIvFvTX/WS12/dnBbrHy xx9Wi98/5rA5cHucWiThsXmFlsfiPS+ZPDat6mTz2PRpErvHiRm/WTxebJ7J6PHx6S0Wj8+b5 AI4o1gz85LyKxJYMyY+3cdcsF654t/Hz4wNjGdluxi5OIQENjBKPP7wix3CWcIk8f3bMyCHE8 jZxygx734RiM0moCNxYcFfVhBbRKBQYsWpoywgDcwCxxkltizfxAySEBbwkmh5tA2siEVAVeL sgg1gcV4BF4mnq/4xgtgSAgoSUx6+B4tzCrhKLJ18kg1imYvEgbYTjBD1ghInZz5hAbGZBSQk Dr54AVTPAdSrJDGzOx5iTKVE64dfLBC2msTVc5uYJzAKzkLSPQtJ9wJGplWMZsWpRWWpRbqme klFmekZJbmJmTl6iVW6iXqppbp5+UUlGbqGeonlxXqpxcV6xZW5yTkpenmpJZsYgZGWUpzMsI Oxs++v3iFGSQ4mJVFew4T3yUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeE/3A+UEi1LTUyvSMnO AUQ+TluDgURLhnZwPlOYtLkjMLc5Mh0idYtTlWNtwYC+zEEtefl6qlDjvjElARQIgRRmleXAj YAnoEqOslDAvIwMDgxBPQWpRbmYJqvwrRnEORiVh3ucTgabwZOaVwG16BXQEE9ARC5jfghxRk oiQkmpgit5+/KbrI8s/D299WSwXPSfiRz23aYBGsVWqzeHql6GXQ9ZOnLxgw85szvBMx4Uzq+ z+ivGdme0rt1Vk3v2UWataMlOb2QVz0vKKSyS+NJmvjZWYeuJHzjvmhYaeen95v7/yWt50uKb PYi1LV9F+s2OW0Uu/LXD/viHpHNdzs60lljsfxbfdVew8X+V1PNipTFD84budefsfKQh7l5+u Zzjwk/unZIG5hNAz1ypOo+U+AZ6SJ9bNuTL/0QOv4ydObnatnvfEqzZOVkArK9Iw8Ow1Jp+JS +otf78M4JZ8/zstVfaSobapY/yxqbI55htnxhnyXZvfwMl6OTWocqFO2YMthVt/FfTa11VF5R QrsRRnJBpqMRcVJwIAW0qBWbsDAAA= X-Env-Sender: ruansy.fnst@fujitsu.com X-Msg-Ref: server-7.tower-732.messagelabs.com!1676645341!163832!1 X-Originating-IP: [62.60.8.179] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.102.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14491 invoked from network); 17 Feb 2023 14:49:02 -0000 Received: from unknown (HELO n03ukasimr04.n03.fujitsu.local) (62.60.8.179) by server-7.tower-732.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Feb 2023 14:49:02 -0000 Received: from n03ukasimr04.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr04.n03.fujitsu.local (Postfix) with ESMTP id 880897C; Fri, 17 Feb 2023 14:49:01 +0000 (GMT) Received: from R01UKEXCASM223.r01.fujitsu.local (R01UKEXCASM223 [10.182.185.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr04.n03.fujitsu.local (Postfix) with ESMTPS id 7B7BE7B; Fri, 17 Feb 2023 14:49:01 +0000 (GMT) Received: from localhost.localdomain (10.167.225.141) by R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 17 Feb 2023 14:48:57 +0000 From: Shiyang Ruan To: , , , CC: , , , , , , , Subject: [PATCH v10 3/3] mm, pmem, xfs: Introduce MF_MEM_REMOVE for unbind Date: Fri, 17 Feb 2023 14:48:32 +0000 Message-ID: <1676645312-13-4-git-send-email-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1676645312-13-1-git-send-email-ruansy.fnst@fujitsu.com> References: <1676645312-13-1-git-send-email-ruansy.fnst@fujitsu.com> Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Originating-IP: [10.167.225.141] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) X-Virus-Scanned: ClamAV using ClamSMTP This patch is inspired by Dan's "mm, dax, pmem: Introduce dev_pagemap_failure()"[1]. With the help of dax_holder and ->notify_failure() mechanism, the pmem driver is able to ask filesystem (or mapped device) on it to unmap all files in use and notify processes who are using those files. Call trace: trigger unbind -> unbind_store() -> ... (skip) -> devres_release_all() # was pmem driver ->remove() in v1 -> kill_dax() -> dax_holder_notify_failure(dax_dev, 0, U64_MAX, MF_MEM_PRE_REMOVE) -> xfs_dax_notify_failure() Introduce MF_MEM_PRE_REMOVE to let filesystem know this is a remove event. So do not shutdown filesystem directly if something not supported, or if failure range includes metadata area. Make sure all files and processes are handled correctly. [1]: https://lore.kernel.org/linux-mm/161604050314.1463742.14151665140035795571.stgit@dwillia2-desk3.amr.corp.intel.com/ Signed-off-by: Shiyang Ruan --- drivers/dax/super.c | 3 ++- fs/xfs/xfs_notify_failure.c | 26 ++++++++++++++++++++++++++ include/linux/mm.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/dax/super.c b/drivers/dax/super.c index c4c4728a36e4..2e1a35e82fce 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -323,7 +323,8 @@ void kill_dax(struct dax_device *dax_dev) return; if (dax_dev->holder_data != NULL) - dax_holder_notify_failure(dax_dev, 0, U64_MAX, 0); + dax_holder_notify_failure(dax_dev, 0, U64_MAX, + MF_MEM_PRE_REMOVE); clear_bit(DAXDEV_ALIVE, &dax_dev->flags); synchronize_srcu(&dax_srcu); diff --git a/fs/xfs/xfs_notify_failure.c b/fs/xfs/xfs_notify_failure.c index 7d46a7e4980f..5f915cfc9632 100644 --- a/fs/xfs/xfs_notify_failure.c +++ b/fs/xfs/xfs_notify_failure.c @@ -22,6 +22,7 @@ #include #include +#include struct xfs_failure_info { xfs_agblock_t startblock; @@ -77,6 +78,9 @@ xfs_dax_failure_fn( if (XFS_RMAP_NON_INODE_OWNER(rec->rm_owner) || (rec->rm_flags & (XFS_RMAP_ATTR_FORK | XFS_RMAP_BMBT_BLOCK))) { + /* The device is about to be removed. Not a really failure. */ + if (notify->mf_flags & MF_MEM_PRE_REMOVE) + return 0; notify->want_shutdown = true; return 0; } @@ -168,7 +172,11 @@ xfs_dax_notify_ddev_failure( xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_ONDISK); if (!error) error = -EFSCORRUPTED; + } else if (mf_flags & MF_MEM_PRE_REMOVE) { + error = thaw_super(mp->m_super); + xfs_force_shutdown(mp, SHUTDOWN_FORCE_UMOUNT); } + return error; } @@ -182,6 +190,7 @@ xfs_dax_notify_failure( struct xfs_mount *mp = dax_holder(dax_dev); u64 ddev_start; u64 ddev_end; + int error; if (!(mp->m_super->s_flags & SB_BORN)) { xfs_warn(mp, "filesystem is not ready for notify_failure()!"); @@ -196,6 +205,8 @@ xfs_dax_notify_failure( if (mp->m_logdev_targp && mp->m_logdev_targp->bt_daxdev == dax_dev && mp->m_logdev_targp != mp->m_ddev_targp) { + if (mf_flags & MF_MEM_PRE_REMOVE) + return 0; xfs_err(mp, "ondisk log corrupt, shutting down fs!"); xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_ONDISK); return -EFSCORRUPTED; @@ -209,6 +220,12 @@ xfs_dax_notify_failure( ddev_start = mp->m_ddev_targp->bt_dax_part_off; ddev_end = ddev_start + bdev_nr_bytes(mp->m_ddev_targp->bt_bdev) - 1; + /* Notify failure on the whole device */ + if (offset == 0 && len == U64_MAX) { + offset = ddev_start; + len = bdev_nr_bytes(mp->m_ddev_targp->bt_bdev); + } + /* Ignore the range out of filesystem area */ if (offset + len - 1 < ddev_start) return -ENXIO; @@ -225,6 +242,15 @@ xfs_dax_notify_failure( if (offset + len - 1 > ddev_end) len = ddev_end - offset + 1; + if (mf_flags & MF_MEM_PRE_REMOVE) { + xfs_info(mp, "device is about to be removed!"); + error = freeze_super(mp->m_super); + if (error) + return error; + /* invalidate_inode_pages2() invalidates dax mapping */ + super_drop_pagecache(mp->m_super, invalidate_inode_pages2); + } + return xfs_dax_notify_ddev_failure(mp, BTOBB(offset), BTOBB(len), mf_flags); } diff --git a/include/linux/mm.h b/include/linux/mm.h index 8f857163ac89..9711dbc9451f 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3424,6 +3424,7 @@ enum mf_flags { MF_UNPOISON = 1 << 4, MF_SW_SIMULATED = 1 << 5, MF_NO_RETRY = 1 << 6, + MF_MEM_PRE_REMOVE = 1 << 7, }; int mf_dax_kill_procs(struct address_space *mapping, pgoff_t index, unsigned long count, int mf_flags);