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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7D9DC43381 for ; Wed, 30 Dec 2020 16:58:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6DD8322227 for ; Wed, 30 Dec 2020 16:58:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DD8322227 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A98568D008D; Wed, 30 Dec 2020 11:58:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A70C38D0089; Wed, 30 Dec 2020 11:58:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 937608D008D; Wed, 30 Dec 2020 11:58:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0226.hostedemail.com [216.40.44.226]) by kanga.kvack.org (Postfix) with ESMTP id 7D0868D0089 for ; Wed, 30 Dec 2020 11:58:57 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 4A4DE1EE6 for ; Wed, 30 Dec 2020 16:58:57 +0000 (UTC) X-FDA: 77650558314.15.moon92_5c090bc274a6 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 276E51814B0C1 for ; Wed, 30 Dec 2020 16:58:57 +0000 (UTC) X-HE-Tag: moon92_5c090bc274a6 X-Filterd-Recvd-Size: 6191 Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Wed, 30 Dec 2020 16:58:54 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.78,461,1599494400"; d="scan'208";a="103085835" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 31 Dec 2020 00:58:39 +0800 Received: from G08CNEXMBPEKD05.g08.fujitsu.local (unknown [10.167.33.204]) by cn.fujitsu.com (Postfix) with ESMTP id CD7E44CE6025; Thu, 31 Dec 2020 00:58:38 +0800 (CST) Received: from G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.200) by G08CNEXMBPEKD05.g08.fujitsu.local (10.167.33.204) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 31 Dec 2020 00:58:38 +0800 Received: from irides.mr (10.167.225.141) by G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 31 Dec 2020 00:58:38 +0800 From: Shiyang Ruan To: , , , CC: , , , , , , , , , Subject: [PATCH 05/10] mm, pmem: Implement ->memory_failure() in pmem driver Date: Thu, 31 Dec 2020 00:55:56 +0800 Message-ID: <20201230165601.845024-6-ruansy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201230165601.845024-1-ruansy.fnst@cn.fujitsu.com> References: <20201230165601.845024-1-ruansy.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-yoursite-MailScanner-ID: CD7E44CE6025.AD051 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@cn.fujitsu.com Content-Transfer-Encoding: quoted-printable 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: Call the ->memory_failure() which is implemented by pmem driver, in order to finally notify filesystem to handle the corrupted data. The old collecting and killing processes are moved into mf_dax_mapping_kill_procs(), which will be called by filesystem. Signed-off-by: Shiyang Ruan --- drivers/nvdimm/pmem.c | 24 +++++++++++++++++++++ mm/memory-failure.c | 50 +++++-------------------------------------- 2 files changed, 29 insertions(+), 45 deletions(-) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 875076b0ea6c..4a114937c43b 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -363,9 +363,33 @@ static void pmem_release_disk(void *__pmem) put_disk(pmem->disk); } =20 +static int pmem_pagemap_memory_failure(struct dev_pagemap *pgmap, + unsigned long pfn, int flags) +{ + struct pmem_device *pdev; + struct gendisk *disk; + loff_t disk_offset; + int rc =3D 0; + unsigned long size =3D page_size(pfn_to_page(pfn)); + + pdev =3D container_of(pgmap, struct pmem_device, pgmap); + disk =3D pdev->disk; + if (!disk) + return -ENXIO; + + disk_offset =3D PFN_PHYS(pfn) - pdev->phys_addr - pdev->data_offset; + if (disk->fops->corrupted_range) { + rc =3D disk->fops->corrupted_range(disk, NULL, disk_offset, size, &fla= gs); + if (rc =3D=3D -ENODEV) + rc =3D -ENXIO; + } + return rc; +} + static const struct dev_pagemap_ops fsdax_pagemap_ops =3D { .kill =3D pmem_pagemap_kill, .cleanup =3D pmem_pagemap_cleanup, + .memory_failure =3D pmem_pagemap_memory_failure, }; =20 static int pmem_attach_disk(struct device *dev, diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 37bc6e2a9564..0109ad607fb8 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1269,28 +1269,11 @@ static int memory_failure_dev_pagemap(unsigned lo= ng pfn, int flags, struct dev_pagemap *pgmap) { struct page *page =3D pfn_to_page(pfn); - const bool unmap_success =3D true; - unsigned long size =3D 0; - struct to_kill *tk; - LIST_HEAD(to_kill); int rc =3D -EBUSY; - loff_t start; - dax_entry_t cookie; - - /* - * Prevent the inode from being freed while we are interrogating - * the address_space, typically this would be handled by - * lock_page(), but dax pages do not use the page lock. This - * also prevents changes to the mapping of this pfn until - * poison signaling is complete. - */ - cookie =3D dax_lock_page(page); - if (!cookie) - goto out; =20 if (hwpoison_filter(page)) { rc =3D 0; - goto unlock; + goto out; } =20 if (pgmap->type =3D=3D MEMORY_DEVICE_PRIVATE) { @@ -1298,7 +1281,7 @@ static int memory_failure_dev_pagemap(unsigned long= pfn, int flags, * TODO: Handle HMM pages which may need coordination * with device-side memory. */ - goto unlock; + goto out; } =20 /* @@ -1307,33 +1290,10 @@ static int memory_failure_dev_pagemap(unsigned lo= ng pfn, int flags, */ SetPageHWPoison(page); =20 - /* - * Unlike System-RAM there is no possibility to swap in a - * different physical page at a given virtual address, so all - * userspace consumption of ZONE_DEVICE memory necessitates - * SIGBUS (i.e. MF_MUST_KILL) - */ - flags |=3D MF_ACTION_REQUIRED | MF_MUST_KILL; - collect_procs_file(page, page->mapping, page->index, &to_kill, - flags & MF_ACTION_REQUIRED); + /* call driver to handle the memory failure */ + if (pgmap->ops->memory_failure) + rc =3D pgmap->ops->memory_failure(pgmap, pfn, flags); =20 - list_for_each_entry(tk, &to_kill, nd) - if (tk->size_shift) - size =3D max(size, 1UL << tk->size_shift); - if (size) { - /* - * Unmap the largest mapping to avoid breaking up - * device-dax mappings which are constant size. The - * actual size of the mapping being torn down is - * communicated in siginfo, see kill_proc() - */ - start =3D (page->index << PAGE_SHIFT) & ~(size - 1); - unmap_mapping_range(page->mapping, start, start + size, 0); - } - kill_procs(&to_kill, flags & MF_MUST_KILL, !unmap_success, pfn, flags); - rc =3D 0; -unlock: - dax_unlock_page(page, cookie); out: /* drop pgmap ref acquired in caller */ put_dev_pagemap(pgmap); --=20 2.29.2