Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939279AbdD0W56 (ORCPT ); Thu, 27 Apr 2017 18:57:58 -0400 Received: from g4t3427.houston.hpe.com ([15.241.140.73]:27187 "EHLO g4t3427.houston.hpe.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937846AbdD0W5m (ORCPT ); Thu, 27 Apr 2017 18:57:42 -0400 From: Toshi Kani To: dan.j.williams@intel.com Cc: dave.jiang@intel.com, vishal.l.verma@intel.com, linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org, Toshi Kani Subject: [PATCH 2/2] libnvdimm: clear region badblock in nvdimm_clear_poison() Date: Thu, 27 Apr 2017 16:57:06 -0600 Message-Id: <20170427225706.26791-2-toshi.kani@hpe.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170427225706.26791-1-toshi.kani@hpe.com> References: <20170427225706.26791-1-toshi.kani@hpe.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1576 Lines: 46 Badblocks are tracked at both region and device levels. pmem_clear_poison() and nsio_rw_bytes() call nvdimm_clear_poison() and then badblocks_clear() to clear badblocks at the device level. However, it does not update badblocks at the region level, which makes them inconsistent. Change nvdimm_clear_poison() to update backblocks at the region level to keep them consistent. Signed-off-by: Toshi Kani Cc: Dan Williams Cc: Dave Jiang Cc: Vishal Verma --- Based on 'libnvdimm-for-next'. --- drivers/nvdimm/bus.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index 43ddfd4..998332d 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -179,6 +179,7 @@ long nvdimm_clear_poison(struct device *dev, phys_addr_t phys, struct nvdimm_bus_descriptor *nd_desc; struct nd_cmd_clear_error clear_err; struct nd_cmd_ars_cap ars_cap; + struct resource res; u32 clear_err_unit, mask; int cmd_rc, rc; @@ -222,6 +223,14 @@ long nvdimm_clear_poison(struct device *dev, phys_addr_t phys, if (clear_err.cleared > 0) nvdimm_forget_poison(nvdimm_bus, phys, clear_err.cleared); + if (clear_err.cleared > 0 && clear_err.cleared / 512) { + nvdimm_bus_lock(&nvdimm_bus->dev); + res.start = phys; + res.end = phys + clear_err.cleared - 1; + __nvdimm_bus_badblocks_clear(nvdimm_bus, &res); + nvdimm_bus_unlock(&nvdimm_bus->dev); + } + return clear_err.cleared; } EXPORT_SYMBOL_GPL(nvdimm_clear_poison);