From patchwork Wed Jan 6 22:31:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 7971521 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BEE73BEEE5 for ; Wed, 6 Jan 2016 22:31:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE8032015E for ; Wed, 6 Jan 2016 22:31:40 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 88EEA20142 for ; Wed, 6 Jan 2016 22:31:39 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 74B171A214F; Wed, 6 Jan 2016 14:31:39 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ml01.01.org (Postfix) with ESMTP id F181B1A214F for ; Wed, 6 Jan 2016 14:31:38 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 06 Jan 2016 14:31:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,530,1444719600"; d="scan'208";a="854940623" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.136]) by orsmga001.jf.intel.com with ESMTP; 06 Jan 2016 14:31:38 -0800 Subject: [PATCH v2 4/9] block, badblocks, pmem: introduce devm_alloc_badblocks From: Dan Williams To: linux-nvdimm@lists.01.org Date: Wed, 06 Jan 2016 14:31:12 -0800 Message-ID: <20160106223112.2736.30034.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <20160106223051.2736.43057.stgit@dwillia2-desk3.amr.corp.intel.com> References: <20160106223051.2736.43057.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 Cc: linux-block@vger.kernel.org X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Provide a devres interface for allocating a badblocks instance. The pmem driver has several scenarios where it will be beneficial to have this structure automatically freed when the device is disabled / fails probe. Signed-off-by: Dan Williams --- block/badblocks.c | 51 ++++++++++++++++++++++++++++++++++----------- drivers/nvdimm/core.c | 27 ++++++++++++++---------- drivers/nvdimm/pmem.c | 2 -- include/linux/badblocks.h | 3 +++ 4 files changed, 58 insertions(+), 25 deletions(-) diff --git a/block/badblocks.c b/block/badblocks.c index 37e5c0a2ef69..253cf4fdb723 100644 --- a/block/badblocks.c +++ b/block/badblocks.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -522,23 +523,19 @@ ssize_t badblocks_store(struct badblocks *bb, const char *page, size_t len, } EXPORT_SYMBOL_GPL(badblocks_store); -/** - * badblocks_init() - initialize the badblocks structure - * @bb: the badblocks structure that holds all badblock information - * @enable: weather to enable badblocks accounting - * - * Return: - * 0: success - * -ve errno: on error - */ -int badblocks_init(struct badblocks *bb, int enable) +static int __badblocks_init(struct device *dev, struct badblocks *bb, + int enable) { + bb->dev = dev; bb->count = 0; if (enable) bb->shift = 0; else bb->shift = -1; - bb->page = kzalloc(PAGE_SIZE, GFP_KERNEL); + if (dev) + bb->page = devm_kzalloc(dev, PAGE_SIZE, GFP_KERNEL); + else + bb->page = kzalloc(PAGE_SIZE, GFP_KERNEL); if (bb->page == (u64 *)0) { bb->shift = -1; return -ENOMEM; @@ -547,8 +544,35 @@ int badblocks_init(struct badblocks *bb, int enable) return 0; } + +/** + * badblocks_init() - initialize the badblocks structure + * @bb: the badblocks structure that holds all badblock information + * @enable: weather to enable badblocks accounting + * + * Return: + * 0: success + * -ve errno: on error + */ +int badblocks_init(struct badblocks *bb, int enable) +{ + return __badblocks_init(NULL, bb, enable); +} EXPORT_SYMBOL_GPL(badblocks_init); +struct badblocks *devm_alloc_badblocks(struct device *dev) +{ + struct badblocks *bb; + + bb = devm_kzalloc(dev, sizeof(*bb), GFP_KERNEL); + if (!bb) + return NULL; + if (__badblocks_init(dev, bb, 1)) + return NULL; + return bb; +} +EXPORT_SYMBOL_GPL(devm_alloc_badblocks); + /** * badblocks_exit() - free the badblocks structure * @bb: the badblocks structure that holds all badblock information @@ -557,7 +581,10 @@ void badblocks_exit(struct badblocks *bb) { if (!bb) return; - kfree(bb->page); + if (bb->dev) + devm_kfree(bb->dev, bb->page); + else + kfree(bb->page); bb->page = NULL; } EXPORT_SYMBOL_GPL(badblocks_exit); diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c index 21003b7f0b38..5541612bb449 100644 --- a/drivers/nvdimm/core.c +++ b/drivers/nvdimm/core.c @@ -11,6 +11,7 @@ * General Public License for more details. */ #include +#include #include #include #include @@ -362,7 +363,8 @@ EXPORT_SYMBOL_GPL(__nvdimm_bus_register); /** * __add_badblock_range() - Convert a physical address range to bad sectors - * @disk: the disk associated with the namespace + * @dev: host device for allocations + * @bb: badblocks instance to establish / extend * @ns_offset: namespace offset where the error range begins (in bytes) * @len: number of bytes of poison to be added * @@ -370,9 +372,10 @@ EXPORT_SYMBOL_GPL(__nvdimm_bus_register); * the bounds of physical addresses for this namespace, i.e. lies in the * interval [ns_start, ns_start + ns_size) */ -static int __add_badblock_range(struct gendisk *disk, u64 ns_offset, u64 len) +static int __add_badblock_range(struct device *dev, struct badblocks **bb, + u64 ns_offset, u64 len) { - unsigned int sector_size = queue_logical_block_size(disk->queue); + const unsigned int sector_size = 512; sector_t start_sector; u64 num_sectors; u32 rem; @@ -383,10 +386,10 @@ static int __add_badblock_range(struct gendisk *disk, u64 ns_offset, u64 len) if (rem) num_sectors++; - if (!disk->bb) { - rc = disk_alloc_badblocks(disk); - if (rc) - return rc; + if (!*bb) { + *bb = devm_alloc_badblocks(dev); + if (*bb == NULL) + return -ENOMEM; } if (unlikely(num_sectors > (u64)INT_MAX)) { @@ -396,7 +399,7 @@ static int __add_badblock_range(struct gendisk *disk, u64 ns_offset, u64 len) while (remaining) { int done = min_t(u64, remaining, INT_MAX); - rc = disk_set_badblocks(disk, s, done); + rc = badblocks_set(*bb, s, done, 1); if (rc) return rc; remaining -= done; @@ -404,7 +407,7 @@ static int __add_badblock_range(struct gendisk *disk, u64 ns_offset, u64 len) } return 0; } else - return disk_set_badblocks(disk, start_sector, num_sectors); + return badblocks_set(*bb, start_sector, num_sectors, 1); } /** @@ -430,6 +433,7 @@ int nvdimm_namespace_add_poison(struct gendisk *disk, resource_size_t offset, struct nvdimm_bus *nvdimm_bus; struct list_head *poison_list; u64 ns_start, ns_end, ns_size; + struct badblocks *bb = NULL; struct nd_poison *pl; int rc; @@ -460,7 +464,8 @@ int nvdimm_namespace_add_poison(struct gendisk *disk, resource_size_t offset, else len = ns_start + ns_size - pl->start; - rc = __add_badblock_range(disk, start - ns_start, len); + rc = __add_badblock_range(&ndns->dev, &bb, + start - ns_start, len); if (rc) return rc; dev_info(&nvdimm_bus->dev, @@ -477,7 +482,7 @@ int nvdimm_namespace_add_poison(struct gendisk *disk, resource_size_t offset, else len = ns_size; - rc = __add_badblock_range(disk, 0, len); + rc = __add_badblock_range(&ndns->dev, &bb, 0, len); if (rc) return rc; dev_info(&nvdimm_bus->dev, diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 8f562acc5034..384d979af6c8 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -161,8 +161,6 @@ static void pmem_detach_disk(struct pmem_device *pmem) if (!disk) return; - badblocks_exit(disk->bb); - kfree(disk->bb); del_gendisk_queue(disk); put_disk(disk); } diff --git a/include/linux/badblocks.h b/include/linux/badblocks.h index 2d98c026c57f..12dd9dd60f44 100644 --- a/include/linux/badblocks.h +++ b/include/linux/badblocks.h @@ -23,6 +23,7 @@ #define MAX_BADBLOCKS (PAGE_SIZE/8) struct badblocks { + struct device *dev; /* set by devm_alloc_badblocks */ int count; /* count of bad blocks */ int unacked_exist; /* there probably are unacknowledged * bad blocks. This is only cleared @@ -49,5 +50,7 @@ ssize_t badblocks_store(struct badblocks *bb, const char *page, size_t len, int unack); int badblocks_init(struct badblocks *bb, int enable); void badblocks_exit(struct badblocks *bb); +struct device; +struct badblocks *devm_alloc_badblocks(struct device *dev); #endif