From patchwork Mon May 28 08:58:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 10430119 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 41AFA60249 for ; Mon, 28 May 2018 09:02:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3490C28AD9 for ; Mon, 28 May 2018 09:02:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 288FD28BDC; Mon, 28 May 2018 09:02:28 +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 B58D028AD9 for ; Mon, 28 May 2018 09:02:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754110AbeE1I7U (ORCPT ); Mon, 28 May 2018 04:59:20 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:39158 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754138AbeE1I7I (ORCPT ); Mon, 28 May 2018 04:59:08 -0400 Received: by mail-wm0-f68.google.com with SMTP id f8-v6so30122347wmc.4 for ; Mon, 28 May 2018 01:59:08 -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=2lFs4ND2R3NT+gfyHKmoqwi6f5lgpbkd6RubGeQ0UH8=; b=QfWUHeK1XZenEiTMCd4/S4BXLcBMCIzS2TJjRSDk9sqq9eVy/l8qoNPKA1UHM12YpI nvtZl8kUub785K9W5U5o8s7S8loSeoGVnCQXr0Za/ETeE62G1pqyMcWR4H6aBcUsNHSL bvgT5dqvTvNoi7aZ6oRsJLMukvjKgrnNY6ozdVraIfF6k+LJDgy7oBJuwDg/Rd8iliy6 F1AaXlJVlaKqaEBk6qyTvF3BlYRPd+0O9BTgVWC1RnCvz03FoLfhVE3fDTlMBU3yrpEa p4Rg9S3aEX0naHksxy6mttXByOUVJxP3G4yti9ug5c8vkEShi7hqgkaj9o52dOGUWQiO LbLg== 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=2lFs4ND2R3NT+gfyHKmoqwi6f5lgpbkd6RubGeQ0UH8=; b=o0Yb1bu3ssK3wH31pCPWN9aP1EUQQZTWOu0P/I22rRbrEWflCX14o35LA3EKoU9IVT CkQTgwOtYUmc6s8kTNiJG3VUFIGMz5xc8fbKcBMDXFmIvc13S3x1/iAkd1tnwoJy06k2 aTFyku/5QIG/rAAdlDCtWs6a3IxRzGFrtEyjDBDPP0QCMpDRdl02yMp5+mxfcSBVNRC9 W0tD70aUx7B6LfUUO6Ww7Zd136cb+VhSRJyZ2wNuCS0m56dDprmOKVc+dp0Kk6723FfM NW4XjdNFNnmEyJNdmo+bRkwPjYMHMZf7qPQKs28LkruOeS2cBAThxjPOUYLAxqQtfTVa k9Mg== X-Gm-Message-State: ALKqPwfihPUmbDltV7MdbacUzkt5jQCmcTzONi+knf4Zd7pT6dwuNtsu lIh8PLHBJazV8Zu0/SytGN+rEw== X-Google-Smtp-Source: ADUXVKLWbJm/yn7lB+3MrdG6GQjkDpQnoQ/LlGDsBmQVZYzNuUDk/ppPW2BIK7y+7NXYhPB1wjKnEA== X-Received: by 2002:a2e:94c8:: with SMTP id r8-v6mr7872907ljh.118.1527497947765; Mon, 28 May 2018 01:59:07 -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 u2-v6sm5777848lji.4.2018.05.28.01.59.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 01:59:06 -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, Hans Holmberg , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [GIT PULL 14/20] lightnvm: pblk: fix smeta write error path Date: Mon, 28 May 2018 10:58:35 +0200 Message-Id: <20180528085841.26684-15-mb@lightnvm.io> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180528085841.26684-1-mb@lightnvm.io> References: <20180528085841.26684-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 263da2e43567..e43093e27084 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);