From patchwork Fri Jun 1 14:41:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 10443639 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 6F65E603D7 for ; Fri, 1 Jun 2018 14:44:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60D482860A for ; Fri, 1 Jun 2018 14:44:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54B9428944; Fri, 1 Jun 2018 14:44:45 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, 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 0B7EB2860A for ; Fri, 1 Jun 2018 14:44:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752448AbeFAOoF (ORCPT ); Fri, 1 Jun 2018 10:44:05 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:43967 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752091AbeFAOn6 (ORCPT ); Fri, 1 Jun 2018 10:43:58 -0400 Received: by mail-lf0-f66.google.com with SMTP id n18-v6so15183278lfh.10 for ; Fri, 01 Jun 2018 07:43:57 -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=YYdJk2uR2N3QqD8EoM6h5oV/GI2GTYGW6lyE5UUfNsE=; b=srYQhLRNudpd2+s1bX/nt7QADU/rxOtBUxG/m5qciLaGNNiYrpY0FAuwPPiv8+B4Iv OH7S4PrvthPY3ObXwBXSBXa6vO2TM4E9gbrGNEo8K2QKT/uTZPPCEvpC06yeiaQveNBt zdd0Scg8jxB9ZNSFH1K8d4TlBNY4SCHfPbnGRTah4MA68bS4HboocwD+sapU2ynqumYX qaM6sdW+z1CcgTl/otSV93mkBBLh35wp+FqlrlgvZu6wrQAtBk54sxDM20dJylf/Quie QEu0HreeiL8JoX4YRoTaj6/6Pfh+zIxp0qsfDKJfelicGlHJPvXO0u2HwsNTmvvWZXRZ /xYA== 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=YYdJk2uR2N3QqD8EoM6h5oV/GI2GTYGW6lyE5UUfNsE=; b=a291XY8+Wmp1oTmeMzg+7Qfn0kaW6KZK4bUrojk1V37TTMhkWXXjOkv8UNmhMuC6WJ CEThEO5bx88C3hz67vADpw/RBy8gRpecrQ27cGJ6FikHkUkvgYi5W0l5p0kCsSTdVd0f VffvMCIMDAZW84e//KP/KEPlndhkWkvciT7fSe2Mx93RtNndg4S9bCPhPwW23WUeU6ig WGAOpOm3if4nQCSAdC0erMvDJHA9bjyxq6fdGfBHLXdqGx+wZvsGzdhe7TQTzE9WknPy QLXCz1UWpa60VZmJiJ325Yu/iH72q2/ERBQoKIer0CEZGUh5F0+Q/0sK7hPybdgbJU9s 98cw== X-Gm-Message-State: ALKqPwcVLBWIfani1wOgdAwvM9NEIb19MnZsuu9u9Ply23f+ZsefVwhI D/V/iOwMGZPjeXJ3sVHea3KkF79O X-Google-Smtp-Source: ADUXVKJkiYinM7hHlyySIeHjh6/ZnnssHdoeqg7NegvgOjWVdfqu61/9UMA1ey2Xl0esmBYpPPrgvg== X-Received: by 2002:a19:e544:: with SMTP id c65-v6mr7289241lfh.134.1527864236919; Fri, 01 Jun 2018 07:43:56 -0700 (PDT) Received: from Macroninja.cnexlabs.com (95-166-82-66-cable.dk.customer.tdc.net. [95.166.82.66]) by smtp.gmail.com with ESMTPSA id e65-v6sm356488lff.13.2018.06.01.07.43.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jun 2018 07:43:55 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, javier@cnexlabs.com, igor.j.konopko@intel.com, marcin.dziegielewski@intel.com, Hans Holmberg , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [GIT PULL 03/10] lightnvm: pblk: fix smeta write error path Date: Fri, 1 Jun 2018 16:41:07 +0200 Message-Id: <20180601144114.17490-4-mb@lightnvm.io> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180601144114.17490-1-mb@lightnvm.io> References: <20180601144114.17490-1-mb@lightnvm.io> 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 From: Hans Holmberg Smeta write errors were previously ignored. Skip these lines instead and throw them back on the free list, so the chunks will go through a reset cycle before we attempt to use the line again. Signed-off-by: Hans Holmberg Reviewed-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index e81a70cf9e9b..549341b24e3c 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -849,9 +849,10 @@ static int pblk_line_submit_smeta_io(struct pblk *pblk, struct pblk_line *line, atomic_dec(&pblk->inflight_io); if (rqd.error) { - if (dir == PBLK_WRITE) + if (dir == PBLK_WRITE) { pblk_log_write_err(pblk, &rqd); - else if (dir == PBLK_READ) + ret = 1; + } else if (dir == PBLK_READ) pblk_log_read_err(pblk, &rqd); } @@ -1101,7 +1102,7 @@ static int pblk_line_init_bb(struct pblk *pblk, struct pblk_line *line, if (init && pblk_line_submit_smeta_io(pblk, line, off, PBLK_WRITE)) { pr_debug("pblk: line smeta I/O failed. Retry\n"); - return 1; + return 0; } bitmap_copy(line->invalid_bitmap, line->map_bitmap, lm->sec_per_line);