From patchwork Thu Jun 29 08:16:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 13296744 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 7E0C9EB64D9 for ; Thu, 29 Jun 2023 08:18:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00EF78D0003; Thu, 29 Jun 2023 04:18:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F00E88D0001; Thu, 29 Jun 2023 04:18:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D547B8D0003; Thu, 29 Jun 2023 04:18:18 -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 C32588D0001 for ; Thu, 29 Jun 2023 04:18:18 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9CC7BAFA21 for ; Thu, 29 Jun 2023 08:18:18 +0000 (UTC) X-FDA: 80955083076.16.F76CCA0 Received: from esa4.hc1455-7.c3s2.iphmx.com (esa4.hc1455-7.c3s2.iphmx.com [68.232.139.117]) by imf01.hostedemail.com (Postfix) with ESMTP id 50A1B4001B for ; Thu, 29 Jun 2023 08:18:16 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=fujitsu.com; spf=pass (imf01.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 68.232.139.117 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=1688026696; 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=bPb20kjst8cwktvs1Y/dIK8l3Bb2XJb1iTWC3J4Kbk4=; b=oPCdjHlh/lvhm6SSxWGJC68nMXCd4OcqH3DSwsHo01YxNEh1L/Qz6Ts1Pb+8nBhP9LMvwz UBGrmM9pZjkdVrbAw1Z7uPZpZXLEfYGbM3L5XXeFiacU5eR6L+m7l/2NhL9rZK0AD3uC06 ZCpFe53EI3Er/MxEj8NdjcKTLQwX6Qk= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=fujitsu.com; spf=pass (imf01.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 68.232.139.117 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688026696; a=rsa-sha256; cv=none; b=CsWaKpQytgVfFUiXCI2wDGBI0kn58hWETf7UO221clnbFSv3vCX0kPtqyo2+8peHQwmrIB pV1vcnAcCyvFpX2WjQEOaXxzBYqTCMQINQgLu+GVcmwnDVkt1FN3BzNBhr3zX36iLOg2NT W6T1ComGHeVkLiVMWckEaVvsMYSFKNs= X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="122688753" X-IronPort-AV: E=Sophos;i="6.01,168,1684767600"; d="scan'208";a="122688753" Received: from unknown (HELO yto-r2.gw.nic.fujitsu.com) ([218.44.52.218]) by esa4.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2023 17:18:16 +0900 Received: from yto-m2.gw.nic.fujitsu.com (yto-nat-yto-m2.gw.nic.fujitsu.com [192.168.83.65]) by yto-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id 0D1F7C68E2 for ; Thu, 29 Jun 2023 17:18:13 +0900 (JST) Received: from kws-ab3.gw.nic.fujitsu.com (kws-ab3.gw.nic.fujitsu.com [192.51.206.21]) by yto-m2.gw.nic.fujitsu.com (Postfix) with ESMTP id 48531D67C8 for ; Thu, 29 Jun 2023 17:18:12 +0900 (JST) Received: from irides.g08.fujitsu.local (unknown [10.167.234.230]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id E62E36C9C4; Thu, 29 Jun 2023 17:18:05 +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 Subject: [PATCH v12 1/2] xfs: fix the calculation for "end" and "length" Date: Thu, 29 Jun 2023 16:16:50 +0800 Message-Id: <20230629081651.253626-2-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230629081651.253626-1-ruansy.fnst@fujitsu.com> References: <20230629081651.253626-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-27720.006 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-27720.006 X-TMASE-Result: 10--2.821700-10.000000 X-TMASE-MatchedRID: EXd9akoenk2hhjsqgSuNbxF4zyLyne+ATJDl9FKHbrm/XSsQNWtCeMJ0 8DtUl59d4vM1YF6AJbbieYV7J8ae4wtuKBGekqUpnH7sbImOEBSyUkKnsigAVUOq1cc3wR7p3qY uO0eYbQA38/3PGuNu2whL582BEnpEUGPLb8eYNh9sPkQVQvEczTS8aTKeU4mx11kmIvi83kKbDR BqS2n66yzP5xAyz9Oenvkw4sh/+PcMX5CwH5DTUmgGZNLBHGNe X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 X-Rspam-User: X-Stat-Signature: h3k7nk1pnrrss45pawc5k96uumwh9w5o X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 50A1B4001B X-HE-Tag: 1688026696-993228 X-HE-Meta: U2FsdGVkX1/4fCCFrrY+kMADRP+XIIVSN3Ik6svl/Ob4nagEx6MNuHM+1pCTKJQU9rcennpkwSjN+zeoz5HROu+qyZSVpY2+QXyhGMwKsSef0J8CWH5vncGhYZv0NBb6CbIa6iqOQ5BKcUyUX8EPcc+QJwWwfuWq2v4AQ5FPAZc5Bpz2AMj9k1V9HqRAdqyu5t7wzXY8yOG7nZ4TSztRUdi00S2X/5VLyDmnEfzvLO3vWM2/yChO38lvSSANEyAqK2y9UCr4iYkRmEyhaHi7XQtbN7UtTh89IzeA2kZByY1vNyars8IxQPmqJ0hm4piRT/0GIYG2/uAcDghCIdDZIwzqX0UjY5fyiOHJfNHLWK20O1IAulZwWLzj5v27wHQg/MWxs/7yrtkFEq42WJKaMv21ksA+LXPwvx4ulxZm8wgbCVoPbEC7S71IoW4XLBnBgHFyQRjAcDwakMdelFhQFp4FePUCTvH95zSw9hZRJoTSkwoVI0wGAbCt8KUTyqZ8lTMqoCXIHSVQ3U9lNByy+KvKKW+cCPp0sHpioOchReLqAqPjo2wjLKYErt7SLjIyiPhj/YdNxBg6DoxwYl7U9KCrh6sfzCpl/eeUm4SwnmJMJ/DxJ8KZo32wTAWTeIrutq2NyCvMqO+oK/exwSCFRfzRUSySwgfuPkpjkVSX3SU2E6Dhthi3SmNVEJaIl4Zblg5yLj7T2Z+mc+OfSeyW5YpuaUj9O7klTlamd4O3TjOrh2Yy5dk3r93n39Q4cE8vjDy/7jzIu/JIRv3HUXXW678M8cypVct5FtOG2WfOZEGyGAGgxnQ+vlCdQjPW+AlqYc5zLaAotcVOuhAJqCVMKf5H0Axv8Tt2Zo3gRI8wpMN9XNcVJpBVEaDUd2TuKRfxnS5UmltDmrbLoggbzvadVVj+7kjZ3pgEq17NvOXGfwooIPzhLzicebkk9VkPj3MQGHxWuBnq7qAyqT4Mzzv A9x3sAE7 IFVUr9+4tHGtnyulZkBFV513MRe7RBHHAqXezi0eM7UW+KsfswVTVfSH7kBkpmHdsArI8IHsBKdCFfzZrDHJ43/QJxn9sQczQg+8lyXazC7YfflNwJcRT/VA+XUSvSBvAP1PONCnT9FmyKfxaWgfmdfU+7qrFQZlf1vaxc8L0qkiVQhNiXs7zX6tlKeLuzgRibUAegNi9ediNevMiprBmF0R7s54//stbO1dM 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: The value of "end" should be "start + length - 1". Signed-off-by: Shiyang Ruan Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_notify_failure.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_notify_failure.c b/fs/xfs/xfs_notify_failure.c index c4078d0ec108..4a9bbd3fe120 100644 --- a/fs/xfs/xfs_notify_failure.c +++ b/fs/xfs/xfs_notify_failure.c @@ -114,7 +114,8 @@ 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 +211,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 +223,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 Thu Jun 29 08:16:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 13296745 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 BC4A6EB64D9 for ; Thu, 29 Jun 2023 08:18:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A7B08D0005; Thu, 29 Jun 2023 04:18:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 22FB48D0001; Thu, 29 Jun 2023 04:18:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D1918D0005; Thu, 29 Jun 2023 04:18:26 -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 F29F58D0001 for ; Thu, 29 Jun 2023 04:18:25 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C5EE41C8F4D for ; Thu, 29 Jun 2023 08:18:25 +0000 (UTC) X-FDA: 80955083370.13.619DE0B Received: from esa7.hc1455-7.c3s2.iphmx.com (esa7.hc1455-7.c3s2.iphmx.com [139.138.61.252]) by imf22.hostedemail.com (Postfix) with ESMTP id 7EA0FC0009 for ; Thu, 29 Jun 2023 08:18:23 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 139.138.61.252 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=1688026703; 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=R7op9VfIOMTyNNHX4H6KnBsXiagSB/mebCITaJAfzdc=; b=8GEeuBirbTrUmFKSwx9lCF1WDJexIR348RcGg/wpLWoZq4eodcB2tyOhwf1ySdlSEtFyBH 0MdsU3WvIVjAFzMNkxxuoDnur22Knql3lwKDwK7puoApQh8h527nuhi5IIgQZylvyhoik4 DcucWkQLbF6rmAeUy+6JumFrcGlYIfw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688026703; a=rsa-sha256; cv=none; b=Dd0p8MzHJBkV1fbeK4w7QWYDVziNabD/Qh32oab7843vGX5pxQjjT8HeBt+MLcLT8IIF1C EQYcIpvfXuLwIEsePByOtkDcv/3tIpDctLEfYb2Oy51LQARoGN6TmA/FCbn7gDro8mKbxO oL2iPpqdRXeRLFwRDkVzsg1H9xRxZ8w= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 139.138.61.252 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com; dmarc=pass (policy=none) header.from=fujitsu.com X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="101418456" X-IronPort-AV: E=Sophos;i="6.01,168,1684767600"; d="scan'208";a="101418456" Received: from unknown (HELO yto-r3.gw.nic.fujitsu.com) ([218.44.52.219]) by esa7.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2023 17:18:21 +0900 Received: from yto-m2.gw.nic.fujitsu.com (yto-nat-yto-m2.gw.nic.fujitsu.com [192.168.83.65]) by yto-r3.gw.nic.fujitsu.com (Postfix) with ESMTP id 075A1C3F8C for ; Thu, 29 Jun 2023 17:18:19 +0900 (JST) Received: from kws-ab3.gw.nic.fujitsu.com (kws-ab3.gw.nic.fujitsu.com [192.51.206.21]) by yto-m2.gw.nic.fujitsu.com (Postfix) with ESMTP id 3520CD67C6 for ; Thu, 29 Jun 2023 17:18:18 +0900 (JST) Received: from irides.g08.fujitsu.local (unknown [10.167.234.230]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id 9FDA56C9C4; Thu, 29 Jun 2023 17:18:11 +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 Subject: [PATCH v12 2/2] mm, pmem, xfs: Introduce MF_MEM_REMOVE for unbind Date: Thu, 29 Jun 2023 16:16:51 +0800 Message-Id: <20230629081651.253626-3-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230629081651.253626-1-ruansy.fnst@fujitsu.com> References: <20230629081651.253626-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-27720.006 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-27720.006 X-TMASE-Result: 10--12.719100-10.000000 X-TMASE-MatchedRID: qX9uVe/tNg2eTALXPNvL0hmCYUYerLHro8tN19oTXlc6FHRWx2FGsBiQ n63S7zCUxRuqz2yp6bqq5anvU2i8LD9ETA4D04a1rMZ+BqQt2Np3Bf9JIqsoeNcUntbeUinjBb9 MBXqCqLxZ7eVi3CkHD7HbQpHbOVcK0MIzlvZD6LSdVNZaI2n6/8E5XPQnBzGXkZQXc2Em7eLQSo WMT37bqEsrmnu5rBjMRsAI5G5f74+tEJK5xzxTLJAk4Vz6rKoryJTy9ZwCrCNlioXfon9vxjJkM jqWeIXj+foGNus+rDJm/INRqS5JrqG9XcYgSxs/h5kaQXRvR9feGeDcpMd5NqoDeu6wu7bq1pJn wCjcpwoBIj6hBPg0atmIXrjSUVRwBNiO8Iqvd5jfSQNpZkETVN0pE2POjYg4aJ4DLM5Zm8YYQb1 oGZV/vOLzNWBegCW2wgn7iDBesS0gBwKKRHe+ry1wvOOQ8q2EZ+D1mnMc1SYHR0CAqXjNaYSqK8 gsw7ld17pEanWUgq0= X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 X-Rspamd-Queue-Id: 7EA0FC0009 X-Rspam-User: X-Stat-Signature: okug43hzh3pecmc6owbsen9dx4d4hqdp X-Rspamd-Server: rspam03 X-HE-Tag: 1688026703-615387 X-HE-Meta: U2FsdGVkX18p66jAL2h4DWMkEWPk+KQfj/0v3f4BfzVCVmDcn729beo0XCYhySFocDqs0ldyvfhdVBPrV3m2FPD+fVk/1DMIwhLglQ0G6OyXWIg5Z7PSfTVbUAmhj4T1NCblYLUDGYMWDkBbUxKhF9PUZ1Y8JgQzRqEJelRMYSWi1y54m/om2uqCTbwiEJVSn68ByekWH6g3FcFHDqNCt3zC29rKWQugBey3s4O6aSN3DTIIjc5MaDNwuJsMVVKqnLQdhsgubxIzLfqmcT4ijSxQOaNqSL8wjrd6SX4tzhq+jUh3zxTJbg0qRyA4Mw8zt/LF3q6qQe0KkpADY89SSl+vl0iELMY9LXvst4tLvD1ubfgqsDGKXzUmURfme1is+ywany1P6nOh6yZGGfl12PCo2V9ygP1d8O5ETqWuAksYx2/ybcOrvXjIr6LAplD5n8yoeE+hUt6/oShO4tBcQ63GnjG+MuL029Jd2Byw1T8/HXBHuufuGPhrxskHADGSkIYu8lq4zDvn6Qjry+r6SDhbKE1FGKkxwikMMM1Qm+kHR5Vw6d8H4ulMntnCh1Hf0q5X/00wNEFH6vSZqwlWACWhvXBq+GtzmboFjEX6ClYrZD1cYzrKrUOL965xfGmNErDe4TeOW8jd0w7PLpT/VkzxbjIROceGJqsXPt7fIzJGCBOL2tD0g3W84Fqq9CKZB1VrluSRpug9ADJABAXtvafYfeB1Ifu2vJdShSTWEkvxVIn3YvzCps1eHRrulzb91EMIZuHYsLn8d4oG7qEXwX596ERys97l6kujZwfGRqrF1lje1/vwg11bfBTOpshjnYP4uFRtGlfbzFL96WoONlSyVZBvhZ+aHWZfOOUXY0V6Ywr2j159SgvjVHnl/ubrRmsUNoCSEkqd5B3XjoU2JMvBlu9wmMakcnuBSe94PGzmkv/Jw6iFmU9wfABtZ0yXZ5CyW8r0bq+lvaIA31D yFviLfP7 wFpd02oaLUyBfiabqcbN2/4vephCuz3REVeBean1YA9zCwXKTUtJYO9WwRIJY7bfNh9dBAYhmehTl/WHj/TAF6jqwD/PEQw2qo9gXXPiVghs1b6DAqVERuwEYs1jlUXfolVNWvGzFiH55ZoHLMTaz7+uoXQ9yS+lyekeUz/UglaS0/wb8CYR+hislNF/BD0CJZY3p6c00tuQ9DSL+HNk58GTWyu9M/ud4gF9HVjAI4oA21vJaIuzBM/MnYYCArRgq+dr/3S/LHUKphFEd53MKDe9vlNeARQVIgLQr2WMqzn3N7bw= 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: 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: