From patchwork Mon Jun 26 09:57:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9809069 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 100A960209 for ; Mon, 26 Jun 2017 10:03:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 174AA274D2 for ; Mon, 26 Jun 2017 10:03:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C5462847D; Mon, 26 Jun 2017 10:03:55 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A7C7274D2 for ; Mon, 26 Jun 2017 10:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752378AbdFZKBJ (ORCPT ); Mon, 26 Jun 2017 06:01:09 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:37962 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751920AbdFZJ62 (ORCPT ); Mon, 26 Jun 2017 05:58:28 -0400 Received: by mail-wm0-f54.google.com with SMTP id b184so3028568wme.1 for ; Mon, 26 Jun 2017 02:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VCtErxnnAvL6k+7N+2YVH4n/ehFB9Aok7B8aElKa7Vs=; b=pI38/Vn5rCTvupj387Fw3THa7Zcz7BsaqOveIGyUHA+kqNLX8qG1VaiZXVEMgolrBD 2olcDlheYI0RGzVDwhBngMBY8+kqFxrstoDQCvaublyDBtwGQEyMIGMtwBlmVHQufQpd 5DDZ257IR7+BlGd2yNlIYhZxoj6ICgc4bHTz8tHejXMQ4P0FhCWlEg1n459Mo3C0oBfS ZdYuUuQHWu+XCf0iErUQU4d4fZnrmucK7WSHEFN2WxqgbXModi++ygaIXdCU1psdWRfq FnkSCGLWH0/COAhl7NViqDsSJAtE0hSv68Ba/QP6idJNtj8cotNUZOMzOV3xMCau1Gn+ Ee+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VCtErxnnAvL6k+7N+2YVH4n/ehFB9Aok7B8aElKa7Vs=; b=aIphzLFdiyHvUCadeSPgKdIc3It9Zmx7KlhvvSv/HLPpdlSpZ+aH3WTa0//oj30mEf x2psAv3mqKDjLiKkc88uAEnLDWpXKRT+1HE3Nl8mKPm13jCEtgiWvCRL7LIlg9+A9YeG 6V2xgVMCHLv63ddP4rsxpQUIv0ObQIqmhKJOjs+po1GINc04t6ZsoH21qqsboP6JrdPi vG1/PHFaxyKMcjaZa24YRIDN2zMfVegL3cCICfMZ/0AdlJvv13kzB2U35C72p/dAkShV hYXOESX9mMNO09ryW3qLt3x7EHpP1bs5X269lpMyPwHTNtC59XjYA8zvqwjNf7JHGU79 hZkg== X-Gm-Message-State: AKS2vOyJKh5yU65BRkuZ1m5T29ARfH5IjUbP4KZR/Zbd8Tzo9tzYkN4f ma3oQ27oYTqT0BXq X-Received: by 10.80.145.174 with SMTP id g43mr9542753eda.179.1498471101715; Mon, 26 Jun 2017 02:58:21 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id n26sm5212537edd.51.2017.06.26.02.58.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Jun 2017 02:58:21 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io, axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 13/20] lightnvm: pblk: decouple bad block from line alloc Date: Mon, 26 Jun 2017 11:57:22 +0200 Message-Id: <1498471049-25505-14-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498471049-25505-1-git-send-email-javier@cnexlabs.com> References: <1498471049-25505-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Decouple bad block discovery from line allocation logic. This allows to return meaningful error codes in case of bad block discovery failure. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-init.c | 55 ++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c index c49115d74e85..41db12deaa49 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c @@ -327,6 +327,12 @@ static void pblk_luns_free(struct pblk *pblk) kfree(pblk->luns); } +static void pblk_free_line_bitmaps(struct pblk_line *line) +{ + kfree(line->blk_bitmap); + kfree(line->erase_bitmap); +} + static void pblk_lines_free(struct pblk *pblk) { struct pblk_line_mgmt *l_mg = &pblk->l_mg; @@ -338,8 +344,7 @@ static void pblk_lines_free(struct pblk *pblk) line = &pblk->lines[i]; pblk_line_free(pblk, line); - kfree(line->blk_bitmap); - kfree(line->erase_bitmap); + pblk_free_line_bitmaps(line); } spin_unlock(&l_mg->free_lock); } @@ -396,25 +401,16 @@ static int pblk_bb_discovery(struct nvm_tgt_dev *dev, struct pblk_lun *rlun) return ret; } -static int pblk_bb_line(struct pblk *pblk, struct nvm_geo *geo, - struct pblk_line *line) +static int pblk_bb_line(struct pblk *pblk, struct pblk_line *line, + int blk_per_line) { - struct pblk_line_meta *lm = &pblk->lm; + struct nvm_tgt_dev *dev = pblk->dev; + struct nvm_geo *geo = &dev->geo; struct pblk_lun *rlun; int bb_cnt = 0; int i; - line->blk_bitmap = kzalloc(lm->blk_bitmap_len, GFP_KERNEL); - if (!line->blk_bitmap) - return -ENOMEM; - - line->erase_bitmap = kzalloc(lm->blk_bitmap_len, GFP_KERNEL); - if (!line->erase_bitmap) { - kfree(line->blk_bitmap); - return -ENOMEM; - } - - for (i = 0; i < lm->blk_per_line; i++) { + for (i = 0; i < blk_per_line; i++) { rlun = &pblk->luns[i]; if (rlun->bb_list[line->id] == NVM_BLK_T_FREE) continue; @@ -426,6 +422,23 @@ static int pblk_bb_line(struct pblk *pblk, struct nvm_geo *geo, return bb_cnt; } +static int pblk_alloc_line_bitmaps(struct pblk *pblk, struct pblk_line *line) +{ + struct pblk_line_meta *lm = &pblk->lm; + + line->blk_bitmap = kzalloc(lm->blk_bitmap_len, GFP_KERNEL); + if (!line->blk_bitmap) + return -ENOMEM; + + line->erase_bitmap = kzalloc(lm->blk_bitmap_len, GFP_KERNEL); + if (!line->erase_bitmap) { + kfree(line->blk_bitmap); + return -ENOMEM; + } + + return 0; +} + static int pblk_luns_init(struct pblk *pblk, struct ppa_addr *luns) { struct nvm_tgt_dev *dev = pblk->dev; @@ -748,8 +761,13 @@ static int pblk_lines_init(struct pblk *pblk) line->vsc = &l_mg->vsc_list[i]; spin_lock_init(&line->lock); - nr_bad_blks = pblk_bb_line(pblk, geo, line); + ret = pblk_alloc_line_bitmaps(pblk, line); + if (ret) + goto fail_free_lines; + + nr_bad_blks = pblk_bb_line(pblk, line, lm->blk_per_line); if (nr_bad_blks < 0 || nr_bad_blks > lm->blk_per_line) { + pblk_free_line_bitmaps(line); ret = -EINVAL; goto fail_free_lines; } @@ -776,6 +794,9 @@ static int pblk_lines_init(struct pblk *pblk) return 0; fail_free_lines: + while (--i >= 0) + pblk_free_line_bitmaps(&pblk->lines[i]); + kfree(pblk->lines); fail_free_bb_aux: kfree(l_mg->bb_aux);