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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC1A4EB64DA for ; Fri, 14 Jul 2023 09:08:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C9C46B0071; Fri, 14 Jul 2023 05:08:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 479E56B0072; Fri, 14 Jul 2023 05:08:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31BC26B0074; Fri, 14 Jul 2023 05:08:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2416E6B0071 for ; Fri, 14 Jul 2023 05:08:09 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DE7BB1A0180 for ; Fri, 14 Jul 2023 09:08:08 +0000 (UTC) X-FDA: 81009640656.02.C336C7A Received: from esa2.hc1455-7.c3s2.iphmx.com (esa2.hc1455-7.c3s2.iphmx.com [207.54.90.48]) by imf02.hostedemail.com (Postfix) with ESMTP id 43E918001F for ; Fri, 14 Jul 2023 09:08:05 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=fujitsu.com; spf=pass (imf02.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 207.54.90.48 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689325686; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+Gqd1W59700q2pDgDlTV5BTFIRoaedle81wpFRwmYgg=; b=CffNRCZTAZDGppoHqypXJPKP7milm8IBLFQNczJ7SPkB7MvcUiQpAzKBhsRd7Wq4166RX/ YqqtpT7FZVbLCTyaSVGdcwoI5/qYIzl7+15+Sw2HJlVD7T7KpN43W1PFYIbUmcI2ZqLqAe NSuHX3CrZ1hB71BSubdFlnB0j+rWNKg= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=fujitsu.com; spf=pass (imf02.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 207.54.90.48 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689325686; a=rsa-sha256; cv=none; b=V3gNkoQMa+SXmF1Olsv6GaGwMcXBf7359+Oj1EDQKoXDFL76HB2nhH1ungjyaXQd2T4YZU m4vM5SzLUrdygfiu33AkMC9VXQBAd9BoiTWoJlWYtn07qY9JAXQD/NNLr57eExtVRCZpE4 l1K/exOVKLw7W8TIt6Zmc4gj7s1HEO0= X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="124624279" X-IronPort-AV: E=Sophos;i="6.01,204,1684767600"; d="scan'208";a="124624279" Received: from unknown (HELO oym-r1.gw.nic.fujitsu.com) ([210.162.30.89]) by esa2.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2023 18:08:03 +0900 Received: from oym-m4.gw.nic.fujitsu.com (oym-nat-oym-m4.gw.nic.fujitsu.com [192.168.87.61]) by oym-r1.gw.nic.fujitsu.com (Postfix) with ESMTP id 89F8CD29EE for ; Fri, 14 Jul 2023 18:08:01 +0900 (JST) Received: from kws-ab4.gw.nic.fujitsu.com (kws-ab4.gw.nic.fujitsu.com [192.51.206.22]) by oym-m4.gw.nic.fujitsu.com (Postfix) with ESMTP id B54B5D5D48 for ; Fri, 14 Jul 2023 18:08:00 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id 30C026C822 for ; Fri, 14 Jul 2023 18:08:00 +0900 (JST) Received: from [192.168.50.5] (unknown [10.167.234.230]) by edo.cn.fujitsu.com (Postfix) with ESMTP id 384AA1A0071; Fri, 14 Jul 2023 17:07:59 +0800 (CST) Message-ID: <2840406d-0b7d-9897-87f6-ef3627e9ed5d@fujitsu.com> Date: Fri, 14 Jul 2023 17:07:58 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v12 2/2] mm, pmem, xfs: Introduce MF_MEM_REMOVE for unbind From: Shiyang Ruan To: djwong@kernel.org Cc: linux-mm@kvack.org, linux-xfs@vger.kernel.org, nvdimm@lists.linux.dev, linux-fsdevel@vger.kernel.org, dan.j.williams@intel.com, willy@infradead.org, jack@suse.cz, akpm@linux-foundation.org, mcgrof@kernel.org References: <20230629081651.253626-1-ruansy.fnst@fujitsu.com> <20230629081651.253626-3-ruansy.fnst@fujitsu.com> In-Reply-To: <20230629081651.253626-3-ruansy.fnst@fujitsu.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-27750.005 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-27750.005 X-TMASE-Result: 10--19.497300-10.000000 X-TMASE-MatchedRID: 00R5yCKmLzqPvrMjLFD6eI61Z+HJnvsO1QQ6Jx/fflZYC5LPd7BvbXWJ 7dvKS5ZkYsXN3CL0nEm3W71613vN7Ja3SiQKe1CZtT4jIeGRd/WTDZOVfIlqXsevg9JZNdIszIa 2RGUjJmiI2CAno9ubYWwWBQOse0fpkmoOfourmHQD2WXLXdz+Afi4nVERfgwdUFiDuGDvnz1576 my5Ixjujt8E1FvI1h+0htCm4AReYyKOc/QAD5CQYA7SSmAp7NEC5HdxA3MwScR34ro7k23nb8FH rw7frluvDBM/avXIoa+GyEBMTgQ9t7Rfb2Mc0ONb/oIJuUAIuEFeeAjqMW+l4EBeX0uQ+npMBbl t7zglMEb2wL6PXU3h0K3WEb5CMhwM8kGBcxKxM11e7Xbb6Im2knSHQovAWuA4Jg2aOOdYIKRcyU BIWzD8RR7J3ZruAlBJ7WhME6YJBUSfBCDQJnFm/CW/PNRRp/ZgjDdudOPBHqe38zXnNg9Qw6+rP zHX18bBfsWZGGl0AmdqC2fLtk9xL9ZdlL8eonaRjjVhf+j/woNlf30fAUOwiq2rl3dzGQ1A/3R8 k/14e0= X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 X-Rspamd-Queue-Id: 43E918001F X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 4bnwsd6akox3w49quqkumsyptr5fnaim X-HE-Tag: 1689325685-577442 X-HE-Meta: U2FsdGVkX19Zle98la2ItnEE6g/Su3jgJ9jCrxZJMZu0K0kb8XTcqrEbFOxlWWNgBQKtp6Iam7f5OjzgXLNxlwWC1nyjc4m9Sf8PDT8yu9oduU+yuZfAYDj4bEWPpNUyvRB2RlQR2KbYDRsvwnP8AzX5n5wGm8sO2b4tSy12BBlbExCjWYYigYMVRBquYf61e3h2AJKyg/pZJJwVu3kkpf4J0/YfcDsixddX9qzMqTZYobJV3d1NxTalsOBfxe41xI4WaqbkIYpPB8BbUGw8B7wucirp0dwyhYA7/ay65Ry0FV9EMfw5jPvju9IFIkUU4OXewCZo8pkfOtGRfYTkR3lvXp0G4dDFYAQ6IsRXlNbkp3e/i7k1+hnQOuWp6zBV8ISJS137NI1Ycf0ZrSaS0vEX+G/Z9TWYENYjdGP6/MYbTMASy7mlixjLaY5rawmuby9ntsBiabeEVR8K2C8Eg9ynbfHlWymeJyK/feka5SS4zU+bk8oJVWfoJwvSGtnJooDUO3Qhz+ZGTIZ442MaDW32OfRi1RO6l0JGJujC6SZ3bhRQd2mPOKLLn6imj5e7+49nVAgBv4NxrvkAtYXDAxpWaesgzcJCA7T4B0qX5GsF+Ql1FERnOsqIEokKQyejYiL5ZKZknFmRdNdnpWGIEsUuF4Gq2+duH7fyKfSZ7EtCb3weVvQDGMgTOj4YytdkAVUj5nJ243ZybNj+btZHofHWciEt9eoi8FbG48jG12PeZWjmed0MUTkGIPTk5drTDZpKSRtkYoh62m0aLdVwnJRU042VdnFYkqMJM36x4INv6pj314LcL2O8WV4NMPdum4cxCSE0ZUPiCDqUM2PpgbwD37pga/+MVR/VZYicLXw3cd1SR7mrNkIY/iMHQTzeDkx8HjhoAL1dkHfhF/ecen0a3VNJLlSxsux2y/wtykj8x0zap3Dmjmv9D2biNMy0AOy6TiO5L3tBwy+ofEL eGGxvHga NUevSS9lTyXV4k6ZH1rBaiurgZ2lItn0IQ9PEU5R3YF5hJjOJ2sNHWUBZbDOk2io9HH6VHBUcLaTrl8UqBaGJTz5fAY1Gib9j+s/m4xTXHYXeKrVorXL1EahSjDkglqsAWnUvwqz4PFz8OHwtMH6w+q5pFZ6K2RXTKFeHLriYGiUuEfqGUDrfrBnUuZoZVWnryDcJTZmAUTDKVYxpDuiUDHcL33GT5YzeYma3Dlm2X9OGLkoWqQcTphoLtazJtyTo0oAdVrPMnUq8LLJ0nqYGdHeYso3Sj/0819jNF3ZpEW27Ax2EAPQU8ShKWw== 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: Hi Darrick, Thanks for applying the 1st patch. Now, since this patch is based on the new freeze_super()/thaw_super() api[1], I'd like to ask what's the plan for this api? It seems to have missed the v6.5-rc1. [1] https://lore.kernel.org/linux-xfs/168688010689.860947.1788875898367401950.stgit@frogsfrogsfrogs/ -- Thanks, Ruan. 在 2023/6/29 16:16, Shiyang Ruan 写道: > 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/168688010689.860947.1788875898367401950.stgit@frogsfrogsfrogs/ > > Signed-off-by: Shiyang Ruan > --- > drivers/dax/super.c | 3 +- > fs/xfs/xfs_notify_failure.c | 86 ++++++++++++++++++++++++++++++++++--- > include/linux/mm.h | 1 + > mm/memory-failure.c | 17 ++++++-- > 4 files changed, 96 insertions(+), 11 deletions(-) > > 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 4a9bbd3fe120..f6ec56b76db6 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,55 @@ 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 void > +xfs_dax_notify_failure_freeze( > + struct xfs_mount *mp) > +{ > + struct super_block *sb = mp->m_super; > + > + /* Wait until no one is holding the FREEZE_HOLDER_KERNEL. */ > + while (freeze_super(sb, FREEZE_HOLDER_KERNEL) != 0) { > + // Shall we just wait, or print warning then return -EBUSY? > + delay(HZ / 10); > + } > +} > + > +static void > +xfs_dax_notify_failure_thaw( > + struct xfs_mount *mp) > +{ > + struct super_block *sb = mp->m_super; > + int error; > + > + 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, > @@ -120,7 +168,7 @@ xfs_dax_notify_ddev_failure( > > 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 +213,23 @@ xfs_dax_notify_ddev_failure( > } > > xfs_trans_cancel(tp); > + > + /* > + * Determine how to shutdown the filesystem according to the > + * error code and flags. > + */ > if (error || notify.want_shutdown) { > 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); > + > +out: > + /* Thaw the fs if it is freezed before. */ > + if (mf_flags & MF_MEM_PRE_REMOVE) > + xfs_dax_notify_failure_thaw(mp); > + > return error; > } > > @@ -197,6 +257,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; > @@ -210,6 +272,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; > @@ -226,6 +294,12 @@ 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!"); > + /* Freeze fs to prevent new mappings from being created. */ > + xfs_dax_notify_failure_freeze(mp); > + } > + > 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 27ce77080c79..a80c255b88d2 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -3576,6 +3576,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 5b663eca1f29..483b75f2fcfb 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -688,7 +688,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; > @@ -696,8 +696,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, 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) { > @@ -1793,6 +1800,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; > > @@ -1804,9 +1812,10 @@ 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); > + collect_procs_fsdax(page, mapping, index, &to_kill, pre_remove); > unmap_and_kill(&to_kill, page_to_pfn(page), mapping, > index, mf_flags); > unlock: