From patchwork Tue May 22 14:40:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10418809 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 273B56032A for ; Tue, 22 May 2018 14:51:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10BC928DAA for ; Tue, 22 May 2018 14:51:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DEDA29071; Tue, 22 May 2018 14:51:08 +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 E4C0928DAA for ; Tue, 22 May 2018 14:50:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA5696B026A; Tue, 22 May 2018 10:50:28 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C52FD6B026B; Tue, 22 May 2018 10:50:28 -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 B69E36B026C; Tue, 22 May 2018 10:50:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 731E76B026A for ; Tue, 22 May 2018 10:50:28 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id e1-v6so10734559pld.23 for ; Tue, 22 May 2018 07:50:28 -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=ezSoGJHO3TYEHP9BvzIp+6lwlyoQ1QFLo2iNQJ+kY58=; b=XS3yvEXYQ2/ud9XINCdE69yAA4pSZ0RoAVpQOEs/flBn3RyoK19Y59YsDq/TDObUnC mHtCIZKBOwf1tVAGF2REk5eh7Jd2Q4QAi2Xxv+TD7VaJGAHaL3AQ64rsOYIqt6kkf9L7 jtfzN/O3ARFPINWc9yB8u47lL8kfGl4OSnxOC1egCk89WhwVL3gkX34A/5NRtRiw0bvn RVNlDWWsU08RTT1wcPN4civYM1tMfbzaAqaVfbL6Gm5Lp3kSoi7dub/sWjNh3h63gEtD T8/bWvsJkzk2AEak71h7n9y+6Q6dfWc2fYMNZ4JOWB0G2p/2Bwc1sMQedF7aTIzBjJQe v+3A== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.115 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: ALKqPwfHEWFdyLfJiFlNQsIY7IvkumAMn1BgmvZD6vm6zMh2TcCdAaUL ogCu/W1GnaORa3uPOo5ByFSDz/a4TfCo2whfNcNWW2iXoRXtrAe3QMwCkHdSuJeGCIrJINprfVI 1563bH4p5lYZo7zj/jDFK9W5quVSwY1P0buLox1XelZ64UCiH/D6NTSNODZwHLOQi+w== X-Received: by 2002:a62:b204:: with SMTP id x4-v6mr24521281pfe.21.1527000628155; Tue, 22 May 2018 07:50:28 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoUThk3JhUZy1FjQNBtuXPsjvqOkk7xgm2e5C8wHK9tMlpYEUufdG+CkRzWgKcEIYmEqoAA X-Received: by 2002:a62:b204:: with SMTP id x4-v6mr24521238pfe.21.1527000627405; Tue, 22 May 2018 07:50:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527000627; cv=none; d=google.com; s=arc-20160816; b=ntc11+a0ji9Bv0k8Cie+kPP0ruetOn/umO0b7WbgxfcCVnfPZePhp4I35rOq7hBNB+ 5Qo5y9yIw84tTqH8BRlbj/rdYQzIJCS1QacmrX//jQh/oiv4HJQy7h7pYI0Tkt1g/Zup seeMNmiYBCIlWz7JXMvqYrX+QYTNw+li05YXPBC96RDzfUN7vZZUGnJip46eoAwr5Zlc gkXeFiH+7+6FXrEriYRUUokzf7Vtr1ca13ApLdUd7JtUWdrOSdcnR4NvYeaWNuu1in4Z vnH6quFmPvKtYssfS5QKrZlXSJUgvn0pymrZ6vqFdGdB89U15XgymqCxwQK74o/flbWH I+/Q== 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=ezSoGJHO3TYEHP9BvzIp+6lwlyoQ1QFLo2iNQJ+kY58=; b=M98RFnQIM45i+6l3ISTMAo3Y7nR0unZaktBfuXQfbXmxPrZ5tPtmeu1UDgVZrjs4MN /DP0QB6TKDgajsguGucNnH3cDMlxsG3hM+d4jlgsFiHb0T+SWFlUExGjDv++aYSfTGci 34Ti7DqOMp+Hj5N9GtEhqqG4mVZf7BP3uQyD0jPUtldd0rpKUKjGA7s1L7Elv4t8n/Q8 wNlB5PCDfEnlX/wzudhCTgVcEYa2m5my6qUTiM0fcTMDsk2MEBWoxN2P/1zi32PzMRPc cF8OPxmlyRg2oKFv7N4Ib25v+265j96xuWUnDP3clTEjFqFGLfJZKXyfKL8c5fv2S+AW HZ2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.115 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga14.intel.com (mga14.intel.com. [192.55.52.115]) by mx.google.com with ESMTPS id w17-v6si16748124plq.115.2018.05.22.07.50.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 May 2018 07:50:27 -0700 (PDT) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.115 as permitted sender) client-ip=192.55.52.115; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.115 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 orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2018 07:50:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,430,1520924400"; d="scan'208";a="201487532" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga004.jf.intel.com with ESMTP; 22 May 2018 07:50:26 -0700 Subject: [PATCH 11/11] libnvdimm, pmem: restore page attributes when clearing errors From: Dan Williams To: linux-nvdimm@lists.01.org Cc: hch@lst.de, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, tony.luck@intel.com Date: Tue, 22 May 2018 07:40:29 -0700 Message-ID: <152700002985.24093.13134641532491041554.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <152699997165.24093.12194490924829406111.stgit@dwillia2-desk3.amr.corp.intel.com> References: <152699997165.24093.12194490924829406111.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 9d714926ecf5..04ee1fdee219 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__ */