From patchwork Sat Feb 4 14:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 13128726 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21DB9C61DA4 for ; Sat, 4 Feb 2023 14:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233705AbjBDO7a (ORCPT ); Sat, 4 Feb 2023 09:59:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233373AbjBDO7V (ORCPT ); Sat, 4 Feb 2023 09:59:21 -0500 Received: from mail1.bemta34.messagelabs.com (mail1.bemta34.messagelabs.com [195.245.231.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EDA534C0D; Sat, 4 Feb 2023 06:59:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1675522744; i=@fujitsu.com; bh=dHPfdcvntcTuGRB7mplma0aCs7gQGflhDCMIDJ2bzmY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YvKFAEuatpTlK2jH5ZJqXLuKX8BrnMDOBfHPEFXj1DUIRTutS30RX0fV4Pgyv6V4I tIORfVl+merggHc1RDq6ey44Iw4vBD8PfpRiVNqOgQ7q5HXzfGpE3kZIpgTtJ3U5l+ uq++2wxdNGRvqFbuKZeFftMzMr4YVzKEFXradHCbGkx1XwVYl9kqi3QwpuYnBbjX43 Jf3ZhEfgMcLFPMUrnmWFswYzLDQU8MYNWswHU++bzIlpBw0frMiT1dgPI/ozGRT6mH zKC1F2jCGr1lTBc0hOEFSSmSYPwBhQgvrxn6eP6R+bAH6OGBlhnaZSXmtGWO/s6JJw 0IcrouTun08UQ== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHKsWRWlGSWpSXmKPExsViZ8ORpLut6F6 ywZ6FAhbTp15gtNhy7B6jxeUnfBanJyxistj9+iabxZ69J1ksLu+aw2Zxb81/Votdf3awW6z8 8YfVgcvj1CIJj80rtDwW73nJ5LFpVSebx6ZPk9g9Xmyeyejx8ektFo/Pm+QCOKJYM/OS8isSW DMW7nzMXjCRp6Jt2V/mBsY+ri5GLg4hgY2MEhMebGWEcJYySRx/eYMJwtnLKHF23jm2LkZODj YBHYkLC/6ygiREBCYxShy7cZMZJMEsUC6xf+MNsCJhASeJmTP3sYLYLAIqEnM+rASr4RVwkVj V3glmSwgoSEx5+B7M5hRwlXj7/ixYrxBQTfOd30wQ9YISJ2c+YYGYLyFx8MULoHoOoF4liZnd 8RBjKiVaP/xigbDVJK6e28Q8gVFwFpLuWUi6FzAyrWI0LU4tKkst0jXUSyrKTM8oyU3MzNFLr NJN1Est1S1PLS7RNdJLLC/WSy0u1iuuzE3OSdHLSy3ZxAiMqpRi5Yk7GFf0/tU7xCjJwaQkyt vvfzdZiC8pP6UyI7E4I76oNCe1+BCjDAeHkgTv9YJ7yUKCRanpqRVpmTnACIdJS3DwKInw/gZ J8xYXJOYWZ6ZDpE4x6nKsbTiwl1mIJS8/L1VKnLe1EKhIAKQoozQPbgQs2VxilJUS5mVkYGAQ 4ilILcrNLEGVf8UozsGoJMx7C2QVT2ZeCdymV0BHMAEd0W1wF+SIkkSElFQDU9HDgz8N3qm0K qz6UfJEZaNVZtCK2n36uyLTWbSKV8VMO8WaKfJS+Ph5PqFGvYMXdnxce3jl4bDPInH1Gpef3j q3OeuvD4fDg82bI2Pu7Xpo1VE1IXjJu5cP6v/Zvt9QHnA00POAu/hq/VudDjGG7gt4kh0n/89 /dPcy48Fb6ozT1SXrbHo2bmvqO2Ny9MG1p7KLlxzNFO2MNouc2/TgV6GX0t9fuxUEDF4se6ZY 5b/297FzB7kSmO1Mb80uCFSNOZ3tc8DjwLbgc7YJU2MOneTRt9isEql0IN2W78WbPSXK327xW kbKhEiJ6D2//1VNzPH89M2sAVHTOT7HaIisjGNsZjP5WJf1tSBrm6vcKyWW4oxEQy3mouJEAL S5mr6xAwAA X-Env-Sender: ruansy.fnst@fujitsu.com X-Msg-Ref: server-7.tower-571.messagelabs.com!1675522742!175014!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 25318 invoked from network); 4 Feb 2023 14:59:02 -0000 Received: from unknown (HELO n03ukasimr03.n03.fujitsu.local) (62.60.8.98) by server-7.tower-571.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 4 Feb 2023 14:59:02 -0000 Received: from n03ukasimr03.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTP id E6A831AD; Sat, 4 Feb 2023 14:59: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 n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTPS id D98EF1AC; Sat, 4 Feb 2023 14:59: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; Sat, 4 Feb 2023 14:58:57 +0000 From: Shiyang Ruan To: , , , , CC: , , , , Subject: [PATCH v9 1/3] xfs: fix the calculation of length and end Date: Sat, 4 Feb 2023 14:58:36 +0000 Message-ID: <1675522718-88-2-git-send-email-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675522718-88-1-git-send-email-ruansy.fnst@fujitsu.com> References: <1675522718-88-1-git-send-email-ruansy.fnst@fujitsu.com> 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 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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..3830f908e215 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 -= offset + len - 1 - ddev_end; return xfs_dax_notify_ddev_failure(mp, BTOBB(offset), BTOBB(len), mf_flags); From patchwork Sat Feb 4 14:58:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 13128727 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BA64C6379F for ; Sat, 4 Feb 2023 14:59:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233736AbjBDO7g (ORCPT ); Sat, 4 Feb 2023 09:59:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231654AbjBDO7V (ORCPT ); Sat, 4 Feb 2023 09:59:21 -0500 Received: from mail3.bemta32.messagelabs.com (mail3.bemta32.messagelabs.com [195.245.230.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3626826CC0; Sat, 4 Feb 2023 06:59:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1675522749; i=@fujitsu.com; bh=SXHgAvHOxwfPzF/KQUQcvGQnbZfjSKT6gb8R3kyvGBo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jBfkAGCZ9FZPqdZWz2HTq8cVeMpHR/5NhpdLBp9z2vtboyH0nYXNch+Hwjvf+S5mu aQddaqcph5sqd6ShKSc4MvkILFKQZwMxdfAzDeJC14Inj+/VuC8bnR+KRbXW9bcchB G25sjKf3v/ppkuwu7EO9vD7bA2sIpkzCBw3NPm2//zO7GRc8BNBbltlOCuE7PME1QA 3PLH9D96TNKzO9BV7IHSuvY0gtPjqKbsXdeH0KdlUJm5Y8dDAIR67POmAGHUnCdBUP mhzoOpWkEThDufra2wZKNUdV/Gq8AHulIirue5Xaiy1Ua2B7cVew7LmchUZS2WGXoL 348+pp+tzvO0A== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIKsWRWlGSWpSXmKPExsViZ8MxSXdX0b1 kgzcXxSymT73AaLHl2D1Gi8tP+CxOT1jEZLH79U02iz17T7JYXN41h83i3pr/rBa7/uxgt1j5 4w+rA5fHqUUSHptXaHks3vOSyWPTqk42j02fJrF7vNg8k9Hj49NbLB6fN8kFcESxZuYl5Vcks GZ8OnmHuaDPrKL7FHsD4zvdLkYuDiGBLYwSvWs2MkI4K5gk5m3cwwzh7GWU6Nm9DijDycEmoC NxYcFfVpCEiMAkRoljN24ygySYBcol9m+8wQZiCwu4Saw/8AKsgUVARaLh6zKwOK+Ai8TlCZP B4hICChJTHr4H6+UUcJV4+/4sWI0QUE3znd9MEPWCEidnPmGBmC8hcfDFC6B6DqBeJYmZ3fEQ YyolWj/8YoGw1SSuntvEPIFRcBaS7llIuhcwMq1iNC1OLSpLLdK11EsqykzPKMlNzMzRS6zST dRLLdUtTy0u0TXUSywv1kstLtYrrsxNzknRy0st2cQIjKmUYlanHYzH+/7qHWKU5GBSEuXt97 +bLMSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC93rBvWQhwaLU9NSKtMwcYHzDpCU4eJREeH+DpHm LCxJzizPTIVKnGBWlxHlbC4ESAiCJjNI8uDZYSrnEKCslzMvIwMAgxFOQWpSbWYIq/4pRnINR SZj3Fsh4nsy8Erjpr4AWMwEt7ja4C7K4JBEhJdXAlP5ch2P1L+Pea6sq/POVlkr5WJ+pz+p9k mG44HL0pEer525879q3T26bHqPdiRjTlwWtgYU3WvYuPBDia1719YLgZB/mp0vdGV+eZbSc8X XB71fS/Vs4T+fcXbj5zdq5yUIpLrftbmycNa3980eN/PD25Nvrw5eKme2UtgnavE8lK8zpv4z mpO3q8/2c+Cq+M5Zy5HEHbZThjy5Ym9q/a3Wh47u33vdsEr3OKQvEHz17bM3E+awCXnKqnebh L75OLFlv9uJHNkvsnTTdN3VZxetmMf77KJWkbVCWeNjrWsuGfJnvQXsDl57/8fI+49QTT9WWF D5qOHTradjr2zvPhMz/IHoqeWaV/TJDKymmWiWW4oxEQy3mouJEANvGXT6kAwAA X-Env-Sender: ruansy.fnst@fujitsu.com X-Msg-Ref: server-5.tower-585.messagelabs.com!1675522746!176086!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 24341 invoked from network); 4 Feb 2023 14:59:06 -0000 Received: from unknown (HELO n03ukasimr02.n03.fujitsu.local) (62.60.8.146) by server-5.tower-585.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 4 Feb 2023 14:59:06 -0000 Received: from n03ukasimr02.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTP id E702A1000F5; Sat, 4 Feb 2023 14:59:05 +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 DA65B1000E7; Sat, 4 Feb 2023 14:59:05 +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; Sat, 4 Feb 2023 14:59:01 +0000 From: Shiyang Ruan To: , , , , CC: , , , , Subject: [PATCH v9 2/3] fs: move drop_pagecache_sb() for others to use Date: Sat, 4 Feb 2023 14:58:37 +0000 Message-ID: <1675522718-88-3-git-send-email-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675522718-88-1-git-send-email-ruansy.fnst@fujitsu.com> References: <1675522718-88-1-git-send-email-ruansy.fnst@fujitsu.com> 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 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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 it to super.c and make it available for others. And use its second argument to choose which invalidate method to use. Signed-off-by: Shiyang Ruan --- fs/drop_caches.c | 35 ++------------------------------- fs/super.c | 43 +++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 1 + include/linux/pagemap.h | 1 + mm/truncate.c | 20 +++++++++++++++++-- 5 files changed, 65 insertions(+), 35 deletions(-) diff --git a/fs/drop_caches.c b/fs/drop_caches.c index e619c31b6bd9..4c9281885077 100644 --- a/fs/drop_caches.c +++ b/fs/drop_caches.c @@ -15,38 +15,6 @@ /* A global variable is a bit ugly, but it keeps the code simple */ 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); -} - int drop_caches_sysctl_handler(struct ctl_table *table, int write, void *buffer, size_t *length, loff_t *ppos) { @@ -59,7 +27,8 @@ int drop_caches_sysctl_handler(struct ctl_table *table, int write, static int stfu; if (sysctl_drop_caches & 1) { - iterate_supers(drop_pagecache_sb, NULL); + iterate_supers(super_drop_pagecache, + invalidate_inode_pages); count_vm_event(DROP_PAGECACHE); } if (sysctl_drop_caches & 2) { diff --git a/fs/super.c b/fs/super.c index 12c08cb20405..d788b73f93f0 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, void *arg) +{ + struct inode *inode, *toput_inode = NULL; + int (*invalidator)(struct address_space *) = arg; + + 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..b853632e76cd 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3308,6 +3308,7 @@ 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, void *unused); 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 Sat Feb 4 14:58:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 13128728 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A5DDC636CC for ; Sat, 4 Feb 2023 14:59:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233560AbjBDO7i (ORCPT ); Sat, 4 Feb 2023 09:59:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233026AbjBDO7V (ORCPT ); Sat, 4 Feb 2023 09:59:21 -0500 Received: from mail1.bemta34.messagelabs.com (mail1.bemta34.messagelabs.com [195.245.231.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B109936098; Sat, 4 Feb 2023 06:59:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1675522752; i=@fujitsu.com; bh=iZXWDU8e1IDq/UlXTzSKcomjkFKqhLWmrwUndstFZbY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Y3EvQ3MX1dUVylN/yQ8OGaXHEumBT6+fn+8Ln7a8/pWTcxYfrNQXWFWPTEWYyW2lz 4P14dnakHApQCS5+ZJRwlsN2LaFXnFGrKNjtgvTaOObd4agLZsZokSnkrtzbBme2J2 SjCM0MOtozK0sU5nJVtnL+N/csvzfqIbW0UXl0fLA5bvKrTJViTwxgV1U4F0NRgqD3 sUSfr2PGs3CT9JJY+hAjEuO8ZB19cYwrXJh58fMRQ7glVi5GeAGm4agSkY2AzkvF4q yjE8zgj50K0t1o5B0GGZbsknVdgU23cJmFgdIcawwcpS9QY8J335OYz69KQacG0CFM jbqJ7jshZeQTA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLKsWRWlGSWpSXmKPExsViZ8ORqLuv6F6 ywYvPohbTp15gtNhy7B6jxeUnfBanJyxistj9+iabxZ69J1ksLu+aw2Zxb81/Votdf3awW6z8 8YfVgcvj1CIJj80rtDwW73nJ5LFpVSebx6ZPk9g9Xmyeyejx8ektFo/Pm+QCOKJYM/OS8isSW DM2rqsv2KtcsbNtG0sD4yPZLkYuDiGBLYwSOxrOsUM4K5gkLt0+zgjh7GWUmDJxH5DDycEmoC NxYcFfVpCEiMAkRoljN24ygySYBcol9m+8wQZiCwt4StyYuJEFxGYRUJH4sqUVLM4r4CLxr+8 lO4gtIaAgMeXhe7BeTgFXibfvz4LVCAHVNN/5zQRRLyhxcuYTFoj5EhIHX7wAqucA6lWSmNkd DzGmUqL1wy8WCFtN4uq5TcwTGAVnIemehaR7ASPTKkbT4tSistQiXRO9pKLM9IyS3MTMHL3EK t1EvdRS3fLU4hJdI73E8mK91OJiveLK3OScFL281JJNjMCYSilWPLaD8V/vX71DjJIcTEqivP 3+d5OF+JLyUyozEosz4otKc1KLDzHKcHAoSfBeL7iXLCRYlJqeWpGWmQOMb5i0BAePkgjvb5A 0b3FBYm5xZjpE6hSjLsfahgN7mYVY8vLzUqXEeVsLgYoEQIoySvPgRsBSzSVGWSlhXkYGBgYh noLUotzMElT5V4ziHIxKwry3QFbxZOaVwG16BXQEE9AR3QZ3QY4oSURISTUwzTyQtXpv5pF3W +Jr5zIb8+xfUVp4emrIwQlWS7gb/BZLZB+uCuiu3F2Xum7jssxl+7zsO77sjlaav+pIl/uNVA HJRfnOTQ9YesITLXbP5jwleLjt5cKYJt8vbzjEbK9usTc9W/P797HoCZ8ynN5xpTnODXfNZEm p0gk90H59tfOszWlvq06tevLLdSsH/0+v/jKpjSkVBc9MnSWFftQmrJ+Y4l14rtnCJP71gyO9 E39qb834I6u6zL/ZsuTl95Ijuxf+abh97u8+R24O14gD6x44/DOZwfaTf0Kt5bGsHy8Eb+WvF n2aKmEyI6ZMOqR4huK6p3PZ5zIwp/02v9dSaMR6uv9GhcTX69+NOA5fVmIpzkg01GIuKk4EAD YN41ywAwAA X-Env-Sender: ruansy.fnst@fujitsu.com X-Msg-Ref: server-6.tower-571.messagelabs.com!1675522750!174342!1 X-Originating-IP: [62.60.8.97] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.102.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30248 invoked from network); 4 Feb 2023 14:59:10 -0000 Received: from unknown (HELO n03ukasimr01.n03.fujitsu.local) (62.60.8.97) by server-6.tower-571.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 4 Feb 2023 14:59:10 -0000 Received: from n03ukasimr01.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr01.n03.fujitsu.local (Postfix) with ESMTP id F423E100195; Sat, 4 Feb 2023 14:59:09 +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 n03ukasimr01.n03.fujitsu.local (Postfix) with ESMTPS id E6BC3100188; Sat, 4 Feb 2023 14:59:09 +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; Sat, 4 Feb 2023 14:59:06 +0000 From: Shiyang Ruan To: , , , , CC: , , , , Subject: [PATCH v9 3/3] mm, pmem, xfs: Introduce MF_MEM_REMOVE for unbind Date: Sat, 4 Feb 2023 14:58:38 +0000 Message-ID: <1675522718-88-4-git-send-email-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675522718-88-1-git-send-email-ruansy.fnst@fujitsu.com> References: <1675522718-88-1-git-send-email-ruansy.fnst@fujitsu.com> 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 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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 | 28 +++++++++++++++++++++++++++- include/linux/mm.h | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/drivers/dax/super.c b/drivers/dax/super.c index da4438f3188c..40274d19f4f9 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 3830f908e215..5c1e678a1285 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,9 @@ xfs_dax_notify_ddev_failure( xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_ONDISK); if (!error) error = -EFSCORRUPTED; - } + } else if (mf_flags & MF_MEM_PRE_REMOVE) + xfs_force_shutdown(mp, SHUTDOWN_FORCE_UMOUNT); + return error; } @@ -182,12 +188,24 @@ 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()!"); return -EIO; } + if (mf_flags & MF_MEM_PRE_REMOVE) { + xfs_info(mp, "device is about to be removed!"); + down_write(&mp->m_super->s_umount); + error = sync_filesystem(mp->m_super); + /* invalidate_inode_pages2() invalidates dax mapping */ + super_drop_pagecache(mp->m_super, invalidate_inode_pages2); + up_write(&mp->m_super->s_umount); + if (error) + return error; + } + if (mp->m_rtdev_targp && mp->m_rtdev_targp->bt_daxdev == dax_dev) { xfs_debug(mp, "notify_failure() not supported on realtime device!"); @@ -196,6 +214,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 +229,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; 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);