From patchwork Sat Jul 14 04:50:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10524545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C78B960626 for ; Sat, 14 Jul 2018 05:00:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B90BE295AE for ; Sat, 14 Jul 2018 05:00:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD9232959F; Sat, 14 Jul 2018 05:00:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5217C29571 for ; Sat, 14 Jul 2018 05:00:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F0556B0275; Sat, 14 Jul 2018 01:00:42 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 37DE46B0276; Sat, 14 Jul 2018 01:00:42 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21DB96B0277; Sat, 14 Jul 2018 01:00:42 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id D0E6A6B0276 for ; Sat, 14 Jul 2018 01:00:41 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id b17-v6so20409690pff.17 for ; Fri, 13 Jul 2018 22:00:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=xVWC9ICL0OiJz0L80JF3RcNjbYQUg9dS8+Bvpg0rZuA=; b=T/1GZ4mwv/QmoJECLIL7RaKW0hGbBp49w28deNb4JSrjIRJ2tYwObVwnn+ZmvgL1W0 yVpOW4DrSAvHe5BSP9wR2mYP9foqVxET9Tuvbt3Rj6gKKgiEDNAY0RxMdG9tXujMSQxW qqRs3Xsy1Nt9aqRnjUTtJXsvqBN1FrbsgpzoQBhiVHTHuI0yKmqSRk5heStvUrEuUbTs 0W+iHromoFJNlRKw0JiCIqK/i3nwsErFxIpDWtiEfw2qqLRdPQ1MBsTxHZEjI4m9zNzO kEUmdgvjf+YCOuDgNvTE53fPUhHeOcXlcLTbf1lM8Ovkn8w3G3gJRi1QgtdJoWmhGsKi IVTg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AOUpUlFnAosf8KuF2Q8FEbaU8YkARpfHoA1ARmCQxZoTXmULf9aRnMsd 8c4rOy5Mm6UEcvdRB/d/75VtIqpayLgx5/rRhlpoAq0YH1fsNUQYRMaIFhjxblL8CWo1woO4exQ RQHnyoPX3hvBJlyNBjpMxnGodwVWBiOSlqc8gmMZ9IuDCEAr4Bx3NvjwbfQ5Od4QwzA== X-Received: by 2002:a62:3545:: with SMTP id c66-v6mr9760366pfa.63.1531544441528; Fri, 13 Jul 2018 22:00:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfgfHl0TVz06uKxeseF+reQDVDP/Rf7V/u4VoHFKQDuA0oK+2UgVEWw92tBfHtkWUiFEeJ3 X-Received: by 2002:a62:3545:: with SMTP id c66-v6mr9760340pfa.63.1531544440819; Fri, 13 Jul 2018 22:00:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531544440; cv=none; d=google.com; s=arc-20160816; b=YBU1OeyksWyVX+zjZ1M7PvhCnE+vSjmo+ftDKJPBz1NPSAqEFYqi/Xug1KZpEUgrpv PcA68tUYOcl9wMuB0eIMo1GviOr9mmwmyjidzTL0U9kR9fu85W8HAHxfX7h9Vx9OZpN8 BLtN8sRyRavLzUas89GWqMUdEQjM+wXqkZhs1ewg4qUHd9qmks749tlEZKAYA4GtMVSg y6fd7sZetjtoG1Wj+ZPx+j2skcxqf+q7tgtBmPXaVT9t9UnkkFZqWaQoRogPrQ0R10fU RQWFISBDMwa1Jk1/3gv7z9EHqVxLO5a3zT3dBR/pfQhgP9A3Zm009U6Uu9jjv5EyWRo/ 3qhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject :arc-authentication-results; bh=xVWC9ICL0OiJz0L80JF3RcNjbYQUg9dS8+Bvpg0rZuA=; b=rtKen7jnjVTciuPJeu+Eq6LcbzC8u+aeCaRrzpmYyTgsD2qw7vZB4lnFpzfXOC9Xms hW41eipR6V93KdVKW4pasS7OfMpX9au8wofZD3IEtvoSHEN/KKkiwqCcxgGu86HJVR3I ji5Xs7PdI7Gx2vxqfG0UNrgitIV9FZVIIl0DtqEvg7Qzqi5p1oHru8XNev2QqJ02cbRp 7wiheBQEKomCSfIVHgwVzsNjYjxdA89Ma1OnUSvRc9ZmYoavqomr3Azf605s3mkEOp0I xW3gW+THsG8np0CnVSbkLhXzVTFkhE/IMrD0uKPnVY2wXjmQg4FB66VyUW2NJ+OQiSc2 GsEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id k125-v6si2088027pgk.6.2018.07.13.22.00.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 22:00:40 -0700 (PDT) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jul 2018 22:00:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,350,1526367600"; d="scan'208";a="66888740" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga002.fm.intel.com with ESMTP; 13 Jul 2018 22:00:35 -0700 Subject: [PATCH v6 13/13] libnvdimm, pmem: Restore page attributes when clearing errors From: Dan Williams To: linux-nvdimm@lists.01.org Cc: hch@lst.de, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Fri, 13 Jul 2018 21:50:37 -0700 Message-ID: <153154383784.34503.6412760695151314711.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <153154376846.34503.15480221419473501643.stgit@dwillia2-desk3.amr.corp.intel.com> References: <153154376846.34503.15480221419473501643.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Use clear_mce_nospec() to restore WB mode for the kernel linear mapping of a pmem page that was marked 'HWPoison'. A page with 'HWPoison' set has also been marked UC in PAT (page attribute table) via set_mce_nospec() to prevent speculative retrievals of poison. The 'HWPoison' flag is only cleared when overwriting an entire page. Signed-off-by: Dan Williams --- drivers/nvdimm/pmem.c | 26 ++++++++++++++++++++++++++ drivers/nvdimm/pmem.h | 13 +++++++++++++ 2 files changed, 39 insertions(+) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 68940356cad3..bdaaa7ed49fd 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,30 @@ static struct nd_region *to_region(struct pmem_device *pmem) return to_nd_region(to_dev(pmem)->parent); } +static void hwpoison_clear(struct pmem_device *pmem, + phys_addr_t phys, unsigned int len) +{ + unsigned long pfn_start, pfn_end, pfn; + + /* only pmem in the linear map supports HWPoison */ + if (is_vmalloc_addr(pmem->virt_addr)) + return; + + pfn_start = PHYS_PFN(phys); + pfn_end = pfn_start + PHYS_PFN(len); + for (pfn = pfn_start; pfn < pfn_end; pfn++) { + struct page *page = pfn_to_page(pfn); + + /* + * Note, no need to hold a get_dev_pagemap() reference + * here since we're in the driver I/O path and + * outstanding I/O requests pin the dev_pagemap. + */ + if (test_and_clear_pmem_poison(page)) + clear_mce_nospec(pfn); + } +} + static blk_status_t pmem_clear_poison(struct pmem_device *pmem, phys_addr_t offset, unsigned int len) { @@ -65,6 +90,7 @@ static blk_status_t pmem_clear_poison(struct pmem_device *pmem, if (cleared < len) rc = BLK_STS_IOERR; if (cleared > 0 && cleared / 512) { + hwpoison_clear(pmem, pmem->phys_addr + offset, cleared); cleared /= 512; dev_dbg(dev, "%#llx clear %ld sector%s\n", (unsigned long long) sector, cleared, diff --git a/drivers/nvdimm/pmem.h b/drivers/nvdimm/pmem.h index a64ebc78b5df..59cfe13ea8a8 100644 --- a/drivers/nvdimm/pmem.h +++ b/drivers/nvdimm/pmem.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef __NVDIMM_PMEM_H__ #define __NVDIMM_PMEM_H__ +#include #include #include #include @@ -27,4 +28,16 @@ struct pmem_device { long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn); + +#ifdef CONFIG_MEMORY_FAILURE +static inline bool test_and_clear_pmem_poison(struct page *page) +{ + return TestClearPageHWPoison(page); +} +#else +static inline bool test_and_clear_pmem_poison(struct page *page) +{ + return false; +} +#endif #endif /* __NVDIMM_PMEM_H__ */