From patchwork Mon Apr 30 09:10:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Javier_Gonz=C3=A1lez?= X-Patchwork-Id: 10371151 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 4600D6032A for ; Mon, 30 Apr 2018 09:10:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36CF0289A6 for ; Mon, 30 Apr 2018 09:10:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B1FD289AB; Mon, 30 Apr 2018 09:10:37 +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 AFE04289A6 for ; Mon, 30 Apr 2018 09:10:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753826AbeD3JKf (ORCPT ); Mon, 30 Apr 2018 05:10:35 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:32951 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753812AbeD3JKZ (ORCPT ); Mon, 30 Apr 2018 05:10:25 -0400 Received: by mail-wm0-f65.google.com with SMTP id x12so10640705wmc.0 for ; Mon, 30 Apr 2018 02:10:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javigon-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lkTJbH1zZFKZVgAwLvjriAE/P41U6j7U/Q9hTcXmhjQ=; b=hRkpzhX4E/yINTe3Mw6bsZ1tX2gpLWc4hIQ5BCpc9lpoeUYT615palIeJQ63deSSKG s6DS2sV8UX1NN80Ed0Ee8Dnsu7QoAuyTQ4Tm1xZm7cekgB8Q+Ku6H3L1RJSKnsZZBJ3J Crueemee/JbPHg5EPeI6Eru1g4eMScKl5Lfu7fkAH6BQviLZi0rMsXJigg7bZNXTtnz0 wVjk/nj59els3oZpFcqiF10zy/zlwvIcMrWXTMBjXFZkT4VvN7a07GNgM3uoEKSU1++w j0px2rQG7zE+YMfdFrF7Orfk1oVttiYRIIsFjuAeD6RGL3BdM6/GKPMU1uEuRToBnBYf YNZQ== 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=lkTJbH1zZFKZVgAwLvjriAE/P41U6j7U/Q9hTcXmhjQ=; b=rN7PANj6M5q5/diWcbhJc0ihMNuSg3iPcL3uygUQIrNkVoa0YWoHslWh0R5xS+z+Yu 582f/hdOyuRQF4JRsxbbw6Yj8qRVxOVFuF0bGKoMgFZl84xjWv7ng07usdVMLgn8iEkF ghC4N8Bb2OjSaeRKLXmwf07oOERe6MftB0OMHDjr4bl8nXtJir/c/ZhPHYo8kq+SpcGU PmdmB5CKOYPy39z1x2ZrItHxqF68KALezYt/WEzn3lvwa7BfzW+EECz46u6Mj/B3vVK0 ty7jphhAXgoid3hEYrTnuWlDGPGqeeuhkkplAkNTm1GaB7a1WlWuc5dPofPI8z/M1h/O a/OQ== X-Gm-Message-State: ALQs6tC7cp6mAi1EM/UvVD7IXhzonI+AK/S1zHHTboro1xrkAnkUX1iG shi5vSyQ6ypaye+9T+rH0QkfEg== X-Google-Smtp-Source: AB8JxZqmrA8zFGHAUx4o8zlvTcFurSA4flewJA7bUBzxWofZyhhkkxfUvVVMyQw8VTEx5Ao6vrPcvA== X-Received: by 2002:a50:b706:: with SMTP id g6-v6mr15118748ede.228.1525079424277; Mon, 30 Apr 2018 02:10:24 -0700 (PDT) Received: from uhalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id b56-v6sm2108638edd.85.2018.04.30.02.10.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Apr 2018 02:10:23 -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 Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 09/11] lightnvm: pblk: check for chunk size before allocating it Date: Mon, 30 Apr 2018 11:10:07 +0200 Message-Id: <1525079409-6588-10-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525079409-6588-1-git-send-email-javier@cnexlabs.com> References: <1525079409-6588-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 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 --- 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++; }