From patchwork Mon May 28 08:58:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 10430161 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 E766760249 for ; Mon, 28 May 2018 09:04:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAA1828BDC for ; Mon, 28 May 2018 09:04:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CEE5528BE2; Mon, 28 May 2018 09:04:47 +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 5C41F28BDC for ; Mon, 28 May 2018 09:04:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754200AbeE1JEg (ORCPT ); Mon, 28 May 2018 05:04:36 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:39125 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754194AbeE1I7C (ORCPT ); Mon, 28 May 2018 04:59:02 -0400 Received: by mail-wm0-f67.google.com with SMTP id f8-v6so30121491wmc.4 for ; Mon, 28 May 2018 01:59:01 -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=pUgpTe5N+eIkbhHMh5mZ3uG02wTbwA/rNVB0WiNn0cU=; b=JKUE2NPnkuM6gl6IUpqFPFuP6fAXcHE1On8IZGRk1hM92NESOEhhyPORQ4Y3iNEaXb sY5PRbT+8JazuwML45koxVNdU/MYRmJrz3HqaO1MnYs5W7QXQdKi+3W4rd8r8dk4wRRn FI2RCQo5NBExhul+m/GCSXz6NtGltnJXwNJCKWAUwwzZexwunuhtH9cRUH0fbm0oh2j8 EkAvaBLEyAYDuiJF8o7r/zs6PempMgpYfYA+9ldnpygDiAQPn+nT5YoWT6mK6d+4/oCZ tOXkootflbQhTMzrLVOQLs5YcT6QwG68ALkMFiQZWBl+d3S6MyMKTrJCHvpyKEmIE3hs l0Ig== 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=pUgpTe5N+eIkbhHMh5mZ3uG02wTbwA/rNVB0WiNn0cU=; b=jjDZI2Tk2fpN4UY8djyUpAbEzrVii60Br/pCYeO5837P++bkGabOae2vMj3OAEI0fe JslQwwW+DUsqFL1Ut3GtwJ1bYlgFTHpeWn7T35z6X64xmrkf8+3Rpoqc8Dogwzvci/FT P5LWKXQwAmnIMsLsF76S8McvEpVxQImX91wCXfeTCVHES/k5t9N7uQ07u735ViuYErE7 kG4O124szhkJntcmvz2qC0D4pfDyC7a49k4d3jvYrGvXMCyj00qH1FzV6JDdV2usK/17 pWUPMqAML/nbsUS5TQAvLSy9qFGqWg22rIURJfBucY8KgveHJ4B+ioO7ETSaZB4Q9NbM f2Zw== X-Gm-Message-State: ALKqPwc2r0ciS5SIIfuI/GTkir2WrZ/VfWtxa8tpWIyM+ncf1ritVoay 20bBA4mUAVUPQPeFRz4n1RipaDb9 X-Google-Smtp-Source: AB8JxZr+AwqP4yFYnNMfJKuFH+FjUkp+ywV+Yzl4dqAKSWcXhHaS3s8KoiMHqtNWcmB/Kcm3T1JG8g== X-Received: by 2002:a2e:9d41:: with SMTP id y1-v6mr7718460ljj.112.1527497940971; Mon, 28 May 2018 01:59:00 -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.58.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 01:58:59 -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, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [GIT PULL 09/20] lightnvm: pblk: check for chunk size before allocating it Date: Mon, 28 May 2018 10:58:30 +0200 Message-Id: <20180528085841.26684-10-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: Javier González Do the check for the chunk state after making sure that the chunk type is supported. Fixes: 32ef9412c114 ("lightnvm: pblk: implement get log report chunk") Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c index b52855f9336b..9e3a43346d4c 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c @@ -751,14 +751,14 @@ static int pblk_setup_line_meta_20(struct pblk *pblk, struct pblk_line *line, chunk->cnlb = chunk_meta->cnlb; chunk->wp = chunk_meta->wp; - if (!(chunk->state & NVM_CHK_ST_OFFLINE)) - continue; - if (chunk->type & NVM_CHK_TP_SZ_SPEC) { WARN_ONCE(1, "pblk: custom-sized chunks unsupported\n"); continue; } + if (!(chunk->state & NVM_CHK_ST_OFFLINE)) + continue; + set_bit(pos, line->blk_bitmap); nr_bad_chks++; }