From patchwork Tue Sep 4 10:38:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Holmberg X-Patchwork-Id: 10587047 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CCCCA14E0 for ; Tue, 4 Sep 2018 10:38:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C40FB29141 for ; Tue, 4 Sep 2018 10:38:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B844E2916A; Tue, 4 Sep 2018 10:38:35 +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=ham 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 9DCD229169 for ; Tue, 4 Sep 2018 10:38:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727290AbeIDPCv (ORCPT ); Tue, 4 Sep 2018 11:02:51 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:39175 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727142AbeIDPCu (ORCPT ); Tue, 4 Sep 2018 11:02:50 -0400 Received: by mail-ed1-f68.google.com with SMTP id h4-v6so2839484edi.6 for ; Tue, 04 Sep 2018 03:38:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=owltronix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=J3K6HHHkVtwTQ7S8qBANmx7kdcYrXaaoxA/0xWXmuSo=; b=qc/ZbqVsVMoSsenMKrQV0HBtFKlsrlQIWC9nzaZi2A6wt235I7ixjX+Q6iphZbkduq 4tIjOBGdTRRXfFSPeKcZM6z7FcGvieSD8inNTOfCaB4gtdeAjeJieRr3urVY210Nf7Sn HuFUtfMTEstVTaW6xAy89ktooll/vA05iFrJ6s8EZ3FylhccwruCKIYdcxCSanxCHk3F A6+tBad5ZPk9Hk9MJ+/xYyAeafFzw/tZ+vnV1oLI9zvHIVDqB0cTr4j5tU0S74t98N6g tmcXDUNwffH1gHr0IL4oXSakqxY5EjYlpB0g7lneGUsB2nPTtEKJfpJFaRxBvQnIId6J T0gg== 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; bh=J3K6HHHkVtwTQ7S8qBANmx7kdcYrXaaoxA/0xWXmuSo=; b=Vr77JYTJle0WnLBJbWlGnMlxZ/LRE0ePPVcyEzXmiJzUJJNhNY0SU6/rgqnNCU05O6 jTTCyC/mP45kAxaipddonRXJnMKVDkRZ7PoJIdtfTQku5pDVhbXMCNyJDDmmGLjtW4th b4yGPjZJ7ImRv6A3ELzne9M6D+VUh4yn13IH4ZBYho9q93fYqHY366w9MkV7qJoGmUqd t107ENKHjYxgBYnUO+0kQk/EtuAaZYnDNWkkiqd0aKDPicBzyFO43Ei6prC+iYaXec/r pcHCFAzvf1YTlW1mnIBllI/NCcmGgrv9qBAb5ml+y6HaYXyV0DhG3Ordqs4Q4HzS91Vg wQvQ== X-Gm-Message-State: APzg51APtUMbtHjskeCqt7JI9CEG7yK02y3y7C9GdZQxXUZIB0EI2306 z2mjK8D2dJ0IVirAiDqtrZiOb5HF+5AUTQ== X-Google-Smtp-Source: ANB0VdaPp1cZjhEWOzRMkVQXop5XLw24xW3ppemc2RTstsjSFp3TFnRzASExfNkT3L2c1rGCPYII8Q== X-Received: by 2002:a50:a542:: with SMTP id z2-v6mr34616776edb.77.1536057497909; Tue, 04 Sep 2018 03:38:17 -0700 (PDT) Received: from titan.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id b44-v6sm11803477edd.93.2018.09.04.03.38.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Sep 2018 03:38:17 -0700 (PDT) From: Hans Holmberg To: Matias Bjorling Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Gonzales , Hans Holmberg Subject: [PATCH V3] lightnvm: pblk: fix mapping issue on failed writes Date: Tue, 4 Sep 2018 12:38:06 +0200 Message-Id: <1536057487-17267-2-git-send-email-hans.ml.holmberg@owltronix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536057487-17267-1-git-send-email-hans.ml.holmberg@owltronix.com> References: <1536057487-17267-1-git-send-email-hans.ml.holmberg@owltronix.com> 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 On 1.2-devices, the mapping-out of remaning sectors in the failed-write's block can result in an infinite loop, stalling the write pipeline, fix this. Fixes: 6a3abf5beef6 ("lightnvm: pblk: rework write error recovery path") Signed-off-by: Hans Holmberg --- Changes in V2: Moved the helper function pblk_next_ppa_in_blk to lightnvm core Renamed variable done->last in the helper function. Changes in V3: Renamed the helper function to nvm_next_ppa_in_chk and changed the first parameter to type nvm_tgt_dev drivers/lightnvm/pblk-write.c | 12 +----------- include/linux/lightnvm.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c index 5e6df65d392c..9e8bf2076beb 100644 --- a/drivers/lightnvm/pblk-write.c +++ b/drivers/lightnvm/pblk-write.c @@ -106,8 +106,6 @@ static void pblk_complete_write(struct pblk *pblk, struct nvm_rq *rqd, /* Map remaining sectors in chunk, starting from ppa */ static void pblk_map_remaining(struct pblk *pblk, struct ppa_addr *ppa) { - struct nvm_tgt_dev *dev = pblk->dev; - struct nvm_geo *geo = &dev->geo; struct pblk_line *line; struct ppa_addr map_ppa = *ppa; u64 paddr; @@ -125,15 +123,7 @@ static void pblk_map_remaining(struct pblk *pblk, struct ppa_addr *ppa) if (!test_and_set_bit(paddr, line->invalid_bitmap)) le32_add_cpu(line->vsc, -1); - if (geo->version == NVM_OCSSD_SPEC_12) { - map_ppa.ppa++; - if (map_ppa.g.pg == geo->num_pg) - done = 1; - } else { - map_ppa.m.sec++; - if (map_ppa.m.sec == geo->clba) - done = 1; - } + done = nvm_next_ppa_in_chk(pblk->dev, &map_ppa); } line->w_err_gc->has_write_err = 1; diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index 09f65c6c6676..36a84180c1e8 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -593,6 +593,42 @@ static inline u32 nvm_ppa64_to_ppa32(struct nvm_dev *dev, return ppa32; } +static inline int nvm_next_ppa_in_chk(struct nvm_tgt_dev *dev, + struct ppa_addr *ppa) +{ + struct nvm_geo *geo = &dev->geo; + int last = 0; + + if (geo->version == NVM_OCSSD_SPEC_12) { + int sec = ppa->g.sec; + + sec++; + if (sec == geo->ws_min) { + int pg = ppa->g.pg; + + sec = 0; + pg++; + if (pg == geo->num_pg) { + int pl = ppa->g.pl; + + pg = 0; + pl++; + if (pl == geo->num_pln) + last = 1; + + ppa->g.pl = pl; + } + ppa->g.pg = pg; + } + ppa->g.sec = sec; + } else { + ppa->m.sec++; + if (ppa->m.sec == geo->clba) + last = 1; + } + + return last; +} typedef blk_qc_t (nvm_tgt_make_rq_fn)(struct request_queue *, struct bio *); typedef sector_t (nvm_tgt_capacity_fn)(void *);