From patchwork Tue Nov 24 15:24:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenwei Tao X-Patchwork-Id: 7691901 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 DC811BF90C for ; Tue, 24 Nov 2015 15:26:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 132FB207A9 for ; Tue, 24 Nov 2015 15:26:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C5C32056D for ; Tue, 24 Nov 2015 15:26:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753685AbbKXP0C (ORCPT ); Tue, 24 Nov 2015 10:26:02 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:33907 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753449AbbKXP0A (ORCPT ); Tue, 24 Nov 2015 10:26:00 -0500 Received: by padhx2 with SMTP id hx2so25432763pad.1; Tue, 24 Nov 2015 07:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=iL6RXK90nncV/kiKy1Y0ygRAwyQxF15CIhYgDNOIDPM=; b=XjExSBrqFhDlpn8k8WgYNKUnCJ1ZwvilmmWKeS03CDjk/P8YJnXcfgMJao9+ojyEsX e0A9kEPoi1cWS+9/EdJ1nnBYjaFZ4iIIf8jfWS1P7SCHc6QMD+QwD23vT7ITyBYwMtt/ mj4lr2Ql5o//R2UaFhKRsvIQ+vmqSZscKEHHkY/0iAgvkKwnGpgeXohffFtsvuESnA8L Bq2AIpIqgwj3BhuQqkN/mAOVGBK7/+capiuU/R+iAS3dZS5xUHruHJWmwRj0MJ2qE02Z jsIi46lJN/z8W+tp4mn6/2G0LFkmFP4JMkaBJyykTwUVdGRdxdIXYRjJUOqcBTAOZdJB n/RA== X-Received: by 10.66.235.100 with SMTP id ul4mr7173879pac.142.1448378759807; Tue, 24 Nov 2015 07:25:59 -0800 (PST) Received: from localhost.localdomain ([2002:72fa:582d::72fa:582d]) by smtp.gmail.com with ESMTPSA id ck9sm15591173pad.28.2015.11.24.07.25.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Nov 2015 07:25:59 -0800 (PST) From: Wenwei Tao To: mb@lightnvm.io Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH] lightnvm: missing nvm_lock acquire Date: Tue, 24 Nov 2015 23:24:57 +0800 Message-Id: <1448378697-2532-1-git-send-email-ww.tao0320@gmail.com> X-Mailer: git-send-email 2.5.1.windows.1 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, 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 To avoid race conditions, traverse dev, media manager, and targeet lists and also register, unregister entries to/from them, should be always under the nvm_lock control. Signed-off-by: Wenwei Tao --- drivers/lightnvm/core.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index f659e60..39aec3a 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -333,19 +333,19 @@ EXPORT_SYMBOL(nvm_register); void nvm_unregister(char *disk_name) { + down_write(&nvm_lock); struct nvm_dev *dev = nvm_find_nvm_dev(disk_name); if (!dev) { pr_err("nvm: could not find device %s to unregister\n", disk_name); + up_write(&nvm_lock); return; } - nvm_exit(dev); - - down_write(&nvm_lock); list_del(&dev->devices); up_write(&nvm_lock); + nvm_exit(dev); } EXPORT_SYMBOL(nvm_unregister); @@ -365,12 +365,15 @@ static int nvm_create_target(struct nvm_dev *dev, void *targetdata; int ret = 0; + down_write(&nvm_lock); if (!dev->mt) { /* register with device with a supported NVM manager */ list_for_each_entry(mt, &nvm_mgrs, list) { ret = mt->register_mgr(dev); - if (ret < 0) + if (ret < 0) { + up_write(&nvm_lock); return ret; /* initialization failed */ + } if (ret > 0) { dev->mt = mt; break; /* successfully initialized */ @@ -379,6 +382,7 @@ static int nvm_create_target(struct nvm_dev *dev, if (!ret) { pr_info("nvm: no compatible nvm manager found.\n"); + up_write(&nvm_lock); return -ENODEV; } } @@ -386,10 +390,10 @@ 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; } - down_write(&nvm_lock); list_for_each_entry(t, &dev->online_targets, list) { if (!strcmp(create->tgtname, t->disk->disk_name)) { pr_err("nvm: target name already exists.\n"); @@ -472,8 +476,9 @@ static int __nvm_configure_create(struct nvm_ioctl_create *create) { struct nvm_dev *dev; struct nvm_ioctl_create_simple *s; - + down_write(&nvm_lock); dev = nvm_find_nvm_dev(create->dev); + up_write(&nvm_lock); if (!dev) { pr_err("nvm: device not found\n"); return -EINVAL; @@ -532,7 +537,9 @@ static int nvm_configure_show(const char *val) return -EINVAL; } + down_write(&nvm_lock); dev = nvm_find_nvm_dev(devname); + up_write(&nvm_lock); if (!dev) { pr_err("nvm: device not found\n"); return -EINVAL;