From patchwork Thu May 19 06:38:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenwei Tao X-Patchwork-Id: 9124441 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 16827BF29F for ; Thu, 19 May 2016 06:37:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3134C20204 for ; Thu, 19 May 2016 06:37:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FF292017D for ; Thu, 19 May 2016 06:37:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753851AbcESGhX (ORCPT ); Thu, 19 May 2016 02:37:23 -0400 Received: from m50-138.163.com ([123.125.50.138]:44371 "EHLO m50-138.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753849AbcESGhW (ORCPT ); Thu, 19 May 2016 02:37:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=fX406tJkz7h/vrZmkE fKvuk9xtSeui7dSJdFZ7cHSP4=; b=EC5ymSkK8KNcQm6U5s7HZBzwWcYIBSL+et WPwYUxBoolcwEKiG6vi4r0aQGjCAMdPDVxje9mfILamNvUify8RpSYPlocIHj4eg 1z/rBSW+jfL2tytiElvnxBFRc1esFqHUXldO24jXQ3v5is0L4O5ivNSVNe93dSK1 FL6M7Kkmk= Received: from taowenwei.bj-memblaze.com (unknown [111.204.49.2]) by smtp1 (Coremail) with SMTP id C9GowAB3fAz0Xj1X3TG5Ag--.3280S3; Thu, 19 May 2016 14:36:39 +0800 (CST) From: Wenwei Tao To: mb@lightnvm.io Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, ww.tao0320@gmail.com Subject: [PATCH 2/2] lightnvm: hold nvm_lock until finish the target creation Date: Thu, 19 May 2016 14:38:41 +0800 Message-Id: <1463639921-1824-2-git-send-email-wwtao0320@163.com> X-Mailer: git-send-email 2.7.1.windows.2 In-Reply-To: <1463639921-1824-1-git-send-email-wwtao0320@163.com> References: <1463639921-1824-1-git-send-email-wwtao0320@163.com> X-CM-TRANSID: C9GowAB3fAz0Xj1X3TG5Ag--.3280S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF17CF17AF1DAr43Jw1kZrb_yoW8ZF1rpF WrGryIkr43K397XrWDtFWUXFy5tw10gFyxA34xu34SqF1Yv3y0vF1rXFy3XF1ayFWxCayY qFW8t3WYkay2yrUanT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jgEfOUUUUU= X-Originating-IP: [111.204.49.2] X-CM-SenderInfo: 5zzwt0aqtsiqqrwthudrp/1tbiyBdusVWBT9+W5wAAs1 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wenwei Tao When create a target, we check whether the target is already exist first. If the answer is no, we release the lock and continue the creation. This cannot prevent concurrent creation of the same target, so hold the lock until finish the target creation. Signed-off-by: Wenwei Tao --- drivers/lightnvm/core.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index 160c1a6..a622081 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -791,6 +791,7 @@ static int nvm_create_target(struct nvm_dev *dev, struct nvm_tgt_type *tt; struct nvm_target *t; void *targetdata; + int ret = -ENOMEM; if (!dev->mt) { pr_info("nvm: device has no media manager registered.\n"); @@ -801,21 +802,20 @@ static int nvm_create_target(struct nvm_dev *dev, tt = nvm_find_target_type(create->tgttype); if (!tt) { pr_err("nvm: target type %s not found\n", create->tgttype); - up_write(&nvm_lock); - return -EINVAL; + ret = -EINVAL; + goto err_unlock; } t = nvm_find_target(create->tgtname); if (t) { pr_err("nvm: target name already exists.\n"); - up_write(&nvm_lock); - return -EINVAL; + ret = -EINVAL; + goto err_unlock; } - up_write(&nvm_lock); t = kmalloc(sizeof(struct nvm_target), GFP_KERNEL); if (!t) - return -ENOMEM; + goto err_unlock; tqueue = blk_alloc_queue_node(GFP_KERNEL, dev->q->node); if (!tqueue) @@ -848,8 +848,6 @@ static int nvm_create_target(struct nvm_dev *dev, t->type = tt; t->disk = tdisk; t->dev = dev; - - down_write(&nvm_lock); list_add_tail(&t->list, &nvm_targets); up_write(&nvm_lock); @@ -860,7 +858,9 @@ err_queue: blk_cleanup_queue(tqueue); err_t: kfree(t); - return -ENOMEM; +err_unlock: + up_write(&nvm_lock); + return ret; } static int __nvm_configure_create(struct nvm_ioctl_create *create)