From patchwork Wed Aug 29 09:01:50 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: 10579715 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 A0F4F1709 for ; Wed, 29 Aug 2018 09:02:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 920342AC3C for ; Wed, 29 Aug 2018 09:02:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 862362AC55; Wed, 29 Aug 2018 09:02:18 +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 0E1F12AC3C for ; Wed, 29 Aug 2018 09:02:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727819AbeH2M54 (ORCPT ); Wed, 29 Aug 2018 08:57:56 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:44445 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727254AbeH2M5z (ORCPT ); Wed, 29 Aug 2018 08:57:55 -0400 Received: by mail-ed1-f66.google.com with SMTP id s10-v6so3344482edb.11 for ; Wed, 29 Aug 2018 02:02:00 -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=Ffn4jK+AP1mfvxC0eYWzStCC8ro2vYixtu8eyEmpaVU=; b=m/gHofHSae8Zfwpl25mOumdRm8yVJYAglafYFT3eZf9Ss5UaFjtayrskq13YDpaPvn eN6X4jWmYZQpW3vaUU0YXZO0iYBGnNZfEe4s3YLx3EmuYFZKOHvI+kHWHu9H9NsbMihY Qh6aeU125oeXeM6kIpXovGdTjaxBG10v16GgvFtTim8YXy7sQIyNsLqrQKeb+POAjc02 +EswfMAEWRlNl/TSUYSaRrgeV0OWED5V2+GCBwnQvxULO2lL5unExs9ioak4LUb9CAZf KV67skgpYHzOqRoOYvexEHDXpaqHvp9NJasTisoLxgXhg2AGWvsCdmauDKTrCTaYntXT QQXQ== 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=Ffn4jK+AP1mfvxC0eYWzStCC8ro2vYixtu8eyEmpaVU=; b=uCKmci2Z4TPv1N3mXq00QeQxnhs7lgfot07L8bpDlHB88OmZSCA6/q5tGayv4u7A10 FSz1HImLZ+q4AUonX2OubB0Vmj46I0NA9Olzu+vFzjxy4bGjzUghDhSmAFMxHFtJJv6z poOT/Prwd4qyEZqg79wLj2VS0gVnxkBaULjtxRUc0R+CJN+OLmbu+SxcwKA9VAucrGTs 4l6mpbjOL9J+9Q35fy8IN9TzxkgNxtz8p5o/ytZXsubucq+QfiReSrvSmw8bJVE06dYZ kzWRHcr2OYdTf5aaCrXiBzC52crleyLQPrSepBneVaJrTMtj5MFh1fYMi98d5RkZy5ri HRaw== X-Gm-Message-State: APzg51C/WgnIB7kGWPiGLUXEJVpxYQyCeJDoEjmRpO4G9lkghxIo72nB Xt81huEMBqBye8RXu8O2v+WBM/rWfiA= X-Google-Smtp-Source: ANB0Vdbl4ZpN4OCPQh9bwNdC1dZGZ3vDf1AyrYodhF+pkaekqUZY5s5QOwY8XaLfzGi/+L/IDzR34w== X-Received: by 2002:a50:b4db:: with SMTP id x27-v6mr6465620edd.155.1535533320187; Wed, 29 Aug 2018 02:02:00 -0700 (PDT) Received: from ch-wrk-javier.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id a41-v6sm1546569edc.57.2018.08.29.02.01.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Aug 2018 02:01:59 -0700 (PDT) From: " =?utf-8?q?Javier_Gonz=C3=A1lez?= " X-Google-Original-From: =?utf-8?q?Javier_Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Jav?= =?utf-8?q?ier_Gonz=C3=A1lez?= Subject: [PATCH 1/4] lightnvm: pblk: calculate line pad distance in helper Date: Wed, 29 Aug 2018 11:01:50 +0200 Message-Id: <1535533313-29944-2-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535533313-29944-1-git-send-email-javier@cnexlabs.com> References: <1535533313-29944-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 If a line is padded, calculate the pad distance directly on the helper being used for this purpose. Signed-off-by: Javier González --- drivers/lightnvm/pblk-recovery.c | 2 -- drivers/lightnvm/pblk.h | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c index fdc770f2545f..188c89819a40 100644 --- a/drivers/lightnvm/pblk-recovery.c +++ b/drivers/lightnvm/pblk-recovery.c @@ -487,8 +487,6 @@ static int pblk_recov_scan_all_oob(struct pblk *pblk, struct pblk_line *line, bitmap_clear(line->map_bitmap, line->cur_sec, nr_error_bits); pad_secs = pblk_pad_distance(pblk); - if (pad_secs > line->left_msecs) - pad_secs = line->left_msecs; ret = pblk_recov_pad_oob(pblk, line, pad_secs); if (ret) diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h index 54f937c1fb62..994a081994fb 100644 --- a/drivers/lightnvm/pblk.h +++ b/drivers/lightnvm/pblk.h @@ -990,12 +990,13 @@ static inline int pblk_line_vsc(struct pblk_line *line) return le32_to_cpu(*line->vsc); } -static inline int pblk_pad_distance(struct pblk *pblk) +static inline int pblk_pad_distance(struct pblk *pblk, struct pblk_line *line) { struct nvm_tgt_dev *dev = pblk->dev; struct nvm_geo *geo = &dev->geo; + int distance = geo->mw_cunits * geo->all_luns * geo->ws_opt; - return geo->mw_cunits * geo->all_luns * geo->ws_opt; + return (distance > line->left_msecs) ? line->left_msecs : distance; } static inline int pblk_ppa_to_line_id(struct ppa_addr p) From patchwork Wed Aug 29 09:01:51 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: 10579717 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 90D9B1709 for ; Wed, 29 Aug 2018 09:02:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 831092AC3C for ; Wed, 29 Aug 2018 09:02:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 776332AC53; Wed, 29 Aug 2018 09:02:26 +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 2ED1F2AC3C for ; Wed, 29 Aug 2018 09:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727245AbeH2M6T (ORCPT ); Wed, 29 Aug 2018 08:58:19 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:45383 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727761AbeH2M54 (ORCPT ); Wed, 29 Aug 2018 08:57:56 -0400 Received: by mail-ed1-f65.google.com with SMTP id p52-v6so3345442eda.12 for ; Wed, 29 Aug 2018 02:02:01 -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=UX0Pvs4Hz0Ki3EZ2/37DxNKm9gdSEWipWRlHXL/KZmU=; b=WnPVRfgZhZycAWcdCQ7uA8q2+BksDSZeunfi8VjN6pxIoTuy/YzYZzfVQxCyoN8Y+O jT+ZhjTi5DWL6OndPKki5ixcbLZs+6b2B1VqoCyh52AmUacNyFXh8UEyQfd1RwaEnlEY P4qlXQdJxIl3f/ssCfR3oLSkT1dPp2GFqV6uwLt/wFnvpyAXHkgDCpnzpOeK2mFypWvr jO5/J+wkALyNPYfdouZYenEw5L/cbZqTgzdFM0QJzrQZ5GxKprZ2Q5YhjLEKRXRcRbyY k6UXHXBsCepk0Xphn/2cOsre+aiJDjDhsxONckAFjdgUEgaSf0KoVQGjIZPOvvdE5m8i siSQ== 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=UX0Pvs4Hz0Ki3EZ2/37DxNKm9gdSEWipWRlHXL/KZmU=; b=c1iN3mRjX9goktyh/fAqoN/5VUZO46kzEuGW0+GLvnMvb3+q1iadCs2UvX/X4ngZ/g XtwvB51GPnh7iE9DX3jBag9p/qA51dc9YnTDcTfSDSuvmw716yV7VBbdRLX4TiXk4h+v uGhEkMRFP9ChREEOpxylsg3nO7WWW4616KbFSYUFKR1cM7R8+5Dku8laoDUHlc2n92Hk ecQSJRUHaKy4LBO+RdGRGQCSZZCji5KfSKNI/3FjP740zGdBjAo1niSMnz3t0B8jhQw3 MbD6wvLKj7s0kpAXtsjM9O90ODwmehPDjyl5DP6Q2gn5VN7JDjUYOzOwil3OsZZbOy8T S9Bg== X-Gm-Message-State: APzg51CEeI+4jO6tMW/Fi9RAz8A1J0J28Nj3g0wkHGx3JUickM4lKD2L 6EEGkgnG8PEd9tBPBbkBfyh3Ow== X-Google-Smtp-Source: ANB0VdY/BPOOxayAXQscpxfAHHm9mEFrmcuJJ7Wc2ZdsZ0zUqIhw3QyUZVyifHS9CpBX80cE6eVdow== X-Received: by 2002:a50:83e6:: with SMTP id 93-v6mr6365599edi.164.1535533320972; Wed, 29 Aug 2018 02:02:00 -0700 (PDT) Received: from ch-wrk-javier.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id a41-v6sm1546569edc.57.2018.08.29.02.02.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Aug 2018 02:02:00 -0700 (PDT) From: " =?utf-8?q?Javier_Gonz=C3=A1lez?= " X-Google-Original-From: =?utf-8?q?Javier_Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Jav?= =?utf-8?q?ier_Gonz=C3=A1lez?= Subject: [PATCH 2/4] lightnvm: pblk: fix comment typo Date: Wed, 29 Aug 2018 11:01:51 +0200 Message-Id: <1535533313-29944-3-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535533313-29944-1-git-send-email-javier@cnexlabs.com> References: <1535533313-29944-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 Fix comment typo Decrese -> Decrease Signed-off-by: Javier González --- drivers/lightnvm/pblk-write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c index 767618eba4c2..617572717065 100644 --- a/drivers/lightnvm/pblk-write.c +++ b/drivers/lightnvm/pblk-write.c @@ -195,7 +195,7 @@ static void pblk_prepare_resubmit(struct pblk *pblk, unsigned int sentry, /* Release flags on write context. Protect from writes */ smp_store_release(&w_ctx->flags, flags); - /* Decrese the reference count to the line as we will + /* Decrease the reference count to the line as we will * re-map these entries */ line = pblk_ppa_to_line(pblk, w_ctx->ppa); From patchwork Wed Aug 29 09:01:52 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: 10579713 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 B1AEC174C for ; Wed, 29 Aug 2018 09:02:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2A232AC3C for ; Wed, 29 Aug 2018 09:02:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 972DB2AC55; Wed, 29 Aug 2018 09:02:11 +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 426652AC3C for ; Wed, 29 Aug 2018 09:02:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727952AbeH2M55 (ORCPT ); Wed, 29 Aug 2018 08:57:57 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:34212 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727770AbeH2M55 (ORCPT ); Wed, 29 Aug 2018 08:57:57 -0400 Received: by mail-ed1-f65.google.com with SMTP id u1-v6so3191976eds.1 for ; Wed, 29 Aug 2018 02:02:02 -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=71gVRusD6E2BioSazU9UZHcOJze2HLKeGaU12HwD0ow=; b=Ez4DrqX5ptJK9z0WfyP+oXTEqoRXJIseghjXk3JKgRLEAJNrj9vgaBTvrIHIrtCUeX 41heGLIhj3O+VtoadasG9hxa4yI0lQlgz8TrLfHSxMKU+is0Lpj8f5aL6dIUmeXJ72Kj wBSVIch0iX7ahRmvczdbTvzZ8D2ym02aRwj8/mvSglG3k5Ly7SY3t5fvq9rEeuLOCxV1 yA5s146wgdWKLsEA/Fwu14f5xmAU0jq7TrlJod7RDo4OqtWK/fkOEGBUAVuSdPOg8ezc EXvE+XC4BBCUgyRTq4k+cpXDInFIFjZcEpqBsQzQnpC8SV1ZIy+ZHMcq5YIiMhZ/UhFj H8xQ== 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=71gVRusD6E2BioSazU9UZHcOJze2HLKeGaU12HwD0ow=; b=RiErssl1vQVwP71sLdLxibe5PxGLXSq7NZaTj2uKKwXvaqRnHifwRwsSImXdxTvHWd HvOnz2ZWjHQL5Pq0kGmcAXIHhlZt/2vwfeLQkbZ3JL4G2BJgKcfHiZ1LvxWdrn6MALEA yPedQ1bca7hzMEpva6TpKmWKewhbR+CCX+opgyoJY+4jC5XhJ4qOwcP8exlZp84Gx/j5 JIRHHSjR8MDpwmAmoYIRMW/bo+vLdYprSX/cysVn5JOjxd8353n3gKu1cl+jri6GE23R Nh6wWpf6gUqhTUuG/H9ey+INEWS5/UHjUfxa8fEehMQXhiSdqDjgnuJl9D99K44TE+93 JD1A== X-Gm-Message-State: APzg51CkpPh6SUbKZIH84raBALVRoMv/jKYPMo9LDNvIzkWjHgGZpljQ HZhyEiLAgvwLQT0Jc1oqtRY3Eg== X-Google-Smtp-Source: ANB0Vda5/VzJkdDmi9aANO1JL9isk2bme6FXWGST922Zd6ohUcFbFKPw75oM7lOEvg78oOJWsGDaUg== X-Received: by 2002:a50:c181:: with SMTP id m1-v6mr6732412edf.199.1535533321842; Wed, 29 Aug 2018 02:02:01 -0700 (PDT) Received: from ch-wrk-javier.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id a41-v6sm1546569edc.57.2018.08.29.02.02.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Aug 2018 02:02:01 -0700 (PDT) From: " =?utf-8?q?Javier_Gonz=C3=A1lez?= " X-Google-Original-From: =?utf-8?q?Javier_Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Jav?= =?utf-8?q?ier_Gonz=C3=A1lez?= Subject: [PATCH 3/4] lightnvm: pblk: remove unused variable. Date: Wed, 29 Aug 2018 11:01:52 +0200 Message-Id: <1535533313-29944-4-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535533313-29944-1-git-send-email-javier@cnexlabs.com> References: <1535533313-29944-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 Removed unused struct ppa_addr variable. Signed-off-by: Javier González --- drivers/lightnvm/pblk.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h index 994a081994fb..22cc9bfbbb10 100644 --- a/drivers/lightnvm/pblk.h +++ b/drivers/lightnvm/pblk.h @@ -1398,7 +1398,6 @@ static inline int pblk_check_io(struct pblk *pblk, struct nvm_rq *rqd) if (rqd->opcode == NVM_OP_PWRITE) { struct pblk_line *line; - struct ppa_addr ppa; int i; for (i = 0; i < rqd->nr_ppas; i++) { From patchwork Wed Aug 29 09:01:53 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: 10579711 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 23E4D174C for ; Wed, 29 Aug 2018 09:02:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 152992AC3C for ; Wed, 29 Aug 2018 09:02:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A0842AC66; Wed, 29 Aug 2018 09:02:10 +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 A89742AC3C for ; Wed, 29 Aug 2018 09:02:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727677AbeH2M6C (ORCPT ); Wed, 29 Aug 2018 08:58:02 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:46196 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727950AbeH2M56 (ORCPT ); Wed, 29 Aug 2018 08:57:58 -0400 Received: by mail-ed1-f65.google.com with SMTP id k14-v6so3337143edr.13 for ; Wed, 29 Aug 2018 02:02:03 -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=wpDvVtdSqLEG0+QPxw7Qs3v0IkD26P6KASqUsAywFwU=; b=MSCM6otcc0gvcru+sQKQ7dSSKXZoIy8duuze1WefYuXSw8Kby2oybIDxBMULt4+0KJ AyIWldkvWiLzRzypFUQbWevnMXGnErP4TY5ydb743dTbOeE90ay+mFIW8tHdMhuo8xSM 8oMJuA8AFXQ0ZhttSkVUoNbrU5+CSMhZYx5HATXokxyyZMFkelF/iUv0hqiOGYpYLj2/ eZaU3PJZdAyFytYbHsLrCvzrFPz/PxxA+D4i2Mudpg9M9LaVQmmCYt/GFUcdWRoiwS7d VXlMBafR+fkdhdhtQz8VjC9/OVTREryyfXNh3xYxnJ8TYjJQV1bY/PEfaZgSjKzGqAkH EffQ== 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=wpDvVtdSqLEG0+QPxw7Qs3v0IkD26P6KASqUsAywFwU=; b=QoGA+3cudriEroUstdvKq/kdjMr603J/JrJLx/vVy1/f1ecAyNHD12q+tEiC1tQeH9 ahKXtyo9LEhwE+9vdVJT/Yd1YxUObygATDvw40iGMZ1UxTozWy9lTgHQqJy5Kn/qwSAO f/MhGC8Usa1kPTFvKo3lysi1qkEsLj/RwbA7LOxGbB7N8h+hu6O2rPNMGPEOH/J0ldQy SwycO44USYo9lP7GxiDMQkIJ+9ajzQNQHn1jYxyfgrTQJ6H4gjqsze3xkF6+u8ZG3mc+ Sz6ZeGRcF2sMZfjNGN6kfcEeIfUdCE+AKojIGB6Yd01o0WOBSQZ+x45D/eQR5VUUfvsf kyoQ== X-Gm-Message-State: APzg51DuUtlPiilh9vc5k9fM4k9nDIecWRzEQblhZl5+Jaru3M9ZI9/t hUeE2O1VTk5uPr6FdgLFztUrbQ== X-Google-Smtp-Source: ANB0VdboSl4HoEYyR6ZQugWo7CeAmk3Ko3c8yIJeUPpvebx60T5OkdvRxGMTS7gXw7/rQyedViK8aw== X-Received: by 2002:a50:9a64:: with SMTP id o91-v6mr6718241edb.123.1535533322571; Wed, 29 Aug 2018 02:02:02 -0700 (PDT) Received: from ch-wrk-javier.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id a41-v6sm1546569edc.57.2018.08.29.02.02.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Aug 2018 02:02:02 -0700 (PDT) From: " =?utf-8?q?Javier_Gonz=C3=A1lez?= " X-Google-Original-From: =?utf-8?q?Javier_Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Jav?= =?utf-8?q?ier_Gonz=C3=A1lez?= Subject: [PATCH 4/4] lightnvm: pblk: guarantee emeta on line close Date: Wed, 29 Aug 2018 11:01:53 +0200 Message-Id: <1535533313-29944-5-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535533313-29944-1-git-send-email-javier@cnexlabs.com> References: <1535533313-29944-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 If a line is recovered from open chunks, the memory structures for emeta have not necessarily been properly set on line initialization. When closing a line, make sure that emeta is consistent so that the line can be recovered on the fast path on next reboot. Also, remove a couple of empty lines at the end of the function. Signed-off-by: Javier González --- drivers/lightnvm/pblk-core.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index 1e4dc0c1ed88..fdcbeb920c9e 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -1857,6 +1857,17 @@ void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line) wa->pad = cpu_to_le64(atomic64_read(&pblk->pad_wa)); wa->gc = cpu_to_le64(atomic64_read(&pblk->gc_wa)); + if (le32_to_cpu(emeta_buf->header.identifier) != PBLK_MAGIC) { + emeta_buf->header.identifier = cpu_to_le32(PBLK_MAGIC); + memcpy(emeta_buf->header.uuid, pblk->instance_uuid, 16); + emeta_buf->header.id = cpu_to_le32(line->id); + emeta_buf->header.type = cpu_to_le16(line->type); + emeta_buf->header.version_major = EMETA_VERSION_MAJOR; + emeta_buf->header.version_minor = EMETA_VERSION_MINOR; + emeta_buf->header.crc = cpu_to_le32( + pblk_calc_meta_header_crc(pblk, &emeta_buf->header)); + } + emeta_buf->nr_valid_lbas = cpu_to_le64(line->nr_valid_lbas); emeta_buf->crc = cpu_to_le32(pblk_calc_emeta_crc(pblk, emeta_buf)); @@ -1874,8 +1885,6 @@ void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line) spin_unlock(&l_mg->close_lock); pblk_line_should_sync_meta(pblk); - - } static void pblk_save_lba_list(struct pblk *pblk, struct pblk_line *line)