From patchwork Fri Apr 21 23:32:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9693961 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 5E6F46038D for ; Fri, 21 Apr 2017 23:34:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F34D28680 for ; Fri, 21 Apr 2017 23:34:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43D4F28685; Fri, 21 Apr 2017 23:34:13 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 C86542868B for ; Fri, 21 Apr 2017 23:34:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426714AbdDUXeC (ORCPT ); Fri, 21 Apr 2017 19:34:02 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:35322 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1426666AbdDUXdC (ORCPT ); Fri, 21 Apr 2017 19:33:02 -0400 Received: by mail-wm0-f44.google.com with SMTP id w64so25874444wma.0 for ; Fri, 21 Apr 2017 16:33: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=Zwxbj2NXA384bxGvsgATX72TbQXtHLOl6VlecOQJkzk=; b=S/qyzYaaHIwQyaUA2XCyU82tBNcz0eMaeSOhEZ4YwGiy8986Pj+PvWvqcZ93bb8uN2 UzOW7Mgk+BQuNUMZb3Rsi0LZcxTdBgc7fUhBa/PdLZnwxd2zJ2x1ojkmUC1qVYhVuwLk QqxnnguX4iRvsodAfJs6w3poO4QjHZLW+li14216tiyTp9QM0g2MtV3PPBtjsuC4KB1H eWbp8pY3BCU5iVNTpUOVBGwI4dsAcvzrtD06d3Zold1yA7CPrwzrr6+9kjOYKv16KJVp BNDYASwuf9RQnE3caCtVIZ03ylL83F74qU2L8BEuWkDfig+ICf2CWbDFT/pvbzeLfpFc LVQQ== 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=Zwxbj2NXA384bxGvsgATX72TbQXtHLOl6VlecOQJkzk=; b=WnrXQgTRvthVRSKiUjz7Na8vecx/xGRKbkR8OQ3syBT7srdhKeuC/TLePntJOEDVMj 8ee5nqahqeEDOYbmVYofCqMGq5hBJQEID37zCdSrRW20FDq8qkIjulJ0ezOxcMAyFBQt j98g88UjfBNnryLLUaOetcOoywZ01v0+9jgl3kNtnEQb04kZ1JLTAO1bSL7cZavUvi90 OyFTYfNp1gULtdoZF2nvhYnBcs2lD4ruDCms47fZwa2KQtCr/nyc4vk5HFpo/rXMmTHd p4U6mHRrE4JaEr3bwTlZAHe3T9MWjhTOp4J0sGLu5ByBST6RPvVK2lB6Q4PP4RtejDYR M/aA== X-Gm-Message-State: AN3rC/5yuSOUozTdaxSNw8nxJw6gz07dwexkUnkpi+10eYzzNY7CoHNH rWc4bvuIhi4jOo6P X-Received: by 10.80.163.146 with SMTP id s18mr77342edb.107.1492817580996; Fri, 21 Apr 2017 16:33:00 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id x2sm816935edb.49.2017.04.21.16.33.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Apr 2017 16:33:00 -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 1/5] lightnvm: pblk: fix race condition on line retry Date: Sat, 22 Apr 2017 01:32:45 +0200 Message-Id: <1492817569-13532-2-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492817569-13532-1-git-send-email-javier@cnexlabs.com> References: <1492817569-13532-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 When a pblk line fails (or is recovered), make sure to take the line management lock. Fixes: a4bd217b4326 "lightnvm: physical block device (pblk) target" Signed-off-by: Javier González Reviewed-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index a2bcd09..7065658 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -1050,13 +1050,14 @@ int pblk_line_recov_alloc(struct pblk *pblk, struct pblk_line *line) spin_lock(&l_mg->free_lock); l_mg->data_line = line; list_del(&line->list); - spin_unlock(&l_mg->free_lock); ret = pblk_line_prepare(pblk, line); if (ret) { list_add(&line->list, &l_mg->free_list); + spin_unlock(&l_mg->free_lock); return ret; } + spin_unlock(&l_mg->free_lock); pblk_rl_free_lines_dec(&pblk->rl, line); @@ -1140,6 +1141,7 @@ static struct pblk_line *pblk_line_retry(struct pblk *pblk, line->invalid_bitmap = NULL; line->smeta = NULL; line->emeta = NULL; + l_mg->data_line = retry_line; spin_unlock(&l_mg->free_lock); if (pblk_line_erase(pblk, retry_line)) @@ -1147,8 +1149,6 @@ static struct pblk_line *pblk_line_retry(struct pblk *pblk, pblk_rl_free_lines_dec(&pblk->rl, retry_line); - l_mg->data_line = retry_line; - return retry_line; }