From patchwork Thu Sep 28 10:32:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 13402444 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB782CE7B17 for ; Thu, 28 Sep 2023 10:32:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5633B8D007F; Thu, 28 Sep 2023 06:32:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 513568D0038; Thu, 28 Sep 2023 06:32:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DAED8D007F; Thu, 28 Sep 2023 06:32:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 26FA88D0038 for ; Thu, 28 Sep 2023 06:32:35 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E4C0F140D48 for ; Thu, 28 Sep 2023 10:32:34 +0000 (UTC) X-FDA: 81285642228.29.FAD583B Received: from esa5.hc1455-7.c3s2.iphmx.com (esa5.hc1455-7.c3s2.iphmx.com [68.232.139.130]) by imf14.hostedemail.com (Postfix) with ESMTP id 7839010000C for ; Thu, 28 Sep 2023 10:32:32 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 68.232.139.130 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com; dmarc=pass (policy=none) header.from=fujitsu.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695897152; a=rsa-sha256; cv=none; b=4rdTP27AbOG+oVDzavkK+3234JvhoOjDx8DKe7JWyx5vl8vyWYzsmLInOG4ipiq6lT+j7s D0YLvqgjJ/x+Lwo3sX1QDxnuorZ7MQjm9Aq+W7gj34/4h28KXZoEcSDV4f3WliWx4vxLzq BGvG91uCgflm0DcKsv5KiA4GODjQ/bw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 68.232.139.130 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com; dmarc=pass (policy=none) header.from=fujitsu.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695897152; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QCr0hq5Lu5xtTveqG9Hh+vhaiyzEAhA8tSlCqrpyxWc=; b=2yxe5EtXv3Vf+U9+0mA2AMtYtUzIm/OD8n1KC4ObHIdhvEh0Q7nVakf7XpRMGrlQc6CAiU Vzr0tGi/WTn3vSxp6wOnEQwrbu497vUS6KAyVJiY2FSGscEHm46UxxCeDlRrhKKvz1xUsp /ydNwPtZ/gagY4r+Q92ciNZXWBnb9fY= X-IronPort-AV: E=McAfee;i="6600,9927,10846"; a="133462522" X-IronPort-AV: E=Sophos;i="6.03,183,1694703600"; d="scan'208";a="133462522" Received: from unknown (HELO yto-r3.gw.nic.fujitsu.com) ([218.44.52.219]) by esa5.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2023 19:32:30 +0900 Received: from yto-m1.gw.nic.fujitsu.com (yto-nat-yto-m1.gw.nic.fujitsu.com [192.168.83.64]) by yto-r3.gw.nic.fujitsu.com (Postfix) with ESMTP id AAF83C3F80 for ; Thu, 28 Sep 2023 19:32:27 +0900 (JST) Received: from kws-ab4.gw.nic.fujitsu.com (kws-ab4.gw.nic.fujitsu.com [192.51.206.22]) by yto-m1.gw.nic.fujitsu.com (Postfix) with ESMTP id E21E0CF7CA for ; Thu, 28 Sep 2023 19:32:26 +0900 (JST) Received: from irides.g08.fujitsu.local (unknown [10.167.234.230]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id F340F6B83C; Thu, 28 Sep 2023 19:32:25 +0900 (JST) From: Shiyang Ruan To: linux-fsdevel@vger.kernel.org, nvdimm@lists.linux.dev, linux-xfs@vger.kernel.org, linux-mm@kvack.org Cc: dan.j.williams@intel.com, willy@infradead.org, jack@suse.cz, akpm@linux-foundation.org, djwong@kernel.org, mcgrof@kernel.org, chandanbabu@kernel.org Subject: [PATCH v15] mm, pmem, xfs: Introduce MF_MEM_PRE_REMOVE for unbind Date: Thu, 28 Sep 2023 18:32:27 +0800 Message-ID: <20230928103227.250550-1-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230828065744.1446462-1-ruansy.fnst@fujitsu.com> References: <20230828065744.1446462-1-ruansy.fnst@fujitsu.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-27902.007 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-27902.007 X-TMASE-Result: 10--22.737700-10.000000 X-TMASE-MatchedRID: VU71FGpAPyn0kswJHlL1KikMR2LAnMRpMVx/3ZYby7+eEPi9wVyFrvQ9 seYAnNMGFXLD8NIP1b200CUVHJtoU4tUtJ9UYBX7fiKzBf4Yf9gYH39vFLryE1hs8uimgHNCjcR qQigdY13DKKXtpTQT/spLIuGeLArNnpdzfoA7wecB6/aPodnUlgmWvXEqQTm5R2z2RqVFhBoRbq eAiDR9yWBha63On1TPJ3TEshnsAz7bKAyc+TgM3CoiRKlBVkYI8bHRUazq99RxGu6rjxUqUF88K FWF27c+zSEy3HVaiC5eb2xJS17QL9HpEovtNFNuEXjPIvKd74AzNsXWBvGVBs9anVQrvNX3OxE7 7kNtuQnlkd2q4DAqgeppp2JwmBaVBKvwQYblWIb0hv/rD7WVZH607foZgOWy4Jg2aOOdYIKcQWV MGtd3l37cTriphWHJ1HinZFrgJn7bIYhvv070KFhRyidsElYk8SkdpG2/n9dlSB4Tpn2RE3v3EJ JrdBuxBHGj1qouCqtgOb2hKLw6D2R5WlY/ZLL5rltvlARhKR1XBOoTSveiDwZZ8N3RvTMxo8WMk QWv6iXBcIE78YqRWo6HM5rqDwqtlExlQIQeRG0= X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7839010000C X-Stat-Signature: p96ttj4dnkcy1bch39e35fgf16wkb7fy X-HE-Tag: 1695897152-723225 X-HE-Meta: U2FsdGVkX1+SpQi9hOIoVY18335FmcHC+bmm7QZ5I5stEmK/o72/AxUQMqpG+SSbhAyhDyGj0bxvgFqDUSxjVn2LkTGuDPBqr/Vywn1/coXgyZJmqkC8MJIPBIOkH8acMAgPxwoIzkEL+NNydH9XdhdB7b8Yi5rAVo1fW3k2zK04+lIXyQRIUGZ16TUGzvrNhgw0z7BoHlEsv+4QETv+jGt77Gt6lNMzBMYjICQOrhew1ChF6aDEriJKVCJWtEwOem74QNI3CvP3T7sn/Zo+wZm02SItCx7Q0rx+Bt3eScpCEE5SvvafrnmiF+zfg5YvnOewfxrZcLgviPqBJKZ0p3KZrgLnDqXhkS/5X4rCnDuJrCMX9iIJetAse22nwHJekAjyCM7Tu/0YB5o4EZtX66MByTbZgEQUM1mfKSdV7TXHNFIpaALnjPQtZcoiTIrn+GiGGZ7RL9+nbUz8g5EEEyMjLCWdhrxzzmKIpDuFkMDHP0cOXLd0zVT+vLi535f5oo6CKoG6fWXAmPC+37UbiuJY6p6xE/z7HI6dk0U3GuCyMHWBbsNC46H4XcKyxGUXbwptcMMJzxTFv5Hq26cBlhKBE2tuFaSp/Ylen6VFqX/a1yOD2w/pDXSuQ7KdeKne6ZNc89ZzqCmPqfFYttIVcM3r7XwBwSeg776vRONI79jH2ZzS++pNjiQEoRkyNpJMVVQsjBNUb9T1xl/Azvn06kTghFmd/CvBae7kcMhWKcgqPUcjdxt/GoSPaodi7qEmqfLcU7olsM1rHiai80xOzRInjOaOwwHqLSBhQVHybfRb4aWztu8cNzen+IqMKrTsDh5wwSLPQsn0hDkanxdLOvX15YK2iaj6u1/mWekRDeOY5pCcx9DVpAPSi7TVPI8Bn2AqMHE+0o0dPHS2ys3QSexrVG16RDY06CbG4EcrXFH2/LKGdlodk5579oap/G7KO90Wz/nGKuaBxD1pPlW rfnvHwPn iZHOOZxQoOlEjDMhjtYj3JUEJMXzmMpvd9tjAWxplpdjQtn43s4ijt6ymG5W/aSa2Q7FkRg+i0oR8i/0W8y+Z04Zef7c5zOaIDX4E7+cZ9buiBfIXM5rfUTHJqxQyktN/hvx9gXeqjl6kkOWTI72KnL/vNsfQ4e9ymj5m1H/evjpyKjDlyPCX37X2pku/mEomflWuH2qBMKw4+hgQMEnn9kI4CqsXFEUTexSyEhNucxVR4DjXKwVP7h9KiQAyb+13Qlu4dSuDs5jPRh6YBB0e8FNZZuIOWKAuCYKxbWkDP/Un+QQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: ==== Changes since v14: 1. added/fixed code comments per Dan's comments ==== Now, if we suddenly remove a PMEM device(by calling unbind) which contains FSDAX while programs are still accessing data in this device, e.g.: ``` $FSSTRESS_PROG -d $SCRATCH_MNT -n 99999 -p 4 & # $FSX_PROG -N 1000000 -o 8192 -l 500000 $SCRATCH_MNT/t001 & echo "pfn1.1" > /sys/bus/nd/drivers/nd_pmem/unbind ``` it could come into an unacceptable state: 1. device has gone but mount point still exists, and umount will fail with "target is busy" 2. programs will hang and cannot be killed 3. may crash with NULL pointer dereference To fix this, we introduce a MF_MEM_PRE_REMOVE flag to let it know that we are going to remove the whole device, and make sure all related processes could be notified so that they could end up gracefully. 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 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() -> kill_dax() -> dax_holder_notify_failure(dax_dev, 0, U64_MAX, MF_MEM_PRE_REMOVE) -> xfs_dax_notify_failure() `-> freeze_super() // freeze (kernel call) `-> do xfs rmap ` -> mf_dax_kill_procs() ` -> collect_procs_fsdax() // all associated processes ` -> unmap_and_kill() ` -> invalidate_inode_pages2_range() // drop file's cache `-> thaw_super() // thaw (both kernel & user call) Introduce MF_MEM_PRE_REMOVE to let filesystem know this is a remove event. Use the exclusive freeze/thaw[2] to lock the filesystem to prevent new dax mapping from being created. Do not shutdown filesystem directly if configuration is not supported, or if failure range includes metadata area. Make sure all files and processes(not only the current progress) are handled correctly. Also drop the cache of associated files before pmem is removed. [1]: https://lore.kernel.org/linux-mm/161604050314.1463742.14151665140035795571.stgit@dwillia2-desk3.amr.corp.intel.com/ [2]: https://lore.kernel.org/linux-xfs/169116275623.3187159.16862410128731457358.stg-ugh@frogsfrogsfrogs/ Signed-off-by: Shiyang Ruan Reviewed-by: Darrick J. Wong Acked-by: Dan Williams Reviewed-by: Dan Williams --- drivers/dax/super.c | 3 +- fs/xfs/xfs_notify_failure.c | 108 ++++++++++++++++++++++++++++++++++-- include/linux/mm.h | 1 + mm/memory-failure.c | 21 +++++-- 4 files changed, 122 insertions(+), 11 deletions(-) diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 0da9232ea175..f4b635526345 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -326,7 +326,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 4a9bbd3fe120..30e9f4e09f76 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; @@ -73,10 +74,16 @@ xfs_dax_failure_fn( struct xfs_mount *mp = cur->bc_mp; struct xfs_inode *ip; struct xfs_failure_info *notify = data; + struct address_space *mapping; + pgoff_t pgoff; + unsigned long pgcnt; int error = 0; if (XFS_RMAP_NON_INODE_OWNER(rec->rm_owner) || (rec->rm_flags & (XFS_RMAP_ATTR_FORK | XFS_RMAP_BMBT_BLOCK))) { + /* Continue the query because this isn't a failure. */ + if (notify->mf_flags & MF_MEM_PRE_REMOVE) + return 0; notify->want_shutdown = true; return 0; } @@ -92,14 +99,60 @@ xfs_dax_failure_fn( return 0; } - error = mf_dax_kill_procs(VFS_I(ip)->i_mapping, - xfs_failure_pgoff(mp, rec, notify), - xfs_failure_pgcnt(mp, rec, notify), - notify->mf_flags); + mapping = VFS_I(ip)->i_mapping; + pgoff = xfs_failure_pgoff(mp, rec, notify); + pgcnt = xfs_failure_pgcnt(mp, rec, notify); + + /* Continue the rmap query if the inode isn't a dax file. */ + if (dax_mapping(mapping)) + error = mf_dax_kill_procs(mapping, pgoff, pgcnt, + notify->mf_flags); + + /* Invalidate the cache in dax pages. */ + if (notify->mf_flags & MF_MEM_PRE_REMOVE) + invalidate_inode_pages2_range(mapping, pgoff, + pgoff + pgcnt - 1); + xfs_irele(ip); return error; } +static int +xfs_dax_notify_failure_freeze( + struct xfs_mount *mp) +{ + struct super_block *sb = mp->m_super; + int error; + + error = freeze_super(sb, FREEZE_HOLDER_KERNEL); + if (error) + xfs_emerg(mp, "already frozen by kernel, err=%d", error); + + return error; +} + +static void +xfs_dax_notify_failure_thaw( + struct xfs_mount *mp, + bool kernel_frozen) +{ + struct super_block *sb = mp->m_super; + int error; + + if (kernel_frozen) { + error = thaw_super(sb, FREEZE_HOLDER_KERNEL); + if (error) + xfs_emerg(mp, "still frozen after notify failure, err=%d", + error); + } + + /* + * Also thaw userspace call anyway because the device is about to be + * removed immediately. + */ + thaw_super(sb, FREEZE_HOLDER_USERSPACE); +} + static int xfs_dax_notify_ddev_failure( struct xfs_mount *mp, @@ -112,15 +165,29 @@ xfs_dax_notify_ddev_failure( struct xfs_btree_cur *cur = NULL; struct xfs_buf *agf_bp = NULL; int error = 0; + bool kernel_frozen = false; 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 - 1); xfs_agnumber_t end_agno = XFS_FSB_TO_AGNO(mp, end_fsbno); + if (mf_flags & MF_MEM_PRE_REMOVE) { + xfs_info(mp, "Device is about to be removed!"); + /* + * Freeze fs to prevent new mappings from being created. + * - Keep going on if others already hold the kernel forzen. + * - Keep going on if other errors too because this device is + * starting to fail. + * - If kernel frozen state is hold successfully here, thaw it + * here as well at the end. + */ + kernel_frozen = xfs_dax_notify_failure_freeze(mp) == 0; + } + error = xfs_trans_alloc_empty(mp, &tp); if (error) - return error; + goto out; for (; agno <= end_agno; agno++) { struct xfs_rmap_irec ri_low = { }; @@ -165,11 +232,26 @@ xfs_dax_notify_ddev_failure( } xfs_trans_cancel(tp); - if (error || notify.want_shutdown) { + + /* + * Shutdown fs from a force umount in pre-remove case which won't fail, + * so errors can be ignored. Otherwise, shutdown the filesystem with + * CORRUPT flag if error occured or notify.want_shutdown was set during + * RMAP querying. + */ + if (mf_flags & MF_MEM_PRE_REMOVE) + xfs_force_shutdown(mp, SHUTDOWN_FORCE_UMOUNT); + else if (error || notify.want_shutdown) { xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_ONDISK); if (!error) error = -EFSCORRUPTED; } + +out: + /* Thaw the fs if it has been frozen before. */ + if (mf_flags & MF_MEM_PRE_REMOVE) + xfs_dax_notify_failure_thaw(mp, kernel_frozen); + return error; } @@ -197,6 +279,14 @@ 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) { + /* + * In the pre-remove case the failure notification is attempting + * to trigger a force unmount. The expectation is that the + * device is still present, but its removal is in progress and + * can not be cancelled, proceed with accessing the log device. + */ + 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; @@ -210,6 +300,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 2dd73e4f3d8e..a10c75bebd6d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3665,6 +3665,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); diff --git a/mm/memory-failure.c b/mm/memory-failure.c index e245191e6b04..955edea9837f 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -683,7 +683,7 @@ static void add_to_kill_fsdax(struct task_struct *tsk, struct page *p, */ static void collect_procs_fsdax(struct page *page, struct address_space *mapping, pgoff_t pgoff, - struct list_head *to_kill) + struct list_head *to_kill, bool pre_remove) { struct vm_area_struct *vma; struct task_struct *tsk; @@ -691,8 +691,15 @@ static void collect_procs_fsdax(struct page *page, i_mmap_lock_read(mapping); read_lock(&tasklist_lock); for_each_process(tsk) { - struct task_struct *t = task_early_kill(tsk, true); + struct task_struct *t = tsk; + /* + * Search for all tasks while MF_MEM_PRE_REMOVE is set, because + * the current may not be the one accessing the fsdax page. + * Otherwise, search for the current task. + */ + if (!pre_remove) + t = task_early_kill(tsk, true); if (!t) continue; vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) { @@ -1788,6 +1795,7 @@ int mf_dax_kill_procs(struct address_space *mapping, pgoff_t index, dax_entry_t cookie; struct page *page; size_t end = index + count; + bool pre_remove = mf_flags & MF_MEM_PRE_REMOVE; mf_flags |= MF_ACTION_REQUIRED | MF_MUST_KILL; @@ -1799,9 +1807,14 @@ int mf_dax_kill_procs(struct address_space *mapping, pgoff_t index, if (!page) goto unlock; - SetPageHWPoison(page); + if (!pre_remove) + SetPageHWPoison(page); - collect_procs_fsdax(page, mapping, index, &to_kill); + /* + * The pre_remove case is revoking access, the memory is still + * good and could theoretically be put back into service. + */ + collect_procs_fsdax(page, mapping, index, &to_kill, pre_remove); unmap_and_kill(&to_kill, page_to_pfn(page), mapping, index, mf_flags); unlock: